diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-25 15:08:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-25 15:08:11 -0700 |
| commit | 2603fa5fb358ee7834bc9e1a2e391f69d8fce815 (patch) | |
| tree | 7b9351f89b043762b064ab90ed25da9afc10f23f /Documentation/Makefile | |
| parent | c5a07b3b4f9424ba9887a8a7e0b81164a228ed8e (diff) | |
| parent | fd2a75972e90d34bc8d4bebe1d669645557a2192 (diff) | |
| download | git-2603fa5fb358ee7834bc9e1a2e391f69d8fce815.tar.gz | |
Merge branch 'maint'
* maint:
user-manual: introduce "branch" and "branch head" differently
glossary: clean up cross-references
glossary: stop generating automatically
user-manual: Use def_ instead of ref_ for glossary references.
user-manual.txt: fix a tiny typo.
user-manual: run xsltproc without --nonet option
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 7c1c9e1918..7db3fb992f 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -16,8 +16,9 @@ ARTICLES += repository-layout ARTICLES += hooks ARTICLES += everyday ARTICLES += git-tools +ARTICLES += glossary # with their own formatting rules. -SP_ARTICLES = glossary howto/revert-branch-rebase user-manual +SP_ARTICLES = howto/revert-branch-rebase user-manual DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES)) @@ -106,16 +107,11 @@ user-manual.xml: user-manual.txt user-manual.conf $(ASCIIDOC) -b docbook -d book $< XSLT = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl -XSLTOPTS = --nonet --xinclude --stringparam html.stylesheet docbook-xsl.css +XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css user-manual.html: user-manual.xml xsltproc $(XSLTOPTS) -o $@ $(XSLT) $< -glossary.html : glossary.txt sort_glossary.pl - cat $< | \ - perl sort_glossary.pl | \ - $(ASCIIDOC) -b xhtml11 - > glossary.html - howto-index.txt: howto-index.sh $(wildcard howto/*.txt) rm -f $@+ $@ sh ./howto-index.sh $(wildcard howto/*.txt) >$@+ |