Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 133-141)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.

11 files changed, 540 insertions, 367 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index c2dbbc22328..3b98e7985fb 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,107 @@
+2005-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Document Server Internals): Addition.
+
+2005-10-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (A note on namespaces): Fix RFC reference.
+
+2005-10-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (RSS): Fix key description.
+
+2005-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi: Emacs/w3 -> Emacs/W3.
+        (Browsing the Web): Fix description.
+        (Web Searches): Ditto.
+        (Customizing W3): Ditto.
+
+2005-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Maildir): Clarify expire-age and expire-group.
+
+2005-10-13  Kenichi Handa  <handa@m17n.org>
+
+        * basic.texi (Position Info): Fix previous change.
+
+2005-10-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * cmdargs.texi (Icons X): Fix typo.
+
+2005-10-12  Kenichi Handa  <handa@m17n.org>
+
+        * basic.texi (Position Info): Describe the case that Emacs shows
+        "part of display ...".
+
+2005-10-11  Jay Belanger  <belanger@truman.edu>
+
+        * calc.texi (Integration): Mention using `a i' to compute definite
+        integrals.
+
+2005-10-11  Juri Linkov  <juri@jurta.org>
+
+        * info.texi: Rearrange nodes.
+        (Top): Update menu.  Change ref `Info for Experts' to
+        `Advanced Info Commands'.
+        (Getting Started): Fix description of manual's parts.
+        (Help-Int): Change xref `Info Search' to `Search Index', and
+        `Expert Info' to `Advanced'.
+        (Advanced): Move node one level up.
+        (Search Text, Search Index): New nodes split out from `Info Search'.
+        (Go to node, Choose menu subtopic, Create Info buffer): New nodes
+        split out from `Advanced'.
+        (Advanced, Emacs Info Variables): De-document editing an Info file
+        in Info.
+        (Emacs Info Variables): Move node from `Expert Info' to `Advanced'.
+        (Creating an Info File): Delete node and move its text to
+        `Expert Info'.
+
+2005-10-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * cmdargs.texi (Icons X): -nb => -nbi
+
+2005-10-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frames.texi (Speedbar): A couple more clarifications.
+
+2005-10-11  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (GDB User Interface Layout): Improve diagram.
+        (Watch Expressions): Explain how to make speedbar global.
+        (Other GDB User Interface Buffers): Make references more precise.
+
+2005-10-10  Carsten Dominik  <dominik@science.uva.nl>
+
+        * org.texi: (Workflow states): Documented that change in keywords
+        becomes active only after restart of Emacs.
+
+2005-10-09  Richard M. Stallman  <rms@gnu.org>
+
+        * frames.texi (Speedbar): Clarify the text.
+
+2005-10-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frames.texi (Speedbar): Add information on keybindings,
+        dismissing the speedbar, and buffer display mode.  Link to
+        speedbar manual.
+
+2005-10-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * cmdargs.texi (Icons X): Removed options -i, -itype, --icon-type, 
+        added -nb, --no-bitmap-icon.
+
+2005-10-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.51.
+
+2005-10-08  Nick Roberts  <nickrob@snap.net.nz>
+
+        * speedbar.texi (Introduction): Describe new location of speedbar
+        on menubar.
+        (Basic Key Bindings): Remove descriptions of bindings that have
+        been removed.
+
 2005-10-07  Nick Roberts  <nickrob@snap.net.nz>
 
         * building.texi (GDB Graphical Interface): Add variables and
diff --git a/man/basic.texi b/man/basic.texi
index 2f5aa3162e1..2c78de612ad 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -636,10 +636,17 @@ Char: c (0143, 99, 0x63)  point=21044 of 26883(78%)  column 53
   The four values after @samp{Char:} describe the character that follows
 point, first by showing it and then by giving its character code in
 octal, decimal and hex.  For a non-@acronym{ASCII} multibyte character, these are
-followed by @samp{ext} and the character's representation, in hex, in
+followed by @samp{file} and the character's representation, in hex, in
 the buffer's coding system, if that coding system encodes the character
 safely and with a single byte (@pxref{Coding Systems}).  If the
-character's encoding is longer than one byte, Emacs shows @samp{ext ...}.
+character's encoding is longer than one byte, Emacs shows @samp{file ...}.
+
+  However, if the character displayed is in the range 0200 through
+0377 octal, it may actually stand for an invalid UTF-8 byte read from
+a file.  In Emacs, that byte is represented as a sequence of 8-bit
+characters, but all of them together display as the original invalid
+byte, in octal code.  In this case, @kbd{C-x =} shows @samp{part of
+display ...} instead of @samp{file}.
 
   @samp{point=} is followed by the position of point expressed as a character
 count.  The front of the buffer counts as position 1, one character later
diff --git a/man/building.texi b/man/building.texi
index a9a3cc049c7..eb7a8bb00fe 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -801,18 +801,21 @@ If @code{gdb-many-windows} is non-@code{nil}, regardless of the value of
 @code{gdb-use-inferior-io-buffer} is @code{nil}.  In this case the
 source buffer occupies the full width of the frame.
 
-@multitable @columnfractions .5 .5
-@item GUD buffer (I/O of GDB)
-@tab Locals buffer
-@item
-@tab
-@item Source buffer
-@tab Input/Output (of inferior) buffer
-@item
-@tab
-@item Stack buffer
-@tab Breakpoints buffer
-@end multitable
+@example
++--------------------------------+--------------------------------+
+|                                |                                |
+|  GUD buffer (I/O of GDB)       |     Locals buffer              |
+|                                |                                |
+|--------------------------------+--------------------------------+
+|                                |                                |
+|  Source buffer                 |     I/O buffer (of inferior)   |
+|                                |                                |
+|--------------------------------+--------------------------------+
+|                                |                                |
+|  Stack buffer                  |     Breakpoints buffer         |
+|                                |                                |
++--------------------------------+--------------------------------+
+@end example
 
 To toggle this layout, do @kbd{M-x gdb-many-windows}.
 
@@ -822,12 +825,12 @@ re-compiling your program, then you can restore it with the command
 @code{gdb-restore-windows}.
 
 You may also choose which additional buffers you want to display,
-either in the same frame or a different one.  Select GDB-windows or
-GDB-Frames from the menu-bar under the heading GUD.  If the menu-bar
-is unavailable, type @code{M-x
+either in the same frame or a different one.  Select them from
+@samp{GUD->GDB-windows} or @samp{GUD->GDB-Frames} sub-menu
+respectively.  If the menu-bar is unavailable, type @code{M-x
 gdb-display-@var{buffertype}-buffer} or @code{M-x
-gdb-frame-@var{buffertype}-buffer} respectively, where @var{buffertype}
-is the relevant buffer type e.g breakpoints.
+gdb-frame-@var{buffertype}-buffer} respectively, where
+@var{buffertype} is the relevant buffer type e.g breakpoints.
 
 When you finish debugging then kill the GUD buffer with @kbd{C-x k},
 which will also kill all the buffers associated with the session.
@@ -874,7 +877,7 @@ the current line (@code{gdb-goto-breakpoint}).  Alternatively, click
 
 The stack buffer displays a @dfn{call stack}, with one line for each
 of the nested subroutine calls (@dfn{stack frames}) now active in the
-program.  @xref{Backtrace,,info stack, gdb, The GNU debugger}.
+program.  @xref{Backtrace,, Backtraces, gdb, The GNU debugger}.
 
 @findex gdb-frames-select
 The selected frame number is displayed in reverse contrast.  Move
@@ -898,6 +901,12 @@ types, such as arrays, structures and unions are represented in a tree
 format.  To expand or contract a complex data type, click @kbd{Mouse-2}
 on the tag to the left of the expression.
 
+By default, watch expressions only display in the speedbar when the
+GUD buffer is selected in the attached frame.  If you want your watch
+expressions to remain visible at all times then select the @samp{GUD}
+radio button on the @samp{Speedbar->Displays} sub-menu using
+@kbd{Mouse-3}.
+
 @findex gdb-var-delete
 With the cursor over the root expression of a complex data type, type
 @kbd{D} to delete it from the speedbar
@@ -936,8 +945,8 @@ available here.  @xref{Shell Mode}.
 
 @item Locals Buffer
 The locals buffer displays the values of local variables of the
-current frame for simple data types (@pxref{Frame Info,,, gdb, The GNU
-debugger}).
+current frame for simple data types (@pxref{Frame Info, Frame Info,
+Information on a frame, gdb, The GNU debugger}).
 
 Arrays and structures display their type only.  You must display them
 separately to examine their values.  @xref{Watch Expressions}.
@@ -958,20 +967,21 @@ appear in the fringe or margin.
 @item Threads Buffer
 @findex gdb-threads-select
 The threads buffer displays a summary of all threads currently in your
-program (@pxref{Threads,,, gdb, The GNU debugger}).  Move point to any
-thread in the list and press @key{RET} to select it
-(@code{gdb-threads-select}) and display the associated source in the
-source buffer.  Alternatively, click @kbd{Mouse-2} on a thread to
-select it.  If the locals buffer is displayed then its contents update
-to display the variables that are local to the new thread.
+program (@pxref{Threads, Threads, Debugging programs with multiple
+threads, gdb, The GNU debugger}).  Move point to any thread in the
+list and press @key{RET} to select it (@code{gdb-threads-select}) and
+display the associated source in the source buffer.  Alternatively,
+click @kbd{Mouse-2} on a thread to select it.  If the locals buffer is
+displayed then its contents update to display the variables that are
+local to the new thread.
 
 @item Memory Buffer
 The memory buffer allows the user to examine sections of program
-memory (@pxref{Memory,,, gdb, The GNU debugger}).  Click @kbd{Mouse-1}
-on the appropriate part of the header line to change the starting
-address or number of data items that the buffer displays.
-Click @kbd{Mouse-3} on the header line to select the display format
-or unit size for these data items.
+memory (@pxref{Memory, Memory, Examining memory, gdb, The GNU
+debugger}).  Click @kbd{Mouse-1} on the appropriate part of the header
+line to change the starting address or number of data items that the
+buffer displays.  Click @kbd{Mouse-3} on the header line to select the
+display format or unit size for these data items.
 
 @end table
 
diff --git a/man/calc.texi b/man/calc.texi
index 36f9f68eecd..6e397a0052c 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -12817,7 +12817,9 @@ If you press @kbd{m v} with a numeric prefix argument @var{n}, you
 get a special ``dimensioned'' Matrix mode in which matrices of
 unknown size are assumed to be @var{n}x@var{n} square matrices.
 Then, the function call @samp{idn(1)} will expand into an actual
-matrix rather than representing a ``generic'' matrix.
+matrix rather than representing a ``generic'' matrix.  Simply typing
+@kbd{C-u m v} will get you a square Matrix mode, in which matrices of
+unknown size are assumed to be square matrices of unspecified size.
 
 @cindex Declaring scalar variables
 Of course these modes are approximations to the true state of
@@ -13205,6 +13207,8 @@ The value is not a vector.
 The value is a vector.
 @item matrix
 The value is a matrix (a rectangular vector of vectors).
+@item sqmatrix
+The value is a square matrix.
 @end table
 
 These type symbols can be combined with the other type symbols
@@ -15978,7 +15982,8 @@ Command is @kbd{m p}.
 
 @item
 Matrix/Scalar mode.  Default value is @mathit{-1}.  Value is 0 for Scalar
-mode, @mathit{-2} for Matrix mode, or @var{N} for 
+mode, @mathit{-2} for Matrix mode, @mathit{-3} for square Matrix mode,
+or @var{N} for  
 @texline @math{N\times N}
 @infoline @var{N}x@var{N} 
 Matrix mode.  Command is @kbd{m v}.
@@ -16056,7 +16061,10 @@ Symbolic mode (@kbd{m s}; @pxref{Symbolic Mode}).
 Matrix mode (@kbd{m v}; @pxref{Matrix Mode}).
 
 @item Matrix@var{n}
-Dimensioned Matrix mode (@kbd{C-u @var{n} m v}).
+Dimensioned Matrix mode (@kbd{C-u @var{n} m v}; @pxref{Matrix Mode}).
+
+@item SqMatrix
+Square Matrix mode (@kbd{C-u m v}; @pxref{Matrix Mode}).
 
 @item Scalar
 Scalar mode (@kbd{m v}; @pxref{Matrix Mode}).
@@ -23498,11 +23506,11 @@ argument once).
 @tindex integ
 The @kbd{a i} (@code{calc-integral}) [@code{integ}] command computes the
 indefinite integral of the expression on the top of the stack with
-respect to a variable.  The integrator is not guaranteed to work for
-all integrable functions, but it is able to integrate several large
-classes of formulas.  In particular, any polynomial or rational function
-(a polynomial divided by a polynomial) is acceptable.  (Rational functions
-don't have to be in explicit quotient form, however; 
+respect to a prompted-for variable.  The integrator is not guaranteed to
+work for all integrable functions, but it is able to integrate several
+large classes of formulas.  In particular, any polynomial or rational
+function (a polynomial divided by a polynomial) is acceptable.
+(Rational functions don't have to be in explicit quotient form, however; 
 @texline @math{x/(1+x^{-2})}
 @infoline @expr{x/(1+x^-2)}
 is not strictly a quotient of polynomials, but it is equivalent to
@@ -23511,6 +23519,11 @@ is not strictly a quotient of polynomials, but it is equivalent to
 integrated.  Finally, rational functions involving trigonometric or
 hyperbolic functions can be integrated.
 
+With an argument (@kbd{C-u a i}), this command will compute the definite
+integral of the expression on top of the stack.  In this case, the
+command will again prompt for an integration variable, then prompt for a
+lower limit and an upper limit.
+
 @ifinfo
 If you use the @code{integ} function directly in an algebraic formula,
 you can also write @samp{integ(f,x,v)} which expresses the resulting
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index dad7e61dbf2..28cb567f0cd 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1173,12 +1173,12 @@ If you have many clients running at once, you can avoid cluttering up
 the screen by iconifying most of the clients.
 
 @table @samp
-@item -i
-@opindex -i
-@itemx --icon-type
-@opindex --icon-type
+@item -nbi
+@opindex -nbi
+@itemx --no-bitmap-icon
+@opindex --no-bitmap-icon
 @cindex Emacs icon, a gnu
-Use a picture of a gnu as the Emacs icon.
+Do not use a picture of a gnu as the Emacs icon.
 
 @item -iconic
 @opindex --iconic
@@ -1187,8 +1187,8 @@ Use a picture of a gnu as the Emacs icon.
 Start Emacs in iconified state.
 @end table
 
-  The @samp{-i} or @samp{--icon-type} option tells Emacs to use an icon
-window containing a picture of the GNU gnu.  If omitted, Emacs lets the
+  By default Emacs uses an icon window containing a picture of the GNU gnu.
+The @samp{-nbi} or @samp{--no-bitmap-icon} option tells Emacs to let the
 window manager choose what sort of icon to use---usually just a small
 rectangle containing the frame's title.
 
diff --git a/man/frames.texi b/man/frames.texi
index 2928aa7a62a..daaa9599bf7 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -545,26 +545,53 @@ selects it, that variable should be @code{t}; if a click is necessary,
 the variable should be @code{nil}.
 
 @node Speedbar
-@section Making and Using a Speedbar Frame
+@section Speedbar Frames
 @cindex speedbar
 
-  An Emacs frame can have a @dfn{speedbar}, which is a vertical window
-that serves as a scrollable menu of files you could visit and tags
-within those files.  To create a speedbar, type @kbd{M-x speedbar}; this
-creates a speedbar window for the selected frame.  From then on, you can
-click on a file name in the speedbar to visit that file in the
-corresponding Emacs frame, or click on a tag name to jump to that tag in
-the Emacs frame.
-
-  Initially the speedbar lists the immediate contents of the current
-directory, one file per line.  Each line also has a box, @samp{[+]} or
-@samp{<+>}, that you can click on with @kbd{Mouse-2} to ``open up'' the
-contents of that item.  If the line names a directory, opening it adds
+@cindex attached frame (of speedbar)
+  The @dfn{speedbar} is a special frame for conveniently navigating in
+or operating on another frame.  The speedbar, when it exists, is
+always associated with a specific frame, called its @dfn{attached
+frame}; all speedbar operations act on that frame.
+
+  Type @kbd{M-x speedbar} to create the speedbar and associate it with
+the current frame.  To dismiss the speedbar, type @kbd{M-x speedbar}
+again, or select the speedbar and type @kbd{q}.  (You can also delete
+the speedbar frame like any other Emacs frame.)  If you wish to
+associate the speedbar with a different frame, dismiss it and call
+@kbd{M-x speedbar} from that frame.
+
+  The speedbar can operate in various modes.  Its default mode is
+@dfn{File Display} mode, which shows the files in the current
+directory of the selected window of the attached frame, one file per
+line.  Clicking on a file name visits that file in the selected window
+of the attached frame, and clicking on a directory name shows that
+directory in the speedbar (@pxref{Mouse References}).  Each line also
+has a box, @samp{[+]} or @samp{<+>}, that you can click on to
+@dfn{expand} the contents of that item.  Expanding a directory adds
 the contents of that directory to the speedbar display, underneath the
-directory's own line.  If the line lists an ordinary file, opening it up
-adds a list of the tags in that file to the speedbar display.  When a
-file is opened up, the @samp{[+]} changes to @samp{[-]}; you can click
-on that box to ``close up'' that file (hide its contents).
+directory's own line.  Expanding an ordinary file adds a list of the
+tags in that file to the speedbar display; you can click on a tag name
+to jump to that tag in the selected window of the attached frame.
+When a file or directory is expanded, the @samp{[+]} changes to
+@samp{[-]}; you can click on that box to @dfn{contract} the item,
+hiding its contents.
+
+  You navigate through the speedbar using the keyboard, too.  Typing
+@kbd{RET} while point is on a line in the speedbar is equivalent to
+clicking the item on the current line, and @kbd{SPC} expands or
+contracts the item.  @kbd{U} displays the parent directory of the
+current directory.  To copy, delete, or rename the file on the current
+line, type @kbd{C}, @kbd{D}, and @kbd{R} respectively.  To create a
+new directory, type @kbd{M}.
+
+  Another general-purpose speedbar mode is @dfn{Buffer Display} mode;
+in this mode, the speedbar displays a list of Emacs buffers.  To
+switch to this mode, type @kbd{b} in the speedbar.  To return to File
+Display mode, type @kbd{f}.  You can also change the display mode by
+clicking @kbd{mouse-3} anywhere in the speedbar window (or
+@kbd{mouse-1} on the mode-line) and selecting @samp{Displays} in the
+pop-up menu.
 
   Some major modes, including Rmail mode, Info, and GUD, have
 specialized ways of putting useful items into the speedbar for you to
@@ -572,10 +599,8 @@ select.  For example, in Rmail mode, the speedbar shows a list of Rmail
 files, and lets you move the current message to another Rmail file by
 clicking on its @samp{<M>} box.
 
-  A speedbar belongs to one Emacs frame, and always operates on that
-frame.  If you use multiple frames, you can make a speedbar for some or
-all of the frames; type @kbd{M-x speedbar} in any given frame to make a
-speedbar for it.
+  For more details on using and programming the speedbar, @xref{Top,
+Speedbar,,speedbar, Speedbar Manual}.
 
 @node Multiple Displays
 @section Multiple Displays
diff --git a/man/gnus.texi b/man/gnus.texi
index 7ced947a5ce..1a66bd763e0 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -683,7 +683,7 @@ Browsing the Web
 * Ultimate::                    The Ultimate Bulletin Board systems.
 * Web Archive::                 Reading mailing list archived on web.
 * RSS::                         Reading RDF site summary.
-* Customizing w3::              Doing stuff to Emacs/w3 from Gnus.
+* Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
 
 @acronym{IMAP}
 
@@ -8569,8 +8569,8 @@ Customization, emacs-mime, The Emacs MIME Manual}) to convert the
 can use include:
 
 @table @code
-@item w3
-Use Emacs/w3.
+@item W3
+Use Emacs/W3.
 
 @item w3m
 Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
@@ -15093,8 +15093,9 @@ An integer specifying the minimum age, in seconds, of an article
 before it will be expired, or the symbol @code{never} to specify that
 articles should never be expired.  If this parameter is not set,
 @code{nnmaildir} falls back to the usual
-@code{nnmail-expiry-wait}(@code{-function}) variables (overrideable by
-the @code{expiry-wait}(@code{-function}) group parameters.  If you
+@code{nnmail-expiry-wait}(@code{-function}) variables (the
+@code{expiry-wait} group parameter overrides @code{nnmail-expiry-wait}
+and makes @code{nnmail-expiry-wait-function} ineffective).  If you
 wanted a value of 3 days, you could use something like @code{[(* 3 24
 60 60)]}; @code{nnmaildir} will evaluate the form and use the result.
 An article's age is measured starting from the article file's
@@ -15117,8 +15118,8 @@ the parameter belongs to, then the article is not expired at all.  If
 you use the vector form, the first element is evaluated once for each
 article.  So that form can refer to
 @code{nnmaildir-article-file-name}, etc., to decide where to put the
-article.  @emph{If this parameter is not set, @code{nnmaildir} does
-not fall back to the @code{expiry-target} group parameter or the
+article.  @emph{Even if this parameter is not set, @code{nnmaildir}
+does not fall back to the @code{expiry-target} group parameter or the
 @code{nnmail-expiry-target} variable.}
 
 @item read-only
@@ -15534,10 +15535,11 @@ interfaces to these sources.
 * Ultimate::                    The Ultimate Bulletin Board systems.
 * Web Archive::                 Reading mailing list archived on web.
 * RSS::                         Reading RDF site summary.
-* Customizing w3::              Doing stuff to Emacs/w3 from Gnus.
+* Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
 @end menu
 
-All the web sources require Emacs/w3 and the url library to work.
+All the web sources require Emacs/W3 and the url library or those
+alternatives to work.
 
 The main caveat with all these web sources is that they probably won't
 work for a very long time.  Gleaning information from the @acronym{HTML} data
@@ -15624,8 +15626,9 @@ make money off of advertisements, not to provide services to the
 community.  Since @code{nnweb} washes the ads off all the articles, one
 might think that the providers might be somewhat miffed.  We'll see.
 
-You must have the @code{url} and @code{w3} package installed to be able
-to use @code{nnweb}.
+You must have the @code{url} and @code{W3} package or those alternatives
+(try @code{customize-group} on the @samp{mm-url} variable group)
+installed to be able to use @code{nnweb}.
 
 Virtual server variables:
 
@@ -15845,9 +15848,9 @@ system because @acronym{RSS} uses UTF-8 for encoding non-@acronym{ASCII}
 text by default.  It is also used by default for non-@acronym{ASCII}
 group names.
 
-@kindex G R (Summary)
-Use @kbd{G R} from the summary buffer to subscribe to a feed---you will
-be prompted for the location, the title and the description of the feed.
+@kindex G R (Group)
+Use @kbd{G R} from the group buffer to subscribe to a feed---you will be
+prompted for the location, the title and the description of the feed.
 The title, which allows any characters, will be used for the group name
 and the name of the group data file.  The description can be omitted.
 
@@ -15940,18 +15943,19 @@ summary buffer.
 (add-to-list 'nnmail-extra-headers nnrss-url-field)
 @end lisp
 
-@node Customizing w3
-@subsection Customizing w3
-@cindex w3
+@node Customizing W3
+@subsection Customizing W3
+@cindex W3
 @cindex html
 @cindex url
 @cindex Netscape
 
-Gnus uses the url library to fetch web pages and Emacs/w3 to display web
-pages.  Emacs/w3 is documented in its own manual, but there are some
-things that may be more relevant for Gnus users.
+Gnus uses the url library to fetch web pages and Emacs/W3 (or those
+alternatives) to display web pages.  Emacs/W3 is documented in its own
+manual, but there are some things that may be more relevant for Gnus
+users.
 
-For instance, a common question is how to make Emacs/w3 follow links
+For instance, a common question is how to make Emacs/W3 follow links
 using the @code{browse-url} functions (which will call some external web
 browser like Netscape).  Here's one way:
 
@@ -15966,7 +15970,7 @@ browser like Netscape).  Here's one way:
         (w3-fetch-orig url target)))))
 @end lisp
 
-Put that in your @file{.emacs} file, and hitting links in w3-rendered
+Put that in your @file{.emacs} file, and hitting links in W3-rendered
 @acronym{HTML} in the Gnus article buffers will use @code{browse-url} to
 follow the link.
 
@@ -16559,7 +16563,7 @@ delete them.
 @cindex namespaces
 
 The @acronym{IMAP} protocol has a concept called namespaces, described
-by the following text in the RFC:
+by the following text in the RFC2060:
 
 @display
 5.1.2.  Mailbox Namespace Naming Convention
@@ -16891,34 +16895,48 @@ totally ignored.
 
 @item article-begin
 This setting has to be present in all document type definitions.  It
-says what the beginning of each article looks like.
+says what the beginning of each article looks like.  To do more
+complicated things that cannot be dealt with a simple regexp, you can
+use @code{article-begin-function} instead of this.
 
-@item head-begin-function
-If present, this should be a function that moves point to the head of
-the article.
+@item article-begin-function
+If present, this should be a function that moves point to the beginning
+of each article.  This setting overrides @code{article-begin}.
 
-@item nndoc-head-begin
+@item head-begin
 If present, this should be a regexp that matches the head of the
-article.
+article.  To do more complicated things that cannot be dealt with a
+simple regexp, you can use @code{head-begin-function} instead of this.
 
-@item nndoc-head-end
+@item head-begin-function
+If present, this should be a function that moves point to the head of
+the article.  This setting overrides @code{head-begin}.
+
+@item head-end
 This should match the end of the head of the article.  It defaults to
 @samp{^$}---the empty line.
 
+@item body-begin
+This should match the beginning of the body of the article.  It defaults
+to @samp{^\n}.  To do more complicated things that cannot be dealt with
+a simple regexp, you can use @code{body-begin-function} instead of this.
+
 @item body-begin-function
 If present, this function should move point to the beginning of the body
-of the article.
+of the article.  This setting overrides @code{body-begin}.
 
-@item body-begin
-This should match the beginning of the body of the article.  It defaults
-to @samp{^\n}.
+@item body-end
+If present, this should match the end of the body of the article.  To do
+more complicated things that cannot be dealt with a simple regexp, you
+can use @code{body-end-function} instead of this.
 
 @item body-end-function
 If present, this function should move point to the end of the body of
-the article.
+the article.  This setting overrides @code{body-end}.
 
-@item body-end
-If present, this should match the end of the body of the article.
+@item file-begin
+If present, this should match the beginning of the file.  All text
+before this regexp will be totally ignored.
 
 @item file-end
 If present, this should match the end of the file.  All text after this
@@ -16949,6 +16967,19 @@ understand.  It is called with the article number as a parameter, and is
 expected to generate a nice head for the article in question.  It is
 called when requesting the headers of all articles.
 
+@item generate-article-function
+If present, this function is called to generate an entire article that
+Gnus can understand.  It is called with the article number as a
+parameter when requesting all articles.
+
+@item dissection-function
+If present, this function is called to dissect a document by itself,
+overriding @code{first-article}, @code{article-begin},
+@code{article-begin-function}, @code{head-begin},
+@code{head-begin-function}, @code{head-end}, @code{body-begin},
+@code{body-begin-function}, @code{body-end}, @code{body-end-function},
+@code{file-begin}, and @code{file-end}.
+
 @end table
 
 Let's look at the most complicated example I can come up with---standard
@@ -24388,7 +24419,7 @@ XEmacs is distributed as a collection of packages.  You should install
 whatever packages the Gnus XEmacs package requires.  The current
 requirements are @samp{gnus}, @samp{mail-lib}, @samp{xemacs-base},
 @samp{eterm}, @samp{sh-script}, @samp{net-utils}, @samp{os-utils},
-@samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{w3},
+@samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{W3},
 @samp{pgg}, @samp{mailcrypt}, @samp{ecrypto}, and @samp{sasl}.
 
 
diff --git a/man/info.texi b/man/info.texi
index 95e736ab246..532478ca521 100644
--- a/man/info.texi
+++ b/man/info.texi
@@ -72,28 +72,28 @@ If you are new to the Info reader and want to learn how to use it,
 type the command @kbd{h} now.  It brings you to a programmed
 instruction sequence.
 
-To read about expert-level Info commands, type @kbd{n} twice.  This
-brings you to @cite{Info for Experts}, skipping over the `Getting
+To read about advanced Info commands, type @kbd{n} twice.  This
+brings you to @cite{Advanced Info Commands}, skipping over the `Getting
 Started' chapter.
 @end ifinfo
 @end ifnottex
 
 @menu
 * Getting Started::             Getting started using an Info reader.
+* Advanced::                    Advanced Info commands.
 * Expert Info::                 Info commands for experts.
-* Creating an Info File::       How to make your own Info file.
 * Index::                       An index of topics, commands, and variables.
 @end menu
 
-@node Getting Started, Expert Info, Top, Top
+@node Getting Started, Advanced, Top, Top
 @comment  node-name,  next,  previous,  up
 @chapter Getting Started
 
 This first part of this Info manual describes how to get around inside
 of Info.  The second part of the manual describes various advanced
-Info commands, and how to write an Info as distinct from a Texinfo
-file.  The third part briefly explains how to generate Info files from
-Texinfo files.
+Info commands.  The third part briefly explains how to generate Info
+files from Texinfo files, and describes how to write an Info as
+distinct from a Texinfo file.
 
 @ifnotinfo
 This manual is primarily designed for browsing with an Info reader
@@ -847,7 +847,7 @@ describes the topic you want.
   There is also a short-cut Info command, @kbd{i}, which does all of
 that for you.  It searches the index for a given topic (a string) and
 goes to the node which is listed in the index for that topic.
-@xref{Info Search}, for a full explanation.
+@xref{Search Index}, for a full explanation.
 
 @kindex l @r{(Info mode)}
 @findex Info-history-back
@@ -905,45 +905,129 @@ is @code{Info-top-node}.
 >> Now type @kbd{n} to see the last node of the course.
 @end format
 
-  @xref{Expert Info}, for more advanced Info features.
+  @xref{Advanced}, for more advanced Info features.
 
 @c If a menu appears at the end of this node, remove it.
 @c It is an accident of the menu updating command.
 
-@node Expert Info
-@chapter Info for Experts
+@node Advanced
+@chapter Advanced Info Commands
 
-  This chapter describes various Info commands for experts.  (If you
+  This chapter describes various advanced Info commands.  (If you
 are using a stand-alone Info reader, there are additional commands
 specific to it, which are documented in several chapters of @ref{Top,,
 GNU Info, info-stnd, GNU Info}.)
 
-  This chapter also explains how to write an Info as distinct from a
-Texinfo file.  (However, in most cases, writing a Texinfo file is
-better, since you can use it to make a printed manual or produce other
-formats, such as HTML and DocBook, as well as for generating Info
-files.)  @xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
-Documentation Format}.
-
 @menu
-* Advanced::             Advanced Info commands: g, e, and 1 - 9.
-* Info Search::          How to search Info documents for specific subjects.
-* Add::                  Describes how to add new nodes to the hierarchy.
-                           Also tells what nodes look like.
-* Menus::                How to add to or create menus in Info nodes.
-* Cross-refs::           How to add cross-references to Info nodes.
-* Tags::                 How to make tags tables for Info files.
-* Checking::             Checking an Info File.
+* Search Text::          How to search Info documents.
+* Search Index::         How to search the indices for specific subjects.
+* Go to node::           How to go to a node by name.
+* Choose menu subtopic:: How to choose a menu subtopic by its number.
+* Create Info buffer::   How to create a new Info buffer in Emacs.
 * Emacs Info Variables:: Variables modifying the behavior of Emacs Info.
 @end menu
 
-@node Advanced, Info Search,  , Expert Info
+@node Search Text, Search Index,  , Advanced
+@comment  node-name,  next,  previous,  up
+@section How to search Info documents
+
+@cindex searching Info documents
+@cindex Info document as a reference
+  The commands which move between and inside nodes allow you to read
+the entire manual or its large portions.  But what if you need to find
+some information in the manual as fast as you can, and you don't know
+or don't remember in what node to look for it?  This need arises when
+you use a manual as a @dfn{reference}, or when it is impractical to
+read the entire manual before you start using the programs it
+describes.
+
+  Info has powerful searching facilities that let you find things
+quickly.  You can search either the manual text or its indices.
+
+@kindex s @r{(Info mode)}
+@findex Info-search
+  The @kbd{s} command allows you to search a whole Info file for a string.
+It switches to the next node if and when that is necessary.  You
+type @kbd{s} followed by the string to search for, terminated by
+@key{RET}.  To search for the same string again, just @kbd{s} followed
+by @key{RET} will do.  The file's nodes are scanned in the order
+they are in the file, which has no necessary relationship to the
+order that they may be in the tree structure of menus and @samp{next}
+pointers.  But normally the two orders are not very different.  In any
+case, you can always look at the echo area to find out what node you have
+reached, if the header is not visible (this can happen, because @kbd{s}
+puts your cursor at the occurrence of the string, not at the beginning
+of the node).
+
+@kindex M-s @r{(Info mode)}
+  In Emacs, @kbd{Meta-s} is equivalent to @kbd{s}.  That is for
+compatibility with other GNU packages that use @kbd{M-s} for a similar
+kind of search command.  Both @kbd{s} and @kbd{M-s} run in Emacs the
+command @code{Info-search}.
+
+@kindex C-s @r{(Info mode)}
+@kindex C-r @r{(Info mode)}
+@findex isearch
+  Instead of using @kbd{s} in Emacs Info and in the stand-alone Info,
+you can use an incremental search started with @kbd{C-s} or @kbd{C-r}.
+It can search through multiple Info nodes.  @xref{Incremental Search,,,
+emacs, The GNU Emacs Manual}.  In Emacs, this behavior is enabled only
+if the variable @code{Info-isearch-search} is non-@code{nil}
+(@pxref{Emacs Info Variables}).
+
+@node Search Index, Go to node, Search Text, Advanced
 @comment  node-name,  next,  previous,  up
-@section Advanced Info Commands
+@section How to search the indices for specific subjects
+
+@cindex searching Info indices
+@kindex i @r{(Info mode)}
+@findex Info-index
+  Since most subjects related to what the manual describes should be
+indexed, you should try the index search first.  The @kbd{i} command
+prompts you for a subject and then looks up that subject in the
+indices.  If it finds an index entry with the subject you typed, it
+goes to the node to which that index entry points.  You should browse
+through that node to see whether the issue you are looking for is
+described there.  If it isn't, type @kbd{,} one or more times to go
+through additional index entries which match your subject.
 
-Here are some more Info commands that make it easier to move around.
+  The @kbd{i} command finds all index entries which include the string
+you typed @emph{as a substring}.  For each match, Info shows in the
+echo area the full index entry it found.  Often, the text of the full
+index entry already gives you enough information to decide whether it
+is relevant to what you are looking for, so we recommend that you read
+what Info shows in the echo area before looking at the node it
+displays.
 
-@subheading @kbd{g} goes to a node by name
+  Since @kbd{i} looks for a substring, you can search for subjects even
+if you are not sure how they are spelled in the index.  For example,
+suppose you want to find something that is pertinent to commands which
+complete partial input (e.g., when you type @key{TAB}).  If you want
+to catch index entries that refer to ``complete'', ``completion'', and
+``completing'', you could type @kbd{icomplet@key{RET}}.
+
+  Info documents which describe programs should index the commands,
+options, and key sequences that the program provides.  If you are
+looking for a description of a command, an option, or a key, just type
+their names when @kbd{i} prompts you for a topic.  For example, if you
+want to read the description of what the @kbd{C-f} key does, type
+@kbd{i C - f @key{RET}}.  Here @kbd{C-f} are 3 literal characters
+@samp{C}, @samp{-}, and @samp{f}, not the ``Control-f'' command key
+you type inside Emacs to run the command bound to @kbd{C-f}.
+
+  In Emacs, @kbd{i} runs the command @code{Info-index}.
+
+@findex info-apropos
+@findex index-apropos
+If you don't know what manual documents something, try the @kbd{M-x
+info-apropos} command in Emacs, or the @kbd{M-x index-apropos} command
+in the stand-alone reader.  It prompts for a string and then looks up
+that string in all the indices of all the Info documents installed on
+your system.
+
+@node Go to node, Choose menu subtopic, Search Index, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{g} goes to a node by name
 
 @kindex g @r{(Info mode)}
 @findex Info-goto-node
@@ -951,7 +1035,7 @@ Here are some more Info commands that make it easier to move around.
   If you know a node's name, you can go there by typing @kbd{g}, the
 name, and @key{RET}.  Thus, @kbd{gTop@key{RET}} would go to the node
 called @samp{Top} in this file.  (This is equivalent to @kbd{t}, see
-@ref{Help-Int}.)  @kbd{gAdvanced@key{RET}} would come back here.
+@ref{Help-Int}.)  @kbd{gGo to node@key{RET}} would come back here.
 @kbd{g} in Emacs runs the command @code{Info-goto-node}.
 
   Unlike @kbd{m}, @kbd{g} does not allow the use of abbreviations.
@@ -969,7 +1053,9 @@ the node @samp{Top} in the Info file @file{dir}.  Likewise,
 all of the current file by typing @kbd{g*@key{RET}} or all of any
 other file with @kbd{g(@var{filename})*@key{RET}}.
 
-@subheading @kbd{1}--@kbd{9} choose a menu subtopic by its number
+@node Choose menu subtopic, Create Info buffer, Go to node, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{1}--@kbd{9} choose a menu subtopic by its number
 
 @kindex 1 @r{through} 9 @r{(Info mode)}
 @findex Info-nth-menu-item
@@ -994,22 +1080,9 @@ underlining.  If you need to actually count items, it is better to use
 @kbd{m} instead, and specify the name, or use @key{TAB} to quickly
 move between menu items.
 
-@subheading @kbd{e} makes Info document editable
-
-@kindex e @r{(Info mode)}
-@findex Info-edit
-@cindex edit Info document
-  The Info command @kbd{e} changes from Info mode to an ordinary
-Emacs editing mode, so that you can edit the text of the current node.
-Type @kbd{C-c C-c} to switch back to Info.  The @kbd{e} command is allowed
-only if the variable @code{Info-enable-edit} is non-@code{nil}.
-
-  The @kbd{e} command only works in Emacs, where it runs the command
-@code{Info-edit}.  The stand-alone Info reader doesn't allow you to
-edit the Info file, so typing @kbd{e} there goes to the end of the
-current node.
-
-@subheading @kbd{M-n} creates a new independent Info buffer in Emacs
+@node Create Info buffer, Emacs Info Variables, Choose menu subtopic, Advanced
+@comment  node-name,  next,  previous,  up
+@section @kbd{M-n} creates a new independent Info buffer in Emacs
 
 @kindex M-n @r{(Info mode)}
 @findex clone-buffer
@@ -1031,100 +1104,128 @@ prefix argument for the @kbd{C-h i} command (@code{info}) which
 switches to the Info buffer with that number.  Thus, @kbd{C-u 2 C-h i}
 switches to the buffer @samp{*info*<2>}, creating it if necessary.
 
-@node Info Search, Add, Advanced, Expert Info
+@node Emacs Info Variables, , Create Info buffer, Advanced
 @comment  node-name,  next,  previous,  up
-@section How to search Info documents for specific subjects
+@section Emacs Info-mode Variables
 
-@cindex searching Info documents
-@cindex Info document as a reference
-  The commands which move between and inside nodes allow you to read
-the entire manual or its large portions.  But what if you need to find
-some information in the manual as fast as you can, and you don't know
-or don't remember in what node to look for it?  This need arises when
-you use a manual as a @dfn{reference}, or when it is impractical to
-read the entire manual before you start using the programs it
-describes.
+The following variables may modify the behavior of Info-mode in Emacs;
+you may wish to set one or several of these variables interactively, or
+in your @file{~/.emacs} init file.  @xref{Examining, Examining and Setting
+Variables, Examining and Setting Variables, emacs, The GNU Emacs
+Manual}.  The stand-alone Info reader program has its own set of
+variables, described in @ref{Variables,, Manipulating Variables,
+info-stnd, GNU Info}.
 
-  Info has powerful searching facilities that let you find things
-quickly.  You can search either the manual indices or its text.
+@vtable @code
+@item Info-directory-list
+The list of directories to search for Info files.  Each element is a
+string (directory name) or @code{nil} (try default directory).  If not
+initialized Info uses the environment variable @env{INFOPATH} to
+initialize it, or @code{Info-default-directory-list} if there is no
+@env{INFOPATH} variable in the environment.
 
-@kindex i @r{(Info mode)}
-@findex Info-index
-  Since most subjects related to what the manual describes should be
-indexed, you should try the index search first.  The @kbd{i} command
-prompts you for a subject and then looks up that subject in the
-indices.  If it finds an index entry with the subject you typed, it
-goes to the node to which that index entry points.  You should browse
-through that node to see whether the issue you are looking for is
-described there.  If it isn't, type @kbd{,} one or more times to go
-through additional index entries which match your subject.
+If you wish to customize the Info directory search list for both Emacs
+Info and stand-alone Info, it is best to set the @env{INFOPATH}
+environment variable, since that applies to both programs.
 
-  The @kbd{i} command finds all index entries which include the string
-you typed @emph{as a substring}.  For each match, Info shows in the
-echo area the full index entry it found.  Often, the text of the full
-index entry already gives you enough information to decide whether it
-is relevant to what you are looking for, so we recommend that you read
-what Info shows in the echo area before looking at the node it
-displays.
+@item Info-additional-directory-list
+A list of additional directories to search for Info documentation files.
+These directories are not searched for merging the @file{dir} file.
 
-  Since @kbd{i} looks for a substring, you can search for subjects even
-if you are not sure how they are spelled in the index.  For example,
-suppose you want to find something that is pertinent to commands which
-complete partial input (e.g., when you type @key{TAB}).  If you want
-to catch index entries that refer to ``complete'', ``completion'', and
-``completing'', you could type @kbd{icomplet@key{RET}}.
+@item Info-mode-hook
+Hooks run when @code{Info-mode} is called.  By default, it contains
+the hook @code{turn-on-font-lock} which enables highlighting of Info
+files.  You can change how the highlighting looks by customizing the
+faces @code{info-node}, @code{info-xref}, @code{info-xref-visited},
+@code{info-header-xref}, @code{info-header-node}, @code{info-menu-header},
+@code{info-menu-star}, and @code{info-title-@var{n}} (where @var{n}
+is the level of the section, a number between 1 and 4).  To customize
+a face, type @kbd{M-x customize-face @key{RET} @var{face} @key{RET}},
+where @var{face} is one of the face names listed here.
 
-  Info documents which describe programs should index the commands,
-options, and key sequences that the program provides.  If you are
-looking for a description of a command, an option, or a key, just type
-their names when @kbd{i} prompts you for a topic.  For example, if you
-want to read the description of what the @kbd{C-f} key does, type
-@kbd{i C - f @key{RET}}.  Here @kbd{C-f} are 3 literal characters
-@samp{C}, @samp{-}, and @samp{f}, not the ``Control-f'' command key
-you type inside Emacs to run the command bound to @kbd{C-f}.
+@item Info-fontify-maximum-menu-size
+Maximum size of menu to fontify if @code{font-lock-mode} is non-@code{nil}.
 
-  In Emacs, @kbd{i} runs the command @code{Info-index}.
+@item Info-fontify-visited-nodes
+If non-@code{nil}, menu items and cross-references pointing to visited
+nodes are displayed in the @code{info-xref-visited} face.
 
-@findex info-apropos
-@findex index-apropos
-If you don't know what manual documents something, try the @kbd{M-x
-info-apropos} command in Emacs, or the @kbd{M-x index-apropos} command
-in the stand-alone reader.  It prompts for a string and then looks up
-that string in all the indices of all the Info documents installed on
-your system.
+@item Info-use-header-line
+If non-@code{nil}, Emacs puts in the Info buffer a header line showing
+the @samp{Next}, @samp{Prev}, and @samp{Up} links.  A header line does
+not scroll with the rest of the buffer, making these links always
+visible.
 
-@kindex s @r{(Info mode)}
-@findex Info-search
-  The @kbd{s} command allows you to search a whole file for a string.
-It switches to the next node if and when that is necessary.  You
-type @kbd{s} followed by the string to search for, terminated by
-@key{RET}.  To search for the same string again, just @kbd{s} followed
-by @key{RET} will do.  The file's nodes are scanned in the order
-they are in the file, which has no necessary relationship to the
-order that they may be in the tree structure of menus and @samp{next}
-pointers.  But normally the two orders are not very different.  In any
-case, you can always look at the echo area to find out what node you have
-reached, if the header is not visible (this can happen, because @kbd{s}
-puts your cursor at the occurrence of the string, not at the beginning
-of the node).
+@item Info-hide-note-references
+As explained in earlier nodes, the Emacs version of Info normally
+hides some text in menus and cross-references.  You can completely
+disable this feature, by setting this option to @code{nil}.  Setting
+it to a value that is neither @code{nil} nor @code{t} produces an
+intermediate behavior, hiding a limited amount of text, but showing
+all text that could potentially be useful.
 
-@kindex M-s @r{(Info mode)}
-  In Emacs, @kbd{Meta-s} is equivalent to @kbd{s}.  That is for
-compatibility with other GNU packages that use @kbd{M-s} for a similar
-kind of search command.  Both @kbd{s} and @kbd{M-s} run in Emacs the
-command @code{Info-search}.
+@item Info-scroll-prefer-subnodes
+If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
+@key{DEL}) keys in a menu visit subnodes of the current node before
+scrolling to its end or beginning, respectively.  For example, if the
+node's menu appears on the screen, the next @key{SPC} moves to a
+subnode indicated by the following menu item.  Setting this option to
+@code{nil} results in behavior similar to the stand-alone Info reader
+program, which visits the first subnode from the menu only when you
+hit the end of the current node.  The default is @code{nil}.
 
-@kindex C-s @r{(Info mode)}
-@kindex C-r @r{(Info mode)}
-@findex isearch
-  Instead of using @kbd{s} in Emacs Info and in the stand-alone Info,
-you can use an incremental search started with @kbd{C-s} or @kbd{C-r}.
-It can search through multiple Info nodes.  @xref{Incremental Search,,,
-emacs, The GNU Emacs Manual}.  In Emacs, this behavior is enabled only
-if the variable @code{Info-isearch-search} is non-@code{nil}
-(@pxref{Emacs Info Variables}).
+@item Info-isearch-search
+If non-@code{nil}, isearch in Info searches through multiple nodes.
 
-@node Add, Menus, Info Search, Expert Info
+@item Info-enable-active-nodes
+When set to a non-@code{nil} value, allows Info to execute Lisp code
+associated with nodes.  The Lisp code is executed when the node is
+selected.  The Lisp code to be executed should follow the node
+delimiter (the @samp{DEL} character) and an @samp{execute: } tag, like
+this:
+
+@example
+^_execute: (message "This is an active node!")
+@end example
+@end vtable
+
+
+@node Expert Info
+@chapter Info for Experts
+
+  This chapter explains how to write an Info as distinct from a
+Texinfo file.  However, in most cases, writing a Texinfo file is
+better, since you can use it to make a printed manual or produce other
+formats, such as HTML and DocBook, as well as for generating Info
+files.
+
+@code{makeinfo} is a utility that converts a Texinfo file into an Info
+file; @code{texinfo-format-region} and @code{texinfo-format-buffer} are
+GNU Emacs functions that do the same.
+
+@xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
+Documentation Format}, to learn how to write a Texinfo file.
+
+@xref{Creating an Info File,,, texinfo, Texinfo: The GNU Documentation
+Format}, to learn how to create an Info file from a Texinfo file.
+
+@xref{Installing an Info File,,, texinfo, Texinfo: The GNU
+Documentation Format}, to learn how to install an Info file after you
+have created one.
+
+However, if you want to edit an Info file manually and install it manually,
+here is how.
+
+@menu
+* Add::                   Describes how to add new nodes to the hierarchy.
+                            Also tells what nodes look like.
+* Menus::                 How to add to or create menus in Info nodes.
+* Cross-refs::            How to add cross-references to Info nodes.
+* Tags::                  How to make tags tables for Info files.
+* Checking::              Checking an Info File.
+@end menu
+
+@node Add, Menus,  , Expert Info
 @comment  node-name,  next,  previous,  up
 @section Adding a new node to Info
 
@@ -1137,14 +1238,6 @@ Create some nodes, in some file, to document that topic.
 Put that topic in the menu in the directory.  @xref{Menus, Menu}.
 @end enumerate
 
-  Usually, the way to create the nodes is with Texinfo (@pxref{Top,,
-Overview of Texinfo, texinfo, Texinfo: The GNU Documentation Format});
-this has the advantage that you can also make a printed manual or HTML
-from them.  You would use the @samp{@@dircategory} and
-@samp{@@direntry} commands to put the manual into the Info directory.
-However, if you want to edit an Info file manually and install it
-manually, here is how.
-
 @cindex node delimiters
   The new node can live in an existing documentation file, or in a new
 one.  It must have a @samp{^_} character before it (invisible to the
@@ -1324,7 +1417,7 @@ as new users should do when they learn a new package.
 something quickly in a manual---that is, when you need to use a manual
 as a reference rather than as a tutorial.  We urge you to learn
 these search commands as well.  If you want to do that now, follow this
-cross reference to @ref{Info Search}.
+cross reference to @ref{Advanced}.
 
 Yet another set of commands are meant for experienced users; you can
 find them by looking in the Directory node for documentation on Info.
@@ -1382,8 +1475,7 @@ the beginning of the node's header (ending just after the node name),
 a @samp{DEL} character, and the character position in the file of the
 beginning of the node.
 
-
-@node Checking, Emacs Info Variables, Tags, Expert Info
+@node Checking, , Tags, Expert Info
 @section Checking an Info File
 
 When creating an Info file, it is easy to forget the name of a node when
@@ -1402,112 +1494,6 @@ usually few.
 To check an Info file, do @kbd{M-x Info-validate} while looking at any
 node of the file with Emacs Info mode.
 
-@node Emacs Info Variables, , Checking, Expert Info
-@section Emacs Info-mode Variables
-
-The following variables may modify the behavior of Info-mode in Emacs;
-you may wish to set one or several of these variables interactively, or
-in your @file{~/.emacs} init file.  @xref{Examining, Examining and Setting
-Variables, Examining and Setting Variables, emacs, The GNU Emacs
-Manual}.  The stand-alone Info reader program has its own set of
-variables, described in @ref{Variables,, Manipulating Variables,
-info-stnd, GNU Info}.
-
-@vtable @code
-@item Info-directory-list
-The list of directories to search for Info files.  Each element is a
-string (directory name) or @code{nil} (try default directory).  If not
-initialized Info uses the environment variable @env{INFOPATH} to
-initialize it, or @code{Info-default-directory-list} if there is no
-@env{INFOPATH} variable in the environment.
-
-If you wish to customize the Info directory search list for both Emacs
-Info and stand-alone Info, it is best to set the @env{INFOPATH}
-environment variable, since that applies to both programs.
-
-@item Info-additional-directory-list
-A list of additional directories to search for Info documentation files.
-These directories are not searched for merging the @file{dir} file.
-
-@item Info-mode-hook
-Hooks run when @code{Info-mode} is called.  By default, it contains
-the hook @code{turn-on-font-lock} which enables highlighting of Info
-files.  You can change how the highlighting looks by customizing the
-faces @code{info-node}, @code{info-xref}, @code{info-xref-visited},
-@code{info-header-xref}, @code{info-header-node}, @code{info-menu-header},
-@code{info-menu-star}, and @code{info-title-@var{n}} (where @var{n}
-is the level of the section, a number between 1 and 4).  To customize
-a face, type @kbd{M-x customize-face @key{RET} @var{face} @key{RET}},
-where @var{face} is one of the face names listed here.
-
-@item Info-fontify-maximum-menu-size
-Maximum size of menu to fontify if @code{font-lock-mode} is non-@code{nil}.
-
-@item Info-fontify-visited-nodes
-If non-@code{nil}, menu items and cross-references pointing to visited
-nodes are displayed in the @code{info-xref-visited} face.
-
-@item Info-use-header-line
-If non-@code{nil}, Emacs puts in the Info buffer a header line showing
-the @samp{Next}, @samp{Prev}, and @samp{Up} links.  A header line does
-not scroll with the rest of the buffer, making these links always
-visible.
-
-@item Info-hide-note-references
-As explained in earlier nodes, the Emacs version of Info normally
-hides some text in menus and cross-references.  You can completely
-disable this feature, by setting this option to @code{nil}.  Setting
-it to a value that is neither @code{nil} nor @code{t} produces an
-intermediate behavior, hiding a limited amount of text, but showing
-all text that could potentially be useful.
-
-@item Info-scroll-prefer-subnodes
-If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
-@key{DEL}) keys in a menu visit subnodes of the current node before
-scrolling to its end or beginning, respectively.  For example, if the
-node's menu appears on the screen, the next @key{SPC} moves to a
-subnode indicated by the following menu item.  Setting this option to
-@code{nil} results in behavior similar to the stand-alone Info reader
-program, which visits the first subnode from the menu only when you
-hit the end of the current node.  The default is @code{nil}.
-
-@item Info-isearch-search
-If non-@code{nil}, isearch in Info searches through multiple nodes.
-
-@item Info-enable-active-nodes
-When set to a non-@code{nil} value, allows Info to execute Lisp code
-associated with nodes.  The Lisp code is executed when the node is
-selected.  The Lisp code to be executed should follow the node
-delimiter (the @samp{DEL} character) and an @samp{execute: } tag, like
-this:
-
-@example
-^_execute: (message "This is an active node!")
-@end example
-
-@item Info-enable-edit
-Set to @code{nil}, disables the @samp{e} (@code{Info-edit}) command.  A
-non-@code{nil} value enables it.  @xref{Add, Edit}.
-@end vtable
-
-
-@node Creating an Info File
-@chapter Creating an Info File from a Texinfo File
-
-@code{makeinfo} is a utility that converts a Texinfo file into an Info
-file; @code{texinfo-format-region} and @code{texinfo-format-buffer} are
-GNU Emacs functions that do the same.
-
-@xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
-Documentation Format}, to learn how to write a Texinfo file.
-
-@xref{Creating an Info File,,, texinfo, Texinfo: The GNU Documentation
-Format}, to learn how to create an Info file from a Texinfo file.
-
-@xref{Installing an Info File,,, texinfo, Texinfo: The GNU
-Documentation Format}, to learn how to install an Info file after you
-have created one.
-
 @node Index
 @unnumbered Index
 
diff --git a/man/org.texi b/man/org.texi
index 92248c91e87..b38181c0c22 100644
--- a/man/org.texi
+++ b/man/org.texi
@@ -4,8 +4,8 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 3.16
-@set DATE September 2005
+@set VERSION 3.17
+@set DATE October 2005
 
 @dircategory Emacs
 @direntry
diff --git a/man/speedbar.texi b/man/speedbar.texi
index 469de905a24..4dc2bcea7d2 100644
--- a/man/speedbar.texi
+++ b/man/speedbar.texi
@@ -90,13 +90,13 @@ on.  @xref{Basic Navigation}.
 @chapter Introduction
 @cindex introduction
 
-To start using speedbar use the command @kbd{M-x speedbar RET} or select
-it from the Tools menu in versions of Emacs with speedbar installed by
-default.  This command will open a new frame to summarize the local
-files.  On X Window systems or on MS-Windows, speedbar's frame is twenty
-characters wide, and will mimic the height of the frame from which it
-was started.  It positions itself to the left or right of the frame you
-started it from.
+To start using speedbar use the command @kbd{M-x speedbar RET} or
+select it from the @samp{Options->Show/Hide} sub-menu.  This command
+will open a new frame to summarize the local files.  On X Window
+systems or on MS-Windows, speedbar's frame is twenty characters wide,
+and will mimic the height of the frame from which it was started.  It
+positions itself to the left or right of the frame you started it
+from.
 
 To use speedbar effectively, it is important to understand its
 relationship with the frame you started it from.  This frame is the
@@ -141,9 +141,6 @@ to use.
 These key bindings are common across all modes:
 
 @table @kbd
-@item delete, SPC
-@cindex scrolling in speedbar
-Scroll up and down one page.
 @item Q
 @cindex quitting speedbar
 Quit speedbar, and kill the frame.
diff --git a/man/trampver.texi b/man/trampver.texi
index a77ae82d49b..9f2bb8737f7 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -4,7 +4,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.0.50
+@set trampver 2.0.51
 
 @c Other flags from configuration
 @set prefix /usr/local