From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 19:23:52 +0000 (-0700)
Subject: Merge branch 'ye/doc-http-proto'
X-Git-Tag: v2.1.0-rc0~81
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/ccca6b6523d7071cd0ee09fd00ea3e05d4b8e3eb?hp=8d87e35babb0f9d8657ef530dd9d77eed0bfec9a

Merge branch 'ye/doc-http-proto'

* ye/doc-http-proto:
http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
---

diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 59be59b0eb..229f845dfa 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.