merge trunk

[gnu-emacs] / doc / emacs / emacs.texi

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 450c5e3a684ba06878bfd4f321095c69c876bd25..ec7c426448a17ee97127df12fa9a86f7dd5a62b3 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  23.1.94
+@set EMACSVER  23.1.96
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
@@ -649,6 +649,7 @@ Editing Programs
 * Hideshow::            Displaying blocks selectively.
 * Symbol Completion::   Completion on symbol names of your program or language.
 * Glasses::             Making identifiersLikeThis more readable.
+* Semantic::            Suite of editing tools based on source code parsing.
 * Misc for Programs::   Other Emacs features useful for editing programs.
 * C Modes::             Special commands of C, C++, Objective-C,
                           Java, and Pike modes.
@@ -761,6 +762,7 @@ Maintaining Large Programs
 * Change Log::         Maintaining a change history for your program.
 * Tags::               Go directly to any function in your program in one
                          command.  Tags remembers which file it is in.
+* EDE::                 An integrated development environment for Emacs.
 * Emerge::              A convenient way of merging two versions of a program.
 
 Version Control
@@ -886,16 +888,17 @@ Sending Mail
 * Mail Format::        Format of the mail being composed.
 * Mail Headers::        Details of some standard mail header fields.
 * Mail Aliases::        Abbreviating and grouping mail addresses.
-* Mail Mode::          Special commands for editing mail being composed.
+* Mail Commands::      Special commands for editing mail being composed.
+* Mail Signature::      Adding a signature to every message.
 * Mail Amusements::     Distracting the NSA; adding fortune messages.
 * Mail Methods::        Using alternative mail-composition methods.
 
-Mail Mode
+Mail Commands
 
 * Mail Sending::        Commands to send the message.
 * Header Editing::      Commands to move to header fields and edit them.
-* Citing Mail::         Copying all or part of a message you are replying to.
-* Mail Mode Misc::      Spell checking, signatures, etc.
+* Citing Mail::         Quoting a message you are replying to.
+* Mail Misc::           Attachments, spell checking, etc.
 
 Reading Mail with Rmail
 
@@ -1402,9 +1405,9 @@ Schnoebelen, Jan Schormann, Alex Schroeder, Stephen Schoef, Raymond
 Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel,
 Manuel Serrano, Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard
 Sharman, Olin Shivers, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris
-Smith, David Smith, Paul D.@: Smith, Andre Spiegel, Michael Staats,
-William Sommerfeld, Michael Staats, Reiner Steib, Sam Steingold, Ake
-Stenhoff, Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan
+Smith, David Smith, Paul D.@: Smith, William Sommerfeld, Andre Spiegel,
+Michael Staats, Reiner Steib, Sam Steingold, Ake Stenhoff,
+Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan
 Stigelman, Martin Stjernholm, Kim F.@: Storm, Steve Strassman, Olaf
 Sylvester, Naoto Takahashi, Steven Tamm, Jean-Philippe Theberge, Jens
 T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Luc Teirlinck,