Merge branch 'sb/pack-protocol-mention-smart-http' into maint

Doc updates.

* sb/pack-protocol-mention-smart-http:
  Documentation/technical/pack-protocol: mention http as possible protocol

diff --combined Documentation/technical/pack-protocol.txt
index fc09c63b32e1776347f6b6c562739f9245593639,554b640e46610bb91304ea17e35af74ac5351d5a..4064fc796fe36e58eb580de2c66a00196051ba5f
--- 1/Documentation/technical/pack-protocol.txt
--- 2/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@@ -1,11 -1,11 +1,11 @@@
  Packfile transfer protocols
  ===========================
  
- Git supports transferring data in packfiles over the ssh://, git:// and
+ Git supports transferring data in packfiles over the ssh://, git://, http:// and
  file:// transports.  There exist two sets of protocols, one for pushing
  data from a client to a server and another for fetching data from a
- server to a client.  All three transports (ssh, git, file) use the same
- protocol to transfer data.
+ server to a client.  The three transports (ssh, git, file) use the same
+ protocol to transfer data. http is documented in http-protocol.txt.
  
  The processes invoked in the canonical Git implementation are 'upload-pack'
  on the server side and 'fetch-pack' on the client side for fetching data;
@@@ -465,7 -465,7 +465,7 @@@ contain all the objects that the serve
  references.
  
  ----
 -  update-request    =  *shallow ( command-list | push-cert ) [pack-file]
 +  update-request    =  *shallow ( command-list | push-cert ) [packfile]
  
    shallow           =  PKT-LINE("shallow" SP obj-id LF)
  
@@@ -491,7 -491,7 +491,7 @@@
                      *PKT-LINE(gpg-signature-lines LF)
                      PKT-LINE("push-cert-end" LF)
  
 -  pack-file         = "PACK" 28*(OCTET)
 +  packfile          = "PACK" 28*(OCTET)
  ----
  
  If the receiving end does not support delete-refs, the sending end MUST
@@@ -502,11 -502,11 +502,11 @@@ MUST NOT send a push-cert command.  Whe
  sent, command-list MUST NOT be sent; the commands recorded in the
  push certificate is used instead.
  
 -The pack-file MUST NOT be sent if the only command used is 'delete'.
 +The packfile MUST NOT be sent if the only command used is 'delete'.
  
 -A pack-file MUST be sent if either create or update command is used,
 +A packfile MUST be sent if either create or update command is used,
  even if the server already has all the necessary objects.  In this
 -case the client MUST send an empty pack-file.   The only time this
 +case the client MUST send an empty packfile.   The only time this
  is likely to happen is if the client is creating
  a new branch or a tag that points to an existing obj-id.