Merge from emacs--devo--0

[gnu-emacs] / etc / ORDERS

diff --git a/etc/ORDERS b/etc/ORDERS
index 07c25d0671724c4b768d210bd7bf0679321d0dbf..8c612a1b1b6a3401d6fccf01d70e445f17537583 100644 (file)
--- a/etc/ORDERS
+++ b/etc/ORDERS
@@ -1,14 +1,13 @@
 Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference
 Manual, "Programming in Emacs Lisp: An Introduction", and other
 materials can be ordered directly from the Free Software Foundation.
+
 For more information, see the order form on the web at
-<http://www.gnu.org/order/order.html>.  Your purchases will help support
-further development of Emacs and other free software programs.  You
-can also make tax-deductable donations to the Free Software Foundation,
-a not-for-profit organization (assuming you pay US taxes) - see
-<http://www.gnu.org/help/donate.html>.
+<http://www.gnu.org/order/order.html>.
 
-Copyright (c) 2000, 2001, 2006 Free Software Foundation
+Your purchases will help support further development of Emacs and
+other free software programs.
 
-Verbatim copying and distribution is permitted in any medium
-provided this notice is preserved.
+You can also make tax-deductable donations to the Free Software
+Foundation, a not-for-profit organization (assuming you pay US taxes)
+- see <http://www.gnu.org/help/donate.html>.