@matheusbsbs / matheus-bagliano / commits / e1ccf53a60
Fork 0

[PATCH] Escape asciidoc's built-in em-dash replacement

AsciiDoc replace '--' with em-dash (&#8212) by default. em-dash looks a lot like a single long dash and it's very confusing when we are talking about command options. Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a backslash in front of double dash prevent the replacement. This patch does just that. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Yasushi SHOJI committed Sep 12, 2005 at 02:29 UTC e1ccf53a60657930ae7892387736c8b6a91ec610
4 files changed +12 -12
Documentation/cvs-migration.txt
+1 -1
@@ -186,7 +186,7 @@ you would use git-rev-list and git-diff-tree like this:
186 nitfol();
187 }'
188
189 -We have already talked about the "--stdin" form of git-diff-tree
189 +We have already talked about the "\--stdin" form of git-diff-tree
190 command that reads the list of commits and compares each commit
191 with its parents. The git-whatchanged command internally runs
192 the equivalent of the above command, and can be used like this:
Documentation/diffcore.txt
+7 -7
@@ -22,8 +22,8 @@ The git-diff-* family works by first comparing two sets of
22 files:
23
24 - git-diff-index compares contents of a "tree" object and the
25 - working directory (when '--cached' flag is not used) or a
26 - "tree" object and the index file (when '--cached' flag is
25 + working directory (when '\--cached' flag is not used) or a
26 + "tree" object and the index file (when '\--cached' flag is
27 used);
28
29 - git-diff-files compares contents of the index file and the
@@ -164,11 +164,11 @@ similarity score different from the default 50% by giving a
164 number after "-M" or "-C" option (e.g. "-M8" to tell it to use
165 8/10 = 80%).
166
167 -Note. When the "-C" option is used with --find-copies-harder
167 +Note. When the "-C" option is used with `\--find-copies-harder`
168 option, git-diff-\* commands feed unmodified filepairs to
169 diffcore mechanism as well as modified ones. This lets the copy
170 detector consider unmodified files as copy source candidates at
171 -the expense of making it slower. Without --find-copies-harder,
171 +the expense of making it slower. Without `\--find-copies-harder`,
172 git-diff-\* commands can detect copies only if the file that was
173 copied happened to have been modified in the same changeset.
174
@@ -220,7 +220,7 @@ diffcore-pickaxe
220
221 This transformation is used to find filepairs that represent
222 changes that touch a specified string, and is controlled by the
223 --S option and the --pickaxe-all option to the git-diff-*
223 +-S option and the `\--pickaxe-all` option to the git-diff-*
224 commands.
225
226 When diffcore-pickaxe is in use, it checks if there are
@@ -229,9 +229,9 @@ whose "result" side does not. Such a filepair represents "the
229 string appeared in this changeset". It also checks for the
230 opposite case that loses the specified string.
231
232 -When --pickaxe-all is not in effect, diffcore-pickaxe leaves
232 +When `\--pickaxe-all` is not in effect, diffcore-pickaxe leaves
233 only such filepairs that touches the specified string in its
234 -output. When --pickaxe-all is used, diffcore-pickaxe leaves all
234 +output. When `\--pickaxe-all` is used, diffcore-pickaxe leaves all
235 filepairs intact if there is such a filepair, or makes the
236 output empty otherwise. The latter behaviour is designed to
237 make reviewing of the changes in the context of the whole
Documentation/hooks.txt
+2 -2
@@ -57,7 +57,7 @@ pre-commit
57 ----------
58
59 This hook is invoked by `git-commit`, and can be bypassed
60 -with `--no-verify` option. It takes no parameter, and is
60 +with `\--no-verify` option. It takes no parameter, and is
61 invoked before obtaining the proposed commit log message and
62 making a commit. Exiting with non-zero status from this script
63 causes the `git-commit` to abort.
@@ -70,7 +70,7 @@ commit-msg
70 ----------
71
72 This hook is invoked by `git-commit`, and can be bypassed
73 -with `--no-verify` option. It takes a single parameter, the
73 +with `\--no-verify` option. It takes a single parameter, the
74 name of the file that holds the proposed commit log message.
75 Exiting with non-zero status causes the `git-commit` to
76 abort.
Documentation/tutorial.txt
+2 -2
@@ -828,7 +828,7 @@ which will very loudly warn you that you're now committing a merge
828 (which is correct, so never mind), and you can write a small merge
829 message about your adventures in git-merge-land.
830
831 -After you're done, start up `gitk --all` to see graphically what the
831 +After you're done, start up `gitk \--all` to see graphically what the
832 history looks like. Notice that `mybranch` still exists, and you can
833 switch to it, and continue to work with it if you want to. The
834 `mybranch` branch will not contain the merge, but next time you merge it
@@ -883,7 +883,7 @@ not actually do a merge. Instead, it just updated the top of
883 the tree of your branch to that of the `master` branch. This is
884 often called 'fast forward' merge.
885
886 -You can run `gitk --all` again to see how the commit ancestry
886 +You can run `gitk \--all` again to see how the commit ancestry
887 looks like, or run `show-branch`, which tells you this.
888
889 ------------------------------------------------