Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan.h.d@swipnet.se

diff --cc doc/lispintro/ChangeLog
index 4e6c222,de326f3..4182b6a
--- 1/doc/lispintro/ChangeLog
--- 2/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@@ -1,3 -1,8 +1,8 @@@
 -2013-07-05  Glenn Morris  <rgm@gnu.org>
++2013-07-06  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs-lisp-intro.texi (Top):
+       Move WWW_GNU_ORG section outside @copying, update URL.
+ 
  2013-07-03  Glenn Morris  <rgm@gnu.org>
  
        * emacs-lisp-intro.texi (edebug): Fix cross-references.

diff --cc doc/lispintro/emacs-lisp-intro.texi
index 1479573,ebb82da..dafee51
--- 1/doc/lispintro/emacs-lisp-intro.texi
--- 2/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@@ -106,20 -226,7 +106,12 @@@
  This is an @cite{Introduction to Programming in Emacs Lisp}, for
  people who are not programmers.
  @sp 1
 +@iftex
  Edition @value{edition-number}, @value{update-date}
- @ifset WWW_GNU_ORG
- @html
- <p>The homepage for GNU Emacs is at
- <a href="http://www.gnu.org/software/emacs/">http://www.gnu.org/software/emacs/</a>.
- <br>To view this manual in other formats, click
- <a href="/software/emacs/emacs-lisp-intro/emacs-lisp-intro.html">here</a>.
- @end html
- @end ifset
 +@end iftex
 +@ifnottex
 +Distributed with Emacs version @value{EMACSVER}.
 +@end ifnottex
  @sp 1
  Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software
  Foundation, Inc.

diff --cc doc/lispref/ChangeLog
index aab609b,e9db215..af9ad5c
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,3 -1,7 +1,7 @@@
 -2013-07-05  Glenn Morris  <rgm@gnu.org>
++2013-07-06  Glenn Morris  <rgm@gnu.org>
+ 
+       * elisp.texi (Top): Move WWW_GNU_ORG section outside @copying.
+ 
  2013-07-03  Glenn Morris  <rgm@gnu.org>
  
        * debugging.texi (Debugging):

diff --cc doc/lispref/elisp.texi
Simple merge

diff --cc doc/misc/ChangeLog
index e295b3d,4f45fb4..e4a66e1
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,9 -1,34 +1,36 @@@
 -2013-07-04  Glenn Morris  <rgm@gnu.org>
 -
+ 2013-07-06  Glenn Morris  <rgm@gnu.org>
+ 
+       * mh-e.texi: Fix external links.
+       (Using This Manual): Printed elisp manuals no longer available.
+ 
 -2013-07-03  Glenn Morris  <rgm@gnu.org>
 -
+       * newsticker.texi (Overview): Update URL.
+ 
+       * nxml-mode.texi (Introduction): Update URL.
+ 
+       * org.texi (JavaScript support): Fix URL.
+ 
+       * wisent.texi (Wisent Overview): Remove incorrect, unnecessary uref.
+ 
+       * eudc.texi (CCSO PH/QI): Remove defunct URL.
+ 
+       * dbus.texi (Introspection): Update URL to a less defunct one.
+ 
+       * gnus.texi (Top): Restrict "Other related manuals" to info output.
+       (Foreign Groups): Use @indicateurl for examples.
+       (Direct Functions): Remove defunct URL.
+       (RSS): Update URL.
+ 
+       * gnus-faq.texi (FAQ 5-8, FAQ 6-3): Remove defunct URLs.
+       (FAQ 7-1): Update URL.
+ 
+       * pgg.texi (Top, Overview): Add note about obsolescence.
+ 
 +2013-07-03  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * texinfo.tex: Merge from gnulib.
 +
 +2013-07-03  Glenn Morris  <rgm@gnu.org>
 +
        * bovine.texi (top):
        * cc-mode.texi (AWK Mode Font Locking):
        * mh-e.texi (Preface):

diff --cc doc/misc/eudc.texi
index 5b06cc7,0cb6714..747494f
--- 1/doc/misc/eudc.texi
--- 2/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@@ -150,17 -154,21 +150,20 @@@ phone number, email, academic informati
  configured to.  Nowadays this system is not widely used.
  
  The system consists of two parts: a database server traditionally called
- @samp{qi} and a command-line client called @samp{ph}.  As of 2010, the
- code can still be downloaded from @url{http://www-dev.cites.uiuc.edu/ph/}.
- 
- The original command-line @samp{ph} client that comes with the
- @samp{ph/qi} distribution provides additional features like the
- possibility to communicate with the server in login-mode which makes it
- possible to change records in the database.  This is not implemented in
- EUDC.
+ @samp{qi} and a command-line client called @samp{ph}.
+ @ignore
+ Until 2010, the code could be downloaded from
+ @url{http://www-dev.cites.uiuc.edu/ph/}.
+ @end ignore
+ 
+ The original command-line @samp{ph} client that came with the
+ @samp{ph/qi} distribution provided additional features that are
+ not implemented in EUDC, like the possibility to communicate with the
+ server in login-mode, which made it possible to change records in the
+ database.
  
  
 -@node BBDB,  , CCSO PH/QI, Overview
 -@comment  node-name,  next,  previous,  up
 +@node BBDB
  @section BBDB
  
  BBDB is the @dfn{Big Brother's Insidious Database}, a package for Emacs

diff --cc doc/misc/gnus-faq.texi
Simple merge

diff --cc doc/misc/gnus.texi
Simple merge

diff --cc doc/misc/mh-e.texi
Simple merge

diff --cc doc/misc/wisent.texi
Simple merge