From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 31 Oct 2009 03:05:54 +0000 (-0700)
Subject: Merge branch 'tr/maint-roff-quote'
X-Git-Tag: v1.6.6-rc0~82
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=92246f6bcf41f1287009e73fc501c36ae9fdeeb4;p=git.git

Merge branch 'tr/maint-roff-quote'

* tr/maint-roff-quote:
  Quote ' as \(aq in manpages
---

92246f6bcf41f1287009e73fc501c36ae9fdeeb4
diff --cc Makefile
index 268aede56,797471741..9c5d299f4
--- a/Makefile
+++ b/Makefile
@@@ -153,12 -140,12 +153,16 @@@ all:
  #
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
 -# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
 +# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
 +# (not v1.73 or v1.71).
 +#
 +# Define ASCIIDOC_NO_ROFF if your DocBook XSL escapes raw roff directives
 +# (versions 1.72 and later and 1.68.1 and earlier).
  #
+ # Define GNU_ROFF if your target system uses GNU groff.  This forces
+ # apostrophes to be ASCII so that cut&pasting examples to the shell
+ # will work.
+ #
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #