protocol docs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/PROTOCOL b/PROTOCOL
index cb31035d637a7e11cc02ab75fd5938b36a4c03d4..4c813b9dac9c072d8020e1ea78061c6ef97b05de 100644 (file)
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -22,8 +22,8 @@ Client form parameters (multipart/form-data):
                        token
                        target_requests_outstanding
                        http_timeout
                        token
                        target_requests_outstanding
                        http_timeout

-                       max_batch_down
-                       max_batch_up
+                       max_batch_down          } not supplied
+                       max_batch_up            }  by older clients

  d              data (SLIP format, with SLIP_ESC and `-' swapped)
 
 
  d              data (SLIP format, with SLIP_ESC and `-' swapped)
 
 

diff --git a/docs/settings.rst b/docs/settings.rst
index 6bf171210353a0d22c6db116bad3ec196d0121b0..f900673389eaeff4b429f1341cf723418bc17419 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -65,8 +65,8 @@ value is obtained, it is (silently) reduced to the limit value.
 ``max_batch_down``
   Size limit for response payloads.
 
 ``max_batch_down``
   Size limit for response payloads.
 

-  On client, incoming response bodies are limited to this plus
-  a fixed constant metadata overhead of 10000 bytes.
+  On client, incoming response bodies are limited to this (plus
+  a fixed constant metadata overhead).

   Server uses minimum of client's and server's configured values
   (old servers just use server's value).
 
   Server uses minimum of client's and server's configured values
   (old servers just use server's value).
 


@@ -77,7 +77,7 @@ value is obtained, it is (silently) reduced to the limit value.
   with ``LIMIT`` applied.
 
   On server, only ``LIMIT`` is relevant, and must be at least the
   with ``LIMIT`` applied.
 
   On server, only ``LIMIT`` is relevant, and must be at least the

-  client's configured value (checked). xxx put in metadata
+  client's configured value (checked).

 
   [``4000`` (bytes); ``LIMIT``: ``262144``]
 
 
   [``4000`` (bytes); ``LIMIT``: ``262144``]