Merge from origin/emacs-24

[gnu-emacs] / doc / man / etags.1

diff --git a/doc/man/etags.1 b/doc/man/etags.1
index f6b46add215afa436e40eaa170094ded89bad632..7d13892c15f264ec3a68891a99988865cc1f7ac3 100644 (file)
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -49,7 +49,7 @@ format understood by
 \&.  Both forms of the program understand
 the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang,
 Forth, HTML, LaTeX, Emacs Lisp/Common Lisp, Lua, Makefile, Pascal, Perl,
-PHP, Postscript, Python, Prolog, Scheme and
+PHP, PostScript, Python, Prolog, Scheme and
 most assembler\-like syntaxes.
 Both forms read the files specified on the command line, and write a tag
 table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for
@@ -88,6 +88,7 @@ Only \fBctags\fP accepts this option.
 .B \-\-declarations
 In C and derived languages, create tags for function declarations,
 and create tags for extern variables unless \-\-no\-globals is used.
+In Lisp, create tags for (defvar foo) declarations.
 .TP
 .B \-D, \-\-no\-defines
 Do not create tag entries for C preprocessor constant definitions
@@ -146,7 +147,7 @@ of \- means standard output; overrides default \fBTAGS\fP or \fBtags\fP.
 Make tags based on regexp matching for the files following this option,
 in addition to the tags made with the standard parsing based on
 language. May be freely intermixed with filenames and the \fB\-R\fP
-option.  The regexps are cumulative, i.e. each such option will add to
+option.  The regexps are cumulative, i.e., each such option will add to
 the previous ones.  The regexps are of one of the forms:
 .br
        [\fB{\fP\fIlanguage\fP\fB}\fP]\fB/\fP\fItagregexp/\fP[\fInameregexp\fP\fB/\fP]\fImodifiers\fP
@@ -267,8 +268,7 @@ Stallman.
 Copyright
 .if t \(co
 .if n (C)
-1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010, 2011  Free Software Foundation, Inc.
+1992, 1999, 2001-2014 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
@@ -283,4 +283,3 @@ Permission is granted to copy and distribute translations of this
 document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
-