diff options
| author |  Pavel Roskin <proski@gnu.org> | 2006-01-25 01:52:22 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-01-24 23:16:31 -0800 |
| commit | 941c9449999192e2d338ee204f4153e30ae43829 (patch) | |
| tree | 8e59383424f157e0cc8215327c0a5549876d4e89 /Documentation | |
| parent | sample update-hook: sanely handle a new branch head. (diff) | |
| download | tgif-941c9449999192e2d338ee204f4153e30ae43829.tar.xz | |
Don't include ../README in git.txt - make a local copy
asciidoc 7.0.4 and newer considers such includes from parent directory
unsafe.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/.gitignore | 1 | ||||
| -rw-r--r-- | Documentation/Makefile | 9 | ||||
| -rw-r--r-- | Documentation/git.txt | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/.gitignore b/Documentation/.gitignore index 9fef490871..c87c61af00 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -4,3 +4,4 @@ *.7 howto-index.txt doc.dep +README diff --git a/Documentation/Makefile b/Documentation/Makefile index a65fb1b66b..a3bca86cb0 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -62,11 +62,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl -include doc.dep -git.7: ../README +git.7: README + +README: ../README + cp $< $@ clean: - rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep + rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README %.html : %.txt asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< @@ -77,7 +80,7 @@ clean: %.xml : %.txt asciidoc -b docbook -d manpage -f asciidoc.conf $< -git.html: git.txt ../README +git.html: git.txt README glossary.html : glossary.txt sort_glossary.pl cat $< | \ diff --git a/Documentation/git.txt b/Documentation/git.txt index 25bcb840f9..e8ef3efa89 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -586,7 +586,7 @@ git Diffs Discussion[[Discussion]] ------------------------ -include::../README[] +include::README[] Authors ------- |