Merge from emacs--rel--22

[bpt/emacs.git] / mac / README

diff --git a/mac/README b/mac/README
index bc6b075..886df66 100644 (file)
--- a/mac/README
+++ b/mac/README
@@ -1,12 +1,12 @@
-Emacs for Mac OS Classic and Mac OS X
+Emacs for Mac OS X
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
    2006, 2007, 2008 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory contains the files needed to build Emacs on the Mac OS
-Classic and Mac OS X.  Many of the major features of the Unix version
+This directory contains the files needed to build Emacs on Mac OS X.
+Many of the major features of the Unix version
 are supported: multiple frames, colors, scroll bars, menu bars, use of
 the mouse, fontsets, international characters, input methods, and
 coding systems.
@@ -15,15 +15,6 @@ Mac OS specific support includes document drag-and-drop in the Finder,
 transfer of text to and from other applications via the clipboard, and
 sending AppleScript commands to other applications from Emacs.
 
-The following are not supported on Mac OS Classic: unexec (dump-emacs),
-asynchronous subprocesses (start-process), and networking
-(open-network-stream).  These features work fine on Mac OS X.
-
-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.
-
-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.
 
@@ -47,10 +38,10 @@ Steven
 \f
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -58,6 +49,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.