summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-13 05:49:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-13 05:49:51 (GMT)
commit0d181cbb8adbc964a075fd71148415f6bd431272 (patch)
tree85a5449dc22d7e5adcf504f7199f6e58d0ebaac8 /Makefile
parent73fd7f3761eeef0e28bbf04727c8a1e751a9792e (diff)
parent79c461d5b1139afa3d3997c7ef9ee521562b2a1a (diff)
downloadgit-0d181cbb8adbc964a075fd71148415f6bd431272.zip
git-0d181cbb8adbc964a075fd71148415f6bd431272.tar.gz
git-0d181cbb8adbc964a075fd71148415f6bd431272.tar.bz2
Merge branch 'jk/asciidoc-update'
* jk/asciidoc-update: docs: default to more modern toolset
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 41ab490..fd0053f 100644
--- a/Makefile
+++ b/Makefile
@@ -167,13 +167,13 @@ all::
# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
# field that counts the on-disk footprint in 512-byte blocks.
#
-# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
+# Define ASCIIDOC7 if you want to format documentation with AsciiDoc 7
#
# 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 ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives
+# (versions 1.68.1 through v1.72).
#
# Define GNU_ROFF if your target system uses GNU groff. This forces
# apostrophes to be ASCII so that cut&pasting examples to the shell
@@ -1579,8 +1579,8 @@ ifndef V
endif
endif
-ifdef ASCIIDOC8
- export ASCIIDOC8
+ifdef ASCIIDOC7
+ export ASCIIDOC7
endif
# Shell quote (do not use $(call) to accommodate ancient setups);