[Emacs-diffs] trunk r115952: Make etc/FTP and etc/ORDERS obsolete

[Glenn Morris]

------------------------------------------------------------
revno: 115952
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-09 21:44:51 -0500
message:
  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.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/emacs.texi           emacs.texi-20091113204419-o5vbwnq5f7feedwu-6246
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  etc/FTP                        ftp-20091113204419-o5vbwnq5f7feedwu-1671
  etc/ORDERS                     orders-20091113204419-o5vbwnq5f7feedwu-1677
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/help.el                   help.el-20091113204419-o5vbwnq5f7feedwu-280

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-01-10 02:30:51 +0000
+++ b/doc/emacs/ChangeLog       2014-01-10 02:44:51 +0000
@@ -1,14 +1,16 @@
+2014-01-10  Glenn Morris  <address@hidden>
+
+       * emacs.texi (Distrib): Add donate URL.  Add anchor.
+
 2014-01-10  Rüdiger Sonderfeld  <address@hidden>
 
-       * 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  <address@hidden>
 
        * emacs.texi: Add EWW.
-
        * misc.texi (EWW): Document EWW.
 
 2014-01-09  Glenn Morris  <address@hidden>

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2014-01-09 23:21:56 +0000
+++ b/doc/emacs/emacs.texi      2014-01-10 02:44:51 +0000
@@ -1339,9 +1339,12 @@
 Free Software Foundation to support our work.  Donations to the Free
 Software Foundation are tax deductible in the address@hidden  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}.
 
address@hidden The command view-order-manuals uses this anchor.
address@hidden 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/}.

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2014-01-09 20:51:56 +0000
+++ b/etc/ChangeLog     2014-01-10 02:44:51 +0000
@@ -1,3 +1,9 @@
+2014-01-10  Glenn Morris  <address@hidden>
+
+       * ORDERS: Replace contents with pointer to emacs.info, mark obsolete.
+
+       * FTP: Mark as obsolete.
+
 2014-01-09  David Engster  <address@hidden>
 
        * NEWS: Added new `describe-function' EIEIO support.

=== modified file 'etc/FTP'
--- a/etc/FTP   2007-04-15 01:34:43 +0000
+++ b/etc/FTP   2014-01-10 02:44:51 +0000
@@ -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>.
-
-Information about Emacs is also available at
-<http://www.gnu.org/software/emacs/>.
-
+For information about how to download GNU Emacs, please see:
+<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.

=== modified file 'etc/ORDERS'
--- a/etc/ORDERS        2009-12-15 03:12:44 +0000
+++ b/etc/ORDERS        2014-01-10 02:44:51 +0000
@@ -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.
-
-For more information, see the online store at <http://shop.fsf.org/>.
-
-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/>.
+Printed copies of Emacs manuals
+
+Note added January 2014:
+
+This file is obsolete and will be removed in future.
+Please update any links to use
+  info node `(emacs)Printed Books'
+instead.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-09 20:31:21 +0000
+++ b/lisp/ChangeLog    2014-01-10 02:44:51 +0000
@@ -1,3 +1,7 @@
+2014-01-10  Glenn Morris  <address@hidden>
+
+       * help.el (view-order-manuals): Open emacs.info rather than ORDERS.
+
 2014-01-09  David Engster  <address@hidden>
 
        * emacs-lisp/eieio-custom.el:

=== modified file 'lisp/help.el'
--- a/lisp/help.el      2014-01-07 08:38:58 +0000
+++ b/lisp/help.el      2014-01-10 02:44:51 +0000
@@ -417,9 +417,10 @@
     (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."