# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1138553771 0
# Node ID 53cd4aa49c0e8a4fa0ccf78b619812b8b49688ff
# Parent  2ccd995850e502e02812c9ae35882374bf8916ec
(Top): Add xref to Mac chapter; explain Windows better.
(Intro): Refer to "graphical" terminals, rather than X.

diff -r 2ccd995850e5 -r 53cd4aa49c0e man/emacs.texi
--- a/man/emacs.texi	Sun Jan 29 16:54:49 2006 +0000
+++ b/man/emacs.texi	Sun Jan 29 16:56:11 2006 +0000
@@ -907,7 +907,7 @@
 
   This manual documents the use and simple customization of the Emacs
 editor.  The reader is not expected to be a programmer; simple
-customizations do not require programming skill.  But the user who is not
+customizations do not require programming skill.  The user who is not
 interested in customizing can ignore the scattered customization hints.
 
   This is primarily a reference manual, but can also be used as a
@@ -959,12 +959,14 @@
 Publications Department, Laboratory for Computer Science, 545 Tech Square,
 Cambridge, MA 02139, USA@.  The price today is $3.
 
-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), Windows NT, and Windows 95 systems.  Those systems use
-different file name syntax; in addition, VMS and MS-DOS do not support
-all GNU Emacs features.  We don't try to describe VMS usage in this
-manual.  @xref{MS-DOS}, for information about using Emacs on MS-DOS.
+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.
 @end iftex
 
 @node Distrib, Intro, Top, Top
@@ -1146,11 +1148,11 @@
 Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in
 Emacs Lisp}, if you want to learn Emacs Lisp programming.
 
-   When run under the X Window System, Emacs provides its own menus and
-convenient bindings to mouse buttons.  But Emacs can provide many of the
-benefits of a window system on a text-only terminal.  For instance, you
-can look at or edit several files at once, move text between files, and
-edit files while running shell commands.
+   When running on a graphics terminal, Emacs provides its own menus
+and convenient handling of mouse buttons.  But Emacs provides many of
+the benefits of a window system even on a text-only terminal.  For
+instance, you can look at or edit several files at once, move text
+between files, and edit files while running shell commands.
 
 @include screen.texi
 @include commands.texi