Merge with master

diff --git a/Makefile b/Makefile
index 7bebefd..42387c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -91,3 +91,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 f278193..5ae95b2 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].