Allow asciidoc formatted documentation in howto/

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-08-29 22:38:12 -07:00
parent 3459c2c433
commit 8d0991d7d7
3 changed files with 18 additions and 4 deletions

View file

@ -45,7 +45,7 @@ git-diff-%.txt: diff-format.txt diff-options.txt
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 $<
@ -74,5 +74,12 @@ howto-index.html: howto-index.txt
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)

View file

@ -41,7 +41,14 @@ do
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
"

View file

@ -2,7 +2,7 @@
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"
@ -12,7 +12,7 @@ do
}
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