From 438ded457b6e0d1e615edd593faeeafdc8818fea Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 20 Aug 2010 05:21:53 -0500 Subject: Documentation: quoting trouble in "git rm" discussion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current output (with Asciidoc 8.5.2) seems a bit broken: given two directories ‘d` and d2, there is a difference between using git rm 'd*’ and ‘git rm 'd/\*\’`, as the former will also remove all of directory d2. In other words, the markup parses as given two directories << d` and _d2_, there is a difference between using _git rm 'd* >>_ and << git rm 'd/\*\ >> `. I suspect there is an asciidoc bug involved (why is ' a candidate closing-quote mark when it is preceded by a backslash?) but with all the meanings of ` and ' involved I do not want to track it down. Better to use unambiguous {asterisk} and {apostrophe} entities. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/asciidoc.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/asciidoc.conf') diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 87a90f2c3f..6be8ba3250 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -17,6 +17,7 @@ caret=^ startsb=[ endsb=] tilde=~ +apostrophe=' backtick=` ifdef::backend-docbook[] -- cgit v1.2.1 From f1005987e2c5295f57b19504baa86f1e8fc4a8c2 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 20 Aug 2010 05:23:54 -0500 Subject: Documentation: unbreak regex in show-ref manual I am not sure why, but the regular expression "(?:\^\{\})" gets rendered by asciidoc as "(?:\{})". The intent seems to be a regex matching the literal string "^{}", so this rewrites the markup to produce "(?:\^{})" as output. Cc: Julian Phillips Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/asciidoc.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/asciidoc.conf') diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 6be8ba3250..b5f0f29d1f 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -16,6 +16,7 @@ plus=+ caret=^ startsb=[ endsb=] +backslash=\ tilde=~ apostrophe=' backtick=` -- cgit v1.2.1