Merge from emacs-24; up to 2012-05-08T14:11:47Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / etc / FTP

diff --git a/etc/FTP b/etc/FTP
index ea8d50f..0337d46 100644 (file)
--- a/etc/FTP
+++ b/etc/FTP
@@ -1,7 +1,6 @@
-Please refer to <http://www.gnu.org/software/emacs/> for information
-about obtaining Emacs.
+For information about how to obtain GNU Emacs and other GNU software
+by FTP, please see <http://www.gnu.org/order/ftp.html>.
 
-Copyright (c) 2000, 2006  Free Software Foundation, Inc.
+Information about Emacs is also available at
+<http://www.gnu.org/software/emacs/>.
 
-Verbatim copying and distribution is permitted in any medium
-provided this notice is preserved.