summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 10:28:02 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-22 10:28:02 -0700
commit1a1f7b2c522814a251b77cb7dd7b0ee2e7410f88 (patch)
treed78da530f45cce29432a57770eda25b0428ce213
parent0196a605f742580f53250bddf82b355a1018d9be (diff)
parent04953bc888e648dc22c172ffa74de1b2a08a209a (diff)
downloadgit-1a1f7b2c522814a251b77cb7dd7b0ee2e7410f88.tar.gz
Merge branch 'ye/doc-http-proto' into maint
* ye/doc-http-proto: http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
-rw-r--r--Documentation/technical/http-protocol.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 20525d98bb..58c7e872d7 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -60,7 +60,7 @@ Because Git repositories are accessed by standard path components
server administrators MAY use directory based permissions within
their HTTP server to control repository access.
-Clients SHOULD support Basic authentication as described by RFC 2616.
+Clients SHOULD support Basic authentication as described by RFC 2617.
Servers SHOULD support Basic authentication by relying upon the
HTTP server placed in front of the Git server software.