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 <gitster@pobox.com>
Junio C Hamano committed
Aug 7, 2008 at 16:05 UTC
0f4f4d1597219bad74c4fde624321d8a05d1b55e
3 files changed
+5
-5
Documentation/git-push.txt
+1
-1
@@ -31,7 +31,7 @@ OPTIONS
31
32
<refspec>::
33
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
35
by the source ref, followed by a colon `:`, followed by
36
the destination ref.
37
+
Documentation/git-rerere.txt
+3
-3
@@ -90,15 +90,15 @@ One way to do it is to pull master into the topic branch:
90
91
The commits marked with `*` touch the same area in the same
92
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
94
work-in-progress still works with what is in the latest master.
95
96
After this test merge, there are two ways to continue your work
97
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
99
ready, pull the topic branch into master, and/or ask the
100
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}`,
102
in which case the final commit graph would look like this:
103
104
------------
Documentation/pull-fetch-param.txt
+1
-1
@@ -6,7 +6,7 @@
6
7
<refspec>::
8
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
10
by the source ref, followed by a colon `:`, followed by
11
the destination ref.
12
+