From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 12 Jul 2006 20:31:20 +0000 (+0200)
Subject: Merge with ssh://brok.diku.dk/~/tig
X-Git-Tag: tig-0.5~68
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/30f15e31dcd7510241f3fd23b61d441122390a87?ds=inline;hp=-c

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

30f15e31dcd7510241f3fd23b61d441122390a87
diff --combined tigrc.5.txt
index 5ae95b2,4960212..3b4b7a2
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@@ -150,7 -150,7 +150,7 @@@ ifdef::backend-xhtml11[
  [frame="none"]
  `-----------------------`-----------------------------------------------------
  endif::backend-xhtml11[]
- View switching::
+ View switching:
  ------------------------------------------------------------------------------
  view-main		Show main view
  view-diff		Show diff view
@@@ -163,7 -163,7 +163,7 @@@ ifdef::backend-xhtml11[
  [frame="none"]
  `-----------------------`-----------------------------------------------------
  endif::backend-xhtml11[]
- View manipulation::
+ View manipulation:
  ------------------------------------------------------------------------------
  enter			Enter current line and scroll
  next			Move to next
@@@ -177,7 -177,7 +177,7 @@@ ifdef::backend-xhtml11[
  [frame="none"]
  `-----------------------`-----------------------------------------------------
  endif::backend-xhtml11[]
- Cursor navigation::
+ Cursor navigation:
  ------------------------------------------------------------------------------
  move-up			Move cursor one line up
  move-down		Move cursor one line down
@@@ -191,7 -191,7 +191,7 @@@ ifdef::backend-xhtml11[
  [frame="none"]
  `-----------------------`-----------------------------------------------------
  endif::backend-xhtml11[]
- Scrolling::
+ Scrolling:
  ------------------------------------------------------------------------------
  scroll-line_up		Scroll one line up
  scroll-line_down	Scroll one line down
@@@ -203,7 -203,7 +203,7 @@@ ifdef::backend-xhtml11[
  [frame="none"]
  `-----------------------`-----------------------------------------------------
  endif::backend-xhtml11[]
- Misc::
+ Misc:
  ------------------------------------------------------------------------------
  prompt			Bring up the prompt
  screen-update		Update the screen
@@@ -348,4 -348,4 +348,4 @@@ Licensed under the terms of the GNU Gen
  
  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].