From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Nov 2013 22:57:57 +0000 (-0800)
Subject: Merge branch 'sc/doc-howto-dumb-http'
X-Git-Tag: v1.8.5-rc1~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/68d5fbe285913cf6ff6c62c891539e9600030165?ds=inline;hp=-c

Merge branch 'sc/doc-howto-dumb-http'

* sc/doc-howto-dumb-http:
doc/howto: warn about (dumb)http server document being too old
---

68d5fbe285913cf6ff6c62c891539e9600030165
diff --combined Documentation/howto/setup-git-server-over-http.txt
index 981cbddc86,c8036492e6..6de4f3c487
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@@ -6,6 -6,10 +6,10 @@@ Content-type: text/asciido
  How to setup Git server over http
  =================================
  
+ NOTE: This document is from 2006.  A lot has happened since then, and this
+ document is now relevant mainly if your web host is not CGI capable.
+ Almost everyone else should instead look at linkgit:git-http-backend[1].
+ 
  Since Apache is one of those packages people like to compile
  themselves while others prefer the bureaucrat's dream Debian, it is
  impossible to give guidelines which will work for everyone. Just send
@@@ -81,8 -85,8 +85,8 @@@ Initialize a bare repositor
      $ git --bare init
  
  
 -Change the ownership to your web-server's credentials. Use "grep ^User
 -httpd.conf" and "grep ^Group httpd.conf" to find out:
 +Change the ownership to your web-server's credentials. Use `"grep ^User
 +httpd.conf"` and `"grep ^Group httpd.conf"` to find out:
  
      $ chown -R www.www .