Merge from emacs--devo--0

[gnu-emacs] / etc / etags.1

diff --git a/etc/etags.1 b/etc/etags.1
index aae98875b681cb3f499d420aa9737430337a2622..04b67f389f4965ee93cba199c9ca546b627dccb9 100644 (file)
--- a/etc/etags.1
+++ b/etc/etags.1
@@ -21,7 +21,7 @@ etags, ctags \- generate tag file for Emacs, vi
 [\|\-\-append\|] [\|\-\-no\-defines\|]
 [\|\-\-no\-globals\|] [\|\-\-include=\fIfile\fP\|]
 [\|\-\-ignore\-indentation\|] [\|\-\-language=\fIlanguage\fP\|]
-[\|\-\-members\|] [\|\-\-output=\fItagfile\fP\|]
+[\|\-\-no\-members\|] [\|\-\-output=\fItagfile\fP\|]
 [\|\-\-regex=\fIregexp\fP\|] [\|\-\-no\-regex\|]
 [\|\-\-help\|] [\|\-\-version\|]
 \fIfile\fP .\|.\|.
@@ -135,10 +135,10 @@ regexp matching is done in this case (see the \fB\-\-regex\fP option).
 .TP
 .B \-\-members
 Create tag entries for variables that are members of structure-like
-constructs in C++, Objective C, Java.
+constructs in C++, Objective C, Java.  This is the default for etags.
 .TP
 .B \-\-no\-members
-Do not tag member variables.  This is the default behavior.
+Do not tag member variables.  This is the default for ctags.
 .TP
 .B \-\-packages\-only
 Only tag packages in Ada files.
@@ -224,7 +224,7 @@ Tag TCL files (this last example shows the usage of a \fItagregexp\fP):
 
 .br
 A regexp can be preceded by {\fIlang\fP}, thus restricting it to match
-lines of files of the specified language.  Use \fBetags --help\fP to obtain
+lines of files of the specified language.  Use \fBetags \-\-help\fP to obtain
 a list of the recognised languages.  This feature is particularly useful inside
 \fBregex files\fP.  A regex file contains one regex per line.  Empty lines,
 and those lines beginning with space or tab are ignored.  Lines beginning