diff options
| author | Glenn Morris | 2014-01-09 14:40:57 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-01-09 14:40:57 -0500 |
| commit | 1669fab91c67287fbfdf7d1ace8128b8a3df28bd (patch) | |
| tree | aeee7c8d015665b3f2ae522b23b4051df915f184 | |
| parent | 30b3bce202302800bee253d4f8a9eff801c8c81f (diff) | |
| download | emacs-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/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/trouble.texi | 5 | ||||
| -rw-r--r-- | doc/man/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 7 | ||||
| -rw-r--r-- | etc/ChangeLog | 2 | ||||
| -rw-r--r-- | etc/SERVICE | 4 |
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 @@ | |||
| 1 | 2014-01-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * trouble.texi (Service): Refer to online service directory | ||
| 4 | rather than etc/SERVICE. | ||
| 5 | |||
| 1 | 2014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de> | 6 | 2014-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 | |||
| 1198 | one you use.) | 1198 | one you use.) |
| 1199 | 1199 | ||
| 1200 | @item | 1200 | @item |
| 1201 | Look in the service directory for someone who might help you for a fee. | 1201 | Look in the @uref{http://www.fsf.org/resources/service/, service |
| 1202 | The service directory is found in the file named @file{etc/SERVICE} in the | 1202 | directory} for someone who might help you for a fee. |
| 1203 | Emacs 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 @@ | |||
| 1 | 2014-01-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.1: Refer to online service directory rather than etc/SERVICE. | ||
| 4 | |||
| 1 | 2013-08-31 Ulrich Müller <ulm@gentoo.org> | 5 | 2013-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 | |||
| 576 | of GNU Emacs. | 576 | of GNU Emacs. |
| 577 | They are stored here to reduce the size of Emacs proper. | 577 | They are stored here to reduce the size of Emacs proper. |
| 578 | 578 | ||
| 579 | /usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering | ||
| 580 | various services to assist users of GNU Emacs, including education, | ||
| 581 | troubleshooting, porting and customization. | ||
| 582 | . | 579 | . |
| 583 | . | 580 | . |
| 584 | .SH BUGS | 581 | .SH BUGS |
| @@ -597,8 +594,8 @@ easily reproduced. | |||
| 597 | Do not expect a personal answer to a bug report. | 594 | Do not expect a personal answer to a bug report. |
| 598 | The purpose of reporting bugs is to get them fixed for everyone | 595 | The purpose of reporting bugs is to get them fixed for everyone |
| 599 | in the next release, if possible. | 596 | in the next release, if possible. |
| 600 | For personal assistance, look in the SERVICE file (see above) for | 597 | For personal assistance, consult the service directory at |
| 601 | a list of people who offer it. | 598 | <http://www.fsf.org/resources/service/> for a list of people who offer it. |
| 602 | 599 | ||
| 603 | Please do not send anything but bug reports to this mailing list. | 600 | Please do not send anything but bug reports to this mailing list. |
| 604 | For more information about Emacs mailing lists, see the | 601 | 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 @@ | |||
| 1 | 2014-01-09 Glenn Morris <rgm@gnu.org> | 1 | 2014-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 | ||
| 5 | 2014-01-09 Rüdiger Sonderfeld <ruediger@c-plusplus.de> | 7 | 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 | |||
| 6 | GNU software, including GNU Emacs, for a fee or in some cases at no | 6 | GNU software, including GNU Emacs, for a fee or in some cases at no |
| 7 | charge. | 7 | charge. |
| 8 | 8 | ||
| 9 | 9 | Note added January 2014: | |
| 10 | This file is obsolete and will be removed in future. | ||
| 11 | Please update any links to use the above URL. | ||