Skip to content

Commit 0f4f4d1

Browse files
committed
asciidoc markup fixes
I see quite a few pages on k.org site, e.g. http://www.kernel.org/pub/software/scm/git/docs/git-rerere.html (scroll down to find "After this test merge") are misformatted to lose teletype text '+' that is followed by a comma, and turns the following paragraph all typeset in teletype. This patch seems to fix the issue at the site (meaning, with the particular vintage of asciidoc and docbook toolchain), without breaking things with the version I have at my primary development machine, but wider testing is very much appreciated. After this patch, git grep '`+`,' -- Documentation should report noting. Signed-off-by: Junio C Hamano <[email protected]>
1 parent e19b92b commit 0f4f4d1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Documentation/git-push.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OPTIONS
3131

3232
<refspec>::
3333
The canonical format of a <refspec> parameter is
34-
`+?<src>:<dst>`; that is, an optional plus `+`, followed
34+
`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
3535
by the source ref, followed by a colon `:`, followed by
3636
the destination ref.
3737
+

Documentation/git-rerere.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ One way to do it is to pull master into the topic branch:
9090

9191
The commits marked with `*` touch the same area in the same
9292
file; you need to resolve the conflicts when creating the commit
93-
marked with `+`. Then you can test the result to make sure your
93+
marked with `{plus}`. Then you can test the result to make sure your
9494
work-in-progress still works with what is in the latest master.
9595

9696
After this test merge, there are two ways to continue your work
9797
on the topic. The easiest is to build on top of the test merge
98-
commit `+`, and when your work in the topic branch is finally
98+
commit `{plus}`, and when your work in the topic branch is finally
9999
ready, pull the topic branch into master, and/or ask the
100100
upstream to pull from you. By that time, however, the master or
101-
the upstream might have been advanced since the test merge `+`,
101+
the upstream might have been advanced since the test merge `{plus}`,
102102
in which case the final commit graph would look like this:
103103

104104
------------

Documentation/pull-fetch-param.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<refspec>::
88
The canonical format of a <refspec> parameter is
9-
`+?<src>:<dst>`; that is, an optional plus `+`, followed
9+
`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
1010
by the source ref, followed by a colon `:`, followed by
1111
the destination ref.
1212
+

0 commit comments

Comments
 (0)