*** empty log message ***

1 files changed, 26 insertions, 34 deletions

diff --git a/etc/DISTRIB b/etc/DISTRIB
index f9d17b40951..d143f704531 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -1,12 +1,12 @@
 						-*- text -*-
 For an order form for all Emacs and FSF distributions deliverable from
 the USA, see the file `ORDERS' in this directory (etc/ in the GNU
-Emacs distribution or /pub/gnu/GNUinfo on ftp.gnu.org).  For a
+Emacs distribution or http://www.gnu.org/order/order.html).  For a
 European order form, see `ORDERS.EUROPE'.  For a Japan order form,
 see `ORDERS.JAPAN'.
 
-	   GNU Emacs availability information, April 1998
-Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998
+	   GNU Emacs availability information, October 2000
+Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 2000
 	   Free Software Foundation, Inc.
 
 	Permission is granted to anyone to make or distribute
@@ -33,26 +33,25 @@ are designed to make sure that everyone who has a copy of GNU Emacs
 change it.
 
 If you do not know anyone to get a copy of GNU Emacs from, you can
-order a cd-rom from the Free Software Foundation.  We distribute Emacs
-versions 19 and 20.  We also distribute nicely typeset copies of the
-Emacs user manual, Emacs Lisp Reference Manual, the Emacs reference
-card, etc.  See file `ORDERS'.
+order a cd-rom from the Free Software Foundation.  We distribute
+several Emacs versions.  We also distribute nicely typeset copies of
+the Emacs user manual, Emacs Lisp Reference Manual, the Emacs
+reference card, etc.  See file `ORDERS', or visit
+http://www.gnu.org/order/order.html.
 
 If you have Internet access, you can copy the latest Emacs
-distribution from hosts, such as ftp.gnu.org.  There are several
-ways to do this; see the file `FTP' for more information.  Even
-better, get the latest version of the file from `/pub/gnu/GNUinfo/FTP'
-on ftp.gnu.org for the most current arrangements.  It may also be
-possible to copy Emacs via uucp; the file `FTP' contains information
-on that too.
-
-Emacs has been run on both Berkeley Unix and System V Unix, on a
-variety of types of cpu.  It also works on VMS and on Apollo
-computers, though with some deficiencies that reflect problems in
-these operating systems.  See the file `MACHINES' in this directory
-(see above) for a full list of machines that GNU Emacs has been tested
-on, with machine-specific installation notes and warnings.  There is
-also Demacs that works on newer MS-DOS machines (see file `ORDERS').
+distribution from hosts, such as ftp.gnu.org.  There are several ways
+to do this; see http://www.gnu.org/software/software.html for more
+information.
+
+Emacs has been run on GNU/Linux, FreeBSD, NetBSD, OpenBSD, and on many
+Unix systems, on a variety of types of cpu.  It also works on VMS and
+on Apollo computers, though with some deficiencies that reflect
+problems in these operating systems.  See the file `MACHINES' in this
+directory (see above) for a full list of machines that GNU Emacs has
+been tested on, with machine-specific installation notes and warnings.
+There is also an MS-DOS that works on newer MS-DOS machines, and
+an MS-Windows and a Mac version.
 
 Note that there is significant variation between Unix systems
 supposedly running the same version of Unix; it is possible that what
@@ -65,26 +64,19 @@ License for full details, in the file `COPYING' in this directory (see
 above)), and neither I nor the Free Software Foundation promises any
 kind of support or assistance to users.  The foundation keeps a list
 of people who are willing to offer support and assistance for hire.
-See the file `SERVICE'.  You can get the latest version from
-ftp.gnu.org in file `/pub/gnu/GNUinfo/SERVICE'.
+See http://www.gnu.org/help/gethelp.html.
 
 However, we plan to continue to improve GNU Emacs and keep it
 reliable, so please send me any complaints and suggestions you have.
 I will probably fix anything that I consider a malfunction.  I may
 make improvements that are suggested, but I may choose not to.
-Improving Emacs is not my highest priority now.
 
-If you are on the Internet, report bugs to bug-gnu-emacs@gnu.org.
-Otherwise, phone or write the Foundation at:
+If you are on the Internet, report bugs to bug-gnu-emacs@gnu.org.  You
+can use the Emacs command M-x report-bug RET to mail a bug report.
+Please read the Bugs section of the Emacs manual before reporting
+bugs.
 
-	Free Software Foundation
-	59 Temple Place - Suite 330
-	Boston, MA  02111-1307
-	Voice:  +1-617-542-5942
-	Fax:    +1-617-542-2652
-
-General questions about the GNU Project can be asked of
-gnu@gnu.org.
+General questions about the GNU Project can be asked of gnu@gnu.org.
 
 If you are a computer manufacturer, I encourage you to ship a copy of
 GNU Emacs with every computer you deliver.  The same copying