(Maintaining) [ifnottex]: Add menu entry for "Emerge".

[gnu-emacs] / INSTALL

diff --git a/INSTALL b/INSTALL
index b18baaa1efada32b2c5a5ecca2d36aad1d6979fb..6d5383eee294ce486074139b42bace200b831021 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,6 @@
 GNU Emacs Installation Guide
-Copyright (c) 1992, 94, 96, 97, 2000, 01, 02 Free software Foundation, Inc.
+Copyright (c) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2006 
+Free software Foundation, Inc.
 See the end of the file for copying permissions.
 
 
@@ -132,14 +133,14 @@ can be found:
   . libxpm for XPM:   ftp://ftp.x.org/contrib/libraries/
                      Get version 3.4k or later, which lets Emacs
                      use its own color allocation functions.
-  . libpng for PNG:   ftp://www.libpng.org/pub/png/
-  . libz (for PNG):   http://www.info-zip.org/pub/infozip/zlib/
+  . libpng for PNG:   ftp://ftp.simplesystems.org/pub/libpng/png/
+  . libz (for PNG):   http://www.zlib.net/
   . libjpeg for JPEG: ftp://ftp.uu.net/graphics/jpeg/
                       Get version 6b -- 6a is reported to fail in
                       Emacs.
   . libtiff for TIFF: http://www.libtiff.org/
   . libungif for GIF:
-      http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml
+      http://sourceforge.net/projects/libungif
       Ensure you get version 4.1.0b1 or higher of libungif -- a bug in
       4.1.0 can crash Emacs.
 
@@ -157,7 +158,7 @@ must do this yourself.
 
 To take proper advantage of Emacs 21's mule-unicode charsets, you need
 a suitable font.  For `Unicode' (ISO 10646) fonts for X, see
-<URL:http://dvdeug.dhis.org/unifont.html> (packaged in Debian),
+<URL:http://czyborra.com/unifont/> (packaged in Debian),
 <URL:http://openlab.ring.gr.jp/efont/> (packaged in Debian).  (In
 recent Debian versions, there is an extensive `misc-fixed' iso10646-1
 in the default X installation.)  Perhaps also see
@@ -166,7 +167,7 @@ in the default X installation.)  Perhaps also see
 <URL:http://czyborra.com/charsets/> has basic fonts for Emacs's
 ISO-8859 charsets.
 
-XFree86 release 4 (from <URL:ftp://ftp.xfree86.org/> and mirrors)
+XFree86 release 4 (from <URL:ftp://ftp.xfree86.org/pub/XFree86/> and mirrors)
 contains font support for most, if not all, of the charsets that Emacs
 currently supports, including iso10646-1 encoded fonts for use with
 the mule-unicode charsets.  The font files should also be usable with
@@ -176,7 +177,7 @@ etc/PROBLEMS.
 
 BDF fonts etl-unicode.tar.gz used by ps-print and ps-mule to print
 Unicode characters are available from <URL:ftp://ftp.x.org/contrib/fonts/>
-and <URL:ftp://ftp.xfree86.org/pub/X.Org/contrib/fonts/>.
+and <URL:ftp://ftp.xfree86.org/pub/mirror/X.Org/contrib/fonts/>.
 
 * GNU/Linux development packages
 
@@ -260,7 +261,7 @@ availability).
 
 If `--with-x-toolkit=gtk' is specified, you can tell configure where
 to search for GTK by specifying `--with-pkg-config-prog=PATH' where
-PATH is the pathname to pkg-config.  Note that GTK version 2.0 or
+PATH is the pathname to pkg-config.  Note that GTK version 2.4 or
 newer is required for Emacs.
 
 The `--with-gcc' option specifies that the build process should