Re: What's cooking in git.git (May 2012, #01; Wed, 2)
- From
Jeff King <peff@peff.net>
- Date
- May 2, 2012, 23:43 UTC
- Message-ID
- <20120502234352.GA2163@sigill.intra.peff.net>
- In-Reply-To
- <7vipgegrl0.fsf@alter.siamese.dyndns.org>
On Wed, May 02, 2012 at 03:12:43PM -0700, Junio C Hamano wrote:
Show 8 quoted lines
> [Graduated to "master"] > [...] > * jk/doc-asciidoc-inline-literal (2012-04-26) 1 commit > (merged to 'next' on 2012-04-30 at a52b4e6) > + docs: stop using asciidoc no-inline-literal > > Our documentation was written for an ancient version of AsciiDoc, > making the source not very readable.
Now that this is in master, any in-flight topics would need their documentation updated to match this, too. I checked:
git diff jk/doc-asciidoc-inline-literal origin/pu Documentation
and found only one case. We may still get some submissions based on the old style, but now we are aware of the issue and can comment and correct it during review.
This patch is for mm/include-userpath, which is in master already. And it's only the right thing to do after the merge of jk/doc-asciidoc-inline-literal, so really it should just go straight into master.
-- >8 -- Subject: [PATCH] doc/config: fix inline literals
Since commit 6cf378f, asciidoc backticks are now inline literals; therefore quoting {tilde} inside them is wrong (this instance was missed in 6cf378f because it happened on a parallel line of development).
Signed-off-by: Jeff King <peff@peff.net> --- Documentation/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index e67c8ef..d575481 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -95,8 +95,8 @@ included file is expanded immediately, as if its contents had been found at the location of the include directive. If the value of the `include.path` variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was -found. The value of `include.path` is subject to tilde expansion: `{tilde}/` -is expanded to the value of `$HOME`, and `{tilde}user/` to the specified +found. The value of `include.path` is subject to tilde expansion: `~/` +is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory. See below for examples. Example
-- 1.7.10.630.g31718