diff options
| author | Sebastian Kuzminsky <seb@highlab.com> | 2005-05-19 10:24:54 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-19 09:58:44 -0700 |
| commit | 7984eabe071298df0ce53da2af449ec16dd747d8 (patch) | |
| tree | 931868ef5db23f4dece921fed891387f7954936e /Documentation | |
| parent | 415e96c8b7e7d47f98a45ae1b6d524418245a3b4 (diff) | |
| download | git-7984eabe071298df0ce53da2af449ec16dd747d8.tar.gz git-7984eabe071298df0ce53da2af449ec16dd747d8.tar.xz | |
[PATCH] manpage name conflict
This moves the git manpage to man7, since "git" isn't a direct command
per se. It also does two other things:
* Sort of works around the asciidoc 6.0.3 bug where the manpages all
get called "git.1". It just renames them to what they should have
been called.
* Fixes a cut-n-paste bug in git-diff-helper.txt that was making
asciidoc choke.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/Makefile | 8 | ||||
| -rw-r--r-- | Documentation/git-diff-helper.txt | 2 | ||||
| -rw-r--r-- | Documentation/git.txt | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index a3ad85dce..27ae781a7 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,6 +1,6 @@ DOC_SRC=$(wildcard git*.txt) DOC_HTML=$(patsubst %.txt,%.html,$(DOC_SRC)) -DOC_MAN=$(patsubst %.txt,%.1,$(DOC_SRC)) +DOC_MAN=$(patsubst %.txt,%.1,$(wildcard git-*.txt)) git.7 all: $(DOC_HTML) $(DOC_MAN) @@ -13,13 +13,15 @@ git-diff-%.txt: diff-format.txt touch $@ clean: - rm -f *.xml *.html *.1 + rm -f *.xml *.html *.1 *.7 %.html : %.txt asciidoc -b css-embedded -d manpage $< -%.1 : %.xml +%.1 %.7 : %.xml xmlto man $< + # FIXME: this next line works around an output filename bug in asciidoc 6.0.3 + [ "$@" = "git.7" ] || mv git.1 $@ %.xml : %.txt asciidoc -b docbook -d manpage $< diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt index 3c5d8fdf2..800d71a38 100644 --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -1,5 +1,5 @@ git-diff-helper(1) -======================= +================== v0.1, May 2005 NAME diff --git a/Documentation/git.txt b/Documentation/git.txt index 134afffe3..ec7878eea 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -1,4 +1,4 @@ -git(1) +git(7) ====== v0.1, May 2005 |