split out roadmap

2 files changed, 22 insertions, 20 deletions

diff --git a/doc/design/assistant.mdwn b/doc/design/assistant.mdwn
index affe7d63f..daf6fce0b 100644
--- a/doc/design/assistant.mdwn
+++ b/doc/design/assistant.mdwn
@@ -1,11 +1,11 @@
-This is the design site for the git-annex [[/assistant]].
+These are the design pages for the git-annex [[/assistant]].
 
 Parts of the design is still being fleshed out, still many ideas
 and use cases to add. Feel free to chip in with comments! --[[Joey]]
 
-## roadmap
+See [[roadmap]] for current plans.
 
-kickstarter year
+## initial development kickstarter year overview (2012-2013)
 
 * Month 1 "like dropbox": [[!traillink inotify]] [[!traillink syncing]]
 * Month 2 "shiny webapp": [[!traillink webapp]] [[!traillink progressbars]]
@@ -21,22 +21,6 @@ kickstarter year
 * Month 11: [[!traillink Windows]] porting, finishing touches
 * Month 12: [presentation at SELF2013](http://www.southeastlinuxfest.org/), finishing touches
 
-[sustaining git-annex development](https://campaign.joeyh.name/) year
-(starts September 2013).
-
-* Month 1 [[!traillink encrypted_git_remotes]]
-* Month 2 [[!traillink disaster_recovery]]
-* Month 3 user-driven features and polishing
-* Month 4 improve special remote interface & git-annex enhancement contest
-* Month 5 [[!traillink xmpp_security]]
-* Month 6 Windows assistant and webapp
-* Month 7 user-driven features and polishing
-* Month 8 [[!traillink gpgkeys]] [[!traillink sshpassword]]
-* Month 9 get [[Android]] out of beta
-* Month 10 user-driven features and polishing
-* Month 11 [[!traillink chunks]] [[!traillink deltas]]
-* Month 12 user-driven features and polishing
-
 ## porting
 
 * [[OSX]] port is in fairly good shape, but still has some room for improvement
@@ -57,5 +41,5 @@ I post [[polls]] occasionally to make decisions. You can vote!
 
 ## blog
 
-I'm blogging about my progress in the [[blog]] on a semi-daily basis.
+I'm blogging about my progress in the [[devblog]] on a semi-daily basis.
 Follow along!
diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn
new file mode 100644
index 000000000..625f7b167
--- /dev/null
+++ b/doc/design/roadmap.mdwn
@@ -0,0 +1,18 @@
+## roadmap
+
+Now in the 
+[sustaining git-annex development](https://campaign.joeyh.name/) year
+(starting September 2013).
+
+* Month 1 [[!traillink assistant/encrypted_git_remotes]]
+* Month 2 [[!traillink assistant/disaster_recovery]]
+* Month 3 user-driven features and polishing
+* Month 4 improve special remote interface & git-annex enhancement contest
+* Month 5 [[!traillink assistant/xmpp_security]]
+* Month 6 Windows assistant and webapp
+* Month 7 user-driven features and polishing
+* Month 8 [[!traillink assistant/gpgkeys]] [[!traillink assistant/sshpassword]]
+* Month 9 get [[assistant/Android]] out of beta
+* Month 10 user-driven features and polishing
+* Month 11 [[!traillink assistant/chunks]] [[!traillink assistant/deltas]]
+* Month 12 user-driven features and polishing