[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.

diff --git a/Documentation/Makefile b/Documentation/Makefile
index a3ad85dce757560cc704a5c9342936b86e46658e..27ae781a776f8da20b15578725992357f353bb19 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,6 +1,6 @@
 DOC_SRC=$(wildcard git*.txt)
 DOC_HTML=$(patsubst %.txt,%.html,$(DOC_SRC))
 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)
 
 
 all: $(DOC_HTML) $(DOC_MAN)
 


@@ -13,13 +13,15 @@ git-diff-%.txt: diff-format.txt
        touch $@
 
 clean:
        touch $@
 
 clean:

-       rm -f *.xml *.html *.1
+       rm -f *.xml *.html *.1 *.7

 
 %.html : %.txt
        asciidoc -b css-embedded -d manpage $<
 
 
 %.html : %.txt
        asciidoc -b css-embedded -d manpage $<
 

-%.1 : %.xml
+%.1 %.7 : %.xml

        xmlto man $<
        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 $<
 
 %.xml : %.txt
        asciidoc -b docbook -d manpage $<

diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
index 3c5d8fdf2b1e02eb36ca3e4d58a241406927975b..800d71a386f77f83de8ab85a574ab85a7bf77906 100644 (file)
--- a/Documentation/git-diff-helper.txt
+++ b/Documentation/git-diff-helper.txt
@@ -1,5 +1,5 @@
 git-diff-helper(1)
 git-diff-helper(1)

-=======================
+==================

 v0.1, May 2005
 
 NAME
 v0.1, May 2005
 
 NAME

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 134afffe3f669f5806a03793f1d703895b022e0f..ec7878eeadc28d9cb39311aa48e7c2aa20b73059 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -1,4 +1,4 @@
-git(1)
+git(7)

 ======
 v0.1, May 2005
 
 ======
 v0.1, May 2005