X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2d0600a3d85fd1b0cab38ac280f435510b2abc08..135e3b47ec43ea6c2d83c460f43fbacb8b8257e2:/man/ebrowse.texi

diff --git a/man/ebrowse.texi b/man/ebrowse.texi
index cfafef5c04..25262625e9 100644
--- a/man/ebrowse.texi
+++ b/man/ebrowse.texi
@@ -1,83 +1,65 @@
 \input texinfo   @c -*-texinfo-*-
 
-@comment TODO
-@comment 1. Class *Globals*
-@comment 2. Hinweis auf customize
-
 @comment %**start of header
 @setfilename ../info/ebrowse
 @settitle A Class Browser for C++
 @setchapternewpage odd
+@syncodeindex fn cp
 @comment %**end of header
 
-@ifinfo
-@direntry 
-* Ebrowse::   A C++ class browser for Emacs.
-@end direntry
-
+@copying
 This file documents Ebrowse, a C++ class browser for GNU Emacs.
 
-Copyright @copyright{} 1992--1999, 2000 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through Tex and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-sections entitled ``The GNU Manifesto'', ``Distribution'' and ``GNU
-General Public License'' are included exactly as in the original, and
-provided that the entire resulting derived work is distributed under the
-terms of a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the sections entitled ``The GNU Manifesto'',
-``Distribution'' and ``GNU General Public License'' may be included in a
-translation approved by the Free Software Foundation instead of in the
-original English.
-@end ifinfo
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007  Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU
+Manual,'' and with the Back-Cover Texts as in (a) below.  A copy of the
+license is included in the section entitled ``GNU Free Documentation
+License'' in the Emacs manual.
+
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+this GNU Manual, like GNU software.  Copies published by the Free
+Software Foundation raise funds for GNU development.''
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Ebrowse: (ebrowse).   A C++ class browser for Emacs.
+@end direntry
 
 @titlepage
-@sp 10
-@center @titlefont{A C++ Browser for GNU Emacs}
+@title Ebrowse User's Manual
+@sp 4
+@subtitle Ebrowse/Emacs
+@sp 1
+@subtitle May 2000
+@sp 5
+@author Gerd Moellmann
+@page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992--1999, 2000 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-sections entitled ``Distribution'' and ``General Public License'' are
-included exactly as in the original, and provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the sections entitled ``Distribution'' and ``General Public
-License'' may be included in a translation approved by the author
-instead of in the original English.
+@insertcopying
 @end titlepage
 
-
-
 @node Top, Overview, (dir), (dir)
 
+@ifnottex
 You can browse C++ class hierarchies from within Emacs by using
 Ebrowse.
+@end ifnottex
 
 @menu
-* Overview::			What is it and now does it work?
+* Overview::			What is it and how does it work?
 * Generating browser files::	How to process C++ source files
 * Loading a Tree::		How to start browsing
 * Tree Buffers::		Traversing class hierarchies
@@ -91,11 +73,6 @@ Ebrowse.
 
 @node Overview, Generating browser files, Top, Top
 @chapter Introduction
-@cindex tree buffer
-@cindex member buffer
-@cindex major modes
-@cindex parser
-@cindex @samp{*Globals*}
 
 When working in software projects using C++, I frequently missed
 software support for two things:
@@ -104,9 +81,9 @@ software support for two things:
 @item
 When you get a new class library, or you have to work on source code you
 haven't written yourself (or written sufficiently long ago), you need a
-tool letting you navigate through class hierarchies and investigate
-features of the software.  Without such a tool you often end up grep'ing
-through dozens or even hundreds of files.
+tool to let you navigate class hierarchies and investigate
+features of the software.  Without such a tool you often end up
+@command{grep}ing through dozens or even hundreds of files.
 
 @item
 Once you are productive, it would be nice to have a tool that knows your
@@ -118,46 +95,50 @@ knows what identifiers are defined in your program@dots{}.
 
 The design of Ebrowse reflects these two needs.
 
-How does it work? 
+How does it work?
 
+@cindex parser for C++ sources
 A fast parser written in C is used to process C++ source files.
 The parser generates a data base containing information about classes,
-members, global functions, defines, types etc. found in the sources.
+members, global functions, defines, types etc.@: found in the sources.
 
 The second part of Ebrowse is a Lisp program.  This program reads
 the data base generated by the parser.  It displays its contents in
 various forms and allows you to perform operations on it, or do
 something with the help of the knowledge contained in the data base.
 
+@cindex major modes, of Ebrowse buffers
 @dfn{Navigational} use of Ebrowse is centered around two
 types of buffers which define their own major modes:
 
+@cindex tree buffer
 @dfn{Tree buffers} are used to view class hierarchies in tree form.
 They allow you to quickly find classes, find or view class declarations,
 perform operations like query replace on sets of your source files, and
 finally tree buffers are used to produce the second buffer form---member
-buffers.
+buffers.  @xref{Tree Buffers}.
 
+@cindex member buffer
 Members are displayed in @dfn{member buffers}.  Ebrowse
 distinguishes between six different types of members; each type is
 displayed as a member list of its own:
 
 @itemize @bullet
 @item
-Instance member variables,
+Instance member variables;
 
 @item
-Instance member functions,
+Instance member functions;
 
 @item
-Static member variables,
+Static member variables;
 
 @item
-Static member functions,
+Static member functions;
 
 @item
-Friends/Defines,  The list of defines is contained in the friends
-list of the pseudo-class @samp{*Globals*}.
+Friends/Defines.  The list of defines is contained in the friends
+list of the pseudo-class @samp{*Globals*};
 
 @item
 Types (@code{enum}s, and @code{typedef}s defined with class
@@ -168,7 +149,7 @@ You can switch member buffers from one list to another, or to another
 class.  You can include inherited members in the display, you can set
 filters that remove categories of members from the display, and most
 importantly you can find or view member declarations and definitions
-with a keystroke.
+with a keystroke.  @xref{Member Buffers}.
 
 These two buffer types and the commands they provide support the
 navigational use of the browser.  The second form resembles Emacs' Tags
@@ -181,7 +162,7 @@ To list just a subset of what you can use the Tags part of Ebrowse for:
 @itemize @bullet
 @item
 Jump to the definition or declaration of an identifier in your source
-code, with an electric position stack that let's you easily navigate
+code, with an electric position stack that lets you easily navigate
 back and forth.
 
 @item
@@ -203,16 +184,15 @@ them, if you like.
 @node Generating browser files, Loading a Tree, Overview, Top
 @comment node-name,  next,  previous,  up
 @chapter Processing Source Files
-@cindex command line
-@cindex options
-@cindex switches
-@cindex parser switches
 
+@cindex @command{ebrowse}, the program
+@cindex class data base creation
 Before you can start browsing a class hierarchy, you must run the parser
-@file{ebrowse} on your source files in order to generate a Lisp data
+@command{ebrowse} on your source files in order to generate a Lisp data
 base describing your program.
 
-The operation of @file{ebrowse} can be tailored with command line
+@cindex command line for @command{ebrowse}
+The operation of @command{ebrowse} can be tailored with command line
 options.  Under normal circumstances it suffices to let the parser use
 its default settings.  If you want to do that, call it with a command
 line like:
@@ -222,7 +202,7 @@ ebrowse *.h *.cc
 @end example
 
 @noindent
-or, if your shell doesn't allow all file names to be specified on
+or, if your shell doesn't allow all the file names to be specified on
 the command line,
 
 @example
@@ -233,7 +213,8 @@ ebrowse --files=@var{file}
 where @var{file} contains the names of the files to be parsed, one
 per line.
 
-When invoked with option @samp{--help}, @file{ebrowse} prints a list of
+@findex --help
+When invoked with option @samp{--help}, @command{ebrowse} prints a list of
 available command line options.@refill
 
 @menu
@@ -250,19 +231,15 @@ available command line options.@refill
 @comment name,     next,        prev,                     up
 @node Input files, Output file, Generating browser files, Generating browser files
 @section Specifying Input Files
-@cindex input files
-@cindex response files
-@cindex @samp{--files}
-@cindex @samp{--search-path}
-@cindex standard input
-@cindex header files
-@cindex friend functions
 
 @table @samp
+@cindex input files, for @command{ebrowse}
 @item file
-Each file name on the command line tells @file{ebrowse} to parse
+Each file name on the command line tells @command{ebrowse} to parse
 that file.
 
+@cindex response files
+@findex --files
 @item --files=@var{file}
 This command line switch specifies that @var{file} contains a list of
 file names to parse.  Each line in @var{file} must contain one file
@@ -270,18 +247,22 @@ name.  More than one option of this kind is allowed.  You might, for
 instance, want to use one file for header files, and another for source
 files.
 
+@cindex standard input, specifying input files
 @item standard input
-When @file{ebrowse} finds no file names on the command line, and no
+When @command{ebrowse} finds no file names on the command line, and no
 @samp{--file} option is specified, it reads file names from standard
-input.  This is sometimes convenient when @file{ebrowse} is used as part
+input.  This is sometimes convenient when @command{ebrowse} is used as part
 of a command pipe.
 
+@findex --search-path
 @item --search-path=@var{paths}
-This option let's you specify search paths for your input files.
+This option lets you specify search paths for your input files.
 @var{paths} is a list of directory names, separated from each other by a
 either a colon or a semicolon, depending on the operating system.
 @end table
 
+@cindex header files
+@cindex friend functions
 It is generally a good idea to specify input files so that header files
 are parsed before source files.  This facilitates the parser's work of
 properly identifying friend functions of a class.
@@ -291,32 +272,33 @@ properly identifying friend functions of a class.
 @comment name,     next,               prev,        up
 @node Output file, Structs and unions, Input files, Generating browser files
 @section Changing the Output File Name
-@cindex output file name
-@cindex @samp{BROWSE}
-@cindex appending output
-@cindex @samp{--output-file}
-@cindex @samp{--append}
 
 @table @samp
+@cindex output file name
+@findex --output-file
+@cindex @file{BROWSE} file
 @item --output-file=@var{file}
-This option instructs @file{ebrowse} to generate a Lisp data base with
+This option instructs @command{ebrowse} to generate a Lisp data base with
 name @var{file}.  By default, the data base is named @file{BROWSE}, and
-is written in the directory in which @file{ebrowse} is invoked.
+is written in the directory in which @command{ebrowse} is invoked.
 
 If you regularly use data base names different from the default, you
-might want to add this to your init file
+might want to add this to your init file:
 
 @lisp
 (add-to-list 'auto-mode-alist '(@var{NAME} . ebrowse-tree-mode))
 @end lisp
 
-@noindent 
+@noindent
 where @var{NAME} is the Lisp data base name you are using.
 
+@findex --append
+@cindex appending output to class data base
 @item --append
-By default, each run of @file{ebrowse} erases the old contents of the
-output file when writing to it.  You can instruct @file{ebrowse} to
-append its output to an existing file with this command line option.
+By default, each run of @command{ebrowse} erases the old contents of the
+output file when writing to it.  You can instruct @command{ebrowse} to
+append its output to an existing file produced by @command{ebrowse}
+with this command line option.
 @end table
 
 
@@ -327,14 +309,14 @@ append its output to an existing file with this command line option.
 @section Structs and Unions
 @cindex structs
 @cindex unions
-@cindex @samp{--no-structs-or-unions}
 
 @table @samp
+@findex --no-structs-or-unions
 @item --no-structs-or-unions
 This switch suppresses all classes in the data base declared as
 @code{struct} or @code{union} in the output.
 
-This is mainly thought for the case that you are converting an existing
+This is mainly useful when you are converting an existing
 C program to C++, and do not want to see the old C structs in a class
 tree.
 @end table
@@ -345,19 +327,14 @@ tree.
 @comment name,  next,      prev,               up
 @node Matching, Verbosity, Structs and unions, Generating browser files
 @section Regular Expressions
-@cindex regular expressions
-@cindex minimum regexp length
-@cindex maximum regexp length
-@cindex @samp{--min-regexp-length}
-@cindex @samp{--max-regexp-length}
-@cindex @samp{--no-regexps}
 
-The parser @file{ebrowse} normally writes strings to its output file
-that help the Lisp part of Ebrowse to find functions, variables etc. in
-their source files.
+@cindex regular expressions, recording
+The parser @command{ebrowse} normally writes regular expressions to its
+output file that help the Lisp part of Ebrowse to find functions,
+variables etc.@: in their source files.
 
-You can instruct @file{ebrowse} to omit these strings by calling it
-with the command line switch @samp{--no-regexps}.
+You can instruct @command{ebrowse} to omit these regular expressions by
+calling it with the command line switch @samp{--no-regexps}.
 
 When you do this, the Lisp part of Ebrowse tries to guess, from member
 or class names, suitable regular expressions to locate that class or
@@ -366,30 +343,35 @@ automatic generation of regular expressions can be too weak if unusual
 coding styles are used.
 
 @table @samp
+@findex --no-regexps
 @item --no-regexps
-This option turns regular expression recording off.
+This option turns off regular expression recording.
 
+@findex --min-regexp-length
+@cindex minimum regexp length for recording
 @item --min-regexp-length=@var{n}
 The number @var{n} following this option specifies the minimum length of
 the regular expressions recorded to match class and member declarations
 and definitions.  The default value is set at compilation time of
-@file{ebrowse}.
+@command{ebrowse}.
 
-The smaller the minimum length the higher the probability that
+The smaller the minimum length, the higher the probability that
 Ebrowse will find a wrong match.  The larger the value, the
 larger the output file and therefore the memory consumption once the
 file is read from Emacs.
 
+@findex --max-regexp-length
+@cindex maximum regexp length for recording
 @item --max-regexp-length=@var{n}
 The number following this option specifies the maximum length of the
 regular expressions used to match class and member declarations and
 definitions.  The default value is set at compilation time of
-@file{ebrowse}.
+@command{ebrowse}.
 
-The larger the maximum length the higher the probability that the
+The larger the maximum length, the higher the probability that the
 browser will find a correct match, but the larger the value the larger
 the output file and therefore the memory consumption once the data is
-read.  As a second effect, the larger the regular expression the higher
+read.  As a second effect, the larger the regular expression, the higher
 the probability that it will no longer match after editing the file.
 @end table
 
@@ -399,18 +381,18 @@ the probability that it will no longer match after editing the file.
 @node Verbosity, , Matching, Generating browser files
 @comment  node-name,  next,  previous,  up
 @section Verbose Mode
-@cindex verbose
-@cindex @samp{--verbose}
-@cindex @samp{--very-verbose}
+@cindex verbose operation
 
 @table @samp
+@findex --verbose
 @item --verbose
-When this option is specified on the command line, @file{ebrowse} prints
+When this option is specified on the command line, @command{ebrowse} prints
 a period for each file parsed, and it displays a @samp{+} for each
 class written to the output file.
 
+@findex --very-verbose
 @item --very-verbose
-This option makes @file{ebrowse} print out the names of the files and
+This option makes @command{ebrowse} print out the names of the files and
 the names of the classes seen.
 @end table
 
@@ -423,7 +405,7 @@ the names of the classes seen.
 @cindex loading
 @cindex browsing
 
-You start browsing a class hierarchy parsed by @file{ebrowse} by just
+You start browsing a class hierarchy parsed by @command{ebrowse} by just
 finding the @file{BROWSE} file with @kbd{C-x C-f}.
 
 An example of a tree buffer display is shown below.
@@ -437,15 +419,17 @@ An example of a tree buffer display is shown below.
 |    Dictionary
 @end example
 
-When you run Emacs under X, you will notice that that certain areas in
-the tree buffer are highlighted when you move the mouse over them.  This
-highlight marks mouse-sensitive regions in the buffer.  Please notice
-the help strings in the echo area when the mouse moves over a sensitive
-region.
+@cindex mouse highlight in tree buffers
+When you run Emacs on a display which supports colors and the mouse, you
+will notice that certain areas in the tree buffer are highlighted
+when you move the mouse over them.  This highlight marks mouse-sensitive
+regions in the buffer.  Please notice the help strings in the echo area
+when the mouse moves over a sensitive region.
 
-A click with @kbd{mouse-3} on a mouse-sensitive region opens a context
+@cindex context menu
+A click with @kbd{Mouse-3} on a mouse-sensitive region opens a context
 menu.  In addition to this, each buffer also has a buffer-specific menu
-that is opened with a click with @kbd{mouse-3} somewhere in the buffer
+that is opened with a click with @kbd{Mouse-3} somewhere in the buffer
 where no highlight is displayed.
 
 
@@ -459,14 +443,12 @@ where no highlight is displayed.
 @node Tree Buffers, Member Buffers, Loading a Tree, Top
 @comment  node-name,  next,  previous,  up
 @chapter Tree Buffers
-@cindex tree buffers
-@cindex tree
 @cindex tree buffer mode
 @cindex class trees
 
 Class trees are displayed in @dfn{tree buffers} which install their own
 major mode.  Most Emacs keys work in tree buffers in the usual way,
-e.g., you can move around in the buffer with the usual @kbd{C-f},
+e.g.@: you can move around in the buffer with the usual @kbd{C-f},
 @kbd{C-v} etc., or you can search with @kbd{C-s}.
 
 Tree-specific commands are bound to simple keystrokes, similar to
@@ -494,7 +476,7 @@ buffers.
 @comment  node-name,  next,  previous,  up
 @section Viewing and Finding Class Declarations
 @cindex viewing, class
-@cindex finding, class
+@cindex finding a class
 @cindex class declaration
 
 You can view or find a class declaration when the cursor is on a class
@@ -514,7 +496,7 @@ editing.@refill
 @end table
 
 The same functionality is available from the menu opened with
-@kbd{mouse-3} on the class name.
+@kbd{Mouse-3} on the class name.
 
 
 
@@ -522,10 +504,10 @@ The same functionality is available from the menu opened with
 @node Member Display, Go to Class, Source Display, Tree Buffers
 @comment  node-name,  next,  previous,  up
 @section Displaying Members
-@cindex @samp{*Members*}
+@cindex @samp{*Members*} buffer
 @cindex @samp{*Globals*}
-@cindex freezing
-@cindex member lists
+@cindex freezing a member buffer
+@cindex member lists, in tree buffers
 
 Ebrowse distinguishes six different kinds of members, each of
 which is displayed as a separate @dfn{member list}: instance variables,
@@ -550,29 +532,35 @@ pop to a member buffer displaying the member list.  With prefix argument,
 the member buffer will additionally be @dfn{frozen}.
 
 @table @kbd
+@cindex instance member variables, list
 @item L v
 This command displays the list of instance member variables.
 
+@cindex static variables, list
 @item L V
 Display the list of static variables.
 
+@cindex friend functions, list
 @item L d
 Display the list of friend functions.  This list is used for defines if
 you are viewing the class @samp{*Globals*} which is a place holder for
 global symbols.
 
+@cindex member functions, list
 @item L f
 Display the list of member functions.
 
+@cindex static member functions, list
 @item L F
 Display the list of static member functions.
 
+@cindex types, list
 @item L t
 Display a list of types.
 @end table
 
 These lists are also available from the class' context menu invoked with
-@kbd{mouse-3} on the class name.
+@kbd{Mouse-3} on the class name.
 
 
 
@@ -582,15 +570,17 @@ These lists are also available from the class' context menu invoked with
 @section Finding a Class
 @cindex locate class
 @cindex expanding branches
+@cindex class location
 
 @table @kbd
+@cindex search for class
 @item /
 This command reads a class name from the minibuffer with completion and
 positions the cursor on the class in the class tree.
 
 If the branch of the class tree containing the class searched for is
 currently collapsed, the class itself and all its base classes are
-recursively made visible.  (See also @xref{Expanding and
+recursively made visible.  (See also @ref{Expanding and
 Collapsing}.)@refill
 
 This function is also available from the tree buffer's context menu.
@@ -606,7 +596,7 @@ local copy of the regular expression last searched in it.
 @node Quitting, File Name Display, Go to Class, Tree Buffers
 @comment  node-name,  next,  previous,  up
 @section Burying a Tree Buffer
-@cindex burying buffer, tree
+@cindex burying tree buffer
 
 @table @kbd
 @item q
@@ -619,9 +609,9 @@ Is a synonym for @kbd{M-x bury-buffer}.
 @node File Name Display, Expanding and Collapsing, Quitting, Tree Buffers
 @comment  node-name,  next,  previous,  up
 @section Displaying File Names
-@cindex file name display
 
 @table @kbd
+@cindex file names in tree buffers
 @item T f
 This command toggles the display of file names in a tree buffer.  If
 file name display is switched on, the names of the files containing the
@@ -632,7 +622,7 @@ This command is also provided in the tree buffer's context menu.
 
 @item s
 Display file names for the current line, or for the number of lines
-given by a prefix argument. 
+given by a prefix argument.
 @end table
 
 Here is an example of a tree buffer with file names displayed.
@@ -652,14 +642,15 @@ Here is an example of a tree buffer with file names displayed.
 @node Expanding and Collapsing, Tree Indentation, File Name Display, Tree Buffers
 @comment  node-name,  next,  previous,  up
 @section Expanding and Collapsing a Tree
-@cindex expand
-@cindex collapse
-@cindex branches
+@cindex expand tree branch
+@cindex collapse tree branch
+@cindex branches of class tree
+@cindex class tree, collapse or expand
 
 You can expand and collapse parts of a tree to reduce the complexity of
 large class hierarchies.  Expanding or collapsing branches of a tree has
 no impact on the functionality of other commands, like @kbd{/}.  (See
-also @xref{Go to Class}.)@refill
+also @ref{Go to Class}.)@refill
 
 Collapsed branches are indicated with an ellipsis following the class
 name like in the example below.
@@ -674,11 +665,11 @@ name like in the example below.
 @table @kbd
 @item -
 This command collapses the branch of the tree starting at the class the
-cursor is on. 
+cursor is on.
 
 @item +
 This command expands the branch of the tree starting at the class the
-cursor is on. Both commands for collapsing and expanding branches are
+cursor is on.  Both commands for collapsing and expanding branches are
 also available from the class' object menu.
 
 @item *
@@ -692,12 +683,12 @@ This command expands all collapsed branches in the tree.
 @comment  node-name,  next,  previous,  up
 @section Changing the Tree Indentation
 @cindex tree indentation
-@cindex indentation
+@cindex indentation of the tree
 
 @table @kbd
 @item T w
 This command reads a new indentation width from the minibuffer and
-redisplays the tree buffer with the new indentation. It is also
+redisplays the tree buffer with the new indentation  It is also
 available from the tree buffer's context menu.
 @end table
 
@@ -708,6 +699,7 @@ available from the tree buffer's context menu.
 @comment  node-name,  next,  previous,  up
 @section Removing Classes from the Tree
 @cindex killing classes
+@cindex class, remove from tree
 
 @table @kbd
 @item C-k
@@ -723,12 +715,14 @@ deletion is actually performed.
 @comment  node-name,  next,  previous,  up
 @comment node-name, next, previous, up
 @section Saving a Tree
-@cindex saving tree
+@cindex save tree to a file
+@cindex tree, save to a file
+@cindex class tree, save to a file
 
 @table @kbd
 @item C-x C-s
-This command writes a class tree to the file it was read from.  This is
-useful after classes have been deleted from a tree.
+This command writes a class tree to the file from which it was read.
+This is useful after classes have been deleted from a tree.
 
 @item  C-x C-w
 Writes the tree to a file whose name is read from the minibuffer.
@@ -739,7 +733,9 @@ Writes the tree to a file whose name is read from the minibuffer.
 
 @node     Statistics, Marking Classes, Saving a Tree, Tree Buffers
 @comment  node-name,  next,        previous, up
-@cindex statistics
+@cindex statistics for a tree
+@cindex tree statistics
+@cindex class statistics
 
 @table @kbd
 @item x
@@ -754,17 +750,20 @@ context menu.
 @node     Marking Classes, , Statistics, Tree Buffers
 @comment  node-name,       next,       previous,      up
 @cindex marking classes
+@cindex operations on marked classes
 
 Classes can be marked for operations similar to the standard Emacs
 commands @kbd{M-x tags-search} and @kbd{M-x tags-query-replace} (see
 also @xref{Tags-like Functions}.)@refill
 
 @table @kbd
+@cindex toggle mark
 @item M t
 Toggle the mark of the line point is in or for as many lines as given by
 a prefix command.  This command can also be found in the class' context
-menu. 
+menu.
 
+@cindex unmark all
 @item M a
 Unmark all classes.  With prefix argument @kbd{C-u}, mark all classes in
 the tree. Since this command operates on the whole buffer, it can also be
@@ -793,24 +792,25 @@ display, like in the following example
 @node Member Buffers, Tags-like Functions, Tree Buffers, Top
 @comment  node-name,       next,       previous,      up
 @chapter Member Buffers
-@cindex member buffer
 @cindex members
 @cindex member buffer mode
 
+@cindex class members, types
+@cindex types of class members
 @dfn{Member buffers} are used to operate on lists of members of a class.
 Ebrowse distinguishes six kinds of lists:
 
 @itemize @bullet
 @item
-Instance variables (normal member variables),
+Instance variables (normal member variables);
 @item
-Instance functions (normal member functions),
+Instance functions (normal member functions);
 @item
-Static variables,
+Static variables;
 @item
-Static member functions,
+Static member functions;
 @item
-Friend functions,
+Friend functions;
 @item
 Types (@code{enum}s and @code{typedef}s defined with class scope.
 Nested classes will be shown in the class tree like normal classes.
@@ -843,16 +843,18 @@ buffer: members, classes, and the buffer itself.
 @node Switching Member Lists, Finding/Viewing, Member Buffers, Member Buffers
 @comment  node-name,       next,       previous,      up
 @section Switching Member Lists
-@cindex member lists
+@cindex member lists, in member buffers
 @cindex static members
 @cindex friends
 @cindex types
 @cindex defines
 
 @table @kbd
+@cindex next member list
 @item L n
 This command switches the member buffer display to the next member list.
 
+@cindex previous member list
 @item L p
 This command switches the member buffer display to the previous member
 list.
@@ -860,6 +862,7 @@ list.
 @item L f
 Switch to the list of member functions.
 
+@cindex static
 @item L F
 Switch to the list of static member functions.
 
@@ -873,12 +876,12 @@ Switch to the list of static member variables.
 Switch to the list of friends or defines.
 
 @item L t
-Switch to the list of types.x
+Switch to the list of types.
 @end table
 
 Both commands cycle through the member list.
 
-Most of the commands are also available from the member buffer's 
+Most of the commands are also available from the member buffer's
 context menu.
 
 
@@ -887,12 +890,12 @@ context menu.
 @node Finding/Viewing, Inherited Members, Switching Member Lists, Member Buffers
 @comment  node-name,       next,       previous,      up
 @section Finding and Viewing Member Source
-@cindex finding members
-@cindex viewing members
-@cindex member definitions
-@cindex member declarations
-@cindex definitions
-@cindex declarations
+@cindex finding members, in member buffers
+@cindex viewing members, in member buffers
+@cindex member definitions, in member buffers
+@cindex member declarations, in member buffers
+@cindex definition of a member, in member buffers
+@cindex declaration of a member, in member buffers
 
 @table @kbd
 @item RET
@@ -917,7 +920,7 @@ You can install a hook function to perform actions after a member or
 class declaration or definition has been found, or when it is not found.
 
 All the commands described above can also be found in the context menu
-displayed when clicking @kbd{mouse-2} on a member name.
+displayed when clicking @kbd{Mouse-2} on a member name.
 
 
 
@@ -925,14 +928,14 @@ displayed when clicking @kbd{mouse-2} on a member name.
 @node Inherited Members, Searching Members, Finding/Viewing, Member Buffers
 @comment  node-name,       next,       previous,      up
 @section Display of Inherited Members
-@cindex superclasses
-@cindex base classes
+@cindex superclasses, members
+@cindex base classes, members
 @cindex inherited members
 
 @table @kbd
 @item D b
 This command toggles the display of inherited members in the member
-buffer. This is also in the buffer's context menu.
+buffer.  This is also in the buffer's context menu.
 @end table
 
 
@@ -951,12 +954,12 @@ list.
 
 @item G m
 Like the above command, but all members for the current class appear in
-the completion list. If necessary, the current member list is switched
+the completion list.  If necessary, the current member list is switched
 to the one containing the member.
 
 With a prefix argument (@kbd{C-u}), all members in the class tree,
-i.e., all members the browser knows about appear in the completion
-list. The member display will be switched to the class and member list
+i.e.@: all members the browser knows about appear in the completion
+list.  The member display will be switched to the class and member list
 containing the member.
 
 @item G n
@@ -971,16 +974,16 @@ a mouse.
 @node Switching to Tree, Filters, Searching Members, Member Buffers
 @comment  node-name,       next,       previous,      up
 @section Switching to Tree Buffer
-@cindex tree buffer
+@cindex tree buffer, switch to
 @cindex buffer switching
 @cindex switching buffers
 
 @table @kbd
-@item TAB
+@item @key{TAB}
 Pop up the tree buffer to which the member buffer belongs.
 
 @item t
-Do the same as @kbd{TAB} but also position the cursor on the class
+Do the same as @key{TAB} but also position the cursor on the class
 displayed in the member buffer.
 @end table
 
@@ -991,37 +994,38 @@ displayed in the member buffer.
 @comment  node-name,       next,       previous,      up
 @section Filters
 @cindex filters
-@cindex @code{public}
-@cindex @code{protected}
-@cindex @code{private}
-@cindex @code{virtual}
-@cindex @code{inline}
-@cindex @code{const}
-@cindex pure virtual members
 
 @table @kbd
-@item F a u 
+@cindex @code{public} members
+@item F a u
 This command toggles the display of @code{public} members.  The
 @samp{a} stands for `access'.
 
+@cindex @code{protected} members
 @item F a o
 This command toggles the display of @code{protected} members.
 
+@cindex @code{private} members
 @item F a i
 This command toggles the display of @code{private} members.
 
+@cindex @code{virtual} members
 @item F v
 This command toggles the display of @code{virtual} members.
 
+@cindex @code{inline} members
 @item F i
 This command toggles the display of @code{inline} members.
 
+@cindex @code{const} members
 @item F c
 This command toggles the display of @code{const} members.
 
+@cindex pure virtual members
 @item F p
 This command toggles the display of pure virtual members.
 
+@cindex remove filters
 @item F r
 This command removes all filters.
 @end table
@@ -1035,47 +1039,47 @@ These commands are also found in the buffer's context menu.
 @comment  node-name,       next,       previous,      up
 @section Displaying Member Attributes
 @cindex attributes
-@cindex member attributes
-@cindex @code{virtual}
-@cindex @code{extern "C"}
-@cindex @code{mutable}
-@cindex @code{explicit}
-@cindex @code{template}
-@cindex @code{inline}
-@cindex @code{const}
-@cindex pure virtual
+@cindex member attribute display
 
 @table @kbd
 @item D a
 Toggle the display of member attributes (default is on).
 
-The nine member attributes Ebrowse knows about are are displayed
+The nine member attributes Ebrowse knows about are displayed
 as a list a single-characters flags enclosed in angle brackets in front
 the of the member's name.  A @samp{-} at a given position means that
 the attribute is false.  The list of attributes from left to right is
 
 @table @samp
+@cindex @code{template} attribute
 @item T
 The member is a template.
 
+@cindex @code{extern "C"} attribute
 @item C
 The member is declared @code{extern "C"}.
 
+@cindex @code{virtual} attribute
 @item v
 Means the member is declared @code{virtual}.
 
+@cindex @code{inline}
 @item i
 The member is declared @code{inline}.
 
+@cindex @code{const} attribute
 @item c
 The member is @code{const}.
 
+@cindex pure virtual function attribute
 @item 0
 The member is a pure virtual function.
 
+@cindex @code{mutable} attribute
 @item m
 The member is declared @code{mutable}.
 
+@cindex @code{explicit} attribute
 @item e
 The member is declared @code{explicit}.
 
@@ -1094,7 +1098,6 @@ This command is also in the buffer's context menu.
 @cindex display form
 @cindex long display
 @cindex short display
-@cindex @samp{--no-regexps}
 
 @table @kbd
 @item D l
@@ -1117,7 +1120,8 @@ expressions matching the member (if known):
 @end example
 
 Regular expressions will only be displayed when the Lisp database has
-not been produced with the @file{ebrowse} option @samp{--no-regexps}.
+not been produced with the @command{ebrowse} option @samp{--no-regexps}.
+@xref{Matching, --no-regexps, Regular Expressions}.
 @end table
 
 
@@ -1136,7 +1140,8 @@ matching member definitions.
 @end table
 
 Regular expressions will only be displayed when the Lisp database has
-not been produced with the @file{ebrowse} option @samp{--no-regexps}.
+not been produced with the @command{ebrowse} option @samp{--no-regexps},
+see @ref{Matching, --no-regexps, Regular Expressions}.
 
 
 
@@ -1144,10 +1149,10 @@ not been produced with the @file{ebrowse} option @samp{--no-regexps}.
 @node Switching Classes, Killing/Burying, Regexp Display, Member Buffers
 @comment  node-name,       next,       previous,      up
 @section Displaying Another Class
-@cindex base classes
-@cindex derived classes
-@cindex superclasses
-@cindex subclasses
+@cindex base class, display
+@cindex derived class, display
+@cindex superclass, display
+@cindex subclass, display
 @cindex class display
 
 @table @kbd
@@ -1206,14 +1211,14 @@ This command sets the column width depending on the display form used
 @node Redisplay, Getting Help, Column Width, Member Buffers
 @comment  node-name,       next,       previous,      up
 @section Forced Redisplay
-@cindex redisplay
+@cindex redisplay of member buffers
 
 @table @kbd
 @item C-l
 This command forces a redisplay of the member buffer.  If the width
 of the window displaying the member buffer is changed this command
 redraws the member list with the appropriate column widths and number of
-columns. 
+columns.
 @end table
 
 
@@ -1258,14 +1263,19 @@ Emacs Tags facility, but better suited to the needs of C++ programmers.
 @node Finding and Viewing, Position Stack, Tags-like Functions, Tags-like Functions
 @comment  node-name,       next,       previous,      up
 @section Finding and Viewing Members
-@cindex finding member
-@cindex viewing member
+@cindex finding class member, in C++ source
+@cindex viewing class member, in C++ source
 @cindex tags
-@cindex member definition
-@cindex member declaration
+@cindex member definition, finding, in C++ source
+@cindex member declaration, finding, in C++ source
+
+The functions in this section are similar to those described in
+@ref{Source Display}, and also in @ref{Finding/Viewing}, except that
+they work in a C++ source buffer, not in member and tree buffers created
+by Ebrowse.
 
 @table @kbd
-@item C-c b f
+@item C-c C-m f
 Find the definition of the member around point.  If you invoke this
 function with a prefix argument, the declaration is searched.
 
@@ -1274,37 +1284,37 @@ select the class with completion.  If there is a scope declaration in
 front of the member name, this class name is used as initial input for
 the completion.
 
-@item C-c b F
-Fin the declaration of the member around point.
+@item C-c C-m F
+Find the declaration of the member around point.
 
-@item C-c b v
+@item C-c C-m v
 View the definition of the member around point.
 
-@item C-c b V
+@item C-c C-m V
 View the declaration of the member around point.
 
-@item C-c b 4 f
+@item C-c C-m 4 f
 Find a member's definition in another window.
 
-@item C-c b 4 F
+@item C-c C-m 4 F
 Find a member's declaration in another window.
 
-@item C-c b 4 v
+@item C-c C-m 4 v
 View a member's definition in another window.
 
-@item C-c b 4 V
+@item C-c C-m 4 V
 View a member's declaration in another window.
 
-@item C-c b 5 f
+@item C-c C-m 5 f
 Find a member's definition in another frame.
 
-@item C-c b 5 F
+@item C-c C-m 5 F
 Find a member's declaration in another frame.
 
-@item C-c b 5 v
+@item C-c C-m 5 v
 View a member's definition in another frame.
 
-@item C-c b 5 V
+@item C-c C-m 5 V
 View a member's declaration in another frame.
 @end table
 
@@ -1322,35 +1332,36 @@ jump and the position where you jumped to are recorded in a
 move to positions in the stack:@refill
 
 @table @kbd
-@item C-c b -
+@cindex return to original position
+@item C-c C-m -
 This command sets point to the previous position in the position stack.
 Directly after you performed a jump, this will put you back to the
 position where you came from.
 
-The stack is not popped, i.e., you can always switch back and forth
+The stack is not popped, i.e.@: you can always switch back and forth
 between positions in the stack.  To avoid letting the stack grow to
 infinite size there is a maximum number of positions defined.  When this
 number is reached, older positions are discarded when new positions are
 pushed on the stack.
 
-@item C-c b +
+@item C-c C-m +
 This command moves forward in the position stack, setting point to
 the next position stored in the position stack.
 
-@item C-c b p
-Displays an electric buffer showing all positions saved in the stack. 
-You can select a position by pressing @kbd{SPC} in a line. You can
+@item C-c C-m p
+Displays an electric buffer showing all positions saved in the stack.
+You can select a position by pressing @kbd{SPC} in a line.  You can
 view a position with @kbd{v}.
 @end table
 
 
 
 
-@node     Search & Replace, Members in Files, Position Stack, Tags-like Functions
+@node Search & Replace, Members in Files, Position Stack, Tags-like Functions
 @comment  node-name,       next,       previous,      up
 @section Searching and Replacing
-@cindex searching
-@cindex replacing
+@cindex searching multiple C++ files
+@cindex replacing in multiple C++ files
 @cindex restart tags-operation
 
 Ebrowse allows you to perform operations on all or a subset of the files
@@ -1362,23 +1373,23 @@ mentioned in the marked classes only.  Otherwise all files in the class
 tree are used.
 
 @table @kbd
-@item C-c b s
+@item C-c C-m s
 This function performs a regular expression search in the chosen set of
 files.
 
-@item C-c b u
+@item C-c C-m u
 This command performs a search for calls of a given member which is
 selected in the usual way with completion.
 
-@item C-c b %
+@item C-c C-m %
 Perform a query replace over the set of files.
 
-@item C-c b ,
-All three operations above stop when finding a match. You can restart
+@item C-c C-m ,
+All three operations above stop when finding a match.  You can restart
 the operation with this command.
 
-@item C-c b n
-This restarts the last tags operation with the next file in the list. 
+@item C-c C-m n
+This restarts the last tags operation with the next file in the list.
 @end table
 
 
@@ -1388,10 +1399,11 @@ This restarts the last tags operation with the next file in the list.
 @comment  node-name,       next,       previous,      up
 @section Members in Files
 @cindex files
-@cindex members in file
+@cindex members in file, listing
+@cindex list class members in a file
 @cindex file, members
 
-The command @kbd{C-c b l}, lists all members in a given file.  The file
+The command @kbd{C-c C-m l}, lists all members in a given file.  The file
 name is read from the minibuffer with completion.
 
 
@@ -1399,18 +1411,18 @@ name is read from the minibuffer with completion.
 
 @node Apropos, Symbol Completion, Members in Files, Tags-like Functions
 @comment  node-name,       next,       previous,      up
-@section Member Apropos 
-@cindex apropos
+@section Member Apropos
+@cindex apropos on class members
 @cindex members, matching regexp
 
-The command @kbd{C-c b a} can be used to display all members matching a
+The command @kbd{C-c C-m a} can be used to display all members matching a
 given regular expression.  This command can be very useful if you
 remember only part of a member name, and not its beginning.
 
 A special buffer is popped up containing all identifiers matching the
-regular expression, and what kind of symbol it is (e.g., a member
+regular expression, and what kind of symbol it is (e.g.@: a member
 function, or a type).  You can then switch to this buffer, and use the
-command @kbd{C-c b f}, for example, to jump to a specific member.
+command @kbd{C-c C-m f}, for example, to jump to a specific member.
 
 
 
@@ -1421,17 +1433,17 @@ command @kbd{C-c b f}, for example, to jump to a specific member.
 @cindex completion
 @cindex symbol completion
 
-The command @kbd{C-c b TAB} completes the symbol in front of point.
+The command @kbd{C-c C-m @key{TAB}} completes the symbol in front of point.
 
 
 
 
 @node Member Buffer Display,  , Symbol Completion, Tags-like Functions
 @section Quick Member Display
-@cindex member buffer
+@cindex member buffer, for member at point
 
 You can quickly display a member buffer containing the member the cursor
-in on with the command @kbd{C-c b m}.
+in on with the command @kbd{C-c C-m m}.
 
 
 @node Concept Index, , Tags-like Functions, Top
@@ -1440,3 +1452,7 @@ in on with the command @kbd{C-c b m}.
 
 @contents
 @bye
+
+@ignore
+   arch-tag: 52fe78ac-a1c4-48e7-815e-0a31acfad4bf
+@end ignore