diff etc/DISTRIB @ 88155:d7ddb3e565de

sync with trunk

--- a/etc/DISTRIB	Sun Jan 15 23:02:10 2006 +0000
+++ b/etc/DISTRIB	Mon Jan 16 00:03:54 2006 +0000
@@ -1,13 +1,11 @@
 						-*- 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 http://www.gnu.org/order/order.html).  For a
-European order form, see `ORDERS.EUROPE'.  For a Japan order form,
-see `ORDERS.JAPAN'.
+the USA, see http://www.gnu.org/order/order.html.
 
 	   GNU Emacs availability information, October 2000
-Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 2000
-	   Free Software Foundation, Inc.
+
+Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
+   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 	Permission is granted to anyone to make or distribute
 	verbatim copies of this document provided that the
@@ -36,8 +34,7 @@
 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.
+reference card, etc.  See 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
@@ -45,14 +42,12 @@
 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 version that works on MS-DOS and all platforms
-that have some kind of ``DOS box'', and also an MS-Windows and a Mac
-version.
+Unix systems, on a variety of types of cpu, as well as on MSDOS,
+Windows and MacOS.  It also formerly worked 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.
 
 Note that there is significant variation between Unix systems
 supposedly running the same version of Unix; it is possible that what
@@ -89,7 +84,7 @@
 If you like GNU Emacs, please express your satisfaction with a
 donation: send me or the Foundation what you feel Emacs has been worth
 to you.  If you are glad that I developed GNU Emacs and distribute it
-as freeware, rather than following the obstructive and antisocial
+as free software, rather than following the obstructive and antisocial
 practices typical of software developers, reward me.  If you would
 like the Foundation to develop more free software, contribute.