From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Sep 2016 04:35:57 +0000 (-0700)
Subject: Merge branch 'ls/packet-line-protocol-doc-fix' into maint
X-Git-Tag: v2.9.4~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a75341c75aff04a9be8c315b0520db3ff40cd9d5?ds=inline;hp=-c

Merge branch 'ls/packet-line-protocol-doc-fix' into maint

Correct an age-old calco (is that a typo-like word for calc)
in the documentation.

* ls/packet-line-protocol-doc-fix:
pack-protocol: fix maximum pkt-line size
---

a75341c75aff04a9be8c315b0520db3ff40cd9d5
diff --combined Documentation/technical/protocol-common.txt
index bf30167ae3,d2a6b268cd..ecedb34bba
--- a/Documentation/technical/protocol-common.txt
+++ b/Documentation/technical/protocol-common.txt
@@@ -36,10 -36,10 +36,10 @@@ More specifically, they
  
  . They cannot have ASCII control characters (i.e. bytes whose
    values are lower than \040, or \177 `DEL`), space, tilde `~`,
 -  caret `{caret}`, colon `:`, question-mark `?`, asterisk `*`,
 +  caret `^`, colon `:`, question-mark `?`, asterisk `*`,
    or open bracket `[` anywhere.
  
 -. They cannot end with a slash `/` nor a dot `.`.
 +. They cannot end with a slash `/` or a dot `.`.
  
  . They cannot end with the sequence `.lock`.
  
@@@ -62,14 -62,11 +62,14 @@@ A pkt-line MAY contain binary data, so 
  pkt-line parsing/formatting routines are 8-bit clean.
  
  A non-binary line SHOULD BE terminated by an LF, which if present
 -MUST be included in the total length.
 +MUST be included in the total length. Receivers MUST treat pkt-lines
 +with non-binary data the same whether or not they contain the trailing
 +LF (stripping the LF if present, and not complaining when it is
 +missing).
  
- The maximum length of a pkt-line's data component is 65520 bytes.
- Implementations MUST NOT send pkt-line whose length exceeds 65524
- (65520 bytes of payload + 4 bytes of length data).
+ The maximum length of a pkt-line's data component is 65516 bytes.
+ Implementations MUST NOT send pkt-line whose length exceeds 65520
+ (65516 bytes of payload + 4 bytes of length data).
  
  Implementations SHOULD NOT send an empty pkt-line ("0004").