3 files changed, 8 insertions, 8 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8fa35abc979..9ee52aebda9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ns-emacs.texi:
+        * faq.texi: Remove mentions of Mac Carbon.
+
 2008-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Saving Articles): Describe the 2nd argument of
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index a8f14cf422b..42a373d820c 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -1163,7 +1163,7 @@ machines, as well as support for the Mac OS X and Cygwin operating
 systems.
 
 @item
-The native MS-Windows, Mac OS 9 and Mac OS X builds include full support
+The native MS-Windows, and Mac OS X builds include full support
 for images, toolbar, and tooltips.
 
 @item
@@ -1359,7 +1359,7 @@ customize, with completion.
 
 In Emacs 21.1 and later, colors and faces are supported in non-windowed mode,
 i.e.@: on Unix and GNU/Linux text-only terminals and consoles, and when
-invoked as @samp{emacs -nw} on X, MS-Windows, and Mac.  (Colors and faces were
+invoked as @samp{emacs -nw} on X, and MS-Windows.  (Colors and faces were
 supported in the MS-DOS port since Emacs 19.29.)  Emacs automatically
 detects color support at startup and uses it if available.  If you think
 that your terminal supports colors, but Emacs won't use them, check the
@@ -3818,10 +3818,6 @@ menus, and multiple frames.  You can get it from
 @cindex Apple computers, Emacs for
 @cindex Macintosh, Emacs for
 
-Beginning with version 21.1, the Macintosh is supported in the official
-Emacs distribution; see the files @file{mac/README} and
-@file{mac/INSTALL} in the Emacs distribution for build instructions.
-
 Beginning with version 22.1, Emacs supports Mac OS X natively.
 
 @node Emacs for VMS and DECwindows, Modes for various languages, Emacs for Apple computers, Finding Emacs and related packages
diff --git a/doc/misc/ns-emacs.texi b/doc/misc/ns-emacs.texi
index 8b39aaa77d1..e80bf34a882 100644
--- a/doc/misc/ns-emacs.texi
+++ b/doc/misc/ns-emacs.texi
@@ -982,8 +982,7 @@ Also a number of others have contributed code.  Steve Nygard
 <nygard@@telusplanet.net> got emacs to dump under OpenStep.  The font panel
 code was Andrew Athan's <athan@@object.com> work.  Joe Reiss
 <jreiss@@magnus.acs.ohio-state.edu> both created the beautiful icons you see
-and wrote the popup menu and dialog box code as well as much else.  (Actually,
-Joe's icon became the one used for the Mac Carbon port..)
+and wrote the popup menu and dialog box code as well as much else.
 
 Finally, suggestions from Darcy Brockbank, Timothy Bissell, Scott Byer, David
 Griffiths, Scott Hess, Eberhard Mandler, John C. Randolph, and Bradley Taylor