aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorGlenn Morris2014-01-09 21:44:51 -0500
committerGlenn Morris2014-01-09 21:44:51 -0500
commit458dbf5e47e92a45d41d9485c55b8b8e58bb3cf2 (patch)
tree703f44e0fe8429fa2cb5982d6f3a02980d288e85 /etc
parent4ed678149d6cebb6c6cb70b5beba2357550949c1 (diff)
downloademacs-458dbf5e47e92a45d41d9485c55b8b8e58bb3cf2.tar.gz
emacs-458dbf5e47e92a45d41d9485c55b8b8e58bb3cf2.zip
Make etc/FTP and etc/ORDERS obsolete
* etc/FTP: Mark as obsolete. * etc/ORDERS: Replace contents with pointer to emacs.info, mark obsolete. * doc/emacs/emacs.texi (Distrib): Add donate URL. Add anchor. * lisp/help.el (view-order-manuals): Open emacs.info rather than ORDERS.
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog6
-rw-r--r--etc/FTP11
-rw-r--r--etc/ORDERS16
3 files changed, 19 insertions, 14 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6395e28f005..24bd6cede5e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
12014-01-10 Glenn Morris <rgm@gnu.org>
2
3 * ORDERS: Replace contents with pointer to emacs.info, mark obsolete.
4
5 * FTP: Mark as obsolete.
6
12014-01-09 David Engster <deng@randomsample.de> 72014-01-09 David Engster <deng@randomsample.de>
2 8
3 * NEWS: Added new `describe-function' EIEIO support. 9 * NEWS: Added new `describe-function' EIEIO support.
diff --git a/etc/FTP b/etc/FTP
index 0337d464c30..2fcfa22c55c 100644
--- a/etc/FTP
+++ b/etc/FTP
@@ -1,6 +1,9 @@
1For information about how to obtain GNU Emacs and other GNU software 1For information about how to download GNU Emacs, please see:
2by FTP, please see <http://www.gnu.org/order/ftp.html>. 2<http://www.gnu.org/software/emacs/>
3 3
4Information about Emacs is also available at 4For general GNU software downloading, please see
5<http://www.gnu.org/software/emacs/>. 5<http://www.gnu.org/order/ftp.html>
6 6
7Note added January 2014:
8This file is obsolete and will be removed in future.
9Please update any links to use the above URLs.
diff --git a/etc/ORDERS b/etc/ORDERS
index 3998fcae37b..1df755de9f5 100644
--- a/etc/ORDERS
+++ b/etc/ORDERS
@@ -1,12 +1,8 @@
1Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference 1Printed copies of Emacs manuals
2Manual, "Programming in Emacs Lisp: An Introduction", and other
3materials can be ordered directly from the Free Software Foundation.
4 2
5For more information, see the online store at <http://shop.fsf.org/>. 3Note added January 2014:
6 4
7Your purchases will help support further development of Emacs and 5This file is obsolete and will be removed in future.
8other free software programs. 6Please update any links to use
9 7 info node `(emacs)Printed Books'
10You can also make tax-deductible donations to the Free Software 8instead.
11Foundation, a not-for-profit organization (assuming you pay US taxes)
12- see <https://my.fsf.org/donate/>.