Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-331
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-332
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-333
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-334
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-335
   Add note about "link" button-class to etc/TODO

 * emacs@sv.gnu.org/emacs--devo--0--patch-336
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-337
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-338
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-339
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-340
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-341
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-342
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-343
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-344
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-345
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-346
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-347
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-348
   Update for ERC 5.1.3.

 * emacs@sv.gnu.org/emacs--devo--0--patch-349
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-350
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-111
   Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-112
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-113
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-114
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-572

3 files changed, 28 insertions, 35 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index a17f456ae6f..20c9c255c58 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-12  Kim F. Storm  <storm@cua.dk>
+
+	* INSTALL: More cleanup related to last change.
+
+2006-07-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* INSTALL: Remove descriptions about Metrowerks CodeWarrior.  Fix URL
+	for GNU-fonts.smi.bin.  USE_ATSUI is enabled by default on Mac OS X.
+
+	* README: Remove descriptions about Metrowerks CodeWarrior.
+
 2006-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* makefile.MPW (SOME_MACHINE_LISP): Add fringe.elc.
diff --git a/mac/INSTALL b/mac/INSTALL
index e887537354b..cf82003e5c4 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -160,22 +160,18 @@ For usage of other options, use the --help option.
 
 * BUILDING EMACS ON MAC OS Classic
 
-FIXME: You can use either Metrowerks CodeWarrior Pro 6 or MPW-GM
-(Aug. 2001) to build Emacs.  MPW-GM can be downloaded free of charge
-from Apple.
-
-In either case, you will need MPW-GM to build the make-docfile utility
-and to generate the doc string file DOC.
+You can use MPW-GM (Aug. 2001) to build Emacs.  MPW-GM can be
+downloaded free of charge from Apple.
 
 ### IMPORTANT ### You can use StuffIt Expander to decompress and untar
 the distribution.  However, you *must* set the radio button in the
 Preferences->Cross Platform->Convert text files to Macintosh format to
 "Never".  Otherwise the compiled Lisp files will be corrupted.
 
-FIXME: (Optional) A subset of the fonts from the GNU intlfonts-1.2
+(Optional) A subset of the fonts from the GNU intlfonts-1.2
 distribution converted to NFNT format can be obtained from
 
-  ftp://mac-emacs.sourceforge.net/pub/mac-emacs/GNU-fonts.smi.bin
+  http://members.shaw.ca/akochoi-emacs/stories/Resources/GNU-Fonts.smi.bin
 
 To build Emacs in the MPW Shell, simply set the directory to
 ...:emacs:mac: and build the target Emacs of the make file
@@ -184,27 +180,14 @@ makefile.MPW.  I.e., execute the commands
   make Emacs -f makefile.MPW > Emacs.MakeScript
   Emacs.MakeScript
 
-The above commands create an executable that uses the Carbon API.  The
-non-Carbon version can also be created by replacing all the
+The above commands create an executable that uses the Carbon API.
+The non-Carbon version can also be created by replacing all the
 occurrences of `Emacs' above with `NonCarbon'.  Not that the
 non-Carbon version does not support some features such as file
 dialogs, drag-and-drop, and Unicode menus.
 
-FIXME: To build Emacs using CodeWarrior, start up the CodeWarrior IDE,
-choose File->Import Project...  and select the file cw6-mcp.xml.  When
-prompted to save the project, navigate to same directory as the file
-cw6-mcp.xml, name the project emacs-cw6.mcp, and save it there.  Then
-choose Project->Make.  Note that this does not build the DOC file.  To
-do so, use MPW and build the target "Doc" in makefile.MPW.
-
-FIXME: Once built, the Emacs application (Emacs CW or Emacs MPW) can
-be launched where it is created.
-
-FIXME: To build an optimized version of Emacs in CodeWarrior, change
-the value in the Emacs Settings->Code Generation->Global Optimization
-dialog.  To build a version for profiling, check the Profiler
-Information box in the Emacs Settings->Code Generation->PPC Processor
-dialog and include the Profiler PPC.Lib library.
+Once built, the Emacs application (Emacs MPW) can be launched where it
+is created.
 
 * NOTES
 
@@ -234,12 +217,12 @@ There are some compile-time flags that enable experimental features.
 Please use them at your own risk after reading the corresponding
 threads in the emacs-devel@gnu.org archive.
 
-  USE_ATSUI: Enable ATSUI (Apple Type Services for Unicode Imaging)
-  support.  Available on Mac OS 9/Carbon and Mac OS X.
-  http://lists.gnu.org/archive/html/emacs-devel/2005-10/msg00005.html
-
-  SELECT_USE_CFSOCKET: Avoid polling in sys_select (in src/mac.c).
-  Available on Mac OS X.
+  SELECT_USE_CFSOCKET (on Mac OS X): Avoid polling in sys_select (in
+  src/mac.c).
   http://lists.gnu.org/archive/html/emacs-devel/2004-12/msg00789.html
 
+  USE_ATSUI (on Mac OS 9/Carbon): Enable ATSUI (Apple Type Services
+  for Unicode Imaging) support.
+  http://lists.gnu.org/archive/html/emacs-devel/2005-10/msg00005.html
+
 Enjoy!
diff --git a/mac/README b/mac/README
index 63ff2e76dd1..ecbd438a3f6 100644
--- a/mac/README
+++ b/mac/README
@@ -32,10 +32,9 @@ There is basic support for synchronous subprocesses (call-process) on
 Mac OS Classic (non-Carbon build only) although Unix commands that are
 used will need to be ported.
 
-FIXME: Metrowerks CodeWarrior Pro 6 or MPW-GM (August 2001) can be
-used to build Emacs on the Mac OS Classic.  On Mac OS X, Emacs can be
-built using the Developer Tools.  See the INSTALL file in this
-directory for instructions on building Emacs.
+MPW-GM (August 2001) can be used to build Emacs on the Mac OS Classic.
+On Mac OS X, Emacs can be built using the Developer Tools.  See the
+INSTALL file in this directory for instructions on building Emacs.
 
 Read the Mac OS section of the on-line help to find out about how to
 use Emacs on the Mac.