* lib-src/etags.c (Perl_functions): Support "use constant".

[bpt/emacs.git] / doc / emacs / maintaining.texi

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index f874c28..06680a6 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -426,7 +426,7 @@ VC fileset is handled individually; for example, a commit generates
 one revision for each changed file.
 
 @table @kbd
-@itemx C-x v v
+@item C-x v v
 Perform the next appropriate version control operation on the current
 VC fileset.
 @end table
@@ -903,11 +903,11 @@ Display the changes that will be sent by the next push operation
 
 @kindex C-x v l
 @findex vc-print-log
-  The command @kbd{C-x v l} (@code{vc-print-log}) displays a buffer
-named @file{*vc-change-log*}, showing the history of changes made to
-the current file, including who made the changes, the dates, and the
-log entry for each change (these are the same log entries you would
-enter via the @file{*vc-log*} buffer; @pxref{Log Buffer}).  Point is
+  @kbd{C-x v l} (@code{vc-print-log}) displays a buffer named
+@file{*vc-change-log*}, showing the history of changes made to the
+current file, including who made the changes, the dates, and the log
+entry for each change (these are the same log entries you would enter
+via the @file{*vc-log*} buffer; @pxref{Log Buffer}).  Point is
 centered at the revision of the file currently being visited.  With a
 prefix argument, the command prompts for the revision to center on,
 and the maximum number of revisions to display.
@@ -1186,11 +1186,8 @@ point is on a directory entry, mark all files in that directory tree
 (@code{vc-dir-mark-all-files}).  With a prefix argument, mark all
 listed files and directories.
 
-@kindex q @r{(VC Directory)}
-@findex quit-window
 @item q
-Bury the VC Directory buffer, and delete its window if the window was
-created just for that buffer.
+Quit the VC Directory buffer, and bury it (@code{quit-window}).
 
 @item u
 Unmark the file or directory on the current line.  If the region is
@@ -1205,9 +1202,6 @@ files and directories.
 @item x
 Hide files with @samp{up-to-date} status
 (@code{vc-dir-hide-up-to-date}).
-
-@item q
-Quit the VC Directory buffer, and bury it (@code{quit-window}).
 @end table
 
 @findex vc-dir-mark
@@ -1326,7 +1320,7 @@ commit will be committed to that specific branch.
 @subsubsection Pulling Changes into a Branch
 
 @table @kbd
-@itemx C-x v +
+@item C-x v +
 On a decentralized version control system, update the current branch
 by ``pulling in'' changes from another location.
 
@@ -1366,7 +1360,7 @@ updates the current VC fileset from the repository.
 @cindex merging changes
 
 @table @kbd
-@itemx C-x v m
+@item C-x v m
 On a decentralized version control system, merge changes from another
 branch into the current one.
 
@@ -1772,11 +1766,11 @@ the file.
 
 @item
 In Perl code, the tags are the packages, subroutines and variables
-defined by the @code{package}, @code{sub}, @code{my} and @code{local}
-keywords.  Use @samp{--globals} if you want to tag global variables.
-Tags for subroutines are named @samp{@var{package}::@var{sub}}.  The
-name for subroutines defined in the default package is
-@samp{main::@var{sub}}.
+defined by the @code{package}, @code{sub}, @code{use constant},
+@code{my}, and @code{local} keywords.  Use @samp{--globals} if you
+want to tag global variables.  Tags for subroutines are named
+@samp{@var{package}::@var{sub}}.  The name for subroutines defined in
+the default package is @samp{main::@var{sub}}.
 
 @item
 In PHP code, tags are functions, classes and defines.  Vars are tags
@@ -2227,7 +2221,7 @@ the current buffer, followed by the remaining files of the tags table.
 reads a regexp to search for and a string to replace with, just like
 ordinary @kbd{M-x query-replace-regexp}.  It searches much like @kbd{M-x
 tags-search}, but repeatedly, processing matches according to your
-input.  @xref{Replace}, for more information on query replace.
+input.  @xref{Query Replace}, for more information on query replace.
 
 @vindex tags-case-fold-search
 @cindex case-sensitivity and tags search