Merge branch 'jk/stripspace-asciidoctor-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:20 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:21 +0000 (12:00 -0700)
A literal block in the tutorial had lines with unequal lengths to
delimit it from the rest of the document, which choke GitHub's
AsciiDoc renderer.

* jk/stripspace-asciidoctor-fix:
doc: fix unmatched code fences in git-stripspace

1  2 
Documentation/git-stripspace.txt
index 6c6e989074c58840ca1c8c4e6f4cad0b8fdb718d,28f787976d44023a32c796fa495464f6a14898e0..60328d5d08d43d31dd80e14b07fe75257a1f4446
@@@ -10,7 -10,6 +10,7 @@@ SYNOPSI
  --------
  [verse]
  'git stripspace' [-s | --strip-comments] < input
 +'git stripspace' [-c | --comment-lines] < input
  
  DESCRIPTION
  -----------
@@@ -49,7 -48,7 +49,7 @@@ EXAMPLE
  
  Given the following noisy input with '$' indicating the end of a line:
  
- --------
+ ---------
  |A brief introduction   $
  |   $
  |$
@@@ -65,7 -64,7 +65,7 @@@
  
  Use 'git stripspace' with no arguments to obtain:
  
- --------
+ ---------
  |A brief introduction$
  |$
  |A new paragraph$
@@@ -79,7 -78,7 +79,7 @@@
  
  Use 'git stripspace --strip-comments' to obtain:
  
- --------
+ ---------
  |A brief introduction$
  |$
  |A new paragraph$