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

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

diff --cc Documentation/Makefile
Simple merge

diff --cc Makefile
index 3bca8d42cc214be9bf4ab0e9a7f6cdbf7cbe30e3,79747174190ff5ddc09558af1b90daae01176874..30656cf62cdd41b0c4456c5e0220cb2338048654
--- 1/Makefile
--- 2/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).
  #