Allow asciidoc formatted documentation in howto/

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index bd6833b79ef1354c05062fb063d335dcb6bb8511..cc891748602e63eb133584a68370bbc1697e7b51 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -45,7 +45,7 @@ git-diff-%.txt: diff-format.txt diff-options.txt
        touch $@
 
 clean:
        touch $@
 
 clean:

-       rm -f *.xml *.html *.1 *.7 howto-index.txt
+       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html

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


@@ -74,5 +74,12 @@ howto-index.html: howto-index.txt
 
 WEBDOC_DEST = /pub/software/scm/git/docs
 
 
 WEBDOC_DEST = /pub/software/scm/git/docs
 

+DOC_HTML += howto/revert-branch-rebase.html
+
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+       rm -f $@+ $@
+       sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+
+       mv $@+ $@
+

 install-webdoc : html
        sh ./install-webdoc.sh $(WEBDOC_DEST)
 install-webdoc : html
        sh ./install-webdoc.sh $(WEBDOC_DEST)

diff --git a/Documentation/howto-index.sh b/Documentation/howto-index.sh
index f9d3e57a9179d86389ce4b3f56e34431f1e9a4a7..34aa30c5b9ffc617e1519878317c2ae83bed6a6a 100755 (executable)
--- a/Documentation/howto-index.sh
+++ b/Documentation/howto-index.sh
@@ -41,7 +41,14 @@ do
                q
        }' "$txt"`
 
                q
        }' "$txt"`
 

-       echo "* link:$txt[$title] $from
+       if grep 'Content-type: text/asciidoc' >/dev/null $txt
+       then
+               file=`expr "$txt" : '\(.*\)\.txt$'`.html
+       else
+               file="$txt"
+       fi
+
+       echo "* link:$file[$title] $from

 $abstract
 
 "
 $abstract
 
 "

diff --git a/Documentation/install-webdoc.sh b/Documentation/install-webdoc.sh
index 1f534f1e77807276e8985b70aa7abebd8e93c334..e51a40eecdc6535e29893545f01b80e60dab2ea5 100755 (executable)
--- a/Documentation/install-webdoc.sh
+++ b/Documentation/install-webdoc.sh
@@ -2,7 +2,7 @@
 
 T="$1"
 
 
 T="$1"
 

-for h in *.html howto/*.txt
+for h in *.html howto/*.txt howto/*.html

 do
        diff -u "$T/$h" "$h" || {
                echo >&2 "# install $h $T/$h"
 do
        diff -u "$T/$h" "$h" || {
                echo >&2 "# install $h $T/$h"


@@ -12,7 +12,7 @@ do
        }
 done
 strip_leading=`echo "$T/" | sed -e 's|.|.|g'`
        }
 done
 strip_leading=`echo "$T/" | sed -e 's|.|.|g'`

-for th in "$T"/*.html "$T"/howto/*.txt
+for th in "$T"/*.html "$T"/howto/*.txt "$T"/howto/*.html

 do
        h=`expr "$th" : "$strip_leading"'\(.*\)'`
        case "$h" in
 do
        h=`expr "$th" : "$strip_leading"'\(.*\)'`
        case "$h" in