Merge from emacs--rel--22

[gnu-emacs] / man / speedbar.texi

diff --git a/man/speedbar.texi b/man/speedbar.texi
index 3fea2c33c3debcacc6c415769d94f0cbc77eb021..2a05993f569bf19b231a6c340dc876eff554112e 100644 (file)
--- a/man/speedbar.texi
+++ b/man/speedbar.texi
@@ -5,11 +5,12 @@
 @syncodeindex fn cp
 
 @copying
 @syncodeindex fn cp
 
 @copying

-Copyright @copyright{} 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007  Free Software Foundation, Inc.

 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or

 any later version published by the Free Software Foundation; with the
 Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
 ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
 any later version published by the Free Software Foundation; with the
 Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
 ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU


@@ -81,6 +82,7 @@ on.  @xref{Basic Navigation}.
 * Minor Modes::      Additional minor modes such as Info and RMAIL.
 * Customizing::      Changing speedbar behavior.
 * Extending::        Extend speedbar for your own project.
 * Minor Modes::      Additional minor modes such as Info and RMAIL.
 * Customizing::      Changing speedbar behavior.
 * Extending::        Extend speedbar for your own project.

+* GNU Free Documentation License:: The license for this documentation.

 * Index::
 @end menu
 
 * Index::
 @end menu
 


@@ -89,13 +91,13 @@ on.  @xref{Basic Navigation}.
 @chapter Introduction
 @cindex introduction
 
 @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
 
 To use speedbar effectively, it is important to understand its
 relationship with the frame you started it from.  This frame is the


@@ -140,9 +142,6 @@ to use.
 These key bindings are common across all modes:
 
 @table @kbd
 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.
 @item Q
 @cindex quitting speedbar
 Quit speedbar, and kill the frame.


@@ -590,9 +589,10 @@ will follow the general rules of their major counterparts in terms of
 key bindings and visuals, but will have specialized behaviors.
 
 @menu
 key bindings and visuals, but will have specialized behaviors.
 
 @menu

-* RMAIL::  Managing folders in speedbar
-* Info::   Browsing topics in speedbar
-* GDB::    Managing the current stack trace in speedbar
+* RMAIL::  Managing folders.
+* Info::   Browsing topics.
+* GDB::    Watching expressions or managing the current
+            stack trace.

 @end menu
 
 @node RMAIL, Info, Minor Modes, Minor Modes
 @end menu
 
 @node RMAIL, Info, Minor Modes, Minor Modes


@@ -638,7 +638,15 @@ a @samp{[+]}, indicating that there are no sub-topics.
 @cindex gdb
 @cindex gud
 
 @cindex gdb
 @cindex gud
 

-If you are debugging an application with GDB in Emacs, speedbar can show
+You can debug an application with GDB in Emacs using graphical mode or
+text command mode (@pxref{GDB Graphical Interface,,, emacs, The
+extensible self-documenting text editor}).
+
+If you are using graphical mode you can see how selected variables
+change each time your program stops (@pxref{Watch Expressions,,,
+emacs, The extensible self-documenting text editor}).
+
+If you are using text command mode, speedbar can show

 you the current stack when the current buffer is the @file{*gdb*}
 buffer.  Usually, it will just report that there is no stack, but when
 the application is stopped, the current stack will be shown.
 you the current stack when the current buffer is the @file{*gdb*}
 buffer.  Usually, it will just report that there is no stack, but when
 the application is stopped, the current stack will be shown.


@@ -878,7 +886,7 @@ Set this to implement your own scanning or rescan safe functions with
 state data.
 @end table
 
 state data.
 @end table
 

-@node Extending, Index, Customizing, Top
+@node Extending, GNU Free Documentation License, Customizing, Top

 @comment  node-name,  next,  previous,  up
 @chapter Extending
 @cindex extending
 @comment  node-name,  next,  previous,  up
 @chapter Extending
 @cindex extending


@@ -1234,7 +1242,12 @@ Two good values are @code{nil} and @code{statictag}.
 
 @end defun
 
 
 @end defun
 

-@node Index, , Extending, Top
+@node GNU Free Documentation License, Index, Extending, Top
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
+
+@node Index, , GNU Free Documentation License, Top

 @comment  node-name,  next,  previous,  up
 @unnumbered Concept Index
 @printindex cp
 @comment  node-name,  next,  previous,  up
 @unnumbered Concept Index
 @printindex cp