git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation/diff-config: work around AsciiDoc misfortune
@ 2012-12-07 23:34 Junio C Hamano
  0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2012-12-07 23:34 UTC (permalink / raw)
  To: git

The line that happens to begin with indent followed by "3. " was
interpreted as if it were an enumerated list; just wrap the lines
differently to work it around for now.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 * The last section of Documentation/technical/api-command.txt has a
   related/similar issue in that AsciiDoc wants to renumber them
   starting from 1 not from 0, as all humans do, but the result is
   more desirable.  I'll leave a patch to renumber them in the
   source to others, as I am busy cutting the 1.8.1-rc1 today.

   But "3" in this one is not the beginning of an enumerated item;
   it is cardinal (i.e. counting), not ordinal, and needs to be
   corrected before the final release.

 Documentation/diff-config.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 89dd634..4314ad0 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -57,8 +57,8 @@ diff.statGraphWidth::
 	to all commands generating --stat output except format-patch.
 
 diff.context::
-	Generate diffs with <n> lines of context instead of the default of
-	3. This value is overridden by the -U option.
+	Generate diffs with <n> lines of context instead of the default
+	of 3. This value is overridden by the -U option.
 
 diff.external::
 	If this config variable is set, diff generation is not
-- 
1.8.1.rc1.123.gb624e49

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-12-07 23:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-07 23:34 [PATCH] Documentation/diff-config: work around AsciiDoc misfortune Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).