Merge with ssh://brok.diku.dk/~/tig

diff --git a/Makefile b/Makefile
index 7bebefd..0b970d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ CFLAGS  = -Wall -O2
 DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig
 DOCS   = tig.1.html tig.1 tigrc.5.html tigrc.5 \
-         manual.toc manual.html manual.html-chunked README.html \
+         manual.toc manual.html manual.html-chunked manual.pdf \
+         README.html
 
 ifneq (,$(wildcard .git))
 VERSION = $(shell git-describe)
@@ -41,7 +42,7 @@ install-doc: doc
 
 clean:
        rm -rf manual.html-chunked
-       rm -f $(PROGS) $(DOCS) core
+       rm -f $(PROGS) $(DOCS) core *.xml
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
@@ -65,6 +66,9 @@ tig: tig.c
 README.html: README
        asciidoc -b xhtml11 -d article -a readme $<
 
+%.pdf : %.xml
+       docbook2pdf $<
+
 %.1.html : %.1.txt
        asciidoc -b xhtml11 -d manpage $<
 
@@ -91,3 +95,12 @@ README.html: README
 
 %.html-chunked : %.xml
        xmlto html -o $@ $<
+
+# Maintainer stuff
+sync-docs:
+       cg switch release
+       -cg merge -n master
+       cg commit -m "Merge with master"
+       make doc
+       cg commit -m "Sync docs"
+       cg switch master

diff --git a/SITES b/SITES
index 4ed0e9e..25e94dc 100644 (file)
--- a/SITES
+++ b/SITES
@@ -1,4 +1,5 @@
  - Homepage: http://jonas.nitro.dk/tig[]
+ - Manual: http://jonas.nitro.dk/tig/manual.html[]
  - Releases: http://jonas.nitro.dk/tig/releases[]
  - Git URL:  http://jonas.nitro.dk/tig/tig.git[]
  - Gitweb: http://pasky.or.cz/gitweb.cgi?p=tig.git;a=summary[]

diff --git a/manual.txt b/manual.txt
index 674224f..b7c3d5a 100644 (file)
--- a/manual.txt
+++ b/manual.txt
@@ -250,8 +250,8 @@ Key Action
 -----------------------------------------------------------------------------
 j      Move cursor one line up.
 k      Move cursor one line down.
-PgUp b \
-a      Move cursor one page up.
+PgUp,\
+-,a    Move cursor one page up.
 PgDown Space   Move cursor one page down.
 Home   Jump to first line.
 End    Jump to last line.

diff --git a/tig.1.txt b/tig.1.txt
index b0cafd8..5fe6acc 100644 (file)
--- a/tig.1.txt
+++ b/tig.1.txt
@@ -116,17 +116,9 @@ the Free Software Foundation; either version 2 of the License, or
 SEE ALSO
 --------
 
-- gitlink:tigrc[5]
-- link:http://jonas.nitro.dk/tig/manual.html[The tig manual],
-- link:http://www.kernel.org/pub/software/scm/git/docs/[git(7)],
-- link:http://www.kernel.org/pub/software/scm/cogito/docs/[cogito(7)]
+gitlink:tigrc[5], git(7), cogito(7), as well as other git repository browsers:
+gitk(1), qgit(1), gitview(1).
 
-Other git repository browsers:
-
-- gitk(1)
-- qgit(1)
-- gitview(1)
-
-Sites:
+Online resources:
 
 include::SITES[]

diff --git a/tigrc.5.txt b/tigrc.5.txt
index 4960212..3b4b7a2 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -348,4 +348,4 @@ Licensed under the terms of the GNU General Public License.
 
 SEE ALSO
 --------
-gitlink:tig[1] and the http://jonas.nitro.dk/tig/tig.html[tig manual].
+gitlink:tig[1] and the http://jonas.nitro.dk/tig/manual.html[tig manual].