diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-06 12:25:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-06 12:25:15 +0900 |
| commit | 70c1cbf51535fc0d8ee55809646d95610f3dd558 (patch) | |
| tree | 5806e94bd1390588b6029893462bdbd9b0e11fe3 /Documentation/Makefile | |
| parent | Merge branch 'am/mailmap-andrey-mazo' (diff) | |
| parent | doc-diff: replace --cut-header-footer with --cut-footer (diff) | |
| download | tgif-70c1cbf51535fc0d8ee55809646d95610f3dd558.tar.xz | |
Merge branch 'ma/asciidoctor-refmiscinfo'
Update support for Asciidoctor documentation toolchain.
* ma/asciidoctor-refmiscinfo:
doc-diff: replace --cut-header-footer with --cut-footer
asciidoctor-extensions: provide `<refmiscinfo/>`
Doc/Makefile: give mansource/-version/-manual attributes
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 76f2ecfc1b..e7015c307c 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -123,7 +123,8 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ - -agit_version=$(GIT_VERSION) + -amanversion=$(GIT_VERSION) \ + -amanmanual='Git Manual' -amansource='Git' TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl |