From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Sep 2010 16:43:42 +0000 (-0700)
Subject: Merge branch 'jc/maint-doc-em-dash'
X-Git-Tag: v1.7.3-rc0~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6;p=git.git

Merge branch 'jc/maint-doc-em-dash'

* jc/maint-doc-em-dash:
  Work around em-dash handling in newer AsciiDoc
---

7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6
diff --cc Documentation/asciidoc.conf
index b5f0f29d1,3267bae9d..aea8627be
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@@ -16,10 -16,9 +16,11 @@@ plus=&#43
  caret=&#94;
  startsb=&#91;
  endsb=&#93;
 +backslash=&#92;
  tilde=&#126;
 +apostrophe=&#39;
  backtick=&#96;
+ litdd=&#45;&#45;
  
  ifdef::backend-docbook[]
  [linkgit-inlinemacro]
diff --cc Documentation/git-instaweb.txt
index e70cea932,61e2cbbeb..7477ce8fa
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@@ -44,12 -44,11 +44,12 @@@ OPTION
  -b::
  --browser::
  	The web browser that should be used to view the gitweb
- 	page. This will be passed to the 'git web--browse' helper
+ 	page. This will be passed to the 'git web{litdd}browse' helper
  	script along with the URL of the gitweb instance. See
- 	linkgit:git-web--browse[1] for more information about this. If
+ 	linkgit:git-web{litdd}browse[1] for more information about this. If
  	the script fails, the URL will be printed to stdout.
  
 +start::
  --start::
  	Start the httpd instance and exit.  This does not generate
  	any of the configuration files for spawning a new instance.