merge from trunk

1 files changed, 144 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 1ca638bb7fe..d756f4fd0f0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,144 @@
+2013-01-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * ada-mode.texi: Remove braces from @title argument.
+        * eudc.texi: Likewise.
+        * smtpmail.texi: Likewise.
+        * auth.texi (VERSION): Set before first use.
+        * emacs-gnutls.texi (VERSION): Likewise.
+        * pgg.texi (VERSION): Likewise.
+        * ede.texi (Top): Rename from top, all uses changed.
+        * eshell.texi: Add missing argument to @sp.
+        * forms.texi (Top): Reorder menu to match structure.
+        * htmlfontify.texi (Customisation): Add missing @item in
+        @enumerate.
+        * org.texi (Advanced features): Add missing argument for @item.
+        (Property searches): Use @backslashchar{} in macro argument.
+        * pcl-cvs.texi: Add missing argument to @sp.
+        (Movement commands): Fix use of @itemx.
+        * vip.texi (Misc Commands, Viewing the Buffer): Likewise.
+        * reftex.texi (Options (Creating Citations)): Add missing newline
+        before @end.
+        * tramp.texi (Obtaining Tramp): Remove extra dots.
+        (Configuration): Reorder menu to match structure.
+        (Remote shell setup): Replace literal NUL character by \0.
+        * viper.texi (Marking): Add missing argument for @item.
+
+2013-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS):
+        Add htmlfontify.
+        (htmlfontify, $(buildinfodir)/htmlfontify$(INFO_EXT))
+        (htmlfontify.dvi, htmlfontify.pdf): New targets.
+        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add htmlfontify.
+        ($(infodir)/htmlfontify$(INFO_EXT), htmlfontify.dvi): New targets.
+
+        * htmlfontify.texi: Miscellaneous fixes and updates.
+        Set copyright to FSF, update license to GFDL 1.3+.
+
+2013-01-04  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * htmlfontify.texi: New file.
+
+2013-01-02  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Free-Form Dates): Expand on the date reading
+        algorithm.
+
+2012-12-27  Glenn Morris  <rgm@gnu.org>
+
+        * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings):
+        Avoid some overfull lines.
+
+        * widget.texi (Programming Example): Break some long lines.
+
+        * wisent.texi (Wisent Overview): Fix xref.
+        (Grammar format, Understanding the automaton): Avoid overfill.
+
+        * bovine.texi (Optional Lambda Expression): Allow line break.
+
+        * auth.texi (Help for users): Break long lines.
+
+        * ada-mode.texi (Project file variables):
+        Reword to reduce underfull hbox.
+        (No project files, Use GNAT project file):
+        Use smallexample to make some overfull lines less terrible.
+
+        * autotype.texi, bovine.texi, ede.texi, eieio.texi, pcl-cvs.texi:
+        Fix cross-references to separate manuals.
+
+        * Makefile.in (gfdl): New variable.  Use throughout where
+        appropriate so that targets depend on doclicense.texi.
+
+2012-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Customizing the IMAP Connection): Mention the other
+        authenticators.
+
+2012-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Browse Foreign Server): Document
+        `gnus-browse-delete-group'.
+
+2012-12-22  Glenn Morris  <rgm@gnu.org>
+
+        * ada-mode.texi, ebrowse.texi, ediff.texi, ert.texi, eshell.texi:
+        * eudc.texi, idlwave.texi, pcl-cvs.texi, rcirc.texi, reftex.texi:
+        * remember.texi, ses.texi, speedbar.texi, vip.texi, viper.texi:
+        * widget.texi, wisent.texi: Nuke hand-written node pointers.
+
+        * Makefile.in (gfdl): New variable.  Use throughout where
+        appropriate so that targets depend on doclicense.texi.
+
+2012-12-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(INFO_TARGETS), $(DVI_TARGETS)): Depend on
+        doclicense.texi.  Remove doclicense.texi from all targets that
+        mentioned it explicitly.
+        ($(infodir)/woman$(INFO_EXT), woman.dvi): Depend on
+        $(emacsdir)/emacsver.texi.
+        ($(infodir)/erc$(INFO_EXT), erc.dvi): Don't depend on gpl.texi.
+
+2012-12-21  Glenn Morris  <rgm@gnu.org>
+
+        * woman.texi (UPDATED, VERSION): Remove in favor of EMACSVER.
+        Include emacsver.texi.  Nuke hand-written node pointers.
+        * Makefile.in ($(buildinfodir)/woman$(INFO_EXT), woman.dvi, woman.pdf):
+        Depend on emacsver.texi.
+
+        * auth.texi, emacs-gnutls.texi, epa.texi, ert.texi:
+        * gnus-coding.texi, info.texi, nxml-mode.texi, sasl.texi:
+        May as well just include doclicense.texi in everything.
+
+        * ede.texi, eieio.texi, mairix-el.texi: Include a copy of GFDL,
+        which @copying says is included.
+
+        * ada-mode.texi, auth.texi, autotype.texi, bovine.texi, calc.texi:
+        * cc-mode.texi, cl.texi, dbus.texi, dired-x.texi, ebrowse.texi:
+        * ede.texi, ediff.texi, edt.texi, eieio.texi, emacs-gnutls.texi:
+        * emacs-mime.texi, epa.texi, erc.texi, ert.texi, eshell.texi:
+        * eudc.texi, flymake.texi, forms.texi, gnus-coding.texi, gnus.texi:
+        * idlwave.texi, info.texi, mairix-el.texi, message.texi, mh-e.texi:
+        * newsticker.texi, nxml-mode.texi, pcl-cvs.texi, pgg.texi:
+        * rcirc.texi, reftex.texi, remember.texi, sasl.texi, sc.texi:
+        * semantic.texi, ses.texi, sieve.texi, smtpmail.texi, speedbar.texi:
+        * srecode.texi, tramp.texi, url.texi, vip.texi, viper.texi:
+        * widget.texi, wisent.texi, woman.texi: Do not mention buying
+        copies from the FSF, which does not publish these manuals.
+
+        * erc.texi: No need to include gpl in this small manual.
+
+        * org.texi (copying): Include a copy of the GFDL.
+        (GNU Free Documentation License): New section.
+
+2012-12-21  Bastien Guerry  <bzg@gnu.org>
+
+        * org.texi: Fix typos.
+
+2012-12-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * calc.texi (ISO 8601): Rename from ISO-8601,
+        as it's typically spelled without a hyphen.
+
 2012-12-16  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (ISO-8601): New section.
@@ -435,7 +576,7 @@
         * org.texi (Moving subtrees): Document the ability to archive to a
         datetree.
 
-2012-09-30  Bastien Guerry  <bzg@altern.org>
+2012-09-30  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Installation, Feedback, Batch execution): Use
         (add-to-list 'load-path ... t) for the contrib dir.
@@ -1041,7 +1182,7 @@
 
         * org.texi: Edit :noweb no header argument for correctness.
 
-2012-04-01  Bastien Guerry  <bzg@altern.org>
+2012-04-01  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Customization): Update the approximate number of Org
         variables.
@@ -9812,7 +9953,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.