From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2016 20:17:19 +0000 (-0700)
Subject: Merge branch 'bn/config-doc-tt-varnames' into maint
X-Git-Tag: v2.9.0-rc1~12^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57b76d3379ade86d72cc9db83141e6ec084e6c8c;p=git

Merge branch 'bn/config-doc-tt-varnames' into maint

Doc formatting fixes.

* bn/config-doc-tt-varnames:
  config: consistently format $variables in monospaced font
  config: describe 'pathname' value type
---

57b76d3379ade86d72cc9db83141e6ec084e6c8c
diff --cc Documentation/config.txt
index ef347875dc,2633b82124..611fe5c0ca
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1465,22 -1455,14 +1473,22 @@@ grep.extendedRegexp:
  	option is ignored when the 'grep.patternType' option is set to a value
  	other than 'default'.
  
 +grep.threads::
 +	Number of grep worker threads to use.
 +	See `grep.threads` in linkgit:git-grep[1] for more information.
 +
 +grep.fallbackToNoIndex::
 +	If set to true, fall back to git grep --no-index if git grep
 +	is executed outside of a git repository.  Defaults to false.
 +
  gpg.program::
- 	Use this custom program instead of "gpg" found on $PATH when
+ 	Use this custom program instead of "`gpg`" found on `$PATH` when
  	making or verifying a PGP signature. The program must support the
  	same command-line interface as GPG, namely, to verify a detached
- 	signature, "gpg --verify $file - <$signature" is run, and the
+ 	signature, "`gpg --verify $file - <$signature`" is run, and the
  	program is expected to signal a good signature by exiting with
  	code 0, and to generate an ASCII-armored detached signature, the
- 	standard input of "gpg -bsau $key" is fed with the contents to be
+ 	standard input of "`gpg -bsau $key`" is fed with the contents to be
  	signed, and the program is expected to send the result to its
  	standard output.