summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-03 00:37:56 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-03 00:37:56 -0800
commite21a8577089cb10fed5f298796ba3685010dfaef (patch)
tree2fa14353f22b01694fab0b28ab260a767323c245 /Documentation
parent61b8f407a766bf10ec466e66ec606902a171fc85 (diff)
parenteefe19fbfc93b359afe43aa1645eb5591a502f15 (diff)
downloadgit-e21a8577089cb10fed5f298796ba3685010dfaef.tar.gz
Merge in 1.6.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Makefile7
-rw-r--r--Documentation/git.txt3
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index abb75eb136..e841ca96cb 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -104,9 +104,12 @@ ifdef DOCBOOK_SUPPRESS_SP
XMLTO_EXTRA += -m manpage-suppress-sp.xsl
endif
-ifdef MAN_BASE_URL
+# Newer DocBook stylesheet emits warning cruft in the output when
+# this is not set, and if set it shows an absolute link. We can
+# use MAN_BASE_URL=http://www.kernel.org/pub/software/scm/git/docs/
+# but distros may want to set it to /usr/share/doc/git-core/docs/ or
+# something like that.
XMLTO_EXTRA += --stringparam man.base.url.for.relative.links=$(MAN_BASE_URL)
-endif
# If your target system uses GNU groff, it may try to render
# apostrophes as a "pretty" apostrophe using unicode. This breaks
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8e577cc4fe..36637afa06 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.6.5.3/git.html[documentation for release 1.6.5.3]
+* link:v1.6.5.4/git.html[documentation for release 1.6.5.4]
* release notes for
+ link:RelNotes-1.6.5.4.txt[1.6.5.4],
link:RelNotes-1.6.5.3.txt[1.6.5.3],
link:RelNotes-1.6.5.2.txt[1.6.5.2],
link:RelNotes-1.6.5.1.txt[1.6.5.1],