$NetBSD: patch-am,v 1.2 2013/01/23 17:26:07 wiz Exp $

--- docs/vi.man/vi.1.orig	2007-11-19 03:41:42.000000000 +1100
+++ docs/vi.man/vi.1
@@ -17,7 +17,7 @@ ex, vi, view \- text editors
 .SH SYNOPSIS
 .B ex
 [\c
-.B -eFRrSsv\c
+.B -eFGRrSsv\c
 ] [\c
 .BI -c " cmd"\c
 ] [\c
@@ -39,7 +39,7 @@ ex, vi, view \- text editors
 .br
 .B view
 [\c
-.B -eFRrSv\c
+.B -eFGRrSv\c
 ] [\c
 .BI -c " cmd"\c
 ] [\c
@@ -118,6 +118,9 @@ Don't copy the entire file when first st
 (The default is to make a copy in case someone else modifies
 the file during your edit session.)
 .TP
+.B \-G
+Start editing in gtags mode, as if the gtagsmode option was set.
+.TP
 .B \-l
 Start editing with the lisp and showmatch options set.
 .TP
@@ -429,6 +432,8 @@ commands or cancel partial commands.
 .TP
 .B "<control-]>"
 Push a tag reference onto the tag stack.
+In gtagsmode, if at the first column of line,
+locate function references otherwise function definitions.
 .TP
 .B "<control-^>"
 Switch to the most recently edited file.
@@ -774,6 +779,11 @@ and
 characters to move forward to the next
 .B shiftwidth
 column boundary.
+If
+.B expandtab
+is set, only insert
+.I <space>
+characters.
 .TP
 .B "<erase>
 .TP
@@ -940,6 +950,9 @@ Grow or shrink the current screen.
 .B "rew[ind][!]"
 Rewind the argument list.
 .TP
+.B "rta[g][!] tagstring"
+Edit the file refering the specified tag. (Only in gtagsmode)
+.TP
 .B "se[t] [option[=[value]] ...] [nooption ...] [option? ...] [all]"
 Display or set editor options.
 .TP
@@ -1095,6 +1108,15 @@ command.
 only.
 Announce error messages with a bell.
 .TP
+.B "expandtab, et [off]"
+Prevent the use of
+.I <tab>
+characters in leading whitespace when shifting text, autoindenting,
+indenting with
+.BR "<control-T>" ,
+or outdenting with
+.BR "<control-D>" .
+.TP
 .B "exrc, ex [off]"
 Read the startup files in the local directory.
 .TP
@@ -1110,6 +1132,9 @@ command line.
 .B "flash [on]"
 Flash the screen instead of beeping the keyboard on error.
 .TP
+.B "gtagsmode, gt [off]"
+Use GTAGS and GRTAGS instead of tags.
+.TP
 .B "hardtabs, ht [8]"
 Set the spacing between hardware tab settings.
 .TP
@@ -1151,6 +1176,9 @@ read or written.
 .B "magic [on]"
 Treat certain characters specially in regular expressions.
 .TP
+.B "matchchars [[]{}()<>]"
+Character pairs looked for by the % command.
+.TP
 .B "matchtime [7]"
 .I \&Vi
 only.