r13906@catbus: nickm | 2007-07-25 18:49:50 -0400

 Patch from tup: correct grammar for asynchonous reply lines in control-spec.txt

svn:r10931

diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index e7131cceeed0f80cebb3187d9c0f1e87a7b2824f..df1d8752e70df49ef37eaed88f9ef057bba539be 100644 (file)
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -62,14 +62,16 @@ $Id$
 
 2.3. Replies from Tor to the controller
 
-    Reply = *(MidReplyLine / DataReplyLine) EndReplyLine
-
-    MidReplyLine = "-" ReplyLine
-    DataReplyLine = "+" ReplyLine Data
-    EndReplyLine = SP ReplyLine
-    ReplyLine = StatusCode [ SP ReplyText ]  CRLF
+    Reply = SyncReply / AsyncReply
+    SyncReply = *(MidReplyLine / DataReplyLine) EndReplyLine
+    AsyncReply = *MidReplyLine EndReplyLine / DataReplyLine
+
+    MidReplyLine = StatusCode "-" ReplyLine
+    DataReplyLine = StatusCode "+" ReplyLine Data
+    EndReplyLine = StatusCode SP ReplyLine
+    ReplyLine = [ReplyText] CRLF
     ReplyText = XXXX
-    StatusCode = XXXX
+    StatusCode = 3DIGIT
 
   Specific replies are mentioned below in section 3, and described more fully
   in section 4.