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.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 1039dd522e5d5e61c2614454b38824cb6418cb7e..29ed8fadd29e83e2e4886685b96a330c4b5749c3 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,14 +1,16 @@
+2014-01-10  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.texi (Distrib): Add donate URL.  Add anchor.
+
 2014-01-10  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-       * dired.texi (Misc Dired Features): Document
-       `dired-hide-details-mode',
+       * dired.texi (Misc Dired Features): Document `dired-hide-details-mode',
        `dired-hide-details-hide-symlink-targets', and
        `dired-hide-details-hide-information-lines'.
 
 2014-01-09  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * emacs.texi: Add EWW.
-
        * misc.texi (EWW): Document EWW.
 
 2014-01-09  Glenn Morris  <rgm@gnu.org>

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 8ec4fb5880d9e440c935b6107777c649c3304893..ca5520198f84b3616b3a6d3e9ee5455dd7695810 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1339,9 +1339,12 @@ If you find GNU Emacs useful, please @strong{send a donation} to the
 Free Software Foundation to support our work.  Donations to the Free
 Software Foundation are tax deductible in the US@.  If you use GNU Emacs
 at your workplace, please suggest that the company make a donation.
-For more information on how you can help, see
+To donate, see @url{https://my.fsf.org/donate/}.
+For other ways in which you can help, see
 @url{http://www.gnu.org/help/help.html}.
 
+@c The command view-order-manuals uses this anchor.
+@anchor{Printed Books}
 We also sell hardcopy versions of this manual and @cite{An
 Introduction to Programming in Emacs Lisp}, by Robert J. Chassell.
 You can visit our online store at @url{http://shop.fsf.org/}.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6395e28f0053a2d6402121a853058de10eb3656d..24bd6cede5e08756fc34a658fae515453e0caba5 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-10  Glenn Morris  <rgm@gnu.org>
+
+       * ORDERS: Replace contents with pointer to emacs.info, mark obsolete.
+
+       * FTP: Mark as obsolete.
+
 2014-01-09  David Engster  <deng@randomsample.de>
 
        * NEWS: Added new `describe-function' EIEIO support.

diff --git a/etc/FTP b/etc/FTP
index 0337d464c300b97bf9f86cdb60084923ff2fd62d..2fcfa22c55cca0edbadbe29ffb8dd0d07cd17c30 100644 (file)
--- a/etc/FTP
+++ b/etc/FTP
@@ -1,6 +1,9 @@
-For information about how to obtain GNU Emacs and other GNU software
-by FTP, please see <http://www.gnu.org/order/ftp.html>.
+For information about how to download GNU Emacs, please see:
+<http://www.gnu.org/software/emacs/>
 
-Information about Emacs is also available at
-<http://www.gnu.org/software/emacs/>.
+For general GNU software downloading, please see
+<http://www.gnu.org/order/ftp.html>
 
+Note added January 2014:
+This file is obsolete and will be removed in future.
+Please update any links to use the above URLs.

diff --git a/etc/ORDERS b/etc/ORDERS
index 3998fcae37b98ab9856ec176f900c363a41fe0e4..1df755de9f584f23e80610fbdd7883a17fc54985 100644 (file)
--- a/etc/ORDERS
+++ b/etc/ORDERS
@@ -1,12 +1,8 @@
-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.
+Printed copies of Emacs manuals
 
-For more information, see the online store at <http://shop.fsf.org/>.
+Note added January 2014:
 
-Your purchases will help support further development of Emacs and
-other free software programs.
-
-You can also make tax-deductible donations to the Free Software
-Foundation, a not-for-profit organization (assuming you pay US taxes)
-- see <https://my.fsf.org/donate/>.
+This file is obsolete and will be removed in future.
+Please update any links to use
+  info node `(emacs)Printed Books'
+instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 666a7886a2bdd7548e02a4efec324e5d1850f834..0c1b111e3b09616c3f0d5d14211699dea356fecc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-10  Glenn Morris  <rgm@gnu.org>
+
+       * help.el (view-order-manuals): Open emacs.info rather than ORDERS.
+
 2014-01-09  David Engster  <deng@randomsample.de>
 
        * emacs-lisp/eieio-custom.el:

diff --git a/lisp/help.el b/lisp/help.el
index 22d7007aa5e5ddb01bb3e25f31b80adc4383b50f..f732cf385cda04520ce10c261a428afd7a26a8bf 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -417,9 +417,10 @@ is specified by the variable `message-log-max'."
     (display-buffer (current-buffer))))
 
 (defun view-order-manuals ()
-  "Display the Emacs ORDERS file."
+  "Display information on how to buy printed copies of Emacs manuals."
   (interactive)
-  (view-help-file "ORDERS"))
+;;  (view-help-file "ORDERS")
+  (info "(emacs)Printed Books"))
 
 (defun view-emacs-FAQ ()
   "Display the Emacs Frequently Asked Questions (FAQ) file."