numerous cleanups in the control-spec. patch from tup.

svn:r11182

doc/spec/control-spec.txt

@@ -540,8 +540,8 @@ $Id$
 
   Sent from the client to the server.  The format is:
       "EXTENDCIRCUIT" SP CircuitID SP
-                      ServerSpec *("," ServerSpec) SP
-                      ("purpose=" Purpose) CRLF
+                      ServerSpec *("," ServerSpec)
+                      [SP "purpose=" Purpose] CRLF
 
   This request takes one of two forms: either the CircuitID is zero, in
   which case it is a request for the server to build a new circuit according
@@ -613,7 +613,7 @@ $Id$
 3.14. POSTDESCRIPTOR
 
   Sent from the client to the server. The syntax is:
-    "+POSTDESCRIPTOR" ("purpose=" Purpose) CRLF Descriptor CRLF "." CRLF
+    "+POSTDESCRIPTOR" [SP "purpose=" Purpose] CRLF Descriptor CRLF "." CRLF
 
   This message informs the server about a new descriptor. If Purpose is
   specified, it must be either "general" or "controller", else we
@@ -631,7 +631,7 @@ $Id$
 3.15. REDIRECTSTREAM
 
   Sent from the client to the server. The syntax is:
-    "REDIRECTSTREAM" SP StreamID SP Address (SP Port) CRLF
+    "REDIRECTSTREAM" SP StreamID SP Address [SP Port] CRLF
 
   Tells the server to change the exit address on the specified stream.  If
   Port is specified, changes the destination port as well.  No remapping
@@ -991,7 +991,7 @@ $Id$
 
   The syntax is:
     "650" SP "ORCONN" SP (ServerID / Target) SP ORStatus [ SP "REASON="
-             Reason ] [ SP "NCIRCS=" NumCircuits ]
+             Reason ] [ SP "NCIRCS=" NumCircuits ] CRLF
 
     ORStatus = "NEW" / "LAUNCHED" / "CONNECTED" / "FAILED" / "CLOSED"
 
@@ -1017,7 +1017,7 @@ $Id$
 4.1.4. Bandwidth used in the last second
 
   The syntax is:
-     "650" SP "BW" SP BytesRead SP BytesWritten *(SP Type "=" Num)
+     "650" SP "BW" SP BytesRead SP BytesWritten *(SP Type "=" Num) CRLF
      BytesRead = 1*DIGIT
      BytesWritten = 1*DIGIT
      Type = "DIR" / "OR" / "EXIT" / "APP" / ...
@@ -1030,7 +1030,7 @@ $Id$
 4.1.5. Log messages
 
   The syntax is:
-     "650" SP Severity SP ReplyText
+     "650" SP Severity SP ReplyText CRLF
   or
      "650+" Severity CRLF Data 650 SP "OK" CRLF
 
@@ -1039,7 +1039,7 @@ $Id$
 4.1.6. New descriptors available
 
   Syntax:
-     "650" SP "NEWDESC" 1*(SP ServerID)
+     "650" SP "NEWDESC" 1*(SP ServerID) CRLF
 
 4.1.7. New Address mapping
 
@@ -1074,7 +1074,7 @@ $Id$
 4.1.9. Our descriptor changed
 
   Syntax:
-     "650" SP "DESCCHANGED"
+     "650" SP "DESCCHANGED" CRLF
 
   [First added in 0.1.2.2-alpha.]
 
@@ -1405,7 +1405,7 @@ $Id$
 4.1.13. Bandwidth used on an application stream
 
   The syntax is:
-     "650" SP "STREAM_BW" SP StreamID SP BytesRead SP BytesWritten
+     "650" SP "STREAM_BW" SP StreamID SP BytesRead SP BytesWritten CRLF
      BytesRead = 1*DIGIT
      BytesWritten = 1*DIGIT