From 8d749c9442516868d7819087f4eb3e87b2a05054 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 11 Feb 2015 16:37:13 -0400
Subject: [PATCH] update

---
 doc/design/roadmap.mdwn | 53 ++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn
index b6af4db30e..1cf5fac639 100644
--- a/doc/design/roadmap.mdwn
+++ b/doc/design/roadmap.mdwn
@@ -1,23 +1,38 @@
-## roadmap
+## ahead
 
-Just finished the 
-[sustaining git-annex development](https://campaign.joeyh.name/) year
-(starting September 2013).
+* [[assistant/deltas]]
+* [[assistant/gpgkeys]]
+* [[assistant/telehash]]
+* [[design/requests_routing]]
+* [[design/v6]]
 
-* Month 1 [[!traillink assistant/encrypted_git_remotes]]
-* Month 2 [[!traillink assistant/disaster_recovery]]
-* Month 3 [[!traillink direct_mode]] guard [[!traillink assistant/upgrading]]
-* Month 4 [[!traillink assistant/windows text="Windows webapp"]], Linux arm, external special remotes
-* Month 5 user-driven features and polishing
-* Month 6 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]]
-* Month 7 user-driven features and polishing
-* Month 8 [[!traillink git-remote-daemon]]
-* Month 9 Brazil!, [[!traillink assistant/sshpassword]]
-* Month 10 polish [[assistant/Windows]] port
-* Month 11 [[!traillink assistant/chunks]]
-* Month 12 user-driven features and polishing
+## now
 
-Deferred until later:
+* Feb 2015 user-driven features and polishing, [[design/caching_database]]
 
-* Month XX [[!traillink assistant/deltas]], [[!traillink assistant/gpgkeys]]
-* Month XX [[!traillink assistant/telehash]]
+## the rearview
+
+* Jan 2015 Android 5, relative paths, workload [[tuning]]
+* Dec 2014 [[todo/extensible_addurl]], bittorrent special remote
+* Nov 2014 direct mode proxy, undo command, diffdriver
+* Oct 2014 user-driven features and polishing, S3 multipart
+* Sep 2014 vacation
+
+2013-2014 [crowdfunded](https://campaign.joeyh.name/) year
+
+* Aug 2014 user-driven features and polishing
+* Jul 2014 [[!traillink assistant/chunks]]
+* Jun 2014 polish [[assistant/Windows]] port
+* May 2014 Brazil!, [[!traillink assistant/sshpassword]]
+* Apr 2014 [[!traillink git-remote-daemon]]
+* Mar 2014 user-driven features and polishing
+* Feb 2014 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]]
+* Jan 2014 user-driven features and polishing
+* Dec 2013 [[!traillink assistant/windows text="Windows webapp"]], Linux arm, external special remotes
+* Nov 2013 [[!traillink direct_mode]] guard [[!traillink assistant/upgrading]]
+* Oct 2013 [[!traillink assistant/disaster_recovery]]
+* Sep 2013 [[!traillink assistant/encrypted_git_remotes]]
+
+2012-2013 kickstarted year developing [[git-annex assistant|assistant]]
+
+2010-2011 initial git-annex development