big reshuffle:

drafts/erik-model.rst

@@ -1,4 +1,7 @@
-This is a standalone description of the data architecture of Synapse.  There is a lot of overlap with the currennt specification, so it has been split out here for posterity.  Hopefully all the important bits have been merged into the relevant places in the main spec.
+This is a standalone description of the data architecture of Synapse. There is a
+lot of overlap with the current specification, so it has been split out here for
+posterity. Hopefully all the important bits have been merged into the relevant
+places in the main spec.
 
 
 Model

drafts/general_api.rst

@@ -555,7 +555,7 @@ signature. Requesting the "raw" federation event will have to return these keys.
 
 Account Management API ``[Draft]``
 ----------------------------------
-The registration and login APIs in v2 do not support specifying device IDs. In v2,
+The registration and login APIs in v1 do not support specifying device IDs. In v2,
 this will become *mandatory* when sending your initial request. Access tokens will
 be scoped per device, so using the same device ID twice when logging in will 
 clobber the old access token.
@@ -810,6 +810,10 @@ Notes:
 
 Presence API ``[Draft]``
 ------------------------
+
+FIXME: this seems to be ignoring activity timers entirely, which were present on
+the planning etherpad and are present in the actual HTTP API. Needs attention.
+
 The goals of presence are to:
 
 - Let other users know if someone is "online".

drafts/object_model.rst

@@ -1,6 +1,5 @@
-
-
-
+..TODO
+  What are the start & end tokens doing here?!
 
 ::
 

scripts/gendoc.py

@@ -101,7 +101,8 @@ def prepare_env():
         pass
 
 def cleanup_env():
-    shutil.rmtree("./tmp")
+    pass
+    #shutil.rmtree("./tmp")
 
 def main():
     prepare_env()