aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-09 14:40:57 -0500
committerGlenn Morris2014-01-09 14:40:57 -0500
commit1669fab91c67287fbfdf7d1ace8128b8a3df28bd (patch)
treeaeee7c8d015665b3f2ae522b23b4051df915f184
parent30b3bce202302800bee253d4f8a9eff801c8c81f (diff)
downloademacs-1669fab91c67287fbfdf7d1ace8128b8a3df28bd.tar.gz
emacs-1669fab91c67287fbfdf7d1ace8128b8a3df28bd.zip
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 @@
12014-01-09 Glenn Morris <rgm@gnu.org>
2
3 * trouble.texi (Service): Refer to online service directory
4 rather than etc/SERVICE.
5
12014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de> 62014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
2 7
3 * building.texi (Lisp Libraries): Document `load-prefer-newer'. 8 * 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
1198one you use.) 1198one you use.)
1199 1199
1200@item 1200@item
1201Look in the service directory for someone who might help you for a fee. 1201Look in the @uref{http://www.fsf.org/resources/service/, service
1202The service directory is found in the file named @file{etc/SERVICE} in the 1202directory} for someone who might help you for a fee.
1203Emacs distribution.
1204@end itemize 1203@end itemize
1205 1204
1206@ifnottex 1205@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 @@
12014-01-09 Glenn Morris <rgm@gnu.org>
2
3 * emacs.1: Refer to online service directory rather than etc/SERVICE.
4
12013-08-31 Ulrich Müller <ulm@gentoo.org> 52013-08-31 Ulrich Müller <ulm@gentoo.org>
2 6
3 * emacs.1: Update manual links. 7 * 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
576of GNU Emacs. 576of GNU Emacs.
577They are stored here to reduce the size of Emacs proper. 577They are stored here to reduce the size of Emacs proper.
578 578
579/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
580various services to assist users of GNU Emacs, including education,
581troubleshooting, porting and customization.
582. 579.
583. 580.
584.SH BUGS 581.SH BUGS
@@ -597,8 +594,8 @@ easily reproduced.
597Do not expect a personal answer to a bug report. 594Do not expect a personal answer to a bug report.
598The purpose of reporting bugs is to get them fixed for everyone 595The purpose of reporting bugs is to get them fixed for everyone
599in the next release, if possible. 596in the next release, if possible.
600For personal assistance, look in the SERVICE file (see above) for 597For personal assistance, consult the service directory at
601a list of people who offer it. 598<http://www.fsf.org/resources/service/> for a list of people who offer it.
602 599
603Please do not send anything but bug reports to this mailing list. 600Please do not send anything but bug reports to this mailing list.
604For more information about Emacs mailing lists, see the 601For 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 @@
12014-01-09 Glenn Morris <rgm@gnu.org> 12014-01-09 Glenn Morris <rgm@gnu.org>
2 2
3 * SERVICE: Mark as obsolete.
4
3 * MORE.STUFF: Replace contents with pointer to efaq.info. 5 * MORE.STUFF: Replace contents with pointer to efaq.info.
4 6
52014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de> 72014-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
6GNU software, including GNU Emacs, for a fee or in some cases at no 6GNU software, including GNU Emacs, for a fee or in some cases at no
7charge. 7charge.
8 8
9 9Note added January 2014:
10This file is obsolete and will be removed in future.
11Please update any links to use the above URL.