From 458dbf5e47e92a45d41d9485c55b8b8e58bb3cf2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 9 Jan 2014 21:44:51 -0500 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 8 +++++--- doc/emacs/emacs.texi | 5 ++++- etc/ChangeLog | 6 ++++++ etc/FTP | 11 +++++++---- etc/ORDERS | 16 ++++++---------- lisp/ChangeLog | 4 ++++ lisp/help.el | 5 +++-- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 1039dd522e5..29ed8fadd29 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,14 +1,16 @@ +2014-01-10 Glenn Morris + + * emacs.texi (Distrib): Add donate URL. Add anchor. + 2014-01-10 Rüdiger Sonderfeld - * 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 * emacs.texi: Add EWW. - * misc.texi (EWW): Document EWW. 2014-01-09 Glenn Morris diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 8ec4fb5880d..ca5520198f8 100644 --- 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 6395e28f005..24bd6cede5e 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,9 @@ +2014-01-10 Glenn Morris + + * ORDERS: Replace contents with pointer to emacs.info, mark obsolete. + + * FTP: Mark as obsolete. + 2014-01-09 David Engster * 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 @@ -For information about how to obtain GNU Emacs and other GNU software -by FTP, please see . +For information about how to download GNU Emacs, please see: + -Information about Emacs is also available at -. +For general GNU software downloading, please see + +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 3998fcae37b..1df755de9f5 100644 --- 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 . +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 . +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 666a7886a2b..0c1b111e3b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-01-10 Glenn Morris + + * help.el (view-order-manuals): Open emacs.info rather than ORDERS. + 2014-01-09 David Engster * emacs-lisp/eieio-custom.el: diff --git a/lisp/help.el b/lisp/help.el index 22d7007aa5e..f732cf385cd 100644 --- 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." -- 2.39.2