From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Nov 2009 00:38:36 +0000 (-0800)
Subject: Merge branch 'tr/maint-roff-quote' into maint
X-Git-Tag: v1.6.5.3~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69abb194eed5b2f06590d0145e4034300c3e7ac9;p=git.git

Merge branch 'tr/maint-roff-quote' into maint

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

69abb194eed5b2f06590d0145e4034300c3e7ac9
diff --cc Makefile
index 3bca8d42c,797471741..30656cf62
--- 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).
  #