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>

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 82dd4433f2ac3113fce65f4aa3a953f020bbd1e1..60d53391d263e890ba1fa9183b46a72d090a5749 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -31,7 +31,7 @@ OPTIONS
 
 <refspec>::
        The canonical format of a <refspec> parameter is
 
 <refspec>::
        The canonical format of a <refspec> parameter is

-       `+?<src>:<dst>`; that is, an optional plus `+`, followed
+       `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed

        by the source ref, followed by a colon `:`, followed by
        the destination ref.
 +
        by the source ref, followed by a colon `:`, followed by
        the destination ref.
 +

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 37828e5c5ab83ec1d17747e61703bd8aaa457c8a..8f12dc975910b14ecb9f11a07e0161755f412a52 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -90,15 +90,15 @@ One way to do it is to pull master into the topic branch:
 
 The commits marked with `*` touch the same area in the same
 file; you need to resolve the conflicts when creating the commit
 
 The commits marked with `*` touch the same area in the same
 file; you need to resolve the conflicts when creating the commit

-marked with `+`.  Then you can test the result to make sure your
+marked with `{plus}`.  Then you can test the result to make sure your

 work-in-progress still works with what is in the latest master.
 
 After this test merge, there are two ways to continue your work
 on the topic.  The easiest is to build on top of the test merge
 work-in-progress still works with what is in the latest master.
 
 After this test merge, there are two ways to continue your work
 on the topic.  The easiest is to build on top of the test merge

-commit `+`, and when your work in the topic branch is finally
+commit `{plus}`, and when your work in the topic branch is finally

 ready, pull the topic branch into master, and/or ask the
 upstream to pull from you.  By that time, however, the master or
 ready, pull the topic branch into master, and/or ask the
 upstream to pull from you.  By that time, however, the master or

-the upstream might have been advanced since the test merge `+`,
+the upstream might have been advanced since the test merge `{plus}`,

 in which case the final commit graph would look like this:
 
 ------------
 in which case the final commit graph would look like this:
 
 ------------

diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index cbee369947bf43c245994607ba5d3f77246cce6d..f1577382791e54f1bca017425c8f29dced900feb 100644 (file)
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -6,7 +6,7 @@
 
 <refspec>::
        The canonical format of a <refspec> parameter is
 
 <refspec>::
        The canonical format of a <refspec> parameter is

-       `+?<src>:<dst>`; that is, an optional plus `+`, followed
+       `+?<src>:<dst>`; that is, an optional plus `{plus}`, followed

        by the source ref, followed by a colon `:`, followed by
        the destination ref.
 +
        by the source ref, followed by a colon `:`, followed by
        the destination ref.
 +