From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:31 +0000 (-0700)
Subject: Merge branch 'jc/linkgit-fix'
X-Git-Tag: v2.9.0-rc0~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f232ecfdf2982adf67af5f9b7aaf05da13a155c;p=thirdparty%2Fgit.git

Merge branch 'jc/linkgit-fix'

Many 'linkgit:<git documentation page>' references were broken,
which are all fixed with this.

* jc/linkgit-fix:
  Documentation: fix linkgit references
---

5f232ecfdf2982adf67af5f9b7aaf05da13a155c
diff --cc Documentation/config.txt
index e718410350,4b57519e42..3127aed1d8
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1680,19 -1654,12 +1680,19 @@@ http.emptyAuth:
  	a username in the URL, as libcurl normally requires a username for
  	authentication.
  
 +http.extraHeader::
 +	Pass an additional HTTP header when communicating with a server.  If
 +	more than one such entry exists, all of them are added as extra
 +	headers.  To allow overriding the settings inherited from the system
 +	config, an empty value will reset the extra headers to the empty list.
 +
  http.cookieFile::
 -	File containing previously stored cookie lines which should be used
 +	The pathname of a file containing previously stored cookie lines,
 +	which should be used
  	in the Git http session, if they match the server. The file format
  	of the file to read cookies from should be plain HTTP headers or
- 	the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
+ 	the Netscape/Mozilla cookie file format (see `curl(1)`).
 -	NOTE that the file specified with http.cookieFile is only used as
 +	NOTE that the file specified with http.cookieFile is used only as
  	input unless http.saveCookies is set.
  
  http.saveCookies::