Merge from origin/emacs-24

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

diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 94fe2af1a8aa329df7f8c1933675118fe5b44c3d..08db3430d35cf97c9aa3628dcf21cc2dce680439 100644 (file)
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -147,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
@@ -268,7 +268,7 @@ Stallman.
 Copyright
 .if t \(co
 .if n (C)
-1992, 1999, 2001-2013 Free Software Foundation, Inc.
+1992, 1999, 2001-2015 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.
-