From: Junio C Hamano 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.lorimer.id.au/gitweb.git/diff_plain/7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6?ds=inline;hp=-c Merge branch 'jc/maint-doc-em-dash' * jc/maint-doc-em-dash: Work around em-dash handling in newer AsciiDoc --- 7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6 diff --combined Documentation/asciidoc.conf index b5f0f29d1f,3267bae9da..aea8627be0 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@@ -16,10 -16,9 +16,11 @@@ plus=+ caret=^ startsb=[ endsb=] +backslash=\ tilde=~ +apostrophe=' backtick=` + litdd=-- ifdef::backend-docbook[] [linkgit-inlinemacro] diff --combined Documentation/git-add.txt index e213a2efd7,a008f7e448..73378b2bef --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@@ -157,14 -157,14 +157,14 @@@ those in info/exclude. See linkgit:git EXAMPLES -------- -* Adds content from all `\*.txt` files under `Documentation` directory +* Adds content from all `*.txt` files under `Documentation` directory and its subdirectories: + ------------ $ git add Documentation/\*.txt ------------ + -Note that the asterisk `\*` is quoted from the shell in this +Note that the asterisk `*` is quoted from the shell in this example; this lets the command include the files from subdirectories of `Documentation/` directory. @@@ -220,7 -220,7 +220,7 @@@ binary so line count cannot be shown) a difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The - other file, git-add--interactive.perl, has 403 lines added + other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion). diff --combined Documentation/git-instaweb.txt index e70cea9320,61e2cbbebc..7477ce8fa8 --- a/Documentation/git-instaweb.txt +++ b/Documentation/git-instaweb.txt @@@ -44,23 -44,20 +44,23 @@@ 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. +stop:: --stop:: Stop the httpd instance and exit. This does not generate any of the configuration files for spawning a new instance, nor does it close the browser. +restart:: --restart:: Restart the httpd instance and exit. This does not generate any of the configuration files for spawning a new instance. @@@ -82,7 -79,7 +82,7 @@@ You may specify configuration in your . If the configuration variable 'instaweb.browser' is not set, 'web.browser' will be used instead if it is defined. See - linkgit:git-web--browse[1] for more information about this. + linkgit:git-web{litdd}browse[1] for more information about this. Author ------