(ada-prj-display-page): Use `mapc' rather than `mapcar'.

[gnu-emacs] / mac / INSTALL

diff --git a/mac/INSTALL b/mac/INSTALL
index de9e76071c4364533e07e5c5bc24f911e3bdaef7..7cdf0de494008f65b00505d11e29dbb2cb58f5e0 100644 (file)
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,18 +1,9 @@
 * BUILDING EMACS ON MAC OS Classic AND MAC OS X     -*- outline -*-
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-   Permission is granted to anyone to make or distribute verbatim
-   copies of this document as received, in any medium, provided that
-   the copyright notice and permission notice are preserved, and that
-   the distributor grants the recipient permission for further
-   redistribution as permitted by this notice.
-
-   Permission is granted to distribute modified versions of this
-   document, or of portions of it, under the above conditions,
-   provided also that they carry prominent notices stating who last
-   changed them.
 
 * BUILDING EMACS ON MAC OS X
 
@@ -30,8 +21,8 @@ must install as root using the sudo command.  However, it is not
 recommended; see the notes section below for more details.
 
 The --enable-carbon-app specifies that the Carbon GUI application
-should be installed into /Application.  If you want it to install in a
-different location, specify --enable-carbon-app=<mydir>
+should be installed into /Applications.  If you want it to install in
+a different location, specify --enable-carbon-app=<mydir>
 
 You can type `make bootstrap' instead of `make' to rebuild everything,
 including byte-compiling the Lisp files.
@@ -53,7 +44,7 @@ still meaningful.
 To start Emacs as a GUI application from the terminal, the pathname to
 the executable in the bundle, i.e.,
 
-  /Application/Emacs.app/Contents/MacOS/Emacs
+  /Applications/Emacs.app/Contents/MacOS/Emacs
 
 must be typed to the shell to enable Emacs to locate its resources
 correctly.  You may want to create an alias to this path to quickly
@@ -69,8 +60,8 @@ building Emacs to run on X Window System, you need to specify like:
 Note that the Carbon-specific functions mentioned above are not
 available on the X11-enabled build.
 
-To use colors in a terminal, put the following lines in the file
-~/.termcap and log in again.
+To use colors in Terminal.app on Mac OS X 10.1, put the following
+lines in the file ~/.termcap and log in again.
 
 -----
 # added ANSI color
@@ -162,6 +153,11 @@ options to user
 
 For usage of other options, use the --help option.
 
+Note: due to the problem "Installing to a directory with non-ASCII
+characters in the name fails" mentioned in etc/PROBLEMS, you may not
+move a self-contained Emacs.app application bundle to a non-ASCII
+directory.
+
 * BUILDING EMACS ON MAC OS Classic
 
 You can use MPW-GM (Aug. 2001) to build Emacs.  MPW-GM can be
@@ -218,3 +214,21 @@ with PowerPC builds of Emacs; you will have to recompile for Intel.
 Therefore, builds of Emacs are architecture specific.
 
 Enjoy!
+
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.