summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-01-09 14:40:57 -0500
committerGlenn Morris <rgm@gnu.org>2014-01-09 14:40:57 -0500
commit1669fab91c67287fbfdf7d1ace8128b8a3df28bd (patch)
treeaeee7c8d015665b3f2ae522b23b4051df915f184
parent30b3bce202302800bee253d4f8a9eff801c8c81f (diff)
downloademacs-1669fab91c67287fbfdf7d1ace8128b8a3df28bd.tar.gz
Refer to online service directory rather than etc/SERVICE
* doc/emacs/trouble.texi (Service): * doc/man/emacs.1: Refer to online service directory rather than etc/SERVICE. * etc/SERVICE: Mark as obsolete.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/trouble.texi5
-rw-r--r--doc/man/ChangeLog4
-rw-r--r--doc/man/emacs.17
-rw-r--r--etc/ChangeLog2
-rw-r--r--etc/SERVICE4
6 files changed, 18 insertions, 9 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7f0ca7184e2..b91d9c3075c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-09 Glenn Morris <rgm@gnu.org>
+
+ * trouble.texi (Service): Refer to online service directory
+ rather than etc/SERVICE.
+
2014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
* building.texi (Lisp Libraries): Document `load-prefer-newer'.
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 137f2738b5b..eeb810fccb7 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1198,9 +1198,8 @@ mailing list and newsgroup interconnect, so it does not matter which
one you use.)
@item
-Look in the service directory for someone who might help you for a fee.
-The service directory is found in the file named @file{etc/SERVICE} in the
-Emacs distribution.
+Look in the @uref{http://www.fsf.org/resources/service/, service
+directory} for someone who might help you for a fee.
@end itemize
@ifnottex
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 6a299469bdb..37f765db00f 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-09 Glenn Morris <rgm@gnu.org>
+
+ * emacs.1: Refer to online service directory rather than etc/SERVICE.
+
2013-08-31 Ulrich Müller <ulm@gentoo.org>
* emacs.1: Update manual links.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 3078c29e25a..bd568a2e9da 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -576,9 +576,6 @@ strings for the Lisp primitives and preloaded Lisp functions
of GNU Emacs.
They are stored here to reduce the size of Emacs proper.
-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
-various services to assist users of GNU Emacs, including education,
-troubleshooting, porting and customization.
.
.
.SH BUGS
@@ -597,8 +594,8 @@ easily reproduced.
Do not expect a personal answer to a bug report.
The purpose of reporting bugs is to get them fixed for everyone
in the next release, if possible.
-For personal assistance, look in the SERVICE file (see above) for
-a list of people who offer it.
+For personal assistance, consult the service directory at
+<http://www.fsf.org/resources/service/> for a list of people who offer it.
Please do not send anything but bug reports to this mailing list.
For more information about Emacs mailing lists, see the
diff --git a/etc/ChangeLog b/etc/ChangeLog
index cae210efd23..b7cfd7e5353 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,5 +1,7 @@
2014-01-09 Glenn Morris <rgm@gnu.org>
+ * SERVICE: Mark as obsolete.
+
* MORE.STUFF: Replace contents with pointer to efaq.info.
2014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
diff --git a/etc/SERVICE b/etc/SERVICE
index 61a4b950cee..eed62ea60aa 100644
--- a/etc/SERVICE
+++ b/etc/SERVICE
@@ -6,4 +6,6 @@ people who have asked to be listed as offering support services for
GNU software, including GNU Emacs, for a fee or in some cases at no
charge.
-
+Note added January 2014:
+This file is obsolete and will be removed in future.
+Please update any links to use the above URL.