[PATCH] docs: fix literal quoted spaces
- From
Adam Dinwoodie <adam@dinwoodie.org>
- Date
- May 31, 2017, 15:06 UTC
- Message-ID
- <20170531150624.GC18266@dinwoodie.org>
When compiling the documentation, asciidoc thinks a backtick surrounded by whitespace shouldn't be interpreted as marking the start or end of a literal. In most cases, that's useful behaviour, but in the git-pull documentation the space is clearly intended to be part of the monospace formatted text.
Instead, use + to avoid asciidoc's literal passthrough, and encode the space as {sp}. In particular, this means asciidoc will correctly detect the end of the monospace formatting, rather than having it continue past the backtick.
Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 942af8e0f..da31c5e40 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -159,7 +159,7 @@ present while on branch `<name>`, that value is used instead of In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted -and if there is not any such variable, the value on `URL: ` line +and if there is not any such variable, the value on +URL:{sp}+ line in `$GIT_DIR/remotes/<origin>` file is used. In order to determine what remote branches to fetch (and @@ -167,7 +167,7 @@ optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` -file is consulted and its `Pull: ` lines are used. +file is consulted and its +Pull:{sp}+ lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:
-- 2.12.3