merge TODO into roadmap.txt

diff --git a/TODO b/TODO
deleted file mode 100644 (file)
index d5d5b33..0000000
--- a/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-* port to Windows
-* extirpate all references to "queen" or "metatracker"
-* set up public trac, buildbot reports, mailing list, download page
-* write announcement
-
-* encryption
-* checking hashes
-* make minimal uri by deterministic derivation of some stuff other than crypto bits and filesize

diff --git a/roadmap.txt b/roadmap.txt
index 8165bcc53f657320b2bc5d3378d217188a67db9c..b8eb33d8fc8cadc24a11b48c313543179e6c87ac 100644 (file)
--- a/roadmap.txt
+++ b/roadmap.txt
@@ -66,10 +66,12 @@ UI:
  v3.5: XUIL?
  v4: FUSE
 
-Operations/Deployment:
- v1: doc how to set up a network (introducer, vdrive server, nodes)
- v2: Windows port and testing
- v3: Trac instance
+Operations/Deployment/Doc/Free Software/Community:
+ * Windows port and testing (iputil)
+ * Trac instance
+ * extirpate all references to "queen" and "metatracker"
+ * set up public trac, buildbot reports, mailing list, download page
+ * write announcement
 
 back pocket ideas:
  when nodes are unable to reach storage servers, make a note of it, inform