diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-13 05:49:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-13 05:49:51 (GMT) |
| commit | 0d181cbb8adbc964a075fd71148415f6bd431272 (patch) | |
| tree | 85a5449dc22d7e5adcf504f7199f6e58d0ebaac8 /Documentation | |
| parent | 73fd7f3761eeef0e28bbf04727c8a1e751a9792e (diff) | |
| parent | 79c461d5b1139afa3d3997c7ef9ee521562b2a1a (diff) | |
| download | git-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 'Documentation')
| -rw-r--r-- | Documentation/Makefile | 23 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.4.txt | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index e117bc4..36989b7 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -63,35 +63,28 @@ endif # # For asciidoc ... -# -7.1.2, no extra settings are needed. -# 8.0-, set ASCIIDOC8. +# -7.1.2, set ASCIIDOC7 +# 8.0-, no extra settings are needed # # # For docbook-xsl ... -# -1.68.1, set ASCIIDOC_NO_ROFF? (based on changelog from 1.73.0) -# 1.69.0, no extra settings are needed? +# -1.68.1, no extra settings are needed? +# 1.69.0, set ASCIIDOC_ROFF? # 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP? -# 1.71.1, no extra settings are needed? +# 1.71.1, set ASCIIDOC_ROFF? # 1.72.0, set DOCBOOK_XSL_172. -# 1.73.0-, set ASCIIDOC_NO_ROFF +# 1.73.0-, no extra settings are needed # -# -# If you had been using DOCBOOK_XSL_172 in an attempt to get rid -# of 'the ".ft C" problem' in your generated manpages, and you -# instead ended up with weird characters around callouts, try -# using ASCIIDOC_NO_ROFF instead (it works fine with ASCIIDOC8). -# - -ifdef ASCIIDOC8 +ifndef ASCIIDOC7 ASCIIDOC_EXTRA += -a asciidoc7compatible -a no-inline-literal endif ifdef DOCBOOK_XSL_172 ASCIIDOC_EXTRA += -a git-asciidoc-no-roff MANPAGE_XSL = manpage-1.72.xsl else - ifdef ASCIIDOC_NO_ROFF + ifndef ASCIIDOC_ROFF # docbook-xsl after 1.72 needs the regular XSL, but will not # pass-thru raw roff codes from asciidoc.conf, so turn them off. ASCIIDOC_EXTRA += -a git-asciidoc-no-roff diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt index c1d0669..6084f7d 100644 --- a/Documentation/RelNotes/1.7.4.txt +++ b/Documentation/RelNotes/1.7.4.txt @@ -4,6 +4,10 @@ Git v1.7.4 Release Notes (draft) Updates since v1.7.3 -------------------- + * The documentation Makefile now assumes by default asciidoc 8 and + docbook-xsl >= 1.73. If you have older versions, you can set + ASCIIDOC7 and ASCIIDOC_ROFF, respectively. + * The option parsers of various commands that create new branch (or rename existing ones to a new name) were too loose and users were allowed to call a branch with a name that begins with a dash by |