merge trunk

10 files changed, 77 insertions, 356 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d952550832e..7af5d65092f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,7 +1,27 @@
+2014-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * ORDERS: Replace contents with pointer to emacs.info, mark obsolete.
+
+        * FTP: Mark as obsolete.
+
+2014-01-09  David Engster  <deng@randomsample.de>
+
+        * NEWS: Added new `describe-function' EIEIO support.
+
+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>
+
+        * NEWS: Better document the speed up, slow down, or reverse
+        animation in Image Mode.
+
 2014-01-05  Tassilo Horn  <tsdh@gnu.org>
 
-        * themes/tsdh-light-theme.el (tsdh-light): Define org-level-*
-        faces.
+        * themes/tsdh-light-theme.el (tsdh-light): Define org-level-* faces.
 
 2013-12-29  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -2567,7 +2587,7 @@
         * refcards/calccard.ps, refcards/cs-dired-ref.ps:
         * refcards/cs-refcard.ps, refcards/de-refcard.ps, refcards/dired-ref.ps:
         * refcards/fr-drdref.ps, refcards/fr-refcard.ps:
-        * refcards/gnus-booklet.ps, refcards/gnus-logo.ps:
+        * refcards/gnus-booklet.ps:
         * refcards/gnus-refcard.ps, refcards/orgcard.ps, refcards/pl-refcard.ps:
         * refcards/pt-br-refcard.ps, refcards/refcard.ps:
         * refcards/ru-refcard.ps, refcards/sk-dired-ref.ps:
@@ -3107,7 +3127,7 @@
 
 2007-01-20  Glenn Morris  <rgm@gnu.org>
 
-        * cd-dired-ref.tex (versionemacs): New def.
+        * cs-dired-ref.tex (versionemacs): New def.
         * cs-refcard.tex (versionemacs, versionyear): New defs.
         * cs-survival.tex (versionemacs, versiondate): New defs.
         * de-refcard.tex (versionemacs, versionyear): New defs.
@@ -3286,10 +3306,6 @@
         * PROBLEMS (are): Emacs compiled with Gtk+ crashes when closing a
         display (x-close-connection).
 
-2006-09-03  Diane Murray  <disumu@x3y2z1.net>
-
-        * erc.texi (Getting Started, Connecting): Change erc-select to erc.
-
 2006-09-02  Juri Linkov  <juri@jurta.org>
 
         * HELLO: Regroup Europe Non-ASCII examples by similar scripts.
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 <http://www.gnu.org/order/ftp.html>.
+For information about how to download GNU Emacs, please see:
+<http://www.gnu.org/software/emacs/>
 
-Information about Emacs is also available at
-<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.
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS
index ec3ce3bc72f..0d5ce9bf6ce 100644
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@@ -19,24 +19,6 @@ gnu.emacs.help; gnu-emacs-sources, to gnu.emacs.sources.  Replacing
 `emacs' with some other program in those four examples shows you
 the whole pattern.
 
-If you don't know if your site is on USENET, ask your system
-administrator.  If you are a USENET site and don't get the gnu.all
-newsgroups, please ask your USENET administrator to get them.  If he has
-your feeds ask their feeds, you should win.  And everyone else wins:
-newsgroups make better use of the limited bandwidth of the computer
-networks and your home machine than mailing list traffic; and staying
-off the mailing lists make better use of the people who maintain the
-lists and the machines that the GNU people working with rms use (i.e. we
-have more time to produce code!!).  Thanx.
-
-* Getting the mailing lists directly
-
-If several users at your site or local network want to read a list and
-you aren't a USENET site, Project GNU would prefer that you would set up
-one address that redistributes locally.  This reduces overhead on our
-people and machines, your gateway machine, and the network(s) used to
-transport the mail from us to you.
-
 * How to subscribe to and report bugs in mailing lists
 
 Send requests to be added or removed, to help-gnu-emacs-request (or
@@ -48,8 +30,7 @@ If you need to report problems to a human, send mail to gnu@gnu.org
 explaining the problem.
 
 Many of the GNU mailing lists are very large and are received by many
-people.  Most are unmoderated, so please don't send them anything that
-is not seriously important to all their readers.
+people.
 
 If a message you mail to a list is returned from a MAILER-DAEMON (often
 with the line:
@@ -72,25 +53,11 @@ activities in Cambridge and elsewhere can be directed to:
 
 * General Information about all lists
 
-Please keep each message under 25,000 characters.  Some mailers bounce
-messages that are longer than this.  If your message is long, it is
-generally better to send a message offering to make the large file
-available to only those people who want it (e.g. mailing it to people
-who ask, or putting it up for FTP).  In the case of gnu.emacs.sources,
-somewhat larger postings (up to 10 parts of no more than 25,000
-characters each) are acceptable (assuming they are likely to be of
-interest to a reasonable number of people); if it is larger than that,
-put it in a web page and announce its URL.  Good bug reports are short.
+Do not send very large files to mailing lists; instead put then on a web
+page and announce the URL.  Good bug reports are short.
 See section '* General Information about bug-* lists and ...'  for
 further details.
 
-Most of the time, when you reply to a message sent to a list, the reply
-should not go to the list.  But most mail reading programs supply, by
-default, all the recipients of the original as recipients of the reply.
-Make a point of deleting the list address from the header when it does
-not belong.  This prevents bothering all readers of a list, and reduces
-network congestion.
-
 The GNU mailing lists and newsgroups, like the GNU project itself, exist
 to promote the freedom to share software.  So don't use these lists to
 promote or recommend non-free software or documentation, like
@@ -137,8 +104,8 @@ See section '* General Information about all lists'.
 
 If you think something is a bug in a program, it might be one; or, it
 might be a misunderstanding or even a feature.  Before beginning to
-report bugs, please read the section ``Reporting Emacs Bugs'' toward the
-end of the GNU Emacs reference manual (or node Emacs/Bugs in Emacs's
+report bugs, please read the section ``Reporting Bugs'' in
+the GNU Emacs reference manual (or node Bugs in Emacs's
 built-in Info system) for a discussion of how and when to send in bug
 reports.  For GNU programs other than GNU Emacs, also consult their
 documentation for their bug reporting procedures.  Always include the
@@ -168,7 +135,7 @@ overworked; they don't have time to help individuals and still fix the
 bugs and make the improvements that everyone wants.  If you want help
 for yourself in particular, you may have to hire someone.  The GNU
 project maintains a list of people providing such services.  It is
-found in <URL:http://www.gnu.org/prep/SERVICE>.
+found at <URL:http://www.fsf.org/resources/service>.
 
 Anything addressed to the implementers and maintainers of a GNU program
 via a bug-* list, should NOT be sent to the corresponding info-* or
@@ -234,48 +201,11 @@ unless they are made by someone you know is well connected with GNU and
 are sure the message is not forged.
 
 USENET and gnUSENET readers are expected to have read ALL the articles
-in news.announce.newusers before posting.  If news.announce.newusers is
-empty at your site, wait (the articles are posted monthly), your posting
-isn't that urgent!  Readers on the Internet can anonymous FTP these
-articles from host ftp.uu.net under directory ??
+in news.announce.newusers before posting.
 
 Remember, "GNUs Not Unix" and "gnUSENET is Not USENET".  We have
 higher standards!
 
-** guile-sources-request@gnu.org to subscribe to guile-sources
-
-gnUSENET newsgroup: NONE PLANNED
-Guile source code to: guile-sources@gnu.org
-
-This list will be for the posting, by their authors, of GUILE, Scheme,
-and C sources and patches that improve Guile.  Its contents will be
-reviewed by the FSF for inclusion in future releases of GUILE.
-
-Please do NOT discuss or request source code here.  Use bug-guile for
-those purposes.  This allows the automatic archiving of sources posted
-to this list.
-
-Please do NOT post such sources to any other GNU mailing list (e.g
-bug-guile) or gnUSENET newsgroups.  It's up to each poster to decide
-whether to cross-post to any non-gnUSENET newsgroup.
-
-Please do NOT announce that you have posted source code to guile.sources
-to any other GNU mailing list (e.g. bug-guile) or gnUSENET newsgroups.
-People who want to keep up with sources will read this list.  It's up to
-each poster to decide whether to announce a guile.sources article in any
-non-gnUSENET newsgroup (e.g. comp.emacs or comp.sources.d).
-
-If source or patches that were previously posted or a simple fix is
-requested in bug-guile, please mail it to the requester.  Do NOT
-repost it.  If you also want something that is requested, send mail to
-the requester asking him to forward it to you.  This kind of traffic is
-best handled by e-mail, not by a broadcast medium that reaches millions
-of sites.
-
-If the requested source is very long (>10k bytes) send mail offering to
-send it.  This prevents the requester from getting many redundant copies
-and saves network bandwidth.
-
 ** gnu-emacs-sources-request@gnu.org to subscribe to gnu-emacs-sources
 
 gnUSENET newsgroup: gnu.emacs.sources
@@ -293,14 +223,14 @@ automatic archiving of sources posted to this list/newsgroup.
 Please do NOT post such sources to any other GNU mailing list (e.g
 help-gnu-emacs) or gnUSENET newsgroups (e.g. gnu.emacs.help).  It's up
 to each poster to decide whether to cross-post to any non-gnUSENET
-newsgroup (e.g. comp.emacs or vmsnet.sources).
+newsgroup (e.g. comp.emacs).
 
 Please do NOT announce that you have posted source code to
 gnu.emacs.sources to any other GNU mailing list (e.g. help-gnu-emacs) or
 gnUSENET newsgroups (e.g. gnu.emacs.help).  People who want to keep up
 with sources will read this list/newsgroup.  It's up to each poster to
 decide whether to announce a gnu.emacs.sources article in any
-non-gnUSENET newsgroup (e.g. comp.emacs or comp.sources.d).
+non-gnUSENET newsgroup (e.g. comp.emacs).
 
 If source or patches that were previously posted or a simple fix is
 requested in help-gnu-emacs, please mail it to the requester.  Do NOT
@@ -309,7 +239,7 @@ the requester asking him to forward it to you.  This kind of traffic is
 best handled by e-mail, not by a broadcast medium that reaches millions
 of sites.
 
-If the requested source is very long (>10k bytes) send mail offering to
+If the requested source is very long, send mail offering to
 send it.  This prevents the requester from getting many redundant copies
 and saves network bandwidth.
 
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 2db1bac0f49..e3f2c1664c5 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,205 +1,8 @@
 More Neat Stuff for your Emacs
 
-Copyright (C) 1993, 1999, 2001-2014 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-The easiest way to add more features to your Emacs is to use the command
-M-x list-packages.  This contacts the server at <URL:http://elpa.gnu.org>,
-where many Emacs Lisp packages are stored.  These are distributed
-separately from Emacs itself for reasons of space, etc.  You can browse
-the resulting *Packages* buffer to see what is available, and then
-Emacs can automatically download and install the packages that you
-select.  See the section "Emacs Lisp Packages" in the Emacs manual
-for more details.
-
-Below we describe some GNU Emacs programs and resources that are
-maintained by other people.  Some of these may become part of the
-Emacs distribution, or GNU ELPA, in the future.  Others we unfortunately
-can't distribute, even though they are free software, because we lack
-legal papers for copyright purposes.
-
-Also listed are sites where development versions of some packages
-distributed with Emacs may be found.
-
-It is difficult to keep this file up-to-date, and it only lists a fraction
-of the Emacs modes that are available.  If you are interested in
-a particular feature, then after checking Emacs itself and GNU ELPA,
-a web search is often the best way to find results.
-
-* The gnu-emacs-sources mailing list
-  <URL:https://lists.gnu.org/mailman/listinfo/gnu-emacs-sources>
-  which is gatewayed to the gnu.emacs.sources newsgroup (although the
-  connection between the two can be unreliable) is an official
-  place where people can post or announce their extensions to Emacs.
-
-* The `Emacs Lisp List' at
-  <URL:http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html> has pointers
-  to sources of a large number of packages.  Unfortunately, at the time
-  of writing it seems to no longer be updating.
-
-* emacswiki.org
-  The Emacs Wiki has an area for storing elisp files
-  <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
-
-* WikEmacs
-  <URL:http://wikemacs.org> is an alternative wiki for Emacs.
-
-* Emacs slides and tutorials can be found here:
-   <URL:http://web.psung.name/emacs/>
-
-* Maintenance versions of some packages distributed with Emacs
-
-You might find bug-fixes or enhancements in these places.
-In many cases, however, development of these packages has shifted to Emacs,
-so you will find the latest version in Emacs.
-
- * Ada-mode: <URL:http://stephe-leake.org/emacs/ada-mode/emacs-ada-mode.html>
-
- * CC mode: <URL:http://cc-mode.sourceforge.net/>
-
- * CEDET: <URL:http://cedet.sourceforge.net/>
-
- * Gnus: <URL:http://www.gnus.org/>
-
- * MH-E: <URL:http://mh-e.sourceforge.net/>
-
- * nXML: <URL:http://www.thaiopensource.com/nxml-mode/>
-
- * Org mode: <URL:http://orgmode.org/>
-
- * Tramp: Remote file access via rsh/ssh
-   <URL:http://savannah.gnu.org/projects/tramp/>
-
-* GNU Zile: <URL:http://www.gnu.org/software/zile/>
-  A lightweight Emacs clone, for when you don't have room for Emacs proper.
-
-* Packages and add-ons not bundled with Emacs
-
-Various major packages or useful additions aren't distributed as part of
-Emacs for various reasons, sometimes because their authors haven't made
-a copyright assignment to the FSF.  Some of them may be integrated in
-the future.
-
-Your operating system distribution may include several of these as optional
-packages that you can install.
-
- * AUCTeX: <URL:http://www.gnu.org/software/auctex/>
-   An extensible package that supports writing and formatting TeX
-   files (including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX).
-   Includes Preview LaTeX: embed preview LaTeX images in source buffer.
-   Available from GNU ELPA.
-
- * BBDB: personal Info Rolodex integrated with mail/news:
-   <URL:http://savannah.nongnu.org/projects/bbdb>
-
- * Boxquote: <URL:http://www.davep.org/emacs/>
-
- * CJK-emacs: Converting MULE-encoded text to TeX:
-   <URL:ftp://ctan.tug.org/tex-archive/language/chinese/CJK/> and
-   mirrors of the `CTAN' TeX archives.
-
- * Dismal: spreadsheet:
-   <URL:http://ritter.ist.psu.edu/dismal/dismal.html>
-
- * ECB: Emacs Code Browser: <URL:http://ecb.sourceforge.net/>
-
- * EDB: database: <URL:http://www.gnuvola.org/software/edb/>
-
- * Ee: categorizing information manager:
-   <URL:http://www.jurta.org/en/emacs/ee/>
-
- * EMacro: <URL:http://emacro.sourceforge.net/>
-   EMacro is a portable configuration file that configures itself.
-
- * Emacs Muse: <URL:http://mwolson.org/projects/EmacsMuse.html>
-   An authoring and publishing environment for Emacs.
-   Available from GNU ELPA.
-
- * Emacs speaks statistics (ESS): statistical programming within Emacs
-   <URL:http://ess.r-project.org>
-
- * Emacspeak -- A Speech Output Subsystem For Emacs:
-   <URL:http://emacspeak.sourceforge.net/>
-
- * Emacs-w3m : <URL:http://emacs-w3m.namazu.org/>
-   A simple Emacs interface to w3m, which is a text-mode WWW browser
-
- * Emacs Wiki Mode: <URL:http://mwolson.org/projects/EmacsWikiMode.html>
-   A wiki-like publishing tool and personal information manager
-
- * Go in a buffer: Go Text Protocol client:
-   <URL:http://www.gnuvola.org/software/personal-elisp/dist/lisp/diversions/gnugo.el>
-   A modified version is also bundled with GNU Go:
-   <URL:http://www.gnu.org/software/gnugo/gnugo.html>
-
- * Hyperbole:
-   <URL:http://directory.fsf.org/wiki/Hyperbole>
-   Hyperbole is an open, efficient, programmable information
-   management and hypertext system.
-
- * JDEE: <URL:http://jdee.sourceforge.net/>
-   Provides a Java development environment for Emacs.
-
- * Mew: <URL:http://www.mew.org/>
-   A MIME mail reader for Emacs/XEmacs.
-
- * MMM Mode: <URL:http://mmm-mode.sourceforge.net/>
-   MMM Mode is an emacs add-on package providing a minor mode that
-   allows Multiple Major Modes to coexist in one buffer.
-
- * Planner Mode: <URL:http://www.wjsullivan.net/PlannerMode.html>
-   Planner is an organizer and day planner for Emacs.
-
- * Quack: <URL:http://www.neilvandyke.org/quack/>
-   Quack enhances Emacs support for Scheme.
-
- * QWE: <URL:http://www.nongnu.org/qwe/>
-   QWE's not WEB for Emacs is a quasi-WYSIWYG literate programming system for
-   Emacs that can be used with almost every programming language.
-
- * Session: <URL:http://emacs-session.sourceforge.net/>
-   Session Management for Emacs.
-
- * SLIME: The Superior Lisp Interaction Mode for Emacs:
-   <URL:http://common-lisp.net/project/slime/>
-
- * Tamago: Chinese/Japanese/Korean input method
-   <URL:http://www.m17n.org/tamago/index.en.html>
-   Emacs Lisp package to provide input methods for CJK characters.
-
- * Tiny Tools: <URL:https://savannah.nongnu.org/projects/emacs-tiny-tools>
-
- * VM (View Mail): Alternative mail reader
-   <URL:http://launchpad.net/vm>
-   Previously hosted at: <URL:http://www.nongnu.org/viewmail/>
-
- * W3 Web browser: <URL:http://savannah.gnu.org/projects/w3/>
-
- * Wanderlust: <URL:http://www.gohome.org/wl/>
-   Wanderlust is a mail/news reader for Emacs.
-
- * WhizzyTex: <URL:http://cristal.inria.fr/whizzytex/>
-   WhizzyTeX provides a minor mode for Emacs or XEmacs, a (bash)
-   shell-script daemon and some LaTeX macros.
-
-Local Variables:
-mode: text
-eval: (view-mode 1)
-eval: (goto-address-mode 1)
-End:
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+Note added January 2014:
 
+This file is obsolete and will be removed in future.
+Please update any links to use
+  info node `(efaq)Packages that do not come with Emacs'
+instead.
diff --git a/etc/NEWS b/etc/NEWS
index a17944c2abe..9817115918b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -168,11 +168,19 @@ non-nil, they output the same results.
 +++
 *** The key `?' now describes prefix bindings, like `C-h'.
 
+*** The command `describe-function' was extended for EIEIO.
+Running it on constructors will show a full description of the
+generated class.  For generic functions, it will show all
+implementations together with links to the source.  The old commands
+`describe-class', `describe-constructor' and `describe-generic' were
+removed.
+
 *** The command `quail-help' is deleted.  Use `C-h C-\'
 (`describe-input-method') instead.
 
 ** ImageMagick
 
++++
 *** ImageMagick images now support the :max-width and :max-height
 keywords.
 
@@ -241,6 +249,7 @@ etc.  You can customize this to specify a function that provides a
 default value from the regexp last history element, or from the symbol
 found at point.
 
++++
 *** `load-prefer-newer', affects how the `load' function chooses the
 file to load.  If this is non-nil, then when both .el and .elc
 versions of a file exist, and the caller did not explicitly specify
@@ -451,6 +460,7 @@ restoring the frame/window configuration (frameset).  Additional options
 `desktop-restore-in-current-display', `desktop-restore-reuses-frames'
 and `desktop-restore-forces-onscreen' offer further customization.
 
++++
 ** Dired
 
 *** New minor mode `dired-hide-details-mode' hides details.
@@ -573,11 +583,17 @@ will revert to the old behavior.
 visit the next image file and the previous image file in the same
 directory, respectively.
 
++++
 *** New commands to show specific frames of multi-frame images.
 `f' (`image-next-frame') and `b' (`image-previous-frame') visit the
 next or previous frame.  `F' (`image-goto-frame') shows a specific frame.
 
++++
 *** New commands to speed up, slow down, or reverse animation.
+`a +' (`image-increase-speed') and `a -' (`image-decrease-speed') to
+speed up and slow down the animation.  `a r' (`image-reverse-speed')
+to reverse it and `a 0' (`image-reset-speed') to reset it.
+
 ---
 *** The command `image-mode-fit-frame' deletes other windows.
 When toggling, it restores the frame's previous window configuration.
@@ -880,6 +896,7 @@ has not been relevant for some time.
 
 * New Modes and Packages in Emacs 24.4
 
++++
 ** New package `eww' is a built-in web browser.
 It is only available if Emacs is compiled with libxml2 support.
 
@@ -888,6 +905,7 @@ It is only available if Emacs is compiled with libxml2 support.
 symbol_words as a single word, similar to what `subword-mode' does and
 using the same internal functions.
 
++++
 ** New package nadvice.el offers lighter-weight advice facilities.
 It is layered as:
 - add-function/remove-function which can be used to add/remove code on any
@@ -1087,7 +1105,7 @@ displaying the buffer in a window.
 *** `hash-table-keys'
 +++
 *** `hash-table-values'
-
+---
 *** `string-blank-p`
 *** `string-empty-p`
 *** `string-join`
@@ -1126,6 +1144,7 @@ a non-nil `interactive-only' property.
 The value, if non-nil, is a regexp that specifies what to trim from
 the start and end of each substring.
 
++++
 ** New function `string-suffix-p'.
 
 ** File-handling changes
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 <http://shop.fsf.org/>.
+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 <https://my.fsf.org/donate/>.
+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/etc/ORG-NEWS b/etc/ORG-NEWS
index a0ed5c9e338..c74506ce3ac 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1062,7 +1062,7 @@ See http://orgmode.org/elpa/
    | =k=             |        | [[doc::org-agenda-capture][org-agenda-capture]]          |
    | C-c ,           | ,      | [[doc::org-priority][org-priority]]                |
 
-** New package and Babel langage
+** New package and Babel language
 
 *** =org-eshell.el= by Konrad Hinsen is now in Org
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 6e7fe7d18ce..c3e172ec119 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -357,25 +357,6 @@ The solution is to use gawk (GNU awk).
 
 ** Problems with hostname resolution
 
-*** Emacs fails to understand most Internet host names, even though
-the names work properly with other programs on the same system.
-*** Emacs won't work with X-windows if the value of DISPLAY is HOSTNAME:0.
-*** Gnus can't make contact with the specified host for nntp.
-
-This typically happens on Suns and other systems that use shared
-libraries.  The cause is that the site has installed a version of the
-shared library which uses a name server--but has not installed a
-similar version of the unshared library which Emacs uses.
-
-The result is that most programs, using the shared library, work with
-the nameserver, but Emacs does not.
-
-The fix is to install an unshared library that corresponds to what you
-installed in the shared library, and then relink Emacs.
-
-If you have already installed the name resolver in the file libresolv.a,
-then you need to compile Emacs to use that library.
-
 *** Emacs does not know your host's fully-qualified domain name.
 
 For example, (system-name) returns some variation on
@@ -499,13 +480,6 @@ ftp client.  On a Debian system, type
 
 and then choose /usr/bin/netkit-ftp.
 
-*** JPEG images aren't displayed.
-
-This has been reported when Emacs is built with jpeg-6a library.
-Upgrading to jpeg-6b solves the problem.  Configure checks for the
-correct version, but this problem could occur if a binary built
-against a shared libjpeg is run on a system with an older version.
-
 *** Dired is very slow.
 
 This could happen if invocation of the `df' program takes a long
@@ -570,13 +544,6 @@ to work around the problem.
 
 Please refer to the documentation of your dynamic linker for details.
 
-*** You request inverse video, and the first Emacs frame is in inverse
-video, but later frames are not in inverse video.
-
-This can happen if you have an old version of the custom library in
-your search path for Lisp packages.  Use M-x list-load-path-shadows to
-check whether this is true.  If it is, delete the old custom library.
-
 *** When you run Ispell from Emacs, it reports a "misalignment" error.
 
 This can happen if you compiled the Ispell program to use ASCII
@@ -674,20 +641,6 @@ This is because these fonts contain characters a little taller than
 the font's nominal height.  Emacs needs to make sure that lines do not
 overlap.
 
-** Loading fonts is very slow.
-
-You might be getting scalable fonts instead of precomputed bitmaps.
-Known scalable font directories are "Type1" and "Speedo".  A font
-directory contains scalable fonts if it contains the file
-"fonts.scale".
-
-If this is so, re-order your X windows font path to put the scalable
-font directories last.  See the documentation of `xset' for details.
-
-With some X servers, it may be necessary to take the scalable font
-directories out of your path entirely, at least for Emacs 19.26.
-Changes in the future may make this unnecessary.
-
 ** Font Lock displays portions of the buffer in incorrect faces.
 
 By far the most frequent cause of this is a parenthesis `(' or a brace
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.
diff --git a/etc/echo.msg b/etc/echo.msg
index 00a94b7ae97..53d051f85ef 100644
--- a/etc/echo.msg
+++ b/etc/echo.msg
@@ -69,7 +69,7 @@ DESCRIPTION
 
      -i   emulate IBM OS/VU (recursive universes not supported)
 
-     -I   emulate IBM VTOS 3.7.6 (chronosynclastic infundibulae
+     -I   emulate IBM VTOS 3.7.6 (chronosynclastic infundibula
           supported with restrictions documented in IBM VTOS
 
 
@@ -207,4 +207,3 @@ AUTHOR
 
 
 Printed 10/28/85         18 January 1983                        3
-