[Emacs-diffs] trunk r113294: Merge from emacs-24; up to r111382

[Glenn Morris]

------------------------------------------------------------
revno: 113294 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-07-05 18:39:21 -0700
message:
  Merge from emacs-24; up to r111382
modified:
  doc/lispintro/ChangeLog        changelog-20091113204419-o5vbwnq5f7feedwu-6128
  doc/lispintro/emacs-lisp-intro.texi 
emacslispintro.texi-20091113204419-o5vbwnq5f7feedwu-6143
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/elisp.texi         elisp.texi-20091113204419-o5vbwnq5f7feedwu-6176
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/dbus.texi             dbus.texi-20091113204419-o5vbwnq5f7feedwu-7963
  doc/misc/eudc.texi             eudc.texi-20091113204419-o5vbwnq5f7feedwu-6300
  doc/misc/gnus-faq.texi         
gnusfaq.texi-20091113204419-o5vbwnq5f7feedwu-6304
  doc/misc/gnus.texi             gnus.texi-20091113204419-o5vbwnq5f7feedwu-6305
  doc/misc/mh-e.texi             mhe.texi-20091113204419-o5vbwnq5f7feedwu-6311
  doc/misc/newsticker.texi       
newsticker.texi-20091113204419-o5vbwnq5f7feedwu-6312
  doc/misc/nxml-mode.texi        
nxmlmode.texi-20091113204419-o5vbwnq5f7feedwu-7838
  doc/misc/org.texi              org.texi-20091113204419-o5vbwnq5f7feedwu-6313
  doc/misc/pgg.texi              pgg.texi-20091113204419-o5vbwnq5f7feedwu-6315
  doc/misc/wisent.texi           wisent.texi-20121213044343-qrwu6ibrvum7tr3o-1

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2013-07-03 03:20:04 +0000
+++ b/doc/lispintro/ChangeLog   2013-07-06 01:39:21 +0000
@@ -1,3 +1,8 @@
+2013-07-06  Glenn Morris  <address@hidden>
+
+       * emacs-lisp-intro.texi (Top):
+       Move WWW_GNU_ORG section outside @copying, update URL.
+
 2013-07-03  Glenn Morris  <address@hidden>
 
        * emacs-lisp-intro.texi (edebug): Fix cross-references.

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi       2013-07-03 03:20:04 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi       2013-07-06 01:39:21 +0000
@@ -112,14 +112,6 @@
 @ifnottex
 Distributed with Emacs version @value{EMACSVER}.
 @end ifnottex
address@hidden WWW_GNU_ORG
address@hidden
-<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>.
address@hidden html
address@hidden ifset
 @sp 1
 Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software
 Foundation, Inc.
@@ -211,6 +203,15 @@
 @node Top
 @top An Introduction to Programming in Emacs Lisp
 
address@hidden WWW_GNU_ORG
address@hidden
+<p>The homepage for GNU Emacs is at
+<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+To view this manual in other formats, click
+<a href="/software/emacs/manual/eintr.html">here</a>.
address@hidden html
address@hidden ifset
+
 @insertcopying
 
 This master menu first lists each chapter and index; then it lists

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-07-03 03:20:04 +0000
+++ b/doc/lispref/ChangeLog     2013-07-06 01:39:21 +0000
@@ -1,3 +1,7 @@
+2013-07-06  Glenn Morris  <address@hidden>
+
+       * elisp.texi (Top): Move WWW_GNU_ORG section outside @copying.
+
 2013-07-03  Glenn Morris  <address@hidden>
 
        * debugging.texi (Debugging):

=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi    2013-03-16 22:08:22 +0000
+++ b/doc/lispref/elisp.texi    2013-07-06 01:39:21 +0000
@@ -97,16 +97,6 @@
 This is the @cite{GNU Emacs Lisp Reference Manual}
 @end ifnottex
 corresponding to Emacs version @value{EMACSVER}.
address@hidden WWW_GNU_ORG
address@hidden
-<p>The homepage for GNU Emacs is at
-<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
-For information on using Emacs, refer to
-the <a href="/software/emacs/manual/html_node/emacs/index.html">Emacs
-Manual</a>.<br>  To view this manual in other formats,
-click <a href="/software/emacs/manual/elisp.html">here</a>.
address@hidden html
address@hidden ifset
 
 Copyright @copyright{} 1990--1996, 1998--2013 Free Software Foundation, Inc.
 
@@ -167,6 +157,17 @@
 @node Top
 @top Emacs Lisp
 
address@hidden WWW_GNU_ORG
address@hidden
+<p>The homepage for GNU Emacs is at
+<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+For information on using Emacs, refer to the
+<a href="/software/emacs/manual/emacs.html">Emacs Manual</a>.<br>
+To view this manual in other formats, click
+<a href="/software/emacs/manual/elisp.html">here</a>.
address@hidden html
address@hidden ifset
+
 @insertcopying
 @end ifnottex
 

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-07-03 21:07:48 +0000
+++ b/doc/misc/ChangeLog        2013-07-06 01:39:21 +0000
@@ -1,3 +1,30 @@
+2013-07-06  Glenn Morris  <address@hidden>
+
+       * mh-e.texi: Fix external links.
+       (Using This Manual): Printed elisp manuals no longer available.
+
+       * 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  <address@hidden>
 
        * texinfo.tex: Merge from gnulib.

=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi        2013-01-01 09:11:05 +0000
+++ b/doc/misc/dbus.texi        2013-07-03 07:51:34 +0000
@@ -403,8 +403,11 @@
 The interface offers also a signal, which returns 2 parameters: an
 integer, and an array consisting of elements which are a struct of a
 string and 2 boolean address@hidden The interfaces of the service
address@hidden are described at
address@hidden://people.freedesktop.org/~david/hal-spec/hal-spec.html#interfaces}.}
address@hidden are described in
address@hidden Previous link is gone.  Since HAL is now obsolete, this URL
address@hidden (unchanged in ~ 4 years) feels like it might go too...
address@hidden://people.freedesktop.org/~dkukawka/hal-spec-git/hal-spec.html#interfaces,
+the HAL specification}.}
 @end defun
 
 @defun dbus-introspect-xml bus service path

=== modified file 'doc/misc/eudc.texi'
--- a/doc/misc/eudc.texi        2013-06-24 06:58:52 +0000
+++ b/doc/misc/eudc.texi        2013-07-06 01:39:21 +0000
@@ -150,14 +150,17 @@
 configured to.  Nowadays this system is not widely used.
 
 The system consists of two parts: a database server traditionally called
address@hidden 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/}.
address@hidden and a command-line client called @samp{ph}.
address@hidden
+Until 2010, the code could be downloaded from
address@hidden://www-dev.cites.uiuc.edu/ph/}.
address@hidden ignore
 
-The original command-line @samp{ph} client that comes with the
address@hidden/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.
+The original command-line @samp{ph} client that came with the
address@hidden/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

=== modified file 'doc/misc/gnus-faq.texi'
--- a/doc/misc/gnus-faq.texi    2013-03-07 10:24:23 +0000
+++ b/doc/misc/gnus-faq.texi    2013-07-06 01:39:21 +0000
@@ -1518,8 +1518,9 @@
 
 If you can't use compface, there's an online X-face converter at
 @uref{http://www.dairiki.org/xface/}.
-If you use MS Windows, you could also use the WinFace program from
address@hidden://www.xs4all.nl/~walterln/winface/}.
+If you use MS Windows, you could also use the WinFace program,
+which used to be available from
address@hidden://www.xs4all.nl/~walterln/winface/}.
 Now you only have to tell Gnus to include the X-face in your postings by saying
 
 @example
@@ -1812,15 +1813,20 @@
 Of course you can also use grep to search through your
 local mail, but this is both slow for big archives and
 inconvenient since you are not displaying the found mail
-in Gnus. Here comes nnir into action. Nnir is a front end
+in Gnus.  Here nnir comes into action.  Nnir is a front end
 to search engines like swish-e or swish++ and
-others. You index your mail with one of those search
+others.  You index your mail with one of those search
 engines and with the help of nnir you can search through
 the indexed mail and generate a temporary group with all
-messages which met your search criteria. If this sound
-cool to you get nnir.el from
+messages which met your search criteria.  If this sounds
+cool to you, get nnir.el from
address@hidden FIXME Isn't this file in Gnus?
address@hidden
address@hidden Dead link 2013/7.
 @uref{ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/emacs/}
-or @uref{ftp://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
+or
address@hidden ignore
address@hidden://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
 Instructions on how to use it are at the top of the file.
 
 @node FAQ 6-4
@@ -1943,7 +1949,7 @@
 @uref{http://infa.abo.fi/~patrik/sn/, sn},
 of course you can also install a full featured news
 server like
address@hidden://www.isc.org/products/INN/, inn}.
address@hidden://www.isc.org/software/inn/, inn}.
 Then you want to fetch your Mail, popular choices
 are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail}
 and @uref{http://pyropus.ca/software/getmail/, getmail}.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2013-07-02 10:38:58 +0000
+++ b/doc/misc/gnus.texi        2013-07-06 01:39:21 +0000
@@ -420,6 +420,9 @@
 * Index::                    Variable, function and concept index.
 * Key Index::                Key Index.
 
address@hidden Doesn't work right in html.
address@hidden FIXME Do this in a more standard way.
address@hidden
 Other related manuals
 
 * Message:(message).         Composing messages.
@@ -427,6 +430,7 @@
 * Sieve:(sieve).             Managing Sieve scripts in Emacs.
 * EasyPG:(epa).              @acronym{PGP/MIME} with Gnus.
 * SASL:(sasl).               @acronym{SASL} authentication in Emacs.
address@hidden ifinfo
 
 @detailmenu
  --- The Detailed Node Listing ---
@@ -2712,11 +2716,11 @@
 This command is similar to @code{gnus-read-ephemeral-gmane-group}, but
 the group name and the article number and range are constructed from a
 given @acronym{URL}.  Supported @acronym{URL} formats include:
address@hidden://thread.gmane.org/gmane.foo.bar/12300/focus=12399},
address@hidden://thread.gmane.org/gmane.foo.bar/12345/},
address@hidden://article.gmane.org/gmane.foo.bar/12345/},
address@hidden://permalink.gmane.org/gmane.foo.bar/12345/}, and
address@hidden://news.gmane.org/group/gmane.foo.bar/thread=12345}.
address@hidden://thread.gmane.org/gmane.foo.bar/12300/focus=12399},
address@hidden://thread.gmane.org/gmane.foo.bar/12345/},
address@hidden://article.gmane.org/gmane.foo.bar/12345/},
address@hidden://permalink.gmane.org/gmane.foo.bar/12345/}, and
address@hidden://news.gmane.org/group/gmane.foo.bar/thread=12345}.
 
 @item gnus-read-ephemeral-emacs-bug-group
 @findex gnus-read-ephemeral-emacs-bug-group
@@ -13809,9 +13813,12 @@
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
 Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have @uref{http://www.openssl.org, OpenSSL} or
address@hidden://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay} installed.  You
-then define a server as follows:
+this you must have @uref{http://www.openssl.org, OpenSSL}
address@hidden
address@hidden Defunct URL, ancient package, so don't mention it.
+or @uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay}
address@hidden ignore
+installed.  You then define a server as follows:
 
 @lisp
 ;; @r{"snews" is port 563 and is predefined in our @file{/etc/services}}
@@ -16953,7 +16960,7 @@
 @acronym{RSS} is a format for summarizing headlines from news related
 sites (such as BBC or CNN).  But basically anything list-like can be
 presented as an @acronym{RSS} feed: weblogs, changelogs or recent
-changes to a wiki (e.g., @url{http://cliki.net/recent-changes.rdf}).
+changes to a wiki (e.g., @url{http://cliki.net/site/recent-changes}).
 
 @acronym{RSS} has a quite regular and nice interface, and it's
 possible to get the information Gnus needs to keep groups updated.

=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi        2013-07-03 03:20:04 +0000
+++ b/doc/misc/mh-e.texi        2013-07-06 01:39:21 +0000
@@ -1121,38 +1121,23 @@
 @footnote{The @cite{GNU Emacs Lisp Reference Manual} may be available
 online in the Info system by typing @kbd{C-h i m Emacs Lisp
 @key{RET}}. It is also available online at @*
address@hidden://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
-You can also order a printed manual, which has the desirable
-side-effect of helping to support the Free Software Foundation which
-made all this great software available. You can find an order form by
-running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end iftex
 @ifinfo
 @address@hidden, The GNU Emacs Lisp Reference Manual, , elisp, GNU
 Emacs Lisp Reference Manual}, which may be available online in the
 Info system. It is also available online at
address@hidden://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
-You can also order a printed manual, which has the desirable
-side-effect of helping to support the Free Software Foundation which
-made all this great software available. You can find an order form by
-running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
address@hidden://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end ifinfo
 @ifhtml
 @footnote{The
address@hidden://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/,
address@hidden://www.gnu.org/software/emacs/manual/elisp.html,
 The GNU Emacs Lisp Reference Manual} may also be available online in
-the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}. You can
-also order a printed manual, which has the desirable side-effect of
-helping to support the Free Software Foundation which made all this
-great software available. You can find an order form by running
address@hidden C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}.}
 @end ifhtml
 and you can look at the code itself for examples. Look in the Emacs
 Lisp directory on your system (such as
address@hidden/usr/local/lib/emacs/lisp/mh-e}) and find all the @file{mh-*.el}
address@hidden/usr/local/share/emacs/lisp/mh-e}) and find all the @file{mh-*.el}
 files there. When calling MH-E and other Emacs Lisp functions directly
 from Emacs Lisp code, you'll need to know the correct arguments. Use
 the online help for this. For example, try @kbd{C-h f
@@ -2848,7 +2833,7 @@
 @end ifinfo
 @ifhtml
 See
address@hidden://www.dk.xemacs.org/Documentation/packages/html/pgg.html,
address@hidden://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
@@ -5058,7 +5043,7 @@
 @vindex mh-yank-behavior
 
 For example, if you use the hook function
address@hidden://shasta.cs.uiuc.edu/~lrclause/tc.html,
address@hidden://www.emacswiki.org/emacs/TrivialCite,
 @code{trivial-cite}} (which is NOT part of Emacs), set
 @code{mh-yank-behavior} to @samp{Body and Header}.
 
@@ -5615,7 +5600,7 @@
 @end ifinfo
 @ifhtml
 See
address@hidden://www.dk.xemacs.org/Documentation/packages/html/pgg.html,
address@hidden://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 

=== modified file 'doc/misc/newsticker.texi'
--- a/doc/misc/newsticker.texi  2013-01-01 09:11:05 +0000
+++ b/doc/misc/newsticker.texi  2013-07-04 01:55:25 +0000
@@ -89,7 +89,7 @@
 as well as the following Atom formats:
 @item Atom 0.3
 @item Atom 1.0 (see
address@hidden://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt}).
address@hidden://datatracker.ietf.org/doc/rfc4287/}).
 @end itemize
 
 That makes Newsticker.el an ``Atom aggregator'', ``RSS reader'', ``Feed

=== modified file 'doc/misc/nxml-mode.texi'
--- a/doc/misc/nxml-mode.texi   2013-01-01 09:11:05 +0000
+++ b/doc/misc/nxml-mode.texi   2013-07-04 01:53:56 +0000
@@ -86,7 +86,11 @@
 
 @noindent To convert a RELAX NG XML syntax (@samp{.rng}) schema to a RNC
 one, you can also use the XSLT stylesheet from
address@hidden://github.com/oleg-pavliv/emacs/tree/master/xsl}.
address@hidden
address@hidden Original location, now defunct.
 @url{http://www.pantor.com/download.html}.
address@hidden ignore
 
 To convert a W3C XML Schema to an RNC schema, you need first to convert it
 to RELAX NG XML syntax using the RELAX NG converter tool @code{rngconv}

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2013-02-28 06:30:48 +0000
+++ b/doc/misc/org.texi 2013-07-06 01:39:21 +0000
@@ -10393,7 +10393,7 @@
 script is available at @url{http://orgmode.org/org-info.js} and you can find
 the documentation for it at @url{http://orgmode.org/worg/code/org-info-js/}.
 We host the script at our site, but if you use it a lot, you might
-not want to be dependent on @url{orgmode.org} and prefer to install a local
+not want to be dependent on @url{http://orgmode.org} and prefer to install a 
local
 copy on your own web server.
 
 To use the script, you need to make sure that the @file{org-jsinfo.el} module

=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2013-01-06 10:34:26 +0000
+++ b/doc/misc/pgg.texi 2013-07-03 06:42:43 +0000
@@ -54,6 +54,8 @@
 PGG is an interface library between Emacs
 and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
+This package is obsolete; for new code we recommend EasyPG instead.
address@hidden,, EasyPG, epa, EasyPG Assistant User's Manual}.
 
 @ifnottex
 @insertcopying
@@ -78,6 +80,9 @@
 deal with detached PGP messages, normally used in PGP/MIME
 infrastructure.  This was the main reason why I wrote the new library.
 
+Note that the PGG library is now obsolete, replaced by EasyPG.
address@hidden,, EasyPG, epa, EasyPG Assistant User's Manual}.
+
 PGP/MIME is an application of MIME Object Security Services (RFC1848).
 The standard is documented in RFC2015.
 

=== modified file 'doc/misc/wisent.texi'
--- a/doc/misc/wisent.texi      2013-01-03 02:37:57 +0000
+++ b/doc/misc/wisent.texi      2013-07-06 01:39:21 +0000
@@ -113,9 +113,6 @@
 
 For more details on the basic concepts for understanding Wisent, it is
 worthwhile to read the @ref{Top, Bison Manual, , bison}.
address@hidden
address@hidden://www.gnu.org/manual/bison/html_node/index.html}.
address@hidden ifhtml
 
 Wisent can generate compilers compatible with the @semantic{} tool set.
 See the @ref{Top, Semantic Manual, , semantic}.