Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / doc / man / etags.1

diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 2d2cde8..94fe2af 100644 (file)
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -1,6 +1,4 @@
-.\" Copyright (C) 1992, 2001, 2002, 2003, 2004,
-.\"   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-.\" See section COPYING for conditions for redistribution
+.\" See section COPYING for copyright and redistribution information.
 .TH etags 1 "23nov2001" "GNU Tools" "GNU Tools"
 .de BP
 .sp
@@ -51,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
@@ -64,7 +62,7 @@ Files specified with absolute file names will be recorded
 with absolute file names.  Files generated from a source file\-\-like
 a C file generated from a source Cweb file\-\-will be recorded with
 the name of the source file.
-Compressed files are supported using gzip and bzip2.
+Compressed files are supported using gzip, bzip2, and xz.
 The programs recognize the language used in an input file based on its
 file name and contents.  The \fB\-\-language\fP switch can be used to force
 parsing of the file names following the switch according to the given
@@ -90,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
@@ -268,8 +267,8 @@ Stallman.
 .SH COPYING
 Copyright
 .if t \(co
-.if n (c)
-1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+.if n (C)
+1992, 1999, 2001-2013 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
@@ -285,4 +284,3 @@ 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.
 
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573