From: Glenn Morris Date: Sat, 6 Jul 2013 01:39:21 +0000 (-0700) Subject: Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan.h.d@swipnet.se X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1917 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4431e6d9b30062407a60897db58356a36cedf49f;p=emacs.git Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan.h.d@swipnet.se --- 4431e6d9b30062407a60897db58356a36cedf49f diff --cc doc/lispintro/ChangeLog index 4e6c2220f0d,de326f362c7..4182b6a3184 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@@ -1,3 -1,8 +1,8 @@@ -2013-07-05 Glenn Morris ++2013-07-06 Glenn Morris + + * emacs-lisp-intro.texi (Top): + Move WWW_GNU_ORG section outside @copying, update URL. + 2013-07-03 Glenn Morris * emacs-lisp-intro.texi (edebug): Fix cross-references. diff --cc doc/lispintro/emacs-lisp-intro.texi index 1479573e315,ebb82dab3f1..dafee51a020 --- a/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} +@end iftex +@ifnottex +Distributed with Emacs version @value{EMACSVER}. +@end ifnottex - @ifset WWW_GNU_ORG - @html -

The homepage for GNU Emacs is at - http://www.gnu.org/software/emacs/. -
To view this manual in other formats, click - here. - @end html - @end ifset @sp 1 Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software Foundation, Inc. diff --cc doc/lispref/ChangeLog index aab609b16ac,e9db215d588..af9ad5ccfe1 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,3 -1,7 +1,7 @@@ -2013-07-05 Glenn Morris ++2013-07-06 Glenn Morris + + * elisp.texi (Top): Move WWW_GNU_ORG section outside @copying. + 2013-07-03 Glenn Morris * debugging.texi (Debugging): diff --cc doc/misc/ChangeLog index e295b3de6c7,4f45fb44c6a..e4a66e19877 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,9 -1,34 +1,36 @@@ + 2013-07-06 Glenn Morris + + * mh-e.texi: Fix external links. + (Using This Manual): Printed elisp manuals no longer available. + -2013-07-04 Glenn Morris - + * 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. + -2013-07-03 Glenn Morris - + * 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 + + * texinfo.tex: Merge from gnulib. + +2013-07-03 Glenn Morris + * bovine.texi (top): * cc-mode.texi (AWK Mode Font Locking): * mh-e.texi (Preface): diff --cc doc/misc/eudc.texi index 5b06cc7f11a,0cb6714697a..747494ffbde --- a/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