Merged from emacs@sv.gnu.org

[gnu-emacs] / man / emacs.texi

diff --git a/man/emacs.texi b/man/emacs.texi
index 4cde551bb0044a2be39b83361ed64bafae75b39a..478244aecf6856faa6af6253d1ebbc555d2ba906 100644 (file)
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Fourteenth
-@set EMACSVER  22.0.50
+@set EMACSVER  22.0.51
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
@@ -73,7 +73,12 @@ Boston, MA 02110-1301 USA
 Cover art by Etienne Suvasa.
 
 @end titlepage
-@page
+
+
+@summarycontents
+@contents
+
+
 @ifnottex
 @node Top, Distrib, (dir), (dir)
 @top The Emacs Editor
@@ -122,7 +127,7 @@ and Sending Mail and Registers and Minibuffer.
 * Glossary::           The glossary.
 * Antinews::           Information about Emacs version 21.
 * Mac OS::              Using Emacs in the Mac.
-* MS-DOS::              Using Emacs on MS-DOS and Microsoft Windows.
+* Emacs and Microsoft Windows::  Using Emacs on Microsoft Windows.
 * Manifesto::          What's GNU?  Gnu's Not Unix!
 * Acknowledgments::     Major contributors to GNU Emacs.
 
@@ -394,10 +399,6 @@ Version Control
 * Old Versions::        Examining and comparing old versions.
 * Secondary VC Commands:: The commands used a little less frequently.
 * Branches::            Multiple lines of development.
-* Remote Repositories:: Efficient access to remote CVS servers.
-* Snapshots::           Sets of file versions treated as a unit.
-* Miscellaneous VC::    Various other commands and features of VC.
-* Customizing VC::      Variables that change VC's behavior.
 
 Using Multiple Buffers
 
@@ -801,7 +802,6 @@ Dealing with Emacs Trouble
 * Stuck Recursive::     `[...]' in mode line around the parentheses.
 * Screen Garbled::      Garbage on the screen.
 * Text Garbled::        Garbage in the text.
-* Unasked-for Search::  Spontaneous entry to incremental search.
 * Memory Full::         How to cope when you run out of memory.
 * After a Crash::       Recovering editing in an Emacs session that crashed.
 * Emergency Escape::    Emergency escape---
@@ -856,16 +856,9 @@ Emacs and Mac OS
 * Mac Font Specs::      Specifying fonts on Mac.
 * Mac Functions::       Mac-specific Lisp functions.
 
-MS-DOS and Windows 95/98/NT
+Emacs and Microsoft Windows
 
-* MS-DOS Keyboard::     Keyboard usage on MS-DOS.
-* MS-DOS Mouse::        Mouse usage on MS-DOS.
-* MS-DOS Display::      Fonts, frames and display size on MS-DOS.
-* MS-DOS File Names::   File-name conventions on MS-DOS.
 * Text and Binary::     Text files on MS-DOS use CRLF to separate lines.
-* MS-DOS Printing::     How to specify the printer on MS-DOS.
-* MS-DOS and MULE::     Support for internationalization on MS-DOS.
-* MS-DOS Processes::    Running subprocesses on MS-DOS.
 * Windows Processes::   Running subprocesses on Windows.
 * Windows System Menu:: Controlling what the ALT key does.
 @end menu
@@ -927,10 +920,10 @@ This edition of the manual is intended for use with GNU Emacs
 installed on GNU and Unix systems.  GNU Emacs can also be used on VMS,
 MS-DOS (also called MS-DOG), Microsoft Windows, and Macintosh systems.
 Those systems use different file name syntax; in addition, VMS and
-MS-DOS do not support all GNU Emacs features.  @xref{MS-DOS}, for
-information about using Emacs on MS-DOS and Windows.  @xref{Mac OS},
-for information about using Emacs on Macintosh.  We don't try to
-describe VMS usage in this manual.
+MS-DOS do not support all GNU Emacs features.  @xref{Emacs and
+Microsoft Windows}, for information about using Emacs on Windows.
+@xref{Mac OS}, for information about using Emacs on Macintosh.  We
+don't try to describe VMS usage in this manual.
 @end iftex
 
 @node Distrib, Intro, Top, Top
@@ -1551,7 +1544,12 @@ Public License instead of this License.
 
 @include doclicense.texi
 @include cmdargs.texi
+@iftex
+@include xresmini.texi
+@end iftex
+@ifnottex
 @include xresources.texi
+@end ifnottex
 
 @include anti.texi
 @include macos.texi
@@ -1605,8 +1603,6 @@ Public License instead of this License.
 @unnumbered Concept Index
 @printindex cp
 
-@summarycontents
-@contents
 @bye
 
 @ignore