Merge from mainline.

51 files changed, 5872 insertions, 821 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 73de1ce2920..7ff13a70718 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -2,6 +2,49 @@
 
         * maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
 
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+        * xresources.texi (Motif Resources):
+        Rename from LessTif Resources.  Update xrefs.  (Bug#15145)
+        * emacs.texi: Update menu.
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-17  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * text.texi (Enriched Justification): Minor fixes.
+
+2013-08-14  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * files.texi (Filesets): Add an index.
+
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * macos.texi (GNUstep Support):
+        * trouble.texi (Checklist, Contributing, Service):
+        Avoid mailto: in html output.
+
+        * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
+        (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
+        (INSTALL_DATA): New, set by configure.
+        (HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
+        New variables.
+        (.SUFFIXES): Add .ps and .dvi.
+        (.dvi.ps): New suffix rule.
+        (dvi, html, pdf, ps): Use *_TARGETS variables.
+        (emacs.ps, emacs-xtra.ps): Remove explicit rules.
+        (emacs.html): Use HTML_OPTS.
+        (clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
+        (.PHONY): install-dvi, install-html, install-pdf, install-ps
+        ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
+        uninstall-ps, and uninstall-doc.
+        (install-dvi, install-html, install-pdf, install-ps, install-doc)
+        (uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
+        (uninstall-doc): New rules.
+
 2013-07-31  Eli Zaretskii  <eliz@gnu.org>
 
         * emacs.texi (Top): Remove menu item for the removed "Disabling
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 32bb39b127a..bf9f8152ad4 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
@@ -38,8 +38,22 @@ buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
+prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+docdir = @docdir@
+dvidir = @dvidir@
+htmldir = @htmldir@
+pdfdir = @pdfdir@
+psdir = @psdir@
+
 MKDIR_P = @MKDIR_P@
 
+GZIP_PROG = @GZIP_PROG@
+
+HTML_OPTS = --no-split --html
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 # --no-split is only needed because of MS-DOS.
@@ -47,6 +61,9 @@ INFO_EXT=@INFO_EXT@
 # http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
 INFO_OPTS=@INFO_OPTS@
 
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
 MAKEINFO = @MAKEINFO@
@@ -60,6 +77,10 @@ DVIPS = dvips
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
+DVI_TARGETS = emacs.dvi emacs-xtra.dvi
+HTML_TARGETS = emacs.html
+PDF_TARGETS = emacs.pdf emacs-xtra.pdf
+PS_TARGETS = emacs.ps emacs-xtra.ps
 
 EMACS_XTRA= \
         ${srcdir}/emacs-xtra.texi \
@@ -128,11 +149,16 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
 
 .PHONY: info dvi html pdf ps
 
+.SUFFIXES: .ps .dvi
+
+.dvi.ps:
+        $(DVIPS) -o $@ $<
+
 info: $(buildinfodir)/emacs$(INFO_EXT)
-dvi: emacs.dvi
-html: emacs.html
-pdf: emacs.pdf
-ps: emacs.ps
+dvi: $(DVI_TARGETS)
+html: $(HTML_TARGETS)
+pdf: $(PDF_TARGETS)
+ps: $(PS_TARGETS)
 
 # Note that all the Info targets build the Info files in srcdir.
 # There is no provision for Info files to exist in the build directory.
@@ -145,21 +171,15 @@ $(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES}
 emacs.dvi: ${EMACSSOURCES}
         $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
 
-emacs.ps: emacs.dvi
-        $(DVIPS) -o $@ emacs.dvi
-
 emacs.pdf: ${EMACSSOURCES}
         $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
 
 emacs.html: ${EMACSSOURCES}
-        $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs.texi
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs.texi
 
 emacs-xtra.dvi: $(EMACS_XTRA)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
 
-emacs-xtra.ps: emacs-xtra.dvi
-        $(DVIPS) -o $@ emacs-xtra.dvi
-
 emacs-xtra.pdf: $(EMACS_XTRA)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi
 
@@ -172,9 +192,7 @@ mostlyclean:
 
 ## Products not in the release tarfiles.
 clean: mostlyclean
-        rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \
-          emacs.ps emacs-xtra.ps
-        rm -rf emacs.html/
+        rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
         rm -f emacs-manual-${version}.tar*
 
 distclean: clean
@@ -207,4 +225,52 @@ dist:
         tar -cf emacs-manual-${version}.tar emacs-manual-${version}
         rm -rf emacs-manual-${version}
 
+
+.PHONY: install-dvi install-html install-pdf install-ps install-doc
+
+install-dvi: dvi
+        umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
+        $(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
+install-html: html
+        umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
+        $(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
+install-pdf: pdf
+         umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
+        $(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
+install-ps: ps
+        umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
+        for file in $(PS_TARGETS); do \
+          $(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
+          [ -n "${GZIP_PROG}" ] || continue; \
+          rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
+          ${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
+        done
+
+## Top-level Makefile installs the info pages.
+install-doc: install-dvi install-html install-pdf install-ps
+
+
+.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
+
+uninstall-dvi:
+        for file in $(DVI_TARGETS); do \
+          rm -f $(DESTDIR)$(dvidir)/$${file}; \
+        done
+uninstall-html:
+        for file in $(HTML_TARGETS); do \
+          rm -f $(DESTDIR)$(htmldir)/$${file}; \
+        done
+uninstall-ps:
+        ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
+        for file in $(PS_TARGETS); do \
+          rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
+        done
+uninstall-pdf:
+        for file in $(PDF_TARGETS); do \
+          rm -f $(DESTDIR)$(pdfdir)/$${file}; \
+        done
+
+uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
+
+
 ### Makefile ends here
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 8a518b82abb..985466810f2 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1189,7 +1189,7 @@ X Options and Resources
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 
 GTK resources
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 7daeca3bf38..bff0926f347 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1982,6 +1982,7 @@ thumbnails.  @xref{Image-Dired}.
 @node Filesets
 @section Filesets
 @cindex filesets
+@cindex sets of files
 
 @findex filesets-init
   If you regularly edit a certain group of files, you can define them
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 43441c20814..e4693a5293f 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -873,6 +873,7 @@ The Emacs major modes are a mutually exclusive set of options, each of
 which configures Emacs for editing a certain sort of text.  Ideally,
 each programming language has its own major mode.  @xref{Major Modes}.
 
+@c FIXME: Mention margins for filling?
 @item Margin
 The space between the usable part of a window (including the
 fringe) and the window edge.
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 051bfe3eae8..cb33327faa1 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -109,6 +109,8 @@ number of characters.  If the numeric argument is omitted or one, they
 delete all the text in the region if it is active (@pxref{Using
 Region}).
 
+@c FIXME: `cycle-spacing' should be documented, too.  (Maybe not in
+@c this node, tho.)  --xfq
 @kindex M-\
 @findex delete-horizontal-space
 @kindex M-SPC
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 61c056ceb4b..50a7ea2c335 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -210,4 +210,10 @@ restart Emacs to access newly-available services.
 
 Emacs can be built and run under GNUstep, but there are still
 issues to be addressed.  Interested developers should contact
+@ifnothtml
 @email{emacs-devel@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index d50a841d509..e5743b064fb 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2255,6 +2255,7 @@ Prefix}.
 
 @node Enriched Justification
 @subsection Justification in Enriched Text
+@cindex justification style
 
   In Enriched mode, you can use the following commands to specify
 various @dfn{justification styles} for filling.  These commands apply
@@ -2293,13 +2294,13 @@ commands do nothing on text with this setting.  You can, however,
 still indent the left margin.
 @end table
 
+@c FIXME: We should explain the effect of these symbols.  --xfq
 @vindex default-justification
   You can also specify justification styles using the Justification
-submenu in the Text Properties menu.
-  The default justification style is specified by the per-buffer
-variable @code{default-justification}.  Its value should be one of the
-symbols @code{left}, @code{right}, @code{full}, @code{center}, or
-@code{none}.
+submenu in the Text Properties menu.  The default justification style
+is specified by the per-buffer variable @code{default-justification}.
+Its value should be one of the symbols @code{left}, @code{right},
+@code{full}, @code{center}, or @code{none}.
 
 @node Enriched Properties
 @subsection Setting Other Text Properties
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index d0b6b5191c1..0d5ce6820c7 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -658,7 +658,13 @@ absolutely sure it is best to leave it, so that the developers can
 decide for themselves.
 
 When you have finished writing your report, type @kbd{C-c C-c} and it
-will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
+will be sent to the Emacs maintainers at
+@ifnothtml
+@email{bug-gnu-emacs@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}.
+@end ifhtml
 (If you want to suggest an improvement or new feature, use the same
 address.)  If you cannot send mail from inside Emacs, you can copy the
 text of your report to your normal mail client (if your system
@@ -1138,15 +1144,26 @@ form that is clearly safe to install.
 @section Contributing to Emacs Development
 @cindex contributing to Emacs
 
-If you would like to work on improving Emacs, please contact
-the maintainers at @email{emacs-devel@@gnu.org}.  You can ask for
-suggested projects or suggest your own ideas.
+If you would like to work on improving Emacs, please contact the maintainers at
+@ifnothtml
+@email{emacs-devel@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml
+You can ask for suggested projects or suggest your own ideas.
 
 If you have already written an improvement, please tell us about it.  If
 you have not yet started work, it is useful to contact
-@email{emacs-devel@@gnu.org} before you start; it might be
-possible to suggest ways to make your extension fit in better with the
-rest of Emacs.
+@ifnothtml
+@email{emacs-devel@@gnu.org}
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel}
+@end ifhtml
+before you start; it might be possible to suggest ways to make your
+extension fit in better with the rest of Emacs.
 
 The development version of Emacs can be downloaded from the
 repository where it is actively maintained by a group of developers.
@@ -1164,10 +1181,17 @@ ways to find it:
 
 @itemize @bullet
 @item
-Send a message to the mailing list
-@email{help-gnu-emacs@@gnu.org}, or post your request on
-newsgroup @code{gnu.emacs.help}.  (This mailing list and newsgroup
-interconnect, so it does not matter which one you use.)
+Send a message to
+@ifnothtml
+the mailing list @email{help-gnu-emacs@@gnu.org},
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the
+help-gnu-emacs mailing list},
+@end ifhtml
+or post your request on newsgroup @code{gnu.emacs.help}.  (This
+mailing list and newsgroup interconnect, so it does not matter which
+one you use.)
 
 @item
 Look in the service directory for someone who might help you for a fee.
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 3723c8e5e1d..b2ebf634ba0 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -27,7 +27,7 @@ system registry (@pxref{MS-Windows Registry}).
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 @end menu
 
@@ -260,7 +260,7 @@ compiled with GTK+ support.
 @ifnottex
 @item @code{selectionFont} (class @code{SelectionFont})
 Font name for pop-up menu items, in non-toolkit versions of Emacs.  (For
-toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif
+toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
 Resources}.)
 
 @item @code{selectionTimeout} (class @code{SelectionTimeout})
@@ -370,15 +370,15 @@ elements.  Default is 1.
 Margin of the menu bar, in characters.  Default is 1.
 @end table
 
-@node LessTif Resources
-@appendixsec LessTif Menu X Resources
-@cindex Menu X Resources (LessTif widgets)
-@cindex LessTif Widget X Resources
+@node Motif Resources
+@appendixsec Motif Menu X Resources
+@cindex Menu X Resources (Motif widgets)
+@cindex Motif Widget X Resources
 
-  If Emacs is compiled with the X toolkit support using LessTif or
-Motif widgets, you can use X resources to customize the appearance of
-the menu bar, pop-up menus, and dialog boxes.  However, the resources
-are organized differently from Lucid widgets.
+  If Emacs is compiled with the X toolkit support using Motif or
+LessTif widgets, you can use X resources to customize the appearance
+of the menu bar, pop-up menus, and dialog boxes.  However, the
+resources are organized differently from Lucid widgets.
 
   The resource names for the menu bar are in the @samp{pane.menubar}
 class, and they must be specified in this form:
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 481eb0c9db8..ec082eecb52 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,50 @@
+2013-09-01  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (beginning-of-buffer complete):
+        Put back a version of the removed paragraph about raw prefix arg.
+
+2013-09-01  Dani Moncayo  <dmoncayo@gmail.com>
+
+        * emacs-lisp-intro.texi (beginning-of-buffer complete):
+        Update function details.  (Bug#15085)
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (Complete copy-region-as-kill): Fix typo.
+
+        * emacs-lisp-intro.texi (Thank You): Avoid mailto: in html output.
+
+        * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
+        (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
+        (INSTALL_DATA): New, set by configure.
+        (HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
+        New variables.
+        (.SUFFIXES): Add .ps and .dvi.
+        (.dvi.ps): New suffix rule.
+        (dvi, html, pdf, ps): Use *_TARGETS variables.
+        (emacs-lisp-intro.ps): Remove explicit rule.
+        (emacs-lisp-intro.html): Use HTML_OPTS.
+        (clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
+        (.PHONY): install-dvi, install-html, install-pdf, install-ps
+        ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
+        uninstall-ps, and uninstall-doc.
+        (install-dvi, install-html, install-pdf, install-ps, install-doc)
+        (uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
+        (uninstall-doc): New rules.
+
+2013-08-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs-lisp-intro.texi (Beginning init File): Rename from
+        "Beginning a .emacs File", since a node name cannot include a
+        period.
+        (Top, Emacs Initialization, Change a defun): All references
+        changed.  (Bug#15038)
+
 2013-08-02  Xue Fuqiao  <xfq.free@gmail.com>
 
         * emacs-lisp-intro.texi (zap-to-char): Remove obsolete stuff.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d5462f9e70f..363e12215b3 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
@@ -30,12 +30,29 @@ texinfodir = $(srcdir)/../misc
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
+prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+docdir = @docdir@
+dvidir = @dvidir@
+htmldir = @htmldir@
+pdfdir = @pdfdir@
+psdir = @psdir@
+
 MKDIR_P = @MKDIR_P@
 
+GZIP_PROG = @GZIP_PROG@
+
+HTML_OPTS = --no-split --html
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 INFO_OPTS=@INFO_OPTS@
 
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
 MAKEINFO = @MAKEINFO@
 MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
@@ -45,6 +62,11 @@ DVIPS = dvips
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
+DVI_TARGETS = emacs-lisp-intro.dvi
+HTML_TARGETS = emacs-lisp-intro.html
+PDF_TARGETS = emacs-lisp-intro.pdf
+PS_TARGETS = emacs-lisp-intro.ps
+
 mkinfodir = @${MKDIR_P} ${buildinfodir}
 
 srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
@@ -52,12 +74,17 @@ srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
 
 .PHONY: info dvi html pdf ps
 
+.SUFFIXES: .ps .dvi
+
+.dvi.ps:
+        $(DVIPS) -o $@ $<
+
 info: ${buildinfodir}/eintr$(INFO_EXT)
 
-dvi: emacs-lisp-intro.dvi
-html: emacs-lisp-intro.html
-pdf: emacs-lisp-intro.pdf
-ps: emacs-lisp-intro.ps
+dvi: $(DVI_TARGETS)
+html: $(HTML_TARGETS)
+pdf: $(PDF_TARGETS)
+ps: $(PS_TARGETS)
 
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing.
@@ -69,14 +96,11 @@ ${buildinfodir}/eintr$(INFO_EXT): ${srcs}
 emacs-lisp-intro.dvi: ${srcs}
         $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
 
-emacs-lisp-intro.ps: emacs-lisp-intro.dvi
-        $(DVIPS) -o $@ emacs-lisp-intro.dvi
-
 emacs-lisp-intro.pdf: ${srcs}
         $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
 
 emacs-lisp-intro.html: ${srcs}
-        $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs-lisp-intro.texi
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
@@ -85,8 +109,7 @@ mostlyclean:
           *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
 
 clean: mostlyclean
-        rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf emacs-lisp-intro.ps
-        rm -rf emacs-lisp-intro.html/
+        rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
         rm -f emacs-lispintro-${version}.tar*
 
 distclean: clean
@@ -118,4 +141,52 @@ dist:
         tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
         rm -rf emacs-lispintro-${version}
 
+
+.PHONY: install-dvi install-html install-pdf install-ps install-doc
+
+install-dvi: dvi
+        umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
+        $(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
+install-html: html
+        umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
+        $(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
+install-pdf: pdf
+         umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
+        $(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
+install-ps: ps
+        umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
+        for file in $(PS_TARGETS); do \
+          $(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
+          [ -n "${GZIP_PROG}" ] || continue; \
+          rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
+          ${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
+        done
+
+## Top-level Makefile installs the info pages.
+install-doc: install-dvi install-html install-pdf install-ps
+
+
+.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
+
+uninstall-dvi:
+        for file in $(DVI_TARGETS); do \
+          rm -f $(DESTDIR)$(dvidir)/$${file}; \
+        done
+uninstall-html:
+        for file in $(HTML_TARGETS); do \
+          rm -f $(DESTDIR)$(htmldir)/$${file}; \
+        done
+uninstall-ps:
+        ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
+        for file in $(PS_TARGETS); do \
+          rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
+        done
+uninstall-pdf:
+        for file in $(PDF_TARGETS); do \
+          rm -f $(DESTDIR)$(pdfdir)/$${file}; \
+        done
+
+uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
+
+
 ### Makefile ends here
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index f0d9ab63935..84c9d905487 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -648,7 +648,7 @@ Your @file{.emacs} File
 * Default Configuration::
 * Site-wide Init::              You can write site-wide init files.
 * defcustom::                   Emacs will write code for you.
-* Beginning a .emacs File::     How to write a @code{.emacs file}.
+* Beginning init File::         How to write a @file{.emacs} init file.
 * Text and Auto-fill::          Automatically wrap lines.
 * Mail Aliases::                Use abbreviations for email addresses.
 * Indent Tabs Mode::            Don't use tabs with @TeX{}
@@ -954,7 +954,12 @@ encouragement.  My mistakes are my own.
 
 @flushright
 Robert J. Chassell
+@ifnothtml
 @email{bob@@gnu.org}
+@end ifnothtml
+@ifhtml
+bob@@gnu.org
+@end ifhtml
 @end flushright
 
 @c ================ Beginning of main text ================
@@ -3260,7 +3265,7 @@ line that follows a semicolon is a comment.  The end of the line is the
 end of the comment.  To stretch a comment over two or more lines, begin
 each line with a semicolon.
 
-@xref{Beginning a .emacs File, , Beginning a @file{.emacs}
+@xref{Beginning init File, , Beginning a @file{.emacs}
 File}, and @ref{Comments, , Comments, elisp, The GNU Emacs Lisp
 Reference Manual}, for more about comments.
 
@@ -6318,7 +6323,7 @@ and avoids clobbering the mark."
                         (/ (+ 10 (* size (prefix-numeric-value arg)))
                            10)))
                  (point-min))))
-  (if arg (forward-line 1)))
+  (if (and arg (not (consp arg))) (forward-line 1)))
 @end group
 @end smallexample
 
@@ -6385,7 +6390,7 @@ to move point to the beginning of the next line if the command is
 invoked with an argument:
 
 @smallexample
-(if arg (forward-line 1)))
+(if (and arg (not (consp arg))) (forward-line 1))
 @end smallexample
 
 @noindent
@@ -6394,14 +6399,10 @@ appropriate tenths position in the buffer.  This is a flourish that
 means that the cursor is always located @emph{at least} the requested
 tenths of the way through the buffer, which is a nicety that is,
 perhaps, not necessary, but which, if it did not occur, would be sure
-to draw complaints.
-
-On the other hand, it also means that if you specify the command with
-a @kbd{C-u}, but without a number, that is to say, if the `raw prefix
-argument' is simply a cons cell, then the command puts you at the
-beginning of the second line @dots{}  I don't know whether this is
-intended or whether no one has dealt with the code to avoid this
-happening.
+to draw complaints.  (The @code{(not (consp arg))} portion is so that
+if you specify the command with a @kbd{C-u}, but without a number,
+that is to say, if the `raw prefix argument' is simply a cons cell,
+the command does not put you at the beginning of the second line.)
 
 @node Second Buffer Related Review
 @section Review
@@ -8312,7 +8313,7 @@ As usual, this function can be divided into its component parts:
 
 The arguments are @code{beg} and @code{end} and the function is
 interactive with @code{"r"}, so the two arguments must refer to the
-beginning and end of the region.  If you have been reading though this
+beginning and end of the region.  If you have been reading through this
 document from the beginning, understanding these parts of a function is
 almost becoming routine.
 
@@ -16706,7 +16707,7 @@ expressions in Emacs Lisp you can change or extend Emacs.
 * Default Configuration::
 * Site-wide Init::              You can write site-wide init files.
 * defcustom::                   Emacs will write code for you.
-* Beginning a .emacs File::     How to write a @code{.emacs file}.
+* Beginning init File::         How to write a @file{.emacs} init file.
 * Text and Auto-fill::          Automatically wrap lines.
 * Mail Aliases::                Use abbreviations for email addresses.
 * Indent Tabs Mode::            Don't use tabs with @TeX{}
@@ -16977,7 +16978,7 @@ intent is that neither programs nor users should ever change a value
 set by @code{defconst}.  (You can change it; the value set is a
 variable; but please do not.)
 
-@node Beginning a .emacs File
+@node Beginning init File
 @section Beginning a @file{.emacs} File
 @cindex @file{.emacs} file, beginning of
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d77ede29da1..8b5aa65ff96 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,113 @@
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * variables.texi (File Local Variables): Don't recommend quoting!  Ever!
+
+2013-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (Information about Files): Mention file names with
+        trailing blanks on MS-Windows.  (Bug#15130)
+
+2013-08-18  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * positions.texi (Positions): Improve indexing.
+
+2013-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * markers.texi (The Region): Improve indexing.
+
+2013-08-17  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes.
+
+        * text.texi (Maintaining Undo): Mention interactive call of
+        buffer-disable-undo.
+        (Filling): Add cross-reference for hard newlines.
+        (Sorting): Fix indentation.
+        (Columns): Comment out undefined behavior.
+        (Case Changes): Fix an `args-out-of-range' error in the example.
+
+2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * text.texi (Insertion): Refine.
+        (Margins): Add an index.
+        (Undo): Doc fix for `buffer-undo-list'.
+
+        * positions.texi (Character Motion):
+        * markers.texi (Moving Markers):
+        (Creating Markers): Comment out undefined behavior.
+
+2013-08-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * markers.texi (The Region): Add/move indexes.
+
+2013-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * display.texi (ImageMagick Images): Mention :content-type and
+        `image-content-type-suffixes'.
+
+2013-08-13  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * positions.texi (Word Motion): Remove redundant sentence.
+
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * lists.texi (List Elements):
+        Undocument behavior of nth and nthcdr with n < 0.  (Bug#15059)
+
+2013-08-13  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * frames.texi (Display Feature Testing): Add indexes.
+
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
+        (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
+        (INSTALL_DATA): New, set by configure.
+        (HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
+        New variables.
+        (.SUFFIXES): Add .ps and .dvi.
+        (.dvi.ps): New suffix rule.
+        (dvi, html, pdf, ps): Use *_TARGETS variables.
+        (elisp.html): Use HTML_OPTS.
+        (elisp.ps): Remove explicit rule.
+        (.PHONY): install-dvi, install-html, install-pdf, install-ps
+        ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
+        uninstall-ps, and uninstall-doc.
+        (install-dvi, install-html, install-pdf, install-ps, install-doc)
+        (uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
+        (uninstall-doc): New rules.
+        (clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
+
+2013-08-10  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * edebug.texi (Instrumenting Macro Calls): Use @defmac for macros.
+
+2013-08-09  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * control.texi (Error Symbols): Minor fix for previous change.
+
+2013-08-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * errors.texi (Standard Errors): Don't refer to `error-conditions'.
+
+        * control.texi (Signaling Errors): Refer to define-error.
+        (Error Symbols): Add `define-error'.
+
+2013-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * positions.texi (Motion by Screen Lines):
+        * display.texi (Truncation): Rename `cache-long-line-scans'
+        to `cache-long-scans'.
+
+2013-08-05  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * windows.texi (Window Start and End): Add an index.
+
 2013-08-02  Xue Fuqiao  <xfq.free@gmail.com>
 
         * display.texi (Face Functions): Add an index.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 8e6d034804e..164646ac433 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
@@ -33,12 +33,29 @@ texinfodir = $(srcdir)/../misc
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
+prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+docdir = @docdir@
+dvidir = @dvidir@
+htmldir = @htmldir@
+pdfdir = @pdfdir@
+psdir = @psdir@
+
 MKDIR_P = @MKDIR_P@
 
+GZIP_PROG = @GZIP_PROG@
+
+HTML_OPTS = --no-split --html
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 INFO_OPTS=@INFO_OPTS@
 
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
 MAKEINFO = @MAKEINFO@
 MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
@@ -48,6 +65,11 @@ DVIPS = dvips
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
+DVI_TARGETS = elisp.dvi
+HTML_TARGETS = elisp.html
+PDF_TARGETS = elisp.pdf
+PS_TARGETS = elisp.ps
+
 # List of all the texinfo files in the manual:
 
 srcs = \
@@ -108,11 +130,16 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
 
 .PHONY: info dvi pdf ps
 
+.SUFFIXES: .ps .dvi
+
+.dvi.ps:
+        $(DVIPS) -o $@ $<
+
 info: $(buildinfodir)/elisp$(INFO_EXT)
-dvi: elisp.dvi
-html: elisp.html
-pdf: elisp.pdf
-ps: elisp.ps
+dvi: $(DVI_TARGETS)
+html: $(HTML_TARGETS)
+pdf: $(PDF_TARGETS)
+ps: $(PS_TARGETS)
 
 ## Note: "<" is not portable in ordinary make rules.
 $(buildinfodir)/elisp$(INFO_EXT): $(srcs)
@@ -123,10 +150,7 @@ elisp.dvi: $(srcs)
         $(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi
 
 elisp.html: $(srcs)
-        $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $(srcdir)/elisp.texi
-
-elisp.ps: elisp.dvi
-        $(DVIPS) -o $@ elisp.dvi
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $(srcdir)/elisp.texi
 
 elisp.pdf: $(srcs)
         $(ENVADD) $(TEXI2PDF) $(srcdir)/elisp.texi
@@ -140,9 +164,8 @@ mostlyclean:
         rm -f elisp[12]* vol[12].tmp
 
 clean: mostlyclean
-        rm -f elisp.dvi elisp.pdf elisp.ps
+        rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
         rm -f vol[12].dvi vol[12].pdf vol[12].ps
-        rm -rf elisp.html
         rm -f emacs-lispref-${version}.tar*
 
 distclean: clean
@@ -175,4 +198,51 @@ dist:
         tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
         rm -rf emacs-lispref-${version}
 
+.PHONY: install-dvi install-html install-pdf install-ps install-doc
+
+install-dvi: dvi
+        umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
+        $(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
+install-html: html
+        umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
+        $(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
+install-pdf: pdf
+         umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
+        $(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
+install-ps: ps
+        umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
+        for file in $(PS_TARGETS); do \
+          $(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
+          [ -n "${GZIP_PROG}" ] || continue; \
+          rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
+          ${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
+        done
+
+## Top-level Makefile installs the info pages.
+install-doc: install-dvi install-html install-pdf install-ps
+
+
+.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
+
+uninstall-dvi:
+        for file in $(DVI_TARGETS); do \
+          rm -f $(DESTDIR)$(dvidir)/$${file}; \
+        done
+uninstall-html:
+        for file in $(HTML_TARGETS); do \
+          rm -f $(DESTDIR)$(htmldir)/$${file}; \
+        done
+uninstall-ps:
+        ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
+        for file in $(PS_TARGETS); do \
+          rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
+        done
+uninstall-pdf:
+        for file in $(PDF_TARGETS); do \
+          rm -f $(DESTDIR)$(pdfdir)/$${file}; \
+        done
+
+uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
+
+
 ### Makefile ends here
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 9ee01299260..70eabcd84a4 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -890,9 +890,8 @@ argument @var{data} is a list of additional Lisp objects relevant to
 the circumstances of the error.
 
 The argument @var{error-symbol} must be an @dfn{error symbol}---a symbol
-bearing a property @code{error-conditions} whose value is a list of
-condition names.  This is how Emacs Lisp classifies different sorts of
-errors. @xref{Error Symbols}, for a description of error symbols,
+defined with @code{define-error}.  This is how Emacs Lisp classifies different
+sorts of errors. @xref{Error Symbols}, for a description of error symbols,
 error conditions and condition names.
 
 If the error is not handled, the two arguments are used in printing
@@ -1118,8 +1117,8 @@ Here are examples of handlers:
 @end example
 
 Each error that occurs has an @dfn{error symbol} that describes what
-kind of error it is.  The @code{error-conditions} property of this
-symbol is a list of condition names (@pxref{Error Symbols}).  Emacs
+kind of error it is, and which describes also a list of condition names
+(@pxref{Error Symbols}).  Emacs
 searches all the active @code{condition-case} forms for a handler that
 specifies one or more of these condition names; the innermost matching
 @code{condition-case} handles the error.  Within this
@@ -1259,6 +1258,7 @@ should be robust if one does occur.  Note that this macro uses
 @cindex condition name
 @cindex user-defined error
 @kindex error-conditions
+@kindex define-error
 
   When you signal an error, you specify an @dfn{error symbol} to specify
 the kind of error you have in mind.  Each error has one and only one
@@ -1275,42 +1275,38 @@ Thus, each error has one or more condition names: @code{error}, the
 error symbol if that is distinct from @code{error}, and perhaps some
 intermediate classifications.
 
-  In order for a symbol to be an error symbol, it must have an
-@code{error-conditions} property which gives a list of condition names.
-This list defines the conditions that this kind of error belongs to.
-(The error symbol itself, and the symbol @code{error}, should always be
-members of this list.)  Thus, the hierarchy of condition names is
-defined by the @code{error-conditions} properties of the error symbols.
-Because quitting is not considered an error, the value of the
-@code{error-conditions} property of @code{quit} is just @code{(quit)}.
+@defun define-error name message &optional parent
+  In order for a symbol to be an error symbol, it must be defined with
+@code{define-error} which takes a parent condition (defaults to @code{error}).
+This parent defines the conditions that this kind of error belongs to.
+The transitive set of parents always includes the error symbol itself, and the
+symbol @code{error}.  Because quitting is not considered an error, the set of
+parents of @code{quit} is just @code{(quit)}.
+@end defun
 
 @cindex peculiar error
-  In addition to the @code{error-conditions} list, the error symbol
-should have an @code{error-message} property whose value is a string to
-be printed when that error is signaled but not handled.  If the
-error symbol has no @code{error-message} property or if the
-@code{error-message} property exists, but is not a string, the error
-message @samp{peculiar error} is used.  @xref{Definition of signal}.
+  In addition to its parents, the error symbol has a @var{message} which
+is a string to be printed when that error is signaled but not handled.  If that
+message is not valid, the error message @samp{peculiar error} is used.
+@xref{Definition of signal}.
+
+Internally, the set of parents is stored in the @code{error-conditions}
+property of the error symbol and the message is stored in the
+@code{error-message} property of the error symbol.
 
   Here is how we define a new error symbol, @code{new-error}:
 
 @example
 @group
-(put 'new-error
-     'error-conditions
-     '(error my-own-errors new-error))
-@result{} (error my-own-errors new-error)
-@end group
-@group
-(put 'new-error 'error-message "A new error")
-@result{} "A new error"
+(define-error 'new-error "A new error" 'my-own-errors)
 @end group
 @end example
 
 @noindent
-This error has three condition names: @code{new-error}, the narrowest
+This error has several condition names: @code{new-error}, the narrowest
 classification; @code{my-own-errors}, which we imagine is a wider
-classification; and @code{error}, which is the widest of all.
+classification; and all the conditions of @code{my-own-errors} which should
+include @code{error}, which is the widest of all.
 
   The error string should start with a capital letter but it should
 not end with a period.  This is for consistency with the rest of Emacs.
@@ -1326,7 +1322,7 @@ your code can do this:
 @end group
 @end example
 
-  This error can be handled through any of the three condition names.
+  This error can be handled through any of its condition names.
 This example handles @code{new-error} and any other errors in the class
 @code{my-own-errors}:
 
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index c5068425c66..ff9d98170d1 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -217,9 +217,9 @@ over the @code{line-prefix} variable.  @xref{Special Properties}.
 continuation to display them, computing the continuation lines can
 make redisplay slow.  The column computation and indentation functions
 also become slow.  Then you might find it advisable to set
-@code{cache-long-line-scans} to @code{t}.
+@code{cache-long-scans} to @code{t}.
 
-@defvar cache-long-line-scans
+@defvar cache-long-scans
 If this variable is non-@code{nil}, various indentation and motion
 functions, and Emacs redisplay, cache the results of scanning the
 buffer, and consult the cache to avoid rescanning regions of the buffer
@@ -1243,6 +1243,7 @@ Type RET when done reading
 @node Overlays
 @section Overlays
 @cindex overlays
+@c FIXME: mention intervals in this section?
 
 You can use @dfn{overlays} to alter the appearance of a buffer's text on
 the screen, for the sake of presentation features.  An overlay is an
@@ -4663,6 +4664,14 @@ and if @code{:height} is set it will have precedence over
 wish.  @code{:max-width} and @code{:max-height} will always preserve
 the aspect ratio.
 
+@item :format
+ImageMagick tries to auto-detect the image type, but it isn't always
+able to.  By using @code{:format-type}, we can give ImageMagick a hint
+to try to help it.  It's used in conjunction with the
+@code{image-format-suffixes} variable, which provides a mapping from
+content types to file name suffixes.  This is then given to
+ImageMagick as a file name hint.
+
 @item :rotation
 Specifies a rotation angle in degrees.
 
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index 8e394b5d92d..8384c31a380 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -1132,14 +1132,14 @@ from the macro definition with @code{def-edebug-spec}.  Adding
 definitions in Lisp, but @code{def-edebug-spec} makes it possible to
 define Edebug specifications for special forms implemented in C.
 
-@deffn Macro def-edebug-spec macro specification
+@defmac def-edebug-spec macro specification
 Specify which expressions of a call to macro @var{macro} are forms to be
 evaluated.  @var{specification} should be the edebug specification.
 Neither argument is evaluated.
 
 The @var{macro} argument can actually be any symbol, not just a macro
 name.
-@end deffn
+@end defmac
 
 Here is a table of the possibilities for @var{specification} and how each
 directs processing of arguments.
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 87cfcfa532c..8a10fbf0c47 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -7,12 +7,11 @@
 @appendix Standard Errors
 @cindex standard errors
 
-  Here is a list of the more important error symbols in standard Emacs,
-grouped by concept.  The list includes each symbol's message (on the
-@code{error-message} property of the symbol) and a cross reference to a
-description of how the error can occur.
+  Here is a list of the more important error symbols in standard Emacs, grouped
+by concept.  The list includes each symbol's message and a cross reference
+to a description of how the error can occur.
 
-  Each error symbol has an @code{error-conditions} property that is a
+  Each error symbol has an set of parent error conditions that is a
 list of symbols.  Normally this list includes the error symbol itself
 and the symbol @code{error}.  Occasionally it includes additional
 symbols, which are intermediate classifications, narrower than
@@ -24,8 +23,6 @@ conditions, that means it has none.
   As a special exception, the error symbol @code{quit} does not have the
 condition @code{error}, because quitting is not considered an error.
 
-@c You can grep for "(put 'foo 'error-conditions ...) to find
-@c examples defined in Lisp.  E.g., soap-client.el, sasl.el.
   Most of these error symbols are defined in C (mainly @file{data.c}),
 but some are defined in Lisp.  For example, the file @file{userlock.el}
 defines the @code{file-locked} and @code{file-supersession} errors.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 77b097ae90a..1f7169522cc 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -776,6 +776,14 @@ return information about actual files or directories, so their
 arguments must all exist as actual files or directories unless
 otherwise noted.
 
+@cindex file names, trailing whitespace
+@cindex trailing blanks in file names
+Be careful with file names that end in blanks: some filesystems
+(notably, MS-Windows) will ignore trailing whitespace in file names,
+and return information about the file after stripping those blanks
+from the name, not about the file whose name you passed to the
+functions described in this section.
+
 @menu
 * Testing Accessibility::   Is a given file readable?  Writable?
 * Kinds of Files::          Is it a directory?  A symbolic link?
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 01d2d1d6c45..370098c8b62 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -446,7 +446,7 @@ default parameters by supplying their own parameters.
 If you invoke Emacs with command-line options that specify frame
 appearance, those options take effect by adding elements to either
 @code{initial-frame-alist} or @code{default-frame-alist}.  Options
-which affect just the initial frame, such as @samp{-geometry} and
+which affect just the initial frame, such as @samp{--geometry} and
 @samp{--maximized}, add to @code{initial-frame-alist}; the others add
 to @code{default-frame-alist}.  @pxref{Emacs Invocation,, Command Line
 Arguments for Emacs Invocation, emacs, The GNU Emacs Manual}.
@@ -1362,7 +1362,7 @@ Terminals}.
 @node Input Focus
 @section Input Focus
 @cindex input focus
-@c @cindex selected frame    Duplicates selected-frame
+@c @cindex selected frame    Duplicates selected-frame, same for selected-window.
 
 At any time, one frame in Emacs is the @dfn{selected frame}.  The selected
 window always resides on the selected frame.
@@ -2391,6 +2391,7 @@ displays returned by @code{display-mm-height} and
 @code{display-mm-width} in case the system provides incorrect values.
 @end defopt
 
+@cindex backing store
 @defun display-backing-store &optional display
 This function returns the backing store capability of the display.
 Backing store means recording the pixels of windows (and parts of
@@ -2402,6 +2403,7 @@ Values can be the symbols @code{always}, @code{when-mapped}, or
 when the question is inapplicable to a certain kind of display.
 @end defun
 
+@cindex SaveUnder feature
 @defun display-save-under &optional display
 This function returns non-@code{nil} if the display supports the
 SaveUnder feature.  That feature is used by pop-up windows
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 14601de1814..9daf01cd0a2 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -270,8 +270,10 @@ are numbered starting with zero, so the @sc{car} of @var{list} is
 element number zero.  If the length of @var{list} is @var{n} or less,
 the value is @code{nil}.
 
-If @var{n} is negative, @code{nth} returns the first element of
-@var{list}.
+@c Behavior for -ve n undefined since 2013/08; see bug#15059.
+@ignore
+If @var{n} is negative, @code{nth} returns the first element of @var{list}.
+@end ignore
 
 @example
 @group
@@ -281,10 +283,6 @@ If @var{n} is negative, @code{nth} returns the first element of
 @group
 (nth 10 '(1 2 3 4))
      @result{} nil
-@end group
-@group
-(nth -3 '(1 2 3 4))
-     @result{} 1
 
 (nth n x) @equiv{} (car (nthcdr n x))
 @end group
@@ -300,7 +298,8 @@ This function returns the @var{n}th @sc{cdr} of @var{list}.  In other
 words, it skips past the first @var{n} links of @var{list} and returns
 what follows.
 
-If @var{n} is zero or negative, @code{nthcdr} returns all of
+@c "or negative" removed 2013/08; see bug#15059.
+If @var{n} is zero, @code{nthcdr} returns all of
 @var{list}.  If the length of @var{list} is @var{n} or less,
 @code{nthcdr} returns @code{nil}.
 
@@ -314,7 +313,7 @@ If @var{n} is zero or negative, @code{nthcdr} returns all of
      @result{} nil
 @end group
 @group
-(nthcdr -3 '(1 2 3 4))
+(nthcdr 0 '(1 2 3 4))
      @result{} (1 2 3 4)
 @end group
 @end example
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index cae14ab9a78..d94908994e9 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -216,11 +216,14 @@ new marker that points to the same place and the same buffer as does
 The new marker's insertion type is specified by the argument
 @var{insertion-type}.  @xref{Marker Insertion Types}.
 
+@c This behavior used to be documented until 2013/08.
+@ignore
 If passed an integer argument less than 1, @code{copy-marker} returns a
 new marker that points to the beginning of the current buffer.  If
 passed an integer argument greater than the length of the buffer,
 @code{copy-marker} returns a new marker that points to the end of the
 buffer.
+@end ignore
 
 @example
 @group
@@ -279,6 +282,8 @@ This function returns the position that @var{marker} points to, or
 This function returns the buffer that @var{marker} points into, or
 @code{nil} if it points nowhere.
 
+@c FIXME: The `buffer' argument of `set-marker' already defaults to
+@c the current buffer, why use `(current-buffer)' explicitly here?
 @example
 @group
 (setq m (make-marker))
@@ -349,11 +354,15 @@ This function moves @var{marker} to @var{position}
 in @var{buffer}.  If @var{buffer} is not provided, it defaults to
 the current buffer.
 
+@c This behavior used to be documented until 2013/08.
+@ignore
 If @var{position} is less than 1, @code{set-marker} moves @var{marker}
 to the beginning of the buffer.  If @var{position} is greater than the
 size of the buffer (@pxref{Point}), @code{set-marker} moves marker to
-the end of the buffer.  If @var{position} is @code{nil} or a marker
-that points nowhere, then @var{marker} is set to point nowhere.
+the end of the buffer.
+@end ignore
+If @var{position} is @code{nil} or a marker that points nowhere, then
+@var{marker} is set to point nowhere.
 
 The value returned is @var{marker}.
 
@@ -384,7 +393,7 @@ This is another name for @code{set-marker}.
 @node The Mark
 @section The Mark
 @cindex mark, the
-@cindex mark ring
+@c @cindex the mark?
 
   Each buffer has a special marker, which is designated @dfn{the
 mark}.  When a buffer is newly created, this marker exists but does
@@ -423,6 +432,7 @@ the mark is active.  This is the main motivation for using Transient
 Mark mode.  (Another is that this enables highlighting of the region
 when the mark is active.  @xref{Display}.)
 
+@cindex mark ring
   In addition to the mark, each buffer has a @dfn{mark ring} which is a
 list of markers containing previous values of the mark.  When editing
 commands change the mark, they should normally save the old value of the
@@ -644,7 +654,12 @@ more marks than this are pushed onto the @code{mark-ring},
 
 @node The Region
 @section The Region
-@cindex region (between point and mark)
+@c The index entry must be just ``region'' to make it the first hit
+@c when the user types ``i region RET'', because otherwise the Info
+@c reader will present substring matches in alphabetical order,
+@c putting this one near the end, with something utterly unrelated as
+@c the first hit.
+@cindex region
 
   The text between point and the mark is known as @dfn{the region}.
 Various functions operate on text delimited by point and the mark, but
@@ -668,6 +683,7 @@ integer).  This is the position of either point or the mark, whichever is
 larger.
 @end defun
 
+@c FIXME: Mention it in tips.texi?
   Instead of using @code{region-beginning} and @code{region-end}, a
 command designed to operate on a region should normally use
 @code{interactive} with the @samp{r} specification to find the
@@ -680,6 +696,8 @@ mark is active, and there is a valid region in the buffer.  This
 function is intended to be used by commands that operate on the
 region, instead of on text near point, when the mark is active.
 
+@cindex empty region
+@vindex use-empty-active-region
 A region is valid if it has a non-zero size, or if the user option
 @code{use-empty-active-region} is non-@code{nil} (by default, it is
 @code{nil}).  The function @code{region-active-p} is similar to
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 59729380ea7..180fef7241d 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3381,6 +3381,7 @@ of Lisp sexps and adapts it to non-Lisp languages.
 
 @node SMIE
 @subsection Simple Minded Indentation Engine
+@cindex SMIE
 
 SMIE is a package that provides a generic navigation and indentation
 engine.  Based on a very simple parser using an ``operator precedence
@@ -3548,6 +3549,8 @@ simply ignored.
 
 @node SMIE Grammar
 @subsubsection Defining the Grammar of a Language
+@cindex SMIE grammar
+@cindex grammar, SMIE
 
 The usual way to define the SMIE grammar of a language is by
 defining a new global variable that holds the precedence table by
@@ -3623,6 +3626,8 @@ formally as left associative.
 
 @node SMIE Lexer
 @subsubsection Defining Tokens
+@cindex SMIE lexer
+@cindex defining tokens, SMIE
 
 SMIE comes with a predefined lexical analyzer which uses syntax tables
 in the following way: any sequence of characters that have word or
@@ -3757,6 +3762,7 @@ surrounding text to find ad-hoc clues.
 
 @node SMIE Indentation
 @subsubsection Specifying Indentation Rules
+@cindex indentation rules, SMIE
 
 Based on the provided grammar, SMIE will be able to provide automatic
 indentation without any extra effort.  But in practice, this default
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 090310c5545..f351829e4cf 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -248,6 +248,7 @@ unibyte string, it is returned unchanged.  Use this function for
 characters.
 @end defun
 
+@c FIXME: Should `@var{character}' be `@var{byte}'?
 @defun byte-to-string byte
 @cindex byte to string
 This function returns a unibyte string containing a single byte of
@@ -401,6 +402,8 @@ specifies how the character behaves and how it should be handled
 during text processing and display.  Thus, character properties are an
 important part of specifying the character's semantics.
 
+@c FIXME: Use the latest URI of this chapter?
+@c http://www.unicode.org/versions/latest/ch04.pdf
   On the whole, Emacs follows the Unicode Standard in its implementation
 of character properties.  In particular, Emacs supports the
 @uref{http://www.unicode.org/reports/tr23/, Unicode Character Property
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index e8b6166f63c..69f1b80c431 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -5,6 +5,7 @@
 @node Positions
 @chapter Positions
 @cindex position (in buffer)
+@cindex buffer position
 
   A @dfn{position} is the index of a character in the text of a buffer.
 More precisely, a position identifies the place between two characters
@@ -146,9 +147,13 @@ that.
 
 @deffn Command goto-char position
 This function sets point in the current buffer to the value
-@var{position}.  If @var{position} is less than 1, it moves point to the
-beginning of the buffer.  If @var{position} is greater than the length
-of the buffer, it moves point to the end.
+@var{position}.
+@c This behavior used to be documented until 2013/08.
+@ignore
+If @var{position} is less than 1, it moves point to the beginning of
+the buffer.  If @var{position} is greater than the length of the
+buffer, it moves point to the end.
+@end ignore
 
 If narrowing is in effect, @var{position} still counts from the
 beginning of the buffer, but point cannot go outside the accessible
@@ -191,8 +196,8 @@ whether a given character is part of a word.  @xref{Syntax Tables}.
 
 @deffn Command forward-word &optional count
 This function moves point forward @var{count} words (or backward if
-@var{count} is negative).  If @var{count} is @code{nil}, it moves
-forward one word.
+@var{count} is negative).  If @var{count} is omitted or @code{nil}, it
+defaults to 1.
 
 ``Moving one word'' means moving until point crosses a
 word-constituent character and then encounters a word-separator
@@ -210,7 +215,7 @@ If @code{inhibit-field-text-motion} is non-@code{nil},
 this function ignores field boundaries.
 
 In an interactive call, @var{count} is specified by the numeric prefix
-argument.  If @var{count} is omitted or @code{nil}, it defaults to 1.
+argument.
 @end deffn
 
 @deffn Command backward-word &optional count
@@ -483,7 +488,7 @@ Display}.
   These functions scan text to determine where screen lines break, and
 thus take time proportional to the distance scanned.  If you intend to
 use them heavily, Emacs provides caches which may improve the
-performance of your code.  @xref{Truncation, cache-long-line-scans}.
+performance of your code.  @xref{Truncation, cache-long-scans}.
 
 @defun vertical-motion count &optional window
 This function moves point to the start of the screen line @var{count}
@@ -805,7 +810,7 @@ thousands of times in the Lisp sources of Emacs.
 buffer, use @code{save-current-buffer} or @code{with-current-buffer}
 instead (@pxref{Current Buffer}).  If you need to save or restore
 window configurations, see the forms described in @ref{Window
-Configurations} and in @ref{Frame Configurations}.
+Configurations} and in @ref{Frame Configurations}. @c frameset?
 
 @defspec save-excursion body@dots{}
 @cindex mark excursion
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 7cace70ad07..c4250f2f0ba 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -240,6 +240,7 @@ Major and minor modes can add functions to
 copied out of the buffer.
 @end defun
 
+@c FIXME: `filter-buffer-substring-function' should be documented.
 @defvar filter-buffer-substring-functions
 This variable is a wrapper hook (@pxref{Running Hooks}), whose members
 should be functions that accept four arguments: @var{fun},
@@ -365,7 +366,8 @@ not relocate the marker, depending on the marker's insertion type
 the inserted text, regardless of the markers' insertion type.
 
   Insertion functions signal an error if the current buffer is
-read-only or if they insert within read-only text.
+read-only (@pxref{Read Only Buffers}) or if they insert within
+read-only text (@pxref{Special Properties}).
 
   These functions copy text characters from strings and buffers along
 with their properties.  The inserted characters have exactly the same
@@ -421,10 +423,10 @@ insertion point.  @xref{Sticky Properties}.
 
 @defun insert-buffer-substring from-buffer-or-name &optional start end
 This function inserts a portion of buffer @var{from-buffer-or-name}
-(which must already exist) into the current buffer before point.  The
-text inserted is the region between @var{start} and @var{end}.  (These
-arguments default to the beginning and end of the accessible portion of
-that buffer.)  This function returns @code{nil}.
+into the current buffer before point.  The text inserted is the region
+between @var{start} (inclusive) and @var{end} (exclusive).  (These
+arguments default to the beginning and end of the accessible portion
+of that buffer.)  This function returns @code{nil}.
 
 In this example, the form is executed with buffer @samp{bar} as the
 current buffer.  We assume that buffer @samp{bar} is initially empty.
@@ -482,6 +484,7 @@ it except to install it on a keymap.
 
 In an interactive call, @var{count} is the numeric prefix argument.
 
+@c FIXME: This variable is obsolete since 23.1.
 Self-insertion translates the input character through
 @code{translation-table-for-input}.  @xref{Translation of Characters}.
 
@@ -776,6 +779,7 @@ is deleted.  If point is on a nonblank line, the command deletes all
 blank lines immediately following it.
 
 A blank line is defined as a line containing only tabs and spaces.
+@c and the Newline character?
 
 @code{delete-blank-lines} returns @code{nil}.
 @end deffn
@@ -920,6 +924,7 @@ processes the text according to @code{yank-handled-properties} and
 text anyway.)
 @end defun
 
+@c FIXME: Add an index for yank-handler.
   If you put a @code{yank-handler} text property on all or part of a
 string, that alters how @code{insert-for-yank} inserts the string.  If
 different parts of the string have different @code{yank-handler}
@@ -1284,8 +1289,8 @@ This is an extensible undo item, which is undone by calling
 @item (apply @var{delta} @var{beg} @var{end} @var{funname} . @var{args})
 This is an extensible undo item, which records a change limited to the
 range @var{beg} to @var{end}, which increased the size of the buffer
-by @var{delta}.  It is undone by calling @var{funname} with arguments
-@var{args}.
+by @var{delta} characters.  It is undone by calling @var{funname} with
+arguments @var{args}.
 
 This kind of element enables undo limited to a region to determine
 whether the element pertains to that region.
@@ -1376,7 +1381,8 @@ possible to undo either previous changes or any subsequent changes.  If
 the undo list of @var{buffer-or-name} is already disabled, this function
 has no effect.
 
-This function returns @code{nil}.
+In an interactive call, BUFFER-OR-NAME is the current buffer.  You
+cannot specify any other buffer.  This function returns @code{nil}.
 @end deffn
 
   As editing continues, undo lists get longer and longer.  To prevent
@@ -1493,6 +1499,7 @@ the header lines.  If @var{citation-regexp} is a string, it is used as
 a regular expression; if it matches the beginning of a line, that line
 is treated as a citation marker.
 
+@c FIXME: "That mode" is confusing.  It isn't a major/minor mode.
 Ordinarily, @code{fill-individual-paragraphs} regards each change in
 indentation as starting a new paragraph.  If
 @code{fill-individual-varying-indent} is non-@code{nil}, then only
@@ -1606,11 +1613,13 @@ Manual}.
 @defvar use-hard-newlines
 If this variable is non-@code{nil}, the filling functions do not delete
 newlines that have the @code{hard} text property.  These ``hard
-newlines'' act as paragraph separators.
+newlines'' act as paragraph separators.  @xref{Hard and Soft
+Newlines,, Hard and Soft Newlines, emacs, The GNU Emacs Manual}.
 @end defvar
 
 @node Margins
 @section Margins for Filling
+@cindex margins, filling
 
 @defopt fill-prefix
 This buffer-local variable, if non-@code{nil}, specifies a string of
@@ -1800,6 +1809,7 @@ prefix or @code{nil}, meaning it has failed to determine a prefix.
 @cindex filling, automatic
 @cindex Auto Fill mode
 
+@c FIXME: I don't think any of the variables below is a/an normal/abnormal hook.
   Auto Fill mode is a minor mode that fills lines automatically as text
 is inserted.  This section describes the hook used by Auto Fill mode.
 For a description of functions that you can call explicitly to fill and
@@ -1941,10 +1951,10 @@ its @code{sort-subr} call looks like this:
 @group
 (sort-subr reverse
            (function
-             (lambda ()
-               (while (and (not (eobp))
-                      (looking-at paragraph-separate))
-                 (forward-line 1))))
+            (lambda ()
+              (while (and (not (eobp))
+                          (looking-at paragraph-separate))
+                (forward-line 1))))
            'forward-paragraph)
 @end group
 @end example
@@ -2130,9 +2140,12 @@ line and point.
 When called interactively, @var{column} is the value of prefix numeric
 argument.  If @var{column} is not an integer, an error is signaled.
 
+@c This behavior used to be documented until 2013/08.
+@ignore
 If column @var{column} is beyond the end of the line, point moves to
 the end of the line.  If @var{column} is negative, point moves to the
 beginning of the line.
+@end ignore
 
 If it is impossible to move to column @var{column} because that is in
 the middle of a multicolumn character such as a tab, point moves to the
@@ -2341,6 +2354,8 @@ code.
 For example, if @var{count} is 3, this command adds 3 columns of
 indentation to each of the lines beginning in the region specified.
 
+@c FIXME: I suggest using message-indent-citation as the example, or
+@c just remove this paragraph.  --xfq
 In Mail mode, @kbd{C-c C-y} (@code{mail-yank-original}) uses
 @code{indent-rigidly} to indent the text copied from the message being
 replied to.
@@ -2518,7 +2533,7 @@ This is the contents of the 5th foo.
 @end group
 
 @group
-(capitalize-region 1 44)
+(capitalize-region 1 37)
 @result{} nil
 
 ---------- Buffer: foo ----------
@@ -3024,6 +3039,7 @@ Point}.
 
 @table @code
 @cindex property category of text character
+@c FIXME: Isn't @kindex for keyboard commands?
 @kindex category @r{(text property)}
 @item category
 If a character has a @code{category} property, we call it the
@@ -4012,6 +4028,7 @@ A rectangle is represented by a list of strings.
 This represents a window configuration to restore in one frame, and a
 position to jump to in the current buffer.
 
+@c FIXME: Mention frameset here.
 @item @code{(@var{frame-configuration} @var{position})}
 This represents a frame configuration to restore, and a position
 to jump to in the current buffer.
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 557add738ba..866f3774999 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1649,8 +1649,7 @@ non-@code{nil} given that value.  Many commonly-encountered file
 variables have @code{safe-local-variable} properties; these include
 @code{fill-column}, @code{fill-prefix}, and @code{indent-tabs-mode}.
 For boolean-valued variables that are safe, use @code{booleanp} as the
-property value.  Lambda expressions should be quoted so that
-@code{describe-variable} can display the predicate.
+property value.
 
   When defining a user option using @code{defcustom}, you can set its
 @code{safe-local-variable} property by adding the arguments
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 51a52218633..13c9ca53222 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2569,6 +2569,7 @@ so @code{window-point} will stay behind text inserted there.
 @node Window Start and End
 @section The Window Start and End Positions
 @cindex window start position
+@cindex display-start position
 
   Each window maintains a marker used to keep track of a buffer position
 that specifies where in the buffer display should start.  This position
@@ -3194,6 +3195,7 @@ The value returned is @var{columns}.
    Here is how you can determine whether a given position @var{position}
 is off the screen due to horizontal scrolling:
 
+@c FIXME: Maybe hscroll-on-screen-p is a better name?
 @example
 @group
 (defun hscroll-on-screen (window position)
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8b550dc4417..0235b5f7b9b 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+        * emacs.1: Update manual links.
+
 2013-04-20  Petr Hracek  <phracek@redhat.com>  (tiny change)
 
         * emacs.1: Add some more command-line options.  (Bug#14165)
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 9149be2c523..a306edc3ca9 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -445,7 +445,7 @@ Gives frames menu bars if
 .IR on ;
 don't have menu bars if
 .IR off .
-See the Emacs manual, sections "Lucid Resources" and "LessTif
+See the Emacs manual, sections "Lucid Resources" and "Motif
 Resources", for how to control the appearance of the menu bar
 if you have one.
 .TP
@@ -492,7 +492,7 @@ The scroll bar width in pixels, equivalent to the frame parameter
 Font name for pop-up menu items, in non-toolkit versions of
 .IR Emacs .
 (For toolkit versions, see the Emacs manual, sections
-"Lucid Resources" and "LessTif Resources".)
+"Lucid Resources" and "Motif Resources".)
 .TP
 .BR selectionTimeout " (class " SelectionTimeout )
 Number of milliseconds to wait for a selection reply.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 7f5c70e07e3..22148deace0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,168 @@
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Try to reduce redundancy in doc/misc/Makefile.in.
+        * Makefile.in (DOCMISC_W32): New var to replace DOCMISC_*_W32.
+        (TARGETS): New intermediate variable.
+        (DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Use it.
+
+2013-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * efaq.texi (Emacs for MS-Windows): Update location of MS FAQ.
+
+        * efaq.texi: Rename from faq.texi, to match its output files.
+        * Makefile.in: Update for faq.texi name change.
+
+        * efaq-w32.texi (EMACSVER): Get it from emacsver.texi.
+
+        * Makefile.in (webhack): Remove; it's nothing to do with Emacs.
+
+        * efaq-w32.texi: Move here from the web-pages repository.
+        * Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
+        (DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
+        (INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
+        (DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
+        Add DOCMISC_*_W32 variables.
+        (echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
+        (efaq_w32_deps): New variable.
+        (efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
+        (efaq-w32.pdf, efaq-w32.html): New rules.
+        (clean): Remove efaq-w32 products.
+
+2013-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and
+        shift_jis from the default value set to mm-coding-system-priorities for
+        Japanese users.
+
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * reftex.texi (LaTeX xr Package, Options - Table of Contents)
+        (Options - Defining Label Environments, Options - Creating Labels)
+        (Options - Referencing Labels, Options - Creating Citations)
+        (Options - Index Support, Options - Viewing Cross-References)
+        (Options - Finding Files, Options - Optimizations)
+        (Options - Fontification, Options - Misc):
+        * cc-mode.texi (Sample Init File):
+        * edt.texi (Init file):
+        * epa.texi (Encrypting/decrypting gpg files):
+        * mairix-el.texi (About, Setting up the mairix interface, Using)
+        (Extending):
+        Rename nodes to avoid characters that can cause Texinfo problems.
+
+2013-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Mail Source Specifiers): Fix description for pop3's :leave.
+
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (ada_mode_deps, auth_deps, autotype_deps)
+        (bovine_deps, calc_deps, ccmode_deps, cl_deps, dbus_deps)
+        (dired_x_deps, ebrowse_deps, ede_deps, ediff_deps, edt_deps)
+        (eieio_deps, emacs_gnutls_deps, emacs_mime_deps, epa_deps)
+        (erc_deps, ert_deps, eshell_deps, eudc_deps, faq_deps)
+        (flymake_deps, forms_deps, gnus_deps, htmlfontify_deps)
+        (idlwave_deps, ido_deps, info_deps, mairix_el_deps, message_deps)
+        (mh_e_deps, newsticker_deps, nxml_mode_deps, org_deps)
+        (pcl_cvs_deps, pgg_deps, rcirc_deps, reftex_deps, remember_deps)
+        (sasl_deps, sc_deps, semantic_deps, ses_deps, sieve_deps)
+        (smtpmail_deps, speedbar_deps, srecode_deps, todo_mode_deps)
+        (tramp_deps, url_deps, vip_deps, viper_deps, widget_deps)
+        (wisent_deps, woman_deps): New variables.  Use to reduce duplication.
+
+        * woman.texi (Top): Avoid mailto: in html output.
+
+        * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
+        (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
+        (INSTALL_DATA): New, set by configure.
+        (HTML_OPTS, HTML_TARGETS, PS_TARGETS, DVIPS): New variables.
+        (.PHONY): Add html, ps, install-dvi, install-html, install-pdf,
+        install-ps ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
+        uninstall-ps, and uninstall-doc.
+        (.SUFFIXES): Add .ps and .dvi.
+        (.dvi.ps): New suffix rule.
+        (html, ps, ada-mode.html, auth.html, autotype.html, bovine.html)
+        (calc.html, cc-mode.html, cl.html, dbus.html, dired-x.html)
+        (ebrowse.html, ede.html, ediff.html, edt.html, eieio.html)
+        (emacs-gnutls.html, emacs-mime.html, epa.html, erc.html)
+        (ert.html, eshell.html, eudc.html, faq.html, flymake.html)
+        (forms.html, gnus.html, htmlfontify.html, idlwave.html)
+        (ido.html, mairix-el.html, message.html, mh-e.html)
+        (newsticker.html, nxml-mode.html, org.html, pgg.html)
+        (rcirc.html, reftex.html, remember.html, sasl.html, sc.html)
+        (semantic.html, sieve.html, smtpmail.html, speedbar.html)
+        (srecode.html, todo-mode.html, tramp.html, url.html, vip.html)
+        (viper.html, widget.html, wisent.html, woman.html, install-dvi)
+        (install-html, install-pdf, install-ps, install-doc, uninstall-dvi)
+        (uninstall-html, uninstall-ps, uninstall-pdf, uninstall-doc):
+        New rules.
+        (clean): Remove HTML_TARGETS and PS_TARGETS.
+
+2013-08-10  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * ido.texi (Working Directories):
+        (Flexible Matching, Regexp Matching, Find File At Point)
+        (Ignoring, Misc Customization): Use @defopt for user options.
+
+2013-08-09  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * htmlfontify.texi (Customization): Remove documentation of
+        `hfy-fast-lock-save'.  Minor fixes.
+
+2013-08-08  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * ido.texi (Top): Insert node "Working Directories" in menu.
+        (Working Directories): New node.
+        (Misc Customization): Add documentation of
+        `ido-confirm-unique-completion' and some other user options.
+
+2013-08-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * todo-mode.texi: Update @dircategory.
+        (Overview, Todo Items as Diary Entries, Todo Mode Entry Points)
+        (File Editing, Marked Items, Item Prefix): Fix usage of @xref and
+        @ref.
+
+2013-08-07  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * sc.texi (Introduction): Fix index.
+        (Usage Overview):
+        (Citations, Citation Elements, Recognizing Citations)
+        (Information Keys and the Info Alist, Reference Headers)
+        (The Built-in Header Rewrite Functions)
+        (Electric References, Reply Buffer Initialization)
+        (Filling Cited Text, Selecting an Attribution)
+        (Attribution Preferences)
+        (Anonymous Attributions, Author Names)
+        (Using Regi, Post-yank Formatting Commands)
+        (Citing Commands, Insertion Commands)
+        (Mail Field Commands)
+        (Hints to MUA Authors, Thanks and History): Change from one space
+        between sentences to two.
+        (What Supercite Does): Typo fix.
+
+        * newsticker.texi (Usage): Use @key for RET.
+
+        * cl.texi (Argument Lists):
+        (For Clauses):
+        (Macros): Add indexes.
+
+2013-08-05  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * cl.texi (Blocks and Exits): Add an index.
+
+2013-08-04  Stephen Berman  <stephen.berman@gmx.net>
+
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add todo-mode.
+        (todo-mode, $(buildinfodir)/todo-mode$(INFO_EXT)):
+        (todo-mode.dvi, todo-mode.pdf): New rules.
+
+        * todo-mode.texi: New file.
+
 2013-08-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Basic Usage): Mention that warp means jump here.
@@ -185,7 +350,7 @@
 
 2013-05-25  Xue Fuqiao  <xfq.free@gmail.com>
 
-        * flymake.texi: Changing from one space between sentences to two.
+        * flymake.texi: Change from one space between sentences to two.
 
 2013-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 67a899af8ce..30fc4953172 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # Where to find the source code.  $(srcdir) will be the man-aux
 # subdirectory of the source tree.  This is
@@ -31,142 +31,68 @@ buildinfodir = $(srcdir)/../../info
 ## Directory with emacsver.texi.
 emacsdir = $(srcdir)/../emacs
 
+prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+docdir = @docdir@
+dvidir = @dvidir@
+htmldir = @htmldir@
+pdfdir = @pdfdir@
+psdir = @psdir@
+
 MKDIR_P = @MKDIR_P@
 
+GZIP_PROG = @GZIP_PROG@
+
+HTML_OPTS = --no-split --html
+
 INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 INFO_OPTS=@INFO_OPTS@
 
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
 MAKEINFO = @MAKEINFO@
 MAKEINFO_OPTS = --force -I$(emacsdir)
 
-INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \
+## On MS Windows, efaq-w32; otherwise blank.
+DOCMISC_W32 = @DOCMISC_W32@
+
+## Info files to build and install on all platforms.
+INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
         dbus dired-x ebrowse ede ediff edt eieio \
         emacs-mime epa erc ert eshell eudc efaq \
         flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
         mairix-el message mh-e newsticker nxml-mode \
         org pcl-cvs pgg rcirc remember reftex sasl \
-        sc semantic ses sieve smtpmail speedbar srecode tramp \
+        sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
         url vip viper widget wisent woman
 
-DVI_TARGETS = \
-        ada-mode.dvi \
-        auth.dvi \
-        autotype.dvi \
-        bovine.dvi \
-        calc.dvi \
-        cc-mode.dvi \
-        cl.dvi \
-        dbus.dvi \
-        dired-x.dvi \
-        ebrowse.dvi \
-        ede.dvi \
-        ediff.dvi \
-        edt.dvi \
-        eieio.dvi \
-        emacs-mime.dvi \
-        epa.dvi \
-        erc.dvi \
-        ert.dvi \
-        eshell.dvi \
-        eudc.dvi \
-        faq.dvi \
-        flymake.dvi \
-        forms.dvi \
-        gnus.dvi \
-        emacs-gnutls.dvi \
-        htmlfontify.dvi \
-        idlwave.dvi \
-        ido.dvi \
-        info.dvi \
-        mairix-el.dvi \
-        message.dvi \
-        mh-e.dvi \
-        newsticker.dvi \
-        nxml-mode.dvi \
-        org.dvi \
-        pcl-cvs.dvi \
-        pgg.dvi \
-        rcirc.dvi \
-        reftex.dvi \
-        remember.dvi \
-        sasl.dvi \
-        sc.dvi \
-        semantic.dvi \
-        ses.dvi \
-        sieve.dvi \
-        smtpmail.dvi \
-        speedbar.dvi \
-        srecode.dvi \
-        tramp.dvi \
-        url.dvi \
-        vip.dvi \
-        viper.dvi \
-        widget.dvi \
-        wisent.dvi \
-        woman.dvi
-
-PDF_TARGETS = \
-        ada-mode.pdf \
-        auth.pdf \
-        autotype.pdf \
-        bovine.pdf \
-        calc.pdf \
-        cc-mode.pdf \
-        cl.pdf \
-        dbus.pdf \
-        dired-x.pdf \
-        ebrowse.pdf \
-        ede.pdf \
-        ediff.pdf \
-        edt.pdf \
-        eieio.pdf \
-        emacs-mime.pdf \
-        epa.pdf \
-        erc.pdf \
-        ert.pdf \
-        eshell.pdf \
-        eudc.pdf \
-        faq.pdf \
-        flymake.pdf \
-        forms.pdf \
-        gnus.pdf \
-        htmlfontify.pdf \
-        emacs-gnutls.pdf \
-        idlwave.pdf \
-        ido.pdf \
-        info.pdf \
-        mairix-el.pdf \
-        message.pdf \
-        mh-e.pdf \
-        newsticker.pdf \
-        nxml-mode.pdf \
-        org.pdf \
-        pcl-cvs.pdf \
-        pgg.pdf \
-        rcirc.pdf \
-        reftex.pdf \
-        remember.pdf \
-        sasl.pdf \
-        sc.pdf \
-        semantic.pdf \
-        ses.pdf \
-        sieve.pdf \
-        smtpmail.pdf \
-        speedbar.pdf \
-        srecode.pdf \
-        tramp.pdf \
-        url.pdf \
-        vip.pdf \
-        viper.pdf \
-        widget.pdf \
-        wisent.pdf \
-        woman.pdf
+## Info files to install on current platform.
+INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
+
+## Info files to build on current platform.
+## This is all of them, even though they might not all get installed,
+## because the info files are pre-built in release tarfiles.
+INFO_TARGETS = $(INFO_COMMON) efaq-w32
+
+# There are some naming differences between the info targets and the other
+# targets, so let's resolve them here.
+TARGETS_1 = $(INFO_INSTALL:ccmode=cc-mode)
+TARGETS = $(TARGETS_1:info.info=info)
+
+DVI_TARGETS  = $(TARGETS:=.dvi)
+HTML_TARGETS = $(TARGETS:=.html)
+PDF_TARGETS  = $(TARGETS:=.pdf)
+PS_TARGETS   = $(TARGETS:=.ps)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
+DVIPS = dvips
 
 ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
@@ -175,539 +101,732 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
 
 gfdl = ${srcdir}/doclicense.texi
 
-.PHONY: info dvi pdf echo-info
+.PHONY: info dvi html pdf ps echo-info
 ## Prevent implicit rule triggering for foo.info.
 .SUFFIXES:
 
+.SUFFIXES: .ps .dvi
+
+.dvi.ps:
+        $(DVIPS) -o $@ $<
+
 # Default.
 info: $(INFO_TARGETS)
 
 ## Used by top-level Makefile.
 ## Base file names of output info files.
 echo-info:
-        @echo "$(INFO_TARGETS) " | \
+        @echo "$(INFO_INSTALL) " | \
           sed -e 's|[^ ]*/||g' -e 's/\.info//g' -e "s/  */$(INFO_EXT) /g"
 
-# please modify this for all the web manual targets
-webhack: clean
-        $(MAKE) pdf MAKEINFO_OPTS="-DWEBHACKDEVEL $(MAKEINFO_OPTS)"
-
 dvi: $(DVI_TARGETS)
 
+html: $(HTML_TARGETS)
+
 pdf: $(PDF_TARGETS)
 
+ps: $(PS_TARGETS)
+
 # Note that all the Info targets build the Info files in srcdir.
 # There is no provision for Info files to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 
 # Note: "<" is not portable in ordinary make rules.
 
+ada_mode_deps = ${srcdir}/ada-mode.texi ${gfdl}
 ada-mode : $(buildinfodir)/ada-mode$(INFO_EXT)
-$(buildinfodir)/ada-mode$(INFO_EXT): ${srcdir}/ada-mode.texi ${gfdl}
+$(buildinfodir)/ada-mode$(INFO_EXT): $(ada_mode_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ada-mode.texi
-ada-mode.dvi: ${srcdir}/ada-mode.texi ${gfdl}
+ada-mode.dvi: $(ada_mode_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
-ada-mode.pdf: ${srcdir}/ada-mode.texi ${gfdl}
+ada-mode.pdf: $(ada_mode_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
+ada-mode.html: $(ada_mode_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ada-mode.texi
 
+auth_deps = ${srcdir}/auth.texi ${gfdl}
 auth : $(buildinfodir)/auth$(INFO_EXT)
-$(buildinfodir)/auth$(INFO_EXT): ${srcdir}/auth.texi ${gfdl}
+$(buildinfodir)/auth$(INFO_EXT): $(auth_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/auth.texi
-auth.dvi: ${srcdir}/auth.texi ${gfdl}
+auth.dvi: $(auth_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
-auth.pdf: ${srcdir}/auth.texi ${gfdl}
+auth.pdf: $(auth_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
+auth.html: $(auth_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/auth.texi
 
+autotype_deps = ${srcdir}/autotype.texi ${gfdl}
 autotype : $(buildinfodir)/autotype$(INFO_EXT)
-$(buildinfodir)/autotype$(INFO_EXT): ${srcdir}/autotype.texi ${gfdl}
+$(buildinfodir)/autotype$(INFO_EXT): $(autotype_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/autotype.texi
-autotype.dvi: ${srcdir}/autotype.texi ${gfdl}
+autotype.dvi: $(autotype_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
-autotype.pdf: ${srcdir}/autotype.texi ${gfdl}
+autotype.pdf: $(autotype_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
+autotype.html: $(autotype_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/autotype.texi
 
+bovine_deps = ${srcdir}/bovine.texi ${gfdl}
 bovine : $(buildinfodir)/bovine$(INFO_EXT)
-$(buildinfodir)/bovine$(INFO_EXT): ${srcdir}/bovine.texi ${gfdl}
+$(buildinfodir)/bovine$(INFO_EXT): $(bovine_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/bovine.texi
-bovine.dvi: ${srcdir}/bovine.texi ${gfdl}
+bovine.dvi: $(bovine_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/bovine.texi
-bovine.pdf: ${srcdir}/bovine.texi ${gfdl}
+bovine.pdf: $(bovine_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/bovine.texi
+bovine.html: $(bovine_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/bovine.texi
 
+calc_deps = ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl}
 calc : $(buildinfodir)/calc$(INFO_EXT)
-$(buildinfodir)/calc$(INFO_EXT): ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/calc$(INFO_EXT): $(calc_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/calc.texi
-calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl}
+calc.dvi: $(calc_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
-calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl}
+calc.pdf: $(calc_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
+calc.html: $(calc_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/calc.texi
 
+ccmode_deps = ${srcdir}/cc-mode.texi ${gfdl}
 ccmode : $(buildinfodir)/ccmode$(INFO_EXT)
-$(buildinfodir)/ccmode$(INFO_EXT): ${srcdir}/cc-mode.texi ${gfdl}
+$(buildinfodir)/ccmode$(INFO_EXT): $(cc_mode_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cc-mode.texi
-cc-mode.dvi: ${srcdir}/cc-mode.texi ${gfdl}
+cc-mode.dvi: $(cc_mode_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
-cc-mode.pdf: ${srcdir}/cc-mode.texi ${gfdl}
+cc-mode.pdf: $(cc_mode_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
+cc-mode.html: $(cc_mode_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/cc-mode.texi
 
+cl_deps = ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl}
 cl : $(buildinfodir)/cl$(INFO_EXT)
-$(buildinfodir)/cl$(INFO_EXT): ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/cl$(INFO_EXT): $(cl_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cl.texi
-cl.dvi: ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl}
+cl.dvi: $(cl_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
-cl.pdf: ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl}
+cl.pdf: $(cl_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
+cl.html: $(cl_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/cl.texi
 
+dbus_deps = ${srcdir}/dbus.texi ${gfdl}
 dbus : $(buildinfodir)/dbus$(INFO_EXT)
-$(buildinfodir)/dbus$(INFO_EXT): ${srcdir}/dbus.texi ${gfdl}
+$(buildinfodir)/dbus$(INFO_EXT): $(dbus_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dbus.texi
-dbus.dvi: ${srcdir}/dbus.texi ${gfdl}
+dbus.dvi: $(dbus_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
-dbus.pdf: ${srcdir}/dbus.texi ${gfdl}
+dbus.pdf: $(dbus_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
+dbus.html: $(dbus_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/dbus.texi
 
+dired_x_deps = ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl}
 dired-x : $(buildinfodir)/dired-x$(INFO_EXT)
-$(buildinfodir)/dired-x$(INFO_EXT): ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/dired-x$(INFO_EXT): $(dired_x_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dired-x.texi
-dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl}
+dired-x.dvi: $(dired_x_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
-dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl}
+dired-x.pdf: $(dired_x_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
+dired-x.html: $(dired_x_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/dired-x.texi
 
+ebrowse_deps = ${srcdir}/ebrowse.texi ${gfdl}
 ebrowse : $(buildinfodir)/ebrowse$(INFO_EXT)
-$(buildinfodir)/ebrowse$(INFO_EXT): ${srcdir}/ebrowse.texi ${gfdl}
+$(buildinfodir)/ebrowse$(INFO_EXT): $(ebrowse_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ebrowse.texi
-ebrowse.dvi: ${srcdir}/ebrowse.texi ${gfdl}
+ebrowse.dvi: $(ebrowse_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
-ebrowse.pdf: ${srcdir}/ebrowse.texi ${gfdl}
+ebrowse.pdf: $(ebrowse_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
+ebrowse.html: $(ebrowse_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ebrowse.texi
 
+ede_deps = ${srcdir}/ede.texi ${gfdl}
 ede : $(buildinfodir)/ede$(INFO_EXT)
-$(buildinfodir)/ede$(INFO_EXT): ${srcdir}/ede.texi ${gfdl}
+$(buildinfodir)/ede$(INFO_EXT): $(ede_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ede.texi
-ede.dvi: ${srcdir}/ede.texi ${gfdl}
+ede.dvi: $(ede_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
-ede.pdf: ${srcdir}/ede.texi ${gfdl}
+ede.pdf: $(ede_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
+ede.html: $(ede_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ede.texi
 
+ediff_deps = ${srcdir}/ediff.texi ${gfdl}
 ediff : $(buildinfodir)/ediff$(INFO_EXT)
-$(buildinfodir)/ediff$(INFO_EXT): ${srcdir}/ediff.texi ${gfdl}
+$(buildinfodir)/ediff$(INFO_EXT): $(ediff_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ediff.texi
-ediff.dvi: ${srcdir}/ediff.texi ${gfdl}
+ediff.dvi: $(ediff_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
-ediff.pdf: ${srcdir}/ediff.texi ${gfdl}
+ediff.pdf: $(ediff_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
+ediff.html: $(ediff_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ediff.texi
 
+edt_deps = ${srcdir}/edt.texi ${gfdl}
 edt : $(buildinfodir)/edt$(INFO_EXT)
-$(buildinfodir)/edt$(INFO_EXT): ${srcdir}/edt.texi ${gfdl}
+$(buildinfodir)/edt$(INFO_EXT): $(edt_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/edt.texi
-edt.dvi: ${srcdir}/edt.texi ${gfdl}
+edt.dvi: $(edt_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
-edt.pdf: ${srcdir}/edt.texi ${gfdl}
+edt.pdf: $(edt_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
+edt.html: $(edt_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/edt.texi
 
+## No gfdl dependency.
+efaq_deps = ${srcdir}/efaq.texi $(emacsdir)/emacsver.texi
+efaq : $(buildinfodir)/efaq$(INFO_EXT)
+$(buildinfodir)/efaq$(INFO_EXT): $(efaq_deps)
+        $(mkinfodir)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq.texi
+efaq.dvi: $(efaq_deps)
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/efaq.texi
+efaq.pdf: $(efaq_deps)
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/efaq.texi
+efaq.html: $(efaq_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq.texi
+
+efaq_w32_deps = ${srcdir}/efaq-w32.texi $(emacsdir)/emacsver.texi
+efaq-w32 : $(buildinfodir)/efaq-w32$(INFO_EXT)
+$(buildinfodir)/efaq-w32$(INFO_EXT): $(efaq_w32_deps)
+        $(mkinfodir)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq-w32.texi
+efaq-w32.dvi: $(efaq_w32_deps)
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/efaq-w32.texi
+efaq-w32.pdf: $(efaq_w32_deps)
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/efaq-w32.texi
+efaq-w32.html: $(efaq_w32_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq-w32.texi
+
+eieio_deps = ${srcdir}/eieio.texi ${gfdl}
 eieio : $(buildinfodir)/eieio$(INFO_EXT)
-$(buildinfodir)/eieio$(INFO_EXT): ${srcdir}/eieio.texi ${gfdl}
+$(buildinfodir)/eieio$(INFO_EXT): $(eieio_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eieio.texi
-eieio.dvi: ${srcdir}/eieio.texi ${gfdl}
+eieio.dvi: $(eieio_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
-eieio.pdf: ${srcdir}/eieio.texi ${gfdl}
+eieio.pdf: $(eieio_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
+eieio.html: $(eieio_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eieio.texi
 
+emacs_gnutls_deps = ${srcdir}/emacs-gnutls.texi ${gfdl}
 emacs-gnutls : $(buildinfodir)/emacs-gnutls$(INFO_EXT)
-$(buildinfodir)/emacs-gnutls$(INFO_EXT): ${srcdir}/emacs-gnutls.texi ${gfdl}
+$(buildinfodir)/emacs-gnutls$(INFO_EXT): $(emacs_gnutls_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
-emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi ${gfdl}
+emacs-gnutls.dvi: $(emacs_gnutls_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi
-emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi ${gfdl}
+emacs-gnutls.pdf: $(emacs_gnutls_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
+emacs-gnutls.html: $(emacs_gnutls_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
 
+emacs_mime_deps = ${srcdir}/emacs-mime.texi ${gfdl}
 emacs-mime : $(buildinfodir)/emacs-mime$(INFO_EXT)
-$(buildinfodir)/emacs-mime$(INFO_EXT): ${srcdir}/emacs-mime.texi ${gfdl}
+$(buildinfodir)/emacs-mime$(INFO_EXT): $(emacs_mime_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
-emacs-mime.dvi: ${srcdir}/emacs-mime.texi ${gfdl}
+emacs-mime.dvi: $(emacs_mime_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
-emacs-mime.pdf: ${srcdir}/emacs-mime.texi ${gfdl}
+emacs-mime.pdf: $(emacs_mime_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
+emacs-mime.html: $(emacs_mime_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
 
+epa_deps = ${srcdir}/epa.texi ${gfdl}
 epa : $(buildinfodir)/epa$(INFO_EXT)
-$(buildinfodir)/epa$(INFO_EXT): ${srcdir}/epa.texi ${gfdl}
+$(buildinfodir)/epa$(INFO_EXT): $(epa_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/epa.texi
-epa.dvi: ${srcdir}/epa.texi ${gfdl}
+epa.dvi: $(epa_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
-epa.pdf: ${srcdir}/epa.texi ${gfdl}
+epa.pdf: $(epa_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
+epa.html: $(epa_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/epa.texi
 
+erc_deps = ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl}
 erc : $(buildinfodir)/erc$(INFO_EXT)
-$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/erc$(INFO_EXT): $(erc_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi
-erc.dvi: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl}
+erc.dvi: $(erc_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
-erc.pdf: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl}
+erc.pdf: $(erc_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
+erc.html: $(erc_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/erc.texi
 
+ert_deps = ${srcdir}/ert.texi ${gfdl}
 ert : $(buildinfodir)/ert$(INFO_EXT)
-$(buildinfodir)/ert$(INFO_EXT): ${srcdir}/ert.texi ${gfdl}
+$(buildinfodir)/ert$(INFO_EXT): $(ert_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ert.texi
-ert.dvi: ${srcdir}/ert.texi ${gfdl}
+ert.dvi: $(ert_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
-ert.pdf: ${srcdir}/ert.texi ${gfdl}
+ert.pdf: $(ert_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
+ert.html: $(ert_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ert.texi
 
+eshell_deps = ${srcdir}/eshell.texi ${gfdl}
 eshell : $(buildinfodir)/eshell$(INFO_EXT)
-$(buildinfodir)/eshell$(INFO_EXT): ${srcdir}/eshell.texi ${gfdl}
+$(buildinfodir)/eshell$(INFO_EXT): $(eshell_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eshell.texi
-eshell.dvi: ${srcdir}/eshell.texi ${gfdl}
+eshell.dvi: $(eshell_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
-eshell.pdf: ${srcdir}/eshell.texi ${gfdl}
+eshell.pdf: $(eshell_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
+eshell.html: $(eshell_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eshell.texi
 
+eudc_deps = ${srcdir}/eudc.texi ${gfdl}
 eudc : $(buildinfodir)/eudc$(INFO_EXT)
-$(buildinfodir)/eudc$(INFO_EXT): ${srcdir}/eudc.texi ${gfdl}
+$(buildinfodir)/eudc$(INFO_EXT): $(eudc_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eudc.texi
-eudc.dvi: ${srcdir}/eudc.texi ${gfdl}
+eudc.dvi: $(eudc_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
-eudc.pdf: ${srcdir}/eudc.texi ${gfdl}
+eudc.pdf: $(eudc_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
+eudc.html: $(eudc_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eudc.texi
 
-## No gfdl dependency.
-efaq : $(buildinfodir)/efaq$(INFO_EXT)
-$(buildinfodir)/efaq$(INFO_EXT): ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(mkinfodir)
-        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/faq.texi
-faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
-faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
-
+flymake_deps = ${srcdir}/flymake.texi ${gfdl}
 flymake : $(buildinfodir)/flymake$(INFO_EXT)
-$(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi ${gfdl}
+$(buildinfodir)/flymake$(INFO_EXT): $(flymake_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/flymake.texi
-flymake.dvi: ${srcdir}/flymake.texi ${gfdl}
+flymake.dvi: $(flymake_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
-flymake.pdf: ${srcdir}/flymake.texi ${gfdl}
+flymake.pdf: $(flymake_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
+flymake.html: $(flymake_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/flymake.texi
 
+forms_deps = ${srcdir}/forms.texi ${gfdl}
 forms : $(buildinfodir)/forms$(INFO_EXT)
-$(buildinfodir)/forms$(INFO_EXT): ${srcdir}/forms.texi ${gfdl}
+$(buildinfodir)/forms$(INFO_EXT): $(forms_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/forms.texi
-forms.dvi: ${srcdir}/forms.texi ${gfdl}
+forms.dvi: $(forms_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
-forms.pdf: ${srcdir}/forms.texi ${gfdl}
+forms.pdf: $(forms_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
+forms.html: $(forms_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/forms.texi
 
-# gnus/message/emacs-mime/sieve/pgg are part of Gnus:
+## gnus/message/emacs-mime/sieve/pgg are part of Gnus.
+gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
 gnus : $(buildinfodir)/gnus$(INFO_EXT)
-$(buildinfodir)/gnus$(INFO_EXT): ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
+$(buildinfodir)/gnus$(INFO_EXT): $(gnus_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi
-gnus.dvi: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
+gnus.dvi: $(gnus_deps)
         sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
         $(ENVADD) $(TEXI2DVI) gnustmp.texi
         cp gnustmp.dvi $@
         rm gnustmp.*
-gnus.pdf: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
+gnus.pdf: $(gnus_deps)
         sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
         $(ENVADD) $(TEXI2PDF) gnustmp.texi
         cp gnustmp.pdf $@
         rm gnustmp.*
+gnus.html: $(gnus_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/gnus.texi
 
+htmlfontify_deps = ${srcdir}/htmlfontify.texi ${gfdl}
 htmlfontify : $(buildinfodir)/htmlfontify$(INFO_EXT)
-$(buildinfodir)/htmlfontify$(INFO_EXT): ${srcdir}/htmlfontify.texi ${gfdl}
+$(buildinfodir)/htmlfontify$(INFO_EXT): $(htmlfontify_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/htmlfontify.texi
-htmlfontify.dvi: ${srcdir}/htmlfontify.texi ${gfdl}
+htmlfontify.dvi: $(htmlfontify_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/htmlfontify.texi
-htmlfontify.pdf: ${srcdir}/htmlfontify.texi ${gfdl}
+htmlfontify.pdf: $(htmlfontify_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/htmlfontify.texi
+htmlfontify.html: $(htmlfontify_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/htmlfontify.texi
 
-# NB this one needs --no-split even without a .info extension.
+idlwave_deps = ${srcdir}/idlwave.texi ${gfdl}
 idlwave : $(buildinfodir)/idlwave$(INFO_EXT)
-$(buildinfodir)/idlwave$(INFO_EXT): ${srcdir}/idlwave.texi ${gfdl}
+# NB this one needs --no-split even without a .info extension.
+$(buildinfodir)/idlwave$(INFO_EXT): $(idlwave_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/idlwave.texi
-idlwave.dvi: ${srcdir}/idlwave.texi ${gfdl}
+idlwave.dvi: $(idlwave_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
-idlwave.pdf: ${srcdir}/idlwave.texi ${gfdl}
+idlwave.pdf: $(idlwave_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
+idlwave.html: $(idlwave_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/idlwave.texi
 
+ido_deps = ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl}
 ido : $(buildinfodir)/ido$(INFO_EXT)
-$(buildinfodir)/ido$(INFO_EXT): ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/ido$(INFO_EXT): $(ido_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ido.texi
-ido.dvi: ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl}
+ido.dvi: $(ido_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ido.texi
-ido.pdf: ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl}
+ido.pdf: $(ido_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ido.texi
+ido.html: $(ido_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ido.texi
 
-# NB this one needs --no-split even without a .info extension.
+info_deps = ${srcdir}/info.texi ${gfdl}
 # Avoid name clash with overall "info" target.
 info.info : $(buildinfodir)/info$(INFO_EXT)
-$(buildinfodir)/info$(INFO_EXT): ${srcdir}/info.texi ${gfdl}
+# NB this one needs --no-split even without a .info extension.
+$(buildinfodir)/info$(INFO_EXT): $(info_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/info.texi
-info.dvi: ${srcdir}/info.texi ${gfdl}
+info.dvi: $(info_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
-info.pdf: ${srcdir}/info.texi ${gfdl}
+info.pdf: $(info_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
+info.html: $(info_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/info.texi
 
+mairix_el_deps = ${srcdir}/mairix-el.texi ${gfdl}
 mairix-el : $(buildinfodir)/mairix-el$(INFO_EXT)
-$(buildinfodir)/mairix-el$(INFO_EXT): ${srcdir}/mairix-el.texi ${gfdl}
+$(buildinfodir)/mairix-el$(INFO_EXT): $(mairix_el_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mairix-el.texi
-mairix-el.dvi: ${srcdir}/mairix-el.texi ${gfdl}
+mairix-el.dvi: $(mairix_el_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
-mairix-el.pdf: ${srcdir}/mairix-el.texi ${gfdl}
+mairix-el.pdf: $(mairix_el_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
+mairix-el.html: $(mairix_el_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/mairix-el.texi
 
+message_deps = ${srcdir}/message.texi ${gfdl}
 message : $(buildinfodir)/message$(INFO_EXT)
-$(buildinfodir)/message$(INFO_EXT): ${srcdir}/message.texi ${gfdl}
+$(buildinfodir)/message$(INFO_EXT): $(message_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/message.texi
-message.dvi: ${srcdir}/message.texi ${gfdl}
+message.dvi: $(message_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
-message.pdf: ${srcdir}/message.texi ${gfdl}
+message.pdf: $(message_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
+message.html: $(message_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/message.texi
 
+mh_e_deps = ${srcdir}/mh-e.texi ${gfdl}
 mh-e : $(buildinfodir)/mh-e$(INFO_EXT)
-$(buildinfodir)/mh-e$(INFO_EXT): ${srcdir}/mh-e.texi ${gfdl}
+$(buildinfodir)/mh-e$(INFO_EXT): $(mh_e_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mh-e.texi
-mh-e.dvi: ${srcdir}/mh-e.texi ${gfdl}
+mh-e.dvi: $(mh_e_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
-mh-e.pdf: ${srcdir}/mh-e.texi ${gfdl}
+mh-e.pdf: $(mh_e_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
+mh-e.html: $(mh_e_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/mh-e.texi
 
+newsticker_deps = ${srcdir}/newsticker.texi ${gfdl}
 newsticker : $(buildinfodir)/newsticker$(INFO_EXT)
-$(buildinfodir)/newsticker$(INFO_EXT): ${srcdir}/newsticker.texi ${gfdl}
+$(buildinfodir)/newsticker$(INFO_EXT): $(newsticker_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/newsticker.texi
-newsticker.dvi: ${srcdir}/newsticker.texi ${gfdl}
+newsticker.dvi: $(newsticker_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
-newsticker.pdf: ${srcdir}/newsticker.texi ${gfdl}
+newsticker.pdf: $(newsticker_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
+newsticker.html: $(newsticker_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/newsticker.texi
 
+nxml_mode_deps = ${srcdir}/nxml-mode.texi ${gfdl}
 nxml-mode : $(buildinfodir)/nxml-mode$(INFO_EXT)
-$(buildinfodir)/nxml-mode$(INFO_EXT): ${srcdir}/nxml-mode.texi ${gfdl}
+$(buildinfodir)/nxml-mode$(INFO_EXT): $(nxml_mode_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/nxml-mode.texi
-nxml-mode.dvi: ${srcdir}/nxml-mode.texi ${gfdl}
+nxml-mode.dvi: $(nxml_mode_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
-nxml-mode.pdf: ${srcdir}/nxml-mode.texi ${gfdl}
+nxml-mode.pdf: $(nxml_mode_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
+nxml-mode.html: $(nxml_mode_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/nxml-mode.texi
 
+org_deps = ${srcdir}/org.texi ${gfdl}
 org : $(buildinfodir)/org$(INFO_EXT)
-$(buildinfodir)/org$(INFO_EXT): ${srcdir}/org.texi ${gfdl}
+$(buildinfodir)/org$(INFO_EXT): $(org_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/org.texi
-org.dvi: ${srcdir}/org.texi ${gfdl}
+org.dvi: $(org_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
-org.pdf: ${srcdir}/org.texi ${gfdl}
+org.pdf: $(org_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
+org.html: $(org_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/org.texi
 
+pcl_cvs_deps = ${srcdir}/pcl-cvs.texi ${gfdl}
 pcl-cvs : $(buildinfodir)/pcl-cvs$(INFO_EXT)
-$(buildinfodir)/pcl-cvs$(INFO_EXT): ${srcdir}/pcl-cvs.texi ${gfdl}
+$(buildinfodir)/pcl-cvs$(INFO_EXT): $(pcl_cvs_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
-pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi ${gfdl}
+pcl-cvs.dvi: $(pcl_cvs_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
-pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi ${gfdl}
+pcl-cvs.pdf: $(pcl_cvs_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
+pcl-cvs.html: $(pcl_cvs_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
 
+pgg_deps = ${srcdir}/pgg.texi ${gfdl}
 pgg : $(buildinfodir)/pgg$(INFO_EXT)
-$(buildinfodir)/pgg$(INFO_EXT): ${srcdir}/pgg.texi ${gfdl}
+$(buildinfodir)/pgg$(INFO_EXT): $(pgg_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pgg.texi
-pgg.dvi: ${srcdir}/pgg.texi ${gfdl}
+pgg.dvi: $(pgg_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
-pgg.pdf: ${srcdir}/pgg.texi ${gfdl}
+pgg.pdf: $(pgg_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
+pgg.html: $(pgg_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/pgg.texi
 
+rcirc_deps = ${srcdir}/rcirc.texi ${gfdl}
 rcirc : $(buildinfodir)/rcirc$(INFO_EXT)
-$(buildinfodir)/rcirc$(INFO_EXT): ${srcdir}/rcirc.texi ${gfdl}
+$(buildinfodir)/rcirc$(INFO_EXT): $(rcirc_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/rcirc.texi
-rcirc.dvi: ${srcdir}/rcirc.texi ${gfdl}
+rcirc.dvi: $(rcirc_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
-rcirc.pdf: ${srcdir}/rcirc.texi ${gfdl}
+rcirc.pdf: $(rcirc_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
+rcirc.html: $(rcirc_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/rcirc.texi
 
+reftex_deps = ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl}
 reftex : $(buildinfodir)/reftex$(INFO_EXT)
-$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/reftex$(INFO_EXT): $(reftex_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi
-reftex.dvi: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl}
+reftex.dvi: $(reftex_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
-reftex.pdf: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl}
+reftex.pdf: $(reftex_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
+reftex.html: $(reftex_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/reftex.texi
 
+remember_deps = ${srcdir}/remember.texi ${gfdl}
 remember : $(buildinfodir)/remember$(INFO_EXT)
-$(buildinfodir)/remember$(INFO_EXT): ${srcdir}/remember.texi ${gfdl}
+$(buildinfodir)/remember$(INFO_EXT): $(remember_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/remember.texi
-remember.dvi: ${srcdir}/remember.texi ${gfdl}
+remember.dvi: $(remember_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
-remember.pdf: ${srcdir}/remember.texi ${gfdl}
+remember.pdf: $(remember_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
+remember.html: $(remember_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/remember.texi
 
+sasl_deps = ${srcdir}/sasl.texi ${gfdl}
 sasl : $(buildinfodir)/sasl$(INFO_EXT)
-$(buildinfodir)/sasl$(INFO_EXT): ${srcdir}/sasl.texi ${gfdl}
+$(buildinfodir)/sasl$(INFO_EXT): $(sasl_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sasl.texi
-sasl.dvi: ${srcdir}/sasl.texi ${gfdl}
+sasl.dvi: $(sasl_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
-sasl.pdf: ${srcdir}/sasl.texi ${gfdl}
+sasl.pdf: $(sasl_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
+sasl.html: $(sasl_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sasl.texi
 
+sc_deps = ${srcdir}/sc.texi ${gfdl}
 sc : $(buildinfodir)/sc$(INFO_EXT)
-$(buildinfodir)/sc$(INFO_EXT): ${srcdir}/sc.texi ${gfdl}
+$(buildinfodir)/sc$(INFO_EXT): $(sc_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sc.texi
-sc.dvi: ${srcdir}/sc.texi ${gfdl}
+sc.dvi: $(sc_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
-sc.pdf: ${srcdir}/sc.texi ${gfdl}
+sc.pdf: $(sc_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
+sc.html: $(sc_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sc.texi
 
+semantic_deps = ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl}
 semantic : $(buildinfodir)/semantic$(INFO_EXT)
-$(buildinfodir)/semantic$(INFO_EXT): ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl}
+$(buildinfodir)/semantic$(INFO_EXT): $(semantic_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/semantic.texi
-semantic.dvi: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl}
+semantic.dvi: $(semantic_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
-semantic.pdf: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl}
+semantic.pdf: $(semantic_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
+semantic.html: $(semantic_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/semantic.texi
 
+ses_deps = ${srcdir}/ses.texi ${gfdl}
 ses : $(buildinfodir)/ses$(INFO_EXT)
-$(buildinfodir)/ses$(INFO_EXT): ${srcdir}/ses.texi ${gfdl}
+$(buildinfodir)/ses$(INFO_EXT): $(ses_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ses.texi
-ses.dvi: ${srcdir}/ses.texi ${gfdl}
+ses.dvi: $(ses_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
-ses.pdf: ${srcdir}/ses.texi ${gfdl}
+ses.pdf: $(ses_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
+ses.html: $(ses_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ses.texi
 
+sieve_deps = ${srcdir}/sieve.texi ${gfdl}
 sieve : $(buildinfodir)/sieve$(INFO_EXT)
-$(buildinfodir)/sieve$(INFO_EXT): ${srcdir}/sieve.texi ${gfdl}
+$(buildinfodir)/sieve$(INFO_EXT): $(sieve_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sieve.texi
-sieve.dvi: ${srcdir}/sieve.texi ${gfdl}
+sieve.dvi: $(sieve_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
-sieve.pdf: ${srcdir}/sieve.texi ${gfdl}
+sieve.pdf: $(sieve_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
+sieve.html: $(sieve_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sieve.texi
 
+smtpmail_deps = ${srcdir}/smtpmail.texi ${gfdl}
 smtpmail : $(buildinfodir)/smtpmail$(INFO_EXT)
-$(buildinfodir)/smtpmail$(INFO_EXT): ${srcdir}/smtpmail.texi ${gfdl}
+$(buildinfodir)/smtpmail$(INFO_EXT): $(smtpmail_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/smtpmail.texi
-smtpmail.dvi: ${srcdir}/smtpmail.texi ${gfdl}
+smtpmail.dvi: $(smtpmail_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
-smtpmail.pdf: ${srcdir}/smtpmail.texi ${gfdl}
+smtpmail.pdf: $(smtpmail_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
+smtpmail.html: $(smtpmail_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/smtpmail.texi
 
+speedbar_deps = ${srcdir}/speedbar.texi ${gfdl}
 speedbar : $(buildinfodir)/speedbar$(INFO_EXT)
-$(buildinfodir)/speedbar$(INFO_EXT): ${srcdir}/speedbar.texi ${gfdl}
+$(buildinfodir)/speedbar$(INFO_EXT): $(speedbar_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/speedbar.texi
-speedbar.dvi: ${srcdir}/speedbar.texi ${gfdl}
+speedbar.dvi: $(speedbar_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
-speedbar.pdf: ${srcdir}/speedbar.texi ${gfdl}
+speedbar.pdf: $(speedbar_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
+speedbar.html: $(speedbar_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/speedbar.texi
 
+srecode_deps = ${srcdir}/srecode.texi ${gfdl}
 srecode : $(buildinfodir)/srecode$(INFO_EXT)
-$(buildinfodir)/srecode$(INFO_EXT): ${srcdir}/srecode.texi ${gfdl}
+$(buildinfodir)/srecode$(INFO_EXT): $(srecode_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/srecode.texi
-srecode.dvi: ${srcdir}/srecode.texi ${gfdl}
+srecode.dvi: $(srecode_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/srecode.texi
-srecode.pdf: ${srcdir}/srecode.texi ${gfdl}
+srecode.pdf: $(srecode_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/srecode.texi
-
+srecode.html: $(srecode_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/srecode.texi
+
+todo_mode_deps = ${srcdir}/todo-mode.texi ${gfdl}
+todo-mode : $(buildinfodir)/todo-mode$(INFO_EXT)
+$(buildinfodir)/todo-mode$(INFO_EXT): $(todo_mode_deps)
+        $(mkinfodir)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/todo-mode.texi
+todo-mode.dvi: $(todo_mode_deps)
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/todo-mode.texi
+todo-mode.pdf: $(todo_mode_deps)
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/todo-mode.texi
+todo-mode.html: $(todo_mode_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/todo-mode.texi
+
+tramp_deps = ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl}
 tramp : $(buildinfodir)/tramp$(INFO_EXT)
-$(buildinfodir)/tramp$(INFO_EXT): ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl}
+$(buildinfodir)/tramp$(INFO_EXT): $(tramp_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
-tramp.dvi: ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl}
+tramp.dvi: $(tramp_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
-tramp.pdf: ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl}
+tramp.pdf: $(tramp_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
+tramp.html: $(tramp_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
 
+url_deps = ${srcdir}/url.texi ${gfdl}
 url : $(buildinfodir)/url$(INFO_EXT)
-$(buildinfodir)/url$(INFO_EXT): ${srcdir}/url.texi ${gfdl}
+$(buildinfodir)/url$(INFO_EXT): $(url_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/url.texi
-url.dvi: ${srcdir}/url.texi ${gfdl}
+url.dvi: $(url_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
-url.pdf: ${srcdir}/url.texi ${gfdl}
+url.pdf: $(url_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
+url.html: $(url_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/url.texi
 
+vip_deps = ${srcdir}/vip.texi ${gfdl}
 vip : $(buildinfodir)/vip$(INFO_EXT)
-$(buildinfodir)/vip$(INFO_EXT): ${srcdir}/vip.texi ${gfdl}
+$(buildinfodir)/vip$(INFO_EXT): $(vip_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vip.texi
-vip.dvi: ${srcdir}/vip.texi ${gfdl}
+vip.dvi: $(vip_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
-vip.pdf: ${srcdir}/vip.texi ${gfdl}
+vip.pdf: $(vip_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
+vip.html: $(vip_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/vip.texi
 
+viper_deps = ${srcdir}/viper.texi ${gfdl}
 viper : $(buildinfodir)/viper$(INFO_EXT)
-$(buildinfodir)/viper$(INFO_EXT): ${srcdir}/viper.texi ${gfdl}
+$(buildinfodir)/viper$(INFO_EXT): $(viper_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/viper.texi
-viper.dvi: ${srcdir}/viper.texi ${gfdl}
+viper.dvi: $(viper_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
-viper.pdf: ${srcdir}/viper.texi ${gfdl}
+viper.pdf: $(viper_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
+viper.html: $(viper_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/viper.texi
 
+widget_deps = ${srcdir}/wisent.texi ${gfdl}
 widget : $(buildinfodir)/widget$(INFO_EXT)
-$(buildinfodir)/widget$(INFO_EXT): ${srcdir}/widget.texi ${gfdl}
+$(buildinfodir)/widget$(INFO_EXT): $(widget_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/widget.texi
-widget.dvi: ${srcdir}/widget.texi ${gfdl}
+widget.dvi: $(widget_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
-widget.pdf: ${srcdir}/widget.texi ${gfdl}
+widget.pdf: $(widget_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
+widget.html: $(widget_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/widget.texi
 
+wisent_deps = ${srcdir}/wisent.texi ${gfdl}
 wisent : $(buildinfodir)/wisent$(INFO_EXT)
-$(buildinfodir)/wisent$(INFO_EXT): ${srcdir}/wisent.texi ${gfdl}
+$(buildinfodir)/wisent$(INFO_EXT): $(wisent_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/wisent.texi
-wisent.dvi: ${srcdir}/wisent.texi ${gfdl}
+wisent.dvi: $(wisent_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/wisent.texi
-wisent.pdf: ${srcdir}/wisent.texi ${gfdl}
+wisent.pdf: $(wisent_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/wisent.texi
+wisent.html: $(wisent_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/wisent.texi
 
+woman_deps = ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl}
 woman : $(buildinfodir)/woman$(INFO_EXT)
-$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl}
+$(buildinfodir)/woman$(INFO_EXT): $(woman_deps)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi
-woman.dvi: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl}
+woman.dvi: $(woman_deps)
         $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
-woman.pdf: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl}
+woman.pdf: $(woman_deps)
         $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
-
+woman.html: $(woman_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/woman.texi
 
 .PHONY: mostlyclean clean distclean maintainer-clean
 
@@ -718,7 +837,8 @@ mostlyclean:
         rm -f gnustmp.*
 
 clean: mostlyclean
-        rm -f $(DVI_TARGETS) $(PDF_TARGETS)
+        rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
+        rm -f efaq-w32.dvi efaq-w32.html efaq-w32.pdf efaq-w32.ps
         rm -f emacs-misc-${version}.tar*
 
 distclean: clean
@@ -753,4 +873,53 @@ dist:
         tar -cf emacs-misc-${version}.tar emacs-misc-${version}
         rm -rf emacs-misc-${version}
 
+
+.PHONY: install-dvi install-html install-pdf install-ps install-doc
+
+install-dvi: dvi
+        umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
+        $(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
+install-html: html
+        umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
+        $(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
+install-pdf: pdf
+         umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
+        $(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
+install-ps: ps
+        umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
+        for file in $(PS_TARGETS); do \
+          $(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
+          [ -n "${GZIP_PROG}" ] || continue; \
+          rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
+          ${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
+        done
+
+## Top-level Makefile installs the info pages.
+install-doc: install-dvi install-html install-pdf install-ps
+
+
+
+.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
+
+uninstall-dvi:
+        for file in $(DVI_TARGETS); do \
+          rm -f $(DESTDIR)$(dvidir)/$${file}; \
+        done
+uninstall-html:
+        for file in $(HTML_TARGETS); do \
+          rm -f $(DESTDIR)$(htmldir)/$${file}; \
+        done
+uninstall-ps:
+        ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
+        for file in $(PS_TARGETS); do \
+          rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
+        done
+uninstall-pdf:
+        for file in $(PDF_TARGETS); do \
+          rm -f $(DESTDIR)$(pdfdir)/$${file}; \
+        done
+
+uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
+
+
 ### Makefile ends here
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 4cc5d9c5767..c62d7026541 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -241,7 +241,7 @@ functions, classes, etc.; there are other packages for that.
 * Customizing Indentation::
 * Custom Macros::
 * Odds and Ends::
-* Sample .emacs File::
+* Sample Init File::
 * Performance Issues::
 * Limitations and Known Bugs::
 * FAQ::
@@ -1113,7 +1113,7 @@ valid.}.
 This function is not bound to a key by default, but it's intended to be
 used on the @kbd{RET} key.  If you like the behavior of
 @code{newline-and-indent} on @kbd{RET}, you should consider switching to
-this function.  @xref{Sample .emacs File}.
+this function.  @xref{Sample Init File}.
 
 @item @kbd{M-x c-context-open-line}
 @findex c-context-open-line
@@ -1170,7 +1170,7 @@ and @ref{Indentation Engine Basics}.
 
 You can toggle each of these minor modes on and off, and you can
 configure @ccmode{} so that it starts up with your favorite
-combination of them (@pxref{Sample .emacs File}).  By default, when
+combination of them (@pxref{Sample Init File}).  By default, when
 you initialize a buffer, electric mode and syntactic-indentation mode
 are enabled but the other two modes are disabled.
 
@@ -2378,7 +2378,7 @@ those set by @code{c-default-style}.
 @vindex initialization-hook (c-)
 Hook run only once per Emacs session, when @ccmode{} is initialized.
 This is a good place to change key bindings (or add new ones) in any
-of the @ccmode{} key maps.  @xref{Sample .emacs File}.
+of the @ccmode{} key maps.  @xref{Sample Init File}.
 @end defvar
 
 @defvar c-mode-common-hook
@@ -2406,7 +2406,7 @@ overwritten when @ccmode{} gets loaded.
 Here's a simplified example of what you can add to your @file{.emacs}
 file to do things whenever any @ccmode{} language is edited.  See the
 Emacs manuals for more information on customizing Emacs via hooks.
-@xref{Sample .emacs File}, for a more complete sample @file{.emacs}
+@xref{Sample Init File}, for a more complete sample @file{.emacs}
 file.
 
 @example
@@ -2685,7 +2685,7 @@ create a new @dfn{style definition}, possibly based on an existing
 style.  To do this, put the new style's settings into a list with the
 following format; the list can then be passed as an argument to the
 function @code{c-add-style}.  You can see an example of a style
-definition in @ref{Sample .emacs File}.
+definition in @ref{Sample Init File}.
 
 @cindex style definition
 @c @defvr {List} style definition
@@ -2753,7 +2753,7 @@ deprecated and it might be removed from @ccmode{} in a future release.
 You should use @code{c-set-style} instead.
 
 The sample @file{.emacs} file provides a concrete example of how a new
-style can be added and automatically set.  @xref{Sample .emacs File}.
+style can be added and automatically set.  @xref{Sample Init File}.
 @end defun
 
 @defvar c-style-alist
@@ -6760,7 +6760,7 @@ initialization code.
 @end defun
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@node    Odds and Ends, Sample .emacs File, Custom Macros, Top
+@node    Odds and Ends, Sample Init File, Custom Macros, Top
 @comment node-name, next, previous, up
 @chapter Odds and Ends
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6804,9 +6804,9 @@ anchoring position to indent the line in that case.
 
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@node    Sample .emacs File, Performance Issues, Odds and Ends, Top
+@node    Sample Init File, Performance Issues, Odds and Ends, Top
 @comment node-name, next, previous, up
-@appendix Sample .emacs File
+@appendix Sample Init File
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 Here's a sample .emacs file fragment that might help you along the way.
@@ -6863,7 +6863,7 @@ to change some of the actual values.
 @end verbatim
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@node    Performance Issues, Limitations and Known Bugs, Sample .emacs File, Top
+@node    Performance Issues, Limitations and Known Bugs, Sample Init File, Top
 @comment node-name, next, previous, up
 @chapter Performance Issues
 @cindex performance
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 90f8a258d23..6dfc41d83f3 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -461,6 +461,7 @@ matter of stylistic taste:
     @var{body}))
 @end example
 
+@cindex destructuring, in argument list
 Argument lists support @dfn{destructuring}.  In Common Lisp,
 destructuring is only allowed with @code{defmacro}; this package
 allows it with @code{cl-defun} and other argument lists as well.
@@ -1492,6 +1493,7 @@ simply returning @code{nil}.
 
 @node Blocks and Exits
 @section Blocks and Exits
+@cindex block 
 
 @noindent
 Common Lisp @dfn{blocks} provide a non-local exit mechanism very
@@ -2139,6 +2141,7 @@ that was just set by the previous clause; in the second loop,
 based on the value of @code{x} left over from the previous time
 through the loop.
 
+@cindex destructuring, in cl-loop
 Another feature of the @code{cl-loop} macro is @emph{destructuring},
 similar in concept to the destructuring provided by @code{defmacro}
 (@pxref{Argument Lists}).
@@ -2503,6 +2506,8 @@ if @var{expr} returns a list of the wrong number of arguments
 or with incorrect keyword arguments.
 @end defmac
 
+@cindex compiler macros
+@cindex define compiler macros
 This package also includes the Common Lisp @code{define-compiler-macro}
 facility, which allows you to define compile-time expansions and
 optimizations for your functions.
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index 339d59bd123..40aeae836ef 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -789,13 +789,13 @@ so the above directions may need some modification if your site has such
 special needs.
 
 @menu
-* edt-user.el::          Creating your own @file{edt-user.el} file.
+* Init file::            Creating your own @file{edt-user.el} file.
 * Words::                Specifying word entities.
 * Control keys::         Enabling EDT control key sequence bindings.
 * Scroll margins::       Setting scroll margins.
 @end menu
 
-@node edt-user.el
+@node Init file
 @section Creating your own @file{edt-user.el} File
 
 A sample @file{edt-user.el} file is provided in the Emacs @file{etc/}
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
new file mode 100644
index 00000000000..c6f44cea2b8
--- /dev/null
+++ b/doc/misc/efaq-w32.texi
@@ -0,0 +1,2365 @@
+\input texinfo    @c -*-coding:utf-8 -*-
+@setfilename efaq-w32
+@settitle GNU Emacs FAQ For MS Windows
+@setchapternewpage odd
+@syncodeindex pg cp
+@syncodeindex ky cp
+@syncodeindex tp cp
+@syncodeindex vr fn
+
+@documentdescription
+Answers to Frequently asked Questions about using Emacs on Microsoft Windows.
+@end documentdescription
+
+@include emacsver.texi
+
+@documentencoding utf-8
+@documentlanguage en
+
+@copying
+Copyright @copyright{} 2008, 2010-2013 Free Software Foundation, Inc.
+
+@quotation
+This list of frequently asked questions about GNU Emacs on MS Windows
+with answers (``FAQ'') may be translated into other languages,
+transformed into other formats (e.g. Texinfo, Info, WWW), and updated
+with new information.
+
+The same conditions apply to any derivative of the FAQ as apply to the FAQ
+itself.  Every copy of the FAQ must include this notice or an approved
+translation, information on who is currently maintaining the FAQ and how to
+contact them (including their e-mail address), and information on where the
+latest version of the FAQ is archived (including FTP information).
+
+The FAQ may be copied and redistributed under these conditions, except that
+the FAQ may not be embedded in a larger literary work unless that work
+itself allows free copying and redistribution.
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Emacs W32 FAQ: (efaq-w32).    FAQs about Emacs on MS Windows.
+@end direntry
+
+@c The @titlepage stuff only appears in the printed version
+@titlepage
+@sp 10
+@center @titlefont{GNU Emacs FAQ for MS Windows}
+
+@c The following two commands start the copyright page.
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@footnotestyle end
+
+@node Top
+@top GNU Emacs FAQ for MS Windows
+
+This is the FAQ for using GNU Emacs on MS Windows, as distributed with
+Emacs @value{EMACSVER}.
+
+This FAQ is maintained by the developers and users of Emacs on MS Windows.
+If you find any errors, or have any suggestions, please send them to
+the @url{http://lists.gnu.org/mailman/listinfo/help-emacs-windows,
+help-emacs-windows} mailing list.
+
+At time of writing, the latest version of GNU Emacs is version @value{EMACSVER}.
+
+@c Links to ftp.gnu.org are given as http links, since Windows ftp clients
+@c are notoriously bad at handling firewalls etc.
+
+@contents
+
+@menu
+* Introduction::
+* Getting Emacs::
+* Installing Emacs::
+* Display Settings::
+* Fonts and text translation::
+* Printing::
+* Sub-processes::
+* Network access::
+* Text and Utility modes::
+* Developing with Emacs::
+* Other useful ports::
+* Further information::
+* Indexes::
+@end menu
+
+@c ------------------------------------------------------------
+@node Introduction
+@chapter Introduction
+@cindex scope of FAQ
+
+This FAQ covers questions that are specific to running GNU Emacs on Windows.
+For more general information, see the other Emacs manuals.
+@xref{Further information}.
+
+@menu
+* Why Emacs on Windows::
+* Which versions of Windows::
+* Other versions of Emacs::
+@end menu
+
+@node Why Emacs on Windows
+@section Why support GNU Emacs on Windows?
+@cindex Why Windows
+
+It is not our goal to ``help Windows users'' by making text editing
+on Windows more convenient.  We aim to replace proprietary software,
+not to enhance it.  So why support GNU Emacs on Windows?
+
+We hope that the experience of using GNU Emacs on Windows will give
+programmers a taste of freedom, and that this will later inspire them
+to move to a free operating system such as GNU/Linux.  That is the
+main valid reason to support free applications on nonfree operating
+systems.
+
+@node Which versions of Windows
+@section Which versions of Windows are supported?
+@cindex Windows, versions
+@cindex supported versions of Windows
+
+Emacs @value{EMACSVER} is known to run on all versions of Windows from
+@c FIXME does it really still support Windows 98?  Does it matter?
+Windows 98 and Windows NT 4.0 through to Windows 7.  The Windows port is
+built using the Win32 API and supports most features of the X version,
+including variable width fonts, images and tooltips.
+
+@node Other versions of Emacs
+@section What other versions of Emacs run on Windows?
+@cindex other ports of Emacs
+
+@xref{Cygwin}.
+
+@cindex DOS port
+@cindex Windows 3.11 port
+Emacs can also be compiled for MSDOS.  When run on recent MS Windows,
+it supports long file names, and uses the Windows clipboard.
+See the @file{msdos} directory in the Emacs sources for building
+instructions (requires DJGPP).
+
+@c ------------------------------------------------------------
+@node Getting Emacs
+@chapter Getting Emacs
+
+@menu
+* Downloading::
+* Compiling::
+* Debugging::
+@end menu
+
+@node Downloading
+@section Where can I download Emacs?
+
+@cindex precompiled binaries
+@cindex where to get Emacs binaries
+Pre-compiled versions are distributed from
+@uref{http://ftpmirror.gnu.org/emacs/windows/, ftp.gnu.org mirrors}.
+Emacs binaries are distributed as zip files, digitally
+signed by the developer who built them.  Generally most users will
+want the file @file{emacs-@value{EMACSVER}-bin-i386.zip}, which
+contains everything you need to get started. 
+
+@cindex where to get sources
+@cindex Emacs source code
+@cindex source for Emacs
+The latest source is available from
+@uref{http://ftpmirror.gnu.org/emacs/, ftp.gnu.org mirrors}.  It is
+distributed as a compressed tar file, digitally signed by the maintainer
+who made the release.
+
+@cindex Bzr, getting Emacs
+@cindex latest development version of Emacs
+@cindex Emacs Development
+The development version of Emacs is available from
+@uref{http://savannah.gnu.org/projects/emacs, Savannah}, the GNU
+development site.
+
+@node Compiling
+@section How can I compile Emacs myself?
+@cindex compiling Emacs
+
+To compile Emacs on Windows, you will need the MingW or Cygwin port of
+GCC with MingW make, or a Microsoft C compiler with nmake and the
+single threaded C runtime library.  Recent versions of Microsoft
+Visual Studio no longer come with the single threaded C runtime
+library, which is required for certain POSIX compatibility, so MingW
+is usually the best choice.  Image support requires external
+libraries, the headers and import libraries for which will need to be
+installed where your compiler can find them.  You will also need ports
+of GNU @command{rm} and @command{cp}, as the Windows native
+equivalents are not consistent between versions.  GNU texinfo will be
+required to build the manuals.  @xref{Other useful ports}.
+
+After unpacking the source, or checking out of Bzr, be sure to read the
+instructions in @file{nt/README} and @file{nt/INSTALL}.
+
+@node Debugging
+@section How do I use a debugger on Emacs?
+@cindex debugging Emacs
+@cindex bugs in Emacs, how to debug
+@cindex Emacs debugging
+
+By default, Emacs is compiled with debugging on, and optimizations enabled.
+The optimizations may interfere with some types of debugging; the debugger
+may not show clearly where it is, or may not be able to inspect certain
+variables.  If this is the case, reconfigure with @option{--no-opt}.
+
+The file @file{etc/DEBUG} contains general debugging hints, as well as
+specific notes about debugging Emacs with both gdb and Microsoft debuggers.
+
+@menu
+* GDB::
+* Microsoft Developer Studio::
+@end menu
+
+@node GDB
+@subsection GDB
+@cindex GDB, debugging Emacs with
+@cindex debugging Emacs with GDB
+
+GDB is the GNU debugger, which can be used to debug Emacs when it has
+been compiled with GCC.  The best results will be obtained if you
+start gdb from the @file{src} directory as @samp{gdb oo/i386/emacs.exe}.
+This will load the init file @file{.gdbinit} in that directory, to
+define some extra commands for working with lisp while debugging, and
+set up breakpoints to catch abnormal aborts.
+
+@node Microsoft Developer Studio
+@subsection Microsoft Developer Studio
+@cindex MSVC++, debugging Emacs with
+@cindex DevStudio, debugging Emacs with
+@cindex debugging Emacs with MS DevStudio
+
+MS DevStudio can be used to debug Emacs when it has been compiled with
+a Microsoft compiler.  To view lisp variables, you can call the
+function @code{debug_print} from the Quickwatch window.  Some
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/debug.txt,
+old tips} are probably still valid.
+
+@c ------------------------------------------------------------
+@node Installing Emacs
+@chapter Installing Emacs
+
+@menu
+* Unpacking::
+* Installing::
+* Image support::
+* Init file::
+* Location of init file::
+* Troubleshooting init file::
+* Associate files with Emacs::
+* Find-file and the Desktop::
+* Make Windows more like X::
+* Make Emacs like a Windows app::
+* Window operations::
+* Uninstall::
+* Does not run::
+* Virus::
+* Anti-virus::
+@end menu
+
+@node Unpacking
+@section How do I unpack the distributions?
+@cindex unpacking Emacs distribution
+@cindex extracting Emacs distribution
+@cindex unzipping Emacs distribution
+@cindex untarring Emacs distribution
+@cindex zip files, how to unpack Emacs binaries
+@cindex tar.gz files, how to unpack Emacs sources
+
+The binary distributions are distributed as zip files, which are handled
+natively by Windows XP and later.  For earlier versions, there are many
+tools that can handle the zip format, from InfoZip's command line unzip
+tool, to 7zip's multi-format graphical archive explorer.  Although
+popular, WinZip has caused problems with line-ends in the past, and is not
+Free software, so we do not recommend it.
+
+Source distributions are distributed as gzipped tar files.  7zip and
+similar multi-format graphical tools can handle these, or you can get
+Windows ports of the command line gzip and tar tools from multiple sources.
+@xref{Other useful ports}.
+
+The command to unpack a source distribution from the command line is:
+@example
+tar xzf emacs-@value{EMACSVER}.tar.gz 
+@end example
+
+If this does not work with the versions of tar and gzip that you have,
+you may need to try a two step process:
+@example
+gzip -dc emacs-@value{EMACSVER}.tar.gz | tar xvf -
+@end example
+
+You may see many messages from tar complaining about being unable to change
+the modification time on directories, and from gzip complaining about a
+broken pipe.  These messages are usually harmless, caused by incomplete ports
+that are not fully aware of the limitations of Windows.
+
+@node Installing
+@section How do I install Emacs after unpacking?
+@cindex installing Emacs
+@pindex addpm
+@cindex Start Menu, creating icons for Emacs
+
+You can run Emacs without any extra steps, but if you want icons in your
+Start Menu, or for Emacs to detect the image libraries that are already
+installed on your system as part of GTK, then you should run the program
+@file{emacs-@value{EMACSVER}\bin\addpm.exe}.
+
+@node Image support
+@section How do I get image support?
+@cindex images, installing libraries for
+@cindex jpeg, installing image support in Emacs
+@cindex png, installing image support in Emacs
+@cindex gif, installing image support in Emacs
+@cindex tiff, installing image support in Emacs
+@cindex xpm, installing image support in Emacs
+@cindex toolbar, installing color icons in
+@cindex color images, installing support for images in Emacs
+@cindex monochrome images, getting color images in Emacs
+@cindex black and white images, getting color images in Emacs
+
+Emacs has built in support for XBM and PBM/PGM/PPM images.  This is
+sufficient to see the monochrome splash screen and tool-bar icons.
+Since 22.2, the official precompiled binaries for Windows have bundled
+libXpm, which is required to display the color versions of those images.
+
+Emacs is compiled to recognize JPEG, PNG, GIF and TIFF images also,
+but displaying these image types require external DLLs which are not
+bundled with Emacs.  @xref{Other useful ports}.
+
+@node Init file
+@section What is my init file?
+@cindex .emacs
+@cindex init file
+
+When Emacs starts up, it attempts to load and execute the contents of
+a file commonly called @file{.emacs} (though it may have other names,
+@pxref{Installing Emacs,,Where do I put my init file?}) which contains any
+customizations you have made.  You can manually add lisp code to your
+.emacs, or you can use the Customization interface accessible from the
+@emph{Options} menu.  If the file does not exist, Emacs will start
+with the default settings.
+
+@node Location of init file
+@section Where do I put my init file?
+@cindex HOME directory
+@cindex .emacs.d
+@cindex _emacs
+@cindex init.el
+@cindex registry, setting the HOME directory in
+
+On Windows, the .emacs file may be called _emacs for backward
+compatibility with DOS and FAT filesystems where filenames could not
+start with a dot.  Some users prefer to continue using such a name,
+because Explorer cannot create a file with a name starting with a dot,
+even though the filesystem and most other programs can handle it.
+In Emacs 22 and later, the init file may also be called
+@file{.emacs.d/init.el}.  Many of the other files that are created
+by lisp packages are now stored in the @file{.emacs.d} directory too,
+so this keeps all your Emacs related files in one place.
+
+All the files mentioned above should go in your @env{HOME} directory.
+The @env{HOME} directory is determined by following the steps below:
+
+@enumerate
+@item
+If the environment variable @env{HOME} is set, use the directory it indicates.
+@item
+If the registry entry @code{HKCU\SOFTWARE\GNU\Emacs\HOME} is set, use the
+directory it indicates.
+@item
+If the registry entry @code{HKLM\SOFTWARE\GNU\Emacs\HOME} is set, use the
+directory it indicates.  Not recommended, as it results in users sharing
+the same HOME directory.
+@item
+If @file{C:\.emacs} exists, then use @file{C:/}.  This is for
+backward compatibility, as previous versions defaulted to @file{C:/}
+if @env{HOME} was not set.
+@item
+Use the user's AppData directory, usually a directory called
+@file{Application Data} under the user's profile directory, the location
+of which varies according to Windows version and whether the computer is
+part of a domain.
+@end enumerate
+
+Within Emacs, @key{~} at the beginning of a file name is expanded to your
+@env{HOME} directory, so you can always find your .emacs file with
+@kbd{C-x C-f ~/.emacs}.
+
+@node Troubleshooting init file
+@section Troubleshooting init file problems
+@cindex troubleshooting init problems
+@cindex debugging init problems
+@cindex checking that HOME is set correctly
+
+If you've set @env{HOME} to a directory using one of the above
+methods, and Emacs still doesn't load your init file, the first
+thing you should do is check to see what Emacs thinks @env{HOME} is set
+to.  You can do this by evaluating the following expression in the
+@file{*scratch*} buffer using @kbd{C-x C-e}:
+
+@example
+(insert (getenv "HOME"))
+@end example
+
+Look carefully at what is printed and make sure the value is
+valid.  For example, if the value has trailing whitespace, Emacs won't
+be able to find the directory.  Also, be sure that the value isn't a
+relative drive letter (e.g., @file{d:} without a backslash); if it is,
+then @env{HOME} is going to be whatever the current directory on that
+drive is, which is likely not what you want to happen.
+
+@node Associate files with Emacs
+@section How do I associate files with Emacs?
+@cindex Explorer, associating Emacs with files in
+@cindex emacsclient, associating files with
+@cindex file associations
+@cindex associating files with Emacs
+@cindex ALTERNATE_EDITOR
+@findex server-start
+
+The recommended way to associate files is to associate them with
+@command{emacsclientw.exe}.  In order for this to work when Emacs is
+not yet started, you will also need to set the environment variable
+@env{ALTERNATE_EDITOR} to @command{runemacs.exe}.  To open files
+in a running instance of Emacs, you will need to add the following
+to your init file:
+@example
+(server-start)
+@end example
+
+@menu
+* Using with Explorer::
+@end menu
+
+@node Using with Explorer
+@subsection For use with Internet Explorer
+@cindex Internet Explorer, view source in Emacs
+@cindex mailto urls, associating with Emacs
+@cindex news urls, associating with Emacs
+@cindex URLs, associating mail and news URLs with Emacs
+
+You can use Emacs as the editor for composing mail for
+@indicateurl{mailto:} links, reading usenet for @indicateurl{news:}
+links, and viewing source.  The following registry entries control
+this:
+
+@itemize @w{}
+@item
+Mail
+@itemize
+@item @strong{Key:} HKCR\mailto\shell\open\command\(Default)
+@item @strong{Value:} emacsclientw -e "(message-mail (substring \"%1\" 7))"
+@end itemize
+
+@item
+News
+@itemize
+@item @strong{Key:} HKCR\news\shell\open\command\(Default)
+@item @strong{Value:} emacsclientw -e "(gnus-fetch-group (substring \"%1\" 5)"
+@end itemize
+
+@item
+View Source
+@itemize
+@item @strong{Key:} HKCR\htmlfile\shell\edit\command\(Default)
+@item @strong{Value:} emacsclientw "%1"
+@end itemize
+
+@end itemize
+
+Thanks to Jason Rumney and Sigbjorn Finne for these tips.
+
+@node Find-file and the Desktop
+@section How do I use find-file to open files that are on the Desktop?
+@cindex Desktop, finding where it is
+@cindex finding the Desktop
+@cindex locating files on the Desktop
+
+The location of the Desktop varies between different versions of
+Windows, and in a corporate environment can be moved around by the
+network administrator.  On NT derivatives, you can use the value of
+the @env{USERPROFILE} environment variable to find where the desktop
+might be:
+
+@example
+@kbd{C-x C-f $USERPROFILE/Desktop}
+@end example
+
+If this doesn't work, then you probably have to forgo the keyboard
+just this once, and either drag a file onto the Emacs frame from the
+desktop, or use the file dialog (displayed when you use the toolbar or
+menu by default).  Once you have a file from the Desktop inside Emacs,
+@kbd{C-x C-f} will quickly reveal where your desktop is kept.
+
+@node Make Windows more like X
+@section How can I modify Windows to act more like X?
+@cindex X, making Windows behave like
+
+@menu
+* Focus follows mouse::
+* Swap CapsLock and Control::
+@end menu
+
+@node Focus follows mouse
+@subsection How do it make the active window follow the mouse?
+@vindex focus-follows-mouse
+@cindex point to focus
+@cindex mouse over to focus
+
+Customize the variables @code{focus-follows-mouse} and
+@code{mouse-autoselect-window}.  The former can be used to mislead
+Emacs into giving focus to other frames when the mouse is over them,
+even though Windows has a click to focus policy by default (there is
+software available to change that though).  The latter can be used to
+make Emacs use a focus-follow-mouse policy within its own frames.
+
+@node Swap CapsLock and Control
+@subsection How do I swap CapsLock and Control?
+@cindex scan codes, modifying
+@cindex key layout, customizing
+@cindex caps-lock, swapping with control key
+@cindex control key, swapping with caps-lock
+@cindex windows key, use as alt
+@cindex alt key, using windows keys as additional
+
+This cannot be done within Emacs, but you can modify the scan code
+mappings in the registry or define a new keyboard layout to swap the
+keys on a system wide basis.
+
+@menu
+* Swap Caps NT::
+* Swap Caps 98::
+@end menu
+
+@node Swap Caps NT
+@subsubsection Windows NT/2000/XP/Vista?
+
+@itemize
+@item
+From Chris McMahon.  To make CapsLock a Control key (leaving your
+original control keys as they were), use this registry file:
+@example
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout]
+"Scancode Map"=hex:00,00,00,00,00,00,00,00,02,00,00,00,1d,00,3a,00,00,00,00,00
+@end example
+To swap CapsLock and the left Control key, use:
+@example
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout]
+"Scancode Map"=hex:00,00,00,00,00,00,00,00,03,00,00,00,1d,00,3a,00,3a,00,1d,00,00,00,00,00
+@end example
+Save these as files with a @file{.reg} extension, and double-click on
+them in Explorer, or ``run'' them from a command prompt to have them
+update your registry (you may need to reboot).
+@item
+Shane Holder gives some background on how "Scancode Map" is used
+by the system:
+@ignore
+http://ftp.gnu.org/old-gnu/emacs/windows/docs/ntemacs/contrib/caps-ctrl-registry.txt
+From: Shane Holder <holder@@mordor.rsn.hp.com>
+To: ntemacs-users@@cs.washington.edu
+Date: 04 Dec 1996 14:36:21 -0600
+Message-ID: <fawg21mm4hm.fsf@@mordor.rsn.hp.com>
+Subject: Re: Re[2]: problem with caps/ctrl swap on NT 4.0
+@end ignore
+@example
+It's a binary value that lets you map keystrokes in the low-level keyboard 
+drivers in NT.  As a result you don't have to worry about applications 
+bypassing mappings that you've done at a higher level (i.e. it just works). 
+
+Here's the format of the value:
+
+        DWORD:  0x00000000      header
+        DWORD:  0x00000000      header
+        DWORD:  length (in DWORDs) of remaining data, including terminating DWORD
+        DWORD:  mapping 1
+        ...
+        DWORD:  mapping n
+        DWORD:  0x00000000      terminating null DWORD
+
+Each mapping DWORD  has two parts: the input scancode, and an output 
+scancode.  To map scancode 0x1d (left control) to scancode 0x3a (caps 
+lock), you want a value of 0x003a001d.  Note that this does not swap the 
+keys.  Using just this mapping value, both the left control and the caps 
+lock key will behave as caps-lock.  To swap, you also need to map 0x3a to 
+0x1d, using 0x001d003a.
+
+This registry value is system wide, and can't be made user-specific.  It
+also only takes affect on reboot.
+@end example
+@item
+Ulfar Erlingsson has provided a registry file that sets the CapsLock key
+to be a Control key and the Windows key to be an Alt key:
+@example
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout]
+"Scancode Map"=hex:00,00,00,00,00,00,00,00,03,00,00,00,1d,00,3a,00,38,00,5b,e0,00,00,00,00
+@end example
+@end itemize
+
+@node Swap Caps 98
+@subsubsection Windows 95/98/ME
+
+Microsoft has a tool called keyremap that is part of their Kernel Toys add ons
+for Windows 95.  The tool has also been confirmed to work on Windows 98.
+
+@node Make Emacs like a Windows app
+@section How can I modify Emacs to act more like a Windows app?
+@cindex Windows, making Emacs act more like
+@cindex UI, making Emacs more like other Windows apps
+
+Many beginning users find Emacs difficult to use because its user
+interface is different in many ways.  Emacs predates most UI
+standards, and experienced Emacs users are used to the way things are,
+so changing the defaults is difficult.  Most of the ``standard''
+behavior can be approximated in Emacs after some configuring though.
+
+@menu
+* Highlight selection::
+* CUA::
+@end menu
+
+@node Highlight selection
+@subsection Highlighting the selection
+@cindex transient-mark-mode
+@cindex selection, highlighting
+@cindex region, highlighting
+@cindex highlighting the selected region
+@cindex marked region, highlighting
+@cindex point and mark, highlighting the region between
+@cindex delete-selection-mode
+@cindex overwriting the selected region
+
+Emacs has a concept of a mark and point that is similar to selections
+in other programs.  But the mark in Emacs is used for more than just
+defining the selected region, it lives on while you continue to edit
+and move around the buffer so it can also be a kind of bookmark.  The
+history of marks is saved so you can pop previous marks back to the
+top of the stack to go back to somewhere you were some time ago.
+Because of this dual purpose, the region between mark and point is not
+highlighted by default unless you select a region by clicking and
+dragging the mouse.
+
+The minor mode @code{transient-mark-mode} changes the behavior of
+the mark in two ways.  First, it distinguishes between an active mark
+that has just been defined or reactivated, and an inactive mark.  When
+the mark is active, some commands that normally act on lines, words,
+buffers etc. will instead act on the region.  An inactive mark needs
+to be reactivated to operate on it, unless @code{mark-even-if-inactive}
+is set.  Secondly, @code{transient-mark-mode} also highlights the
+region when it is active, providing the same visual clue that you get
+in other programs.
+
+In addition to seeing the highlighting, new Emacs users often expect
+editing commands to replace the region when it is active.  This behavior
+can be obtained with @code{delete-selection-mode}, but see the following
+question also.
+
+@node CUA
+@subsection Standard Windows key bindings
+@findex cua-mode
+@cindex CUA keybindings
+@cindex shift key, selecting with
+@cindex standard Windows keybindings
+@cindex paste with C-v
+@cindex cut with C-x
+@cindex copy with C-c
+@cindex C-c to copy
+@cindex C-x to cut
+@cindex C-v to paste
+
+The keybindings of Emacs predate modern GUIs, and the keys that were
+chosen by later GUIs for cut and copy were given important functions
+as extended keymaps in Emacs.  CUA mode attempts to let both bindings
+co-exist by defining C-x and C-c as @code{kill-region} and
+@code{copy-region-as-kill} when the region is active, and letting
+them have their normal Emacs bindings when the region is not active.
+Many people find this to be an acceptable compromise.  CUA mode also
+defines a number of other keys (C-v, Shift selection), and can be turned
+on from the @emph{Options} menu.
+
+@node Window operations
+@section Window operations
+@cindex maximize frames from lisp
+@cindex minimize frames from lisp
+@cindex WM_SYSCOMMAND, sending system commands from lisp
+@cindex system menu, simulating from lisp
+
+The function @code{w32-send-sys-command} can be used to simulate
+choosing commands from the system menu (in the top left corner of the
+Window) and a few other system wide functions.  It takes an integer
+argument, the value of which should be a valid @code{WM_SYSCOMMAND}
+message as documented in Microsoft's API documentation.
+
+@node Uninstall
+@section How do I uninstall Emacs?
+@cindex uninstall Emacs
+@cindex remove Emacs
+@cindex clean Emacs registry settings
+@cindex registry, cleaning the Emacs settings
+@cindex Start Menu, removing Emacs from
+@cindex upgrading Emacs
+@cindex delete Emacs directory
+
+Emacs does not come with an uninstall program.  No files are installed
+outside of the Emacs base directory, so deleting that directory is
+sufficient to clean away the files.  If you ran @command{addpm},
+you'll need to delete the Start Menu group too.  The registry entries
+inserted by @command{addpm} will not cause any problems if you leave
+them there, but for the sake of completeness, you can use @command{regedit}
+to remove the keys under @code{HKEY_LOCAL_MACHINE} orx
+@code{HKEY_CURRENT_USER}: @code{SOFTWARE\GNU\Emacs}, and the key
+@code{HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\emacs.exe} if it exists.
+
+@node Does not run
+@section When I run Emacs nothing happens
+@cindex troubleshooting installation problems
+@cindex window not appearing, Emacs
+@cindex failure to run, Emacs
+@cindex 8.3 filenames, problems caused
+
+Emacs could have failed to run for a number of reasons.  The most
+common symptom is that, when Emacs is started, the cursor changes for
+a second but nothing happens.  If this happens to you, it is quite
+likely that the distribution was unpacked incorrectly.
+
+Check for the following to see if there was a problem during unpacking:
+@enumerate
+@item
+Be sure to disable the CR/LF translation or the executables will be
+unusable.  Older versions of WinZipNT would enable this translation by
+default.  If you are using WinZipNT, disable it.
+@item
+Check that filenames were not truncated to 8.3.  For example, there
+should be a file CONTRIBUTE in the top level directory; if this has
+been truncated to CONTRIBU or CONTRI~1, your distribution has been
+corrupted while unpacking and Emacs will not start.
+@end enumerate
+
+If it is still not working, send mail to the list, describing what
+you've done, and what you are seeing. (The more information you send
+the more likely it is that you'll receive a helpful response..
+
+@node Virus
+@section Does Emacs contain a virus?
+@cindex virus reported in Emacs
+@cindex anti-virus software reporting a virus in Emacs
+
+There have been reports in the past that some virus scanners claim
+that the Emacs distribution has a virus.  This is extremely unlikely if
+you have downloaded Emacs from the GNU FTP site or one of its mirrors
+and the GPG signature for it is valid and listed in the GNU keyring,
+unless perhaps it is a new release made in the last few days, in which
+case you should exercise more caution and report the problem.  Past
+problems seem to have been caused by virus checkers running into a
+buffer size limit when unpacking large tar.gz files for scanning, and
+reporting the failure as an ``unknown virus''.
+
+@node Anti-virus
+@section What known problems are there with anti-virus software?
+@cindex anti-virus software, bad interaction with
+@cindex virus software, bad interaction with
+@cindex firewall, bad interaction with
+@cindex scan all files, anti-virus option causing problems
+@cindex auto protect, anti-virus option causing problems
+@cindex shell, interacting badly with anti-virus
+@cindex subprocesses, interacting badly with anti-virus
+
+Anti-virus and firewall software can block Emacs from starting subprocesses
+and opening network connections.  Most such products have an Advanced
+mode where they will prompt you rather than silently blocking.  In some cases
+the ``scan all files'' or ``auto protect'' option of anti-virus programs
+has caused failures running shell related commands within Emacs.
+@xref{Sub-processes,,Why is nothing happening when I enter shell commands?}.
+
+@c ------------------------------------------------------------
+@node Display Settings
+@chapter Display Settings
+
+@menu
+* Console window size::
+* Mouse trouble::
+* Cut and paste NUL::
+* Garbled clipboard::
+* Beep sound::
+@end menu
+
+@node Console window size
+@section Emacs in console mode goes beyond the window size
+@cindex console, window size
+@cindex telnet, display size problems running emacs over
+@cindex -nw, window size
+@vindex w32-use-full-screen-buffer
+
+The variable @code{w32-use-full-screen-buffer} controls whether Emacs uses
+the window size or buffer size to determine the number of lines on screen.
+Normally the window size is correct, but when running Emacs over some
+telnet servers, the buffer size needs to be used.  Emacs tries to guess
+the correct value at startup, but if it guesses wrong, you can customize
+that variable yourself.
+
+@node Mouse trouble
+@section What do I do if I have problems with my mouse buttons?
+@cindex mouse buttons, problems with
+@cindex 2 button mouse
+@cindex two button mouse
+@cindex third mouse button, simulating
+@cindex middle mouse button, simulating
+@cindex simulating three button mouse with two buttons
+@cindex swap right and middle mouse buttons
+@cindex exchange mouse-2 and mouse-3 buttons
+@vindex w32-mouse-button-tolerance
+@vindex w32-num-mouse-buttons
+@vindex w32-swap-mouse-buttons
+
+Emacs assigns bindings assuming a three button mouse.  On Windows, if
+a two button mouse is detected, a hack is enabled which lets you
+simulate the third button by pressing both mouse buttons
+simultaneously.  @code{w32-mouse-button-tolerance} defines the timeout
+for what is considered ``simultaneous''.  You can check how many
+buttons Emacs thinks your mouse has with @kbd{C-h v}
+@code{w32-num-mouse-buttons}.
+
+If you find yourself needing the mouse-3 bindings more often than mouse-2,
+you can swap the buttons with the following code in your init file:
+@example
+(setq w32-swap-mouse-buttons t)
+@end example
+
+@node Cut and paste NUL
+@section How do I cut and paste text with NUL characters?
+@cindex clipboard, NUL characters
+
+If you attempt to cut and paste text with NUL characters embedded in it,
+then the text will be truncated at the first NUL character.  This is a
+limitation of the Windows clipboard, and does not affect killing and yanking
+from the kill-ring within Emacs.
+
+@node Garbled clipboard
+@section How can I fix garbled text yanked from the clipboard?
+@cindex clipboard, corruption of
+@cindex garbage on the clipboard
+@cindex clipboard encoding
+@cindex encoding, clipboard
+@findex set-selection-coding-system
+
+You can try @code{set-selection-coding-system}, but generally such
+corruption is a thing of the past, as Emacs uses Unicode for the clipboard
+by default now.
+
+@node Beep sound
+@section How do I change the sound of the Emacs beep?
+@cindex beep, changing the sound
+@cindex sound, changing the beep
+@findex set-message-beep
+
+You can use the function @code{set-message-beep} to change the sound
+that Emacs uses for its beep.  This affects both console and GUI frames.
+The doc string contains a list of the system sounds you can use.
+
+@c ------------------------------------------------------------
+@node Fonts and text translation
+@chapter Fonts and text translation
+
+@menu
+* Font names::
+* Bold and italic::
+* Multilingual fonts::
+* BDF fonts::
+* Font menu::
+* Line ends::
+@end menu
+
+@node Font names
+@section Font names
+@cindex XLFD font names
+@cindex font XLFD name format
+@cindex fontconfig font names in Emacs 23
+@cindex font dialog, using to find font names
+@findex w32-select-font
+@findex x-list-fonts
+
+Fonts in Emacs 22 and earlier are named using the X Logical Font
+Description (XLFD) format.  Emacs on Windows ignores many of the
+fields, and populates them with * when listing fonts.  Former
+maintainer Andrew Innes wrote
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/x-font-details,
+this explanation} of what each field in the font string means and how
+Emacs treated them back in 19.34.  Since then, multilingual support and
+a redisplay overhaul to support variable width fonts have changed things
+slightly; more character sets are recognized (and the old pseudo character
+sets are deprecated), and the resolution fields are used to calculate the
+difference between point and pixel sizes, but normally you should leave
+these at the system default.  The foundry field is also populated with
+an indication of whether the font is outline (.TTF, .ATM) or raster (.FON)
+based when fonts are listed, which may let you differentiate between two
+fonts with the same name and different technologies.
+
+From Emacs 23, the preferred font name format will be moving to the simpler
+and more flexible fontconfig format.  XLFD names will continue to be
+supported for backward compatibility.
+
+@example
+XLFD: -*-Courier New-normal-r-*-*-13-*-*-*-c-*-iso8859-1
+Fontconfig: Courier New-13
+@end example
+
+To find the XFLD name for a font, you can execute the following in the
+@file{*scratch*} buffer by pressing C-j at the end of the line:
+@example
+(w32-select-font nil t)
+@end example
+
+To see a complete list of fonts, execute the following in the
+@file{*scratch*} buffer by pressing C-x C-e at the end of the line:
+@example
+(insert (prin1-to-string (x-list-fonts "*")))
+@end example
+
+The command line options and frame-parameters for changing the default font
+in Emacs are documented in the manual.  Fonts can also be used when defining
+faces, though family and size are generally specified individually there.
+In addition, Emacs on Windows reads the registry to find X Resources.  This
+is also documented in the manual.
+
+@node Bold and italic
+@section How can I get bold and italic fonts to work?
+@cindex italic fonts
+@cindex synthesized italic and bold fonts
+@cindex bold fonts, synthesized
+@findex set-face-font
+@vindex w32-enable-synthesized-fonts
+
+Emacs will only use the italic (and bold) versions of a font automatically
+if it has the same width as the normal version.  Many fonts have italic
+and bold versions that are slightly wider.  It will also only use real
+bold and italic fonts by default, where other applications may use
+synthesized variations that are derived from the normal font.  To enable
+more italic and bold fonts to be displayed, you can enable synthesized fonts
+and manually set the font for italic, bold and bold-italic as follows:
+
+@example
+(setq w32-enable-synthesized-fonts t)
+(set-face-font 'italic "-*-Courier New-normal-i-*-*-11-*-*-*-c-*-iso8859-1")
+(set-face-font 'bold-italic "-*-Courier New-bold-i-*-*-11-*-*-*-c-*-iso8859-1")
+@end example
+
+@node Multilingual fonts
+@section Multilingual font support
+@cindex multilingual display, fonts
+@cindex MULE, fonts
+
+@menu
+* Language display::
+* Non-latin display::
+* International fonts::
+* Third-party multibyte::
+* Localized fonts::
+@end menu
+
+@node Language display
+@subsection Is it possible to display all the supported languages?
+@cindex HELLO file, displaying all
+@cindex language support, fonts
+@cindex GNU intlfonts, for displaying all languages
+@cindex intlfonts, for displaying all languages
+
+To display all the languages that Emacs is capable of displaying, you will
+require the BDF fonts from the GNU intlfonts package.
+@xref{Fonts and text translation,,How do I use bdf fonts with Emacs?}.
+
+For many languages, native truetype fonts are sufficient, and in Emacs
+23 the need for BDF fonts will disappear for almost all languages.  At
+the time of writing, some Arabic characters in the HELLO file still do
+not display with native fonts, because they are pre-composed characters
+from MULE character sets rather than standard Unicode Arabic, but all
+other characters are able to be displayed with appropriate truetype or
+opentype fonts.
+
+@node Non-latin display
+@subsection How do I get Emacs to display non-latin characters?
+@cindex fontsets, defining
+@cindex language support, forcing Emacs to use specific fonts
+@cindex MULE, fontsets
+@cindex multilingual display, fontsets
+@findex create-fontset-from-ascii-font
+@findex create-fontset-from-fontset-spec
+
+Recent versions of Emacs display a large range of characters out of
+the box, but if you are having problems with a particular character
+set which you know you have fonts for, you can try defining a
+new fontset with @code{create-fontset-from-ascii-font} or
+@code{create-fontset-from-fontset-spec}.
+
+@example
+(create-fontset-from-fontset-spec
+ "-*-Courier New-normal-r-*-*-12-*-*-*-c-*-fontset-most,
+ latin-iso8859-2:-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-2,
+ latin-iso8859-3:-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-3,
+ latin-iso8859-4:-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-4,
+ cyrillic-iso8859-5:-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-5,
+ greek-iso8859-7:-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-7,
+ latin-iso8859-9:-*-Courier New-normal-r-*-*-12-*-*-*-c-*-iso8859-9,
+ japanese-jisx0208:-*-MS Gothic-normal-r-*-*-12-*-*-*-c-*-jisx0208-sjis,
+ katakana-jisx0201:-*-MS Gothic-normal-r-*-*-12-*-*-*-c-*-jisx0208-sjis,
+ latin-jisx0201:-*-MS Gothic-normal-r-*-*-12-*-*-*-c-*-jisx0208-sjis,
+ japanese-jisx0208-1978:-*-MS Gothic-normal-r-*-*-12-*-*-*-c-*-jisx0208-sjis,
+ korean-ksc5601:-*-Gulim-normal-r-*-*-12-*-*-*-c-*-ksc5601-*,
+ chinese-gb2312:-*-MS Song-normal-r-*-*-12-*-*-*-c-*-gb2312-*,
+ chinese-big5-1:-*-MingLiU-normal-r-*-*-12-*-*-*-c-*-big5-*,
+ chinese-big5-2:-*-MingLiU-normal-r-*-*-12-*-*-*-c-*-big5-*" t)
+@end example
+
+@node International fonts
+@subsection Where can I find fonts for other languages?
+@cindex language support, finding fonts
+@cindex fonts, where to find
+@cindex MULE, finding fonts
+@cindex multilingual display, finding fonts
+@cindex GNU intlfonts, where to get
+@cindex intlfonts, where to get
+
+In addition to the wide range of fonts that come with the language
+support packages of various components of Windows itself, GNU/Linux
+distributions these days come with a number of Free truetype fonts
+that cover a wide range of languages.  The GNU intlfonts source
+distribution contains BDF fonts covering all of the languages that can
+be displayed by Emacs 22, and can be downloaded from
+@uref{http://ftpmirror.gnu.org/intlfonts, ftp.gnu.org mirrors}.
+
+@node Third-party multibyte
+@subsection How do I use third party programs to display multibyte characters?
+@cindex multilingual display, third party programs on Windows 9x/ME
+@cindex language support, third party programs on Windows 9x/ME
+@vindex w32-enable-unicode-output
+
+You probably only need to do this on the non-Unicode versions of Windows
+(95, 98 and ME), and even then, various Windows and Internet Explorer
+updates have made third party software unnecessary in most cases.
+If you are having trouble displaying text, try defining a fontset
+with the font for the languages that the third party software handles
+set to what that software expects (which may not be an appropriate font
+for that language, but the third party software is intercepting it
+and using a different font behind the scenes).
+@xref{Non-latin display}.
+
+In addition to defining a fontset with the expected font, you may also need
+to disable unicode output with:
+@example
+(setq w32-enable-unicode-output nil)
+@end example
+
+@node Localized fonts
+@subsection Can I use a font with a name in my language?
+@cindex fonts, localized font names
+@vindex locale-coding-system
+
+Normally Emacs should initialize @code{locale-coding-system} appropriately
+based on your locale, which will let Emacs use font names in your local
+language successfully.
+
+@node BDF fonts
+@section How do I use bdf fonts with Emacs?
+@cindex BDF fonts, using
+@cindex GNU intlfonts, using
+@cindex intlfonts, using
+@vindex w32-bdf-filename-alist
+@vindex bdf-directory-alist
+@vindex font-encoding-alist
+@findex w32-find-bdf-fonts
+@findex set-frame-font
+
+To use bdf fonts with Emacs, you need to tell Emacs where the fonts
+are located, create fontsets for them, and then use them.  We'll use
+the 16 dot international fonts from @uref{http://ftpmirror.gnu.org/intlfonts,
+ftp.gnu.org/gnu/intlfonts} as an
+example put together by Jason Rumney.
+
+Download @file{16dots.tar.gz} and unpack it; I'll assume that they are in
+@file{c:\intlfonts}.  Then set @code{w32-bdf-filename-alist} to the list of
+fonts returned by using @code{w32-find-bdf-fonts} to enumerate all of
+the font files.  It is a good idea to set the variable
+@code{bdf-directory-list} at the same time so @code{ps-print} knows where
+to find the fonts:
+@example
+(setq bdf-directory-list
+      '("c:/intlfonts/Asian" "c:/intlfonts/Chinese"
+        "c:/intlfonts/Chinese-X" "c:/intlfonts/Ethiopic"
+        "c:/intlfonts/European" "c:/intlfonts/Japanese"
+        "c:/intlfonts/Japanese-X" "c:/intlfonts/Korean-X"
+        "c:/intlfonts/Misc/"))
+
+(setq w32-bdf-filename-alist (w32-find-bdf-fonts bdf-directory-list))
+@end example
+
+Then create fontsets for the BDF fonts:
+
+@example
+(create-fontset-from-fontset-spec
+ "-*-fixed-medium-r-normal-*-16-*-*-*-c-*-fontset-bdf,
+japanese-jisx0208:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1983-*,
+katakana-jisx0201:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0201*-*,
+latin-jisx0201:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0201*-*,
+japanese-jisx0208-1978:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1978-*,
+thai-tis620:-misc-fixed-medium-r-normal--16-160-72-72-m-80-tis620.2529-1,
+lao:-misc-fixed-medium-r-normal--16-160-72-72-m-80-MuleLao-1,
+tibetan-1-column:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-80-MuleTibetan-1,
+ethiopic:-Admas-Ethiomx16f-Medium-R-Normal--16-150-100-100-M-160-Ethiopic-Unicode,
+tibetan:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-160-MuleTibetan-0")
+@end example
+
+Many of the international bdf fonts from gnu.org are type 0, and therefore
+need to be added to font-encoding-alist:
+
+@example
+;; Need to add some fonts to font-encoding-alist since the bdf fonts
+;; are type 0 not the default type 1.
+(setq font-encoding-alist
+      (append '(("MuleTibetan-0" (tibetan . 0))
+                ("GB2312"        (chinese-gb2312 . 0))
+                ("JISX0208"      (japanese-jisx0208 . 0))
+                ("JISX0212"      (japanese-jisx0212 . 0))
+                ("VISCII"        (vietnamese-viscii-lower . 0))
+                ("KSC5601"       (korean-ksc5601 . 0))
+                ("MuleArabic-0"  (arabic-digit . 0))
+                ("MuleArabic-1"  (arabic-1-column . 0))
+                ("MuleArabic-2"  (arabic-2-column . 0))) font-encoding-alist))
+@end example
+
+You can now use the Emacs font menu (@pxref{Fonts and text
+translation,,How can I have Emacs use a font menu like on X?}) to
+select the @emph{bdf: 16-dot medium} fontset, or you can select it by
+setting the default font:
+
+@example
+    (set-frame-font "fontset-bdf")
+@end example
+
+Try loading the file @file{etc/HELLO}, and you should be able to see the
+various international fonts displayed (except for Hindi, which is not
+included in the 16-dot font distribution).
+
+@node Font menu
+@section How can I have Emacs use a font menu like on X?
+@cindex fonts, displaying a menu
+@cindex fontsets, displaying a menu
+@cindex font dialog, using a menu instead
+@vindex w32-use-w32-font-dialog
+
+Place the following in your init file:
+
+@example
+(setq w32-use-w32-font-dialog nil)
+@end example
+
+@menu
+* Add fonts to menu::
+@end menu
+
+@node Add fonts to menu
+@subsection How can I add my font to the font menu?
+@cindex font menu, adding fonts
+@vindex w32-fixed-font-alist
+
+If you have set w32-use-w32-font-dialog to nil, you can add fonts to
+the font menu by changing `w32-fixed-font-alist'.  For example:
+
+@example
+(setq w32-fixed-font-alist
+   (append w32-fixed-font-alist
+      '(("Monotype.com"
+         ("8" "-*-Monotype.com-normal-r-*-*-11-*-*-*-c-iso8859-1")
+         ("9" "-*-Monotype.com-normal-r-*-*-12-*-*-*-c-iso8859-1")
+         ("10" "-*-Monotype.com-normal-r-*-*-13-*-*-*-c-iso8859-1")
+         ("11" "-*-Monotype.com-normal-r-*-*-15-*-*-*-c-iso8859-1")))))
+@end example
+
+@node Line ends
+@section How can I control CR/LF translation?
+@cindex DOS line ends
+@cindex Unix line ends
+@cindex Mac line ends
+
+There are a number of methods by which you can control automatic CR/LF
+translation in Emacs, a situation that reflects the fact that the
+default support was not very robust in the past.  For a discussion of
+this issue, take a look at
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/todo/translate,
+this collection of email messages} on the topic.
+
+@menu
+* Automatic line ends::
+* Line ends by filename::
+* Line ends by file system::
+@end menu
+
+@node Automatic line ends
+@subsection Automatic CR/LF translation
+@cindex line ends, automatic detection
+
+For existing files, Emacs scans the file to determine the line ending
+convention as part of the same scan it does to determine the file
+encoding.  Embedded Ctrl-M (ASCII 13) characters and inconsistent line
+ends can confuse the automatic scanning, and Emacs will present the
+file in Unix (LF) mode with the Ctrl-M characters displayed as @samp{^M}.
+It does this to be safe, as no data loss will occur if the file is really
+binary and the Ctrl-M characters are significant.
+
+@node Line ends by filename
+@subsection CR/LF translation by file extension
+@cindex line ends, determining by filename
+@cindex binary files, determining by file name
+@vindex file-name-buffer-file-type-alist
+
+The variable @code{file-name-buffer-file-type-alist} holds a list of
+filename patterns and their associated type; binary or text.  Files marked
+as binary will not have line-end detection performed on them, and instead
+will always be displayed as is.  With auto-detection in recent versions of
+Emacs, this is seldom useful for existing files, but can still be used
+to influence the choice of line ends for newly created files.
+
+@node Line ends by file system
+@subsection CR/LF translation by file system
+@cindex line ends, determining by filesystem
+@cindex binary files, determining by filesystem
+@vindex untranslated-filesystem-list
+@findex add-untranslated-filesystem
+@findex remove-untranslated-filesystem
+
+The variable @code{untranslated-filesystem-list} defines whole
+directory trees that should not have CR/LF autodetection performed on
+them.  The list can be manipulated with the functions
+@code{add-untranslated-filesystem} and
+@code{remove-untranslated-filesystem}.  With auto-detection in
+recent versions of Emacs, this is seldom useful for existing files,
+but can still be used to influence the choice of line ends for newly
+created files.
+
+@c ------------------------------------------------------------
+@node Printing
+@chapter Printing
+@cindex printing
+
+A lot of effort has gone into making it easier to print from Emacs on
+MS Windows, but this has still been insufficient to keep up with
+changes in printing technology from text and postscript based printers
+connected via ports that can be accessed directly, to graphical
+printers that are only accessible via USB.  For details, see
+@uref{http://www.emacswiki.org/cgi-bin/wiki/PrintingFromEmacs, Emacs
+Wiki}.
+
+@c ------------------------------------------------------------
+@node Sub-processes
+@chapter Subprocesses
+@cindex subprocesses
+
+@menu
+* Quoting issues::
+* Subprocess hang::
+* Subprocess buffering::
+* Subprocesses and floppy drive::
+* Killing subprocesses::
+* Subprocess EOF::
+* Using shell::
+* Cygwin paths::
+* Dired ls::
+* Shell echo::
+* Shell completion forward slash::
+* Incorrect DOS version::
+* Shell commands do nothing::
+@end menu
+
+@node Quoting issues
+@section Quoting issues
+@cindex quoting arguments to subprocesses
+@cindex sub-processes, quoting arguments to
+@cindex cygwin, quoting arguments
+
+The quoting rules for native Windows shells and Cygwin shells have
+some subtle differences.  When Emacs spawns subprocesses, it tries to
+determine whether the process is a Cygwin program and changes its
+quoting mechanism appropriately.  See this
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/shell-quoting,
+previous discussion} for details.
+
+@node Subprocess hang
+@section Programs reading input hang
+@cindex subprocesses, hanging when reading input
+@cindex full-screen console programs, as subprocesses
+@cindex ftp, client hanging
+@findex ftp
+
+Programs that explicitly use a handle to the console (@file{CON} or
+@file{CON:}) instead of stdin and stdout cannot be used as
+subprocesses to Emacs, and they will also not work in shell-mode.  The
+default ftp client on Windows is an example of such a program - this
+ftp program is mostly fine for use with @code{ange-ftp} or
+@code{tramp}, but not for @kbd{M-x ftp} (@pxref{Network access,,How do
+I use FTP within Emacs}).  There is no convenient way for either Emacs
+or any shell used in @code{shell-mode} to redirect the input and
+output of such processes from the console to input and output pipes.
+The only workaround is to use a different implementation of the
+program that does not use the console directly.  Microsoft's new
+PowerShell appears to be another such program, so that cannot be used
+as a replacement shell for Emacs.
+
+@node Subprocess buffering
+@section Buffering in shells and subprocesses
+@cindex subprocesses, buffering output
+@cindex output not displaying, subprocesses
+@cindex SQL subprocess hanging
+@cindex cvs hanging when login needed
+@cindex ssh, password prompt not appearing when using with cvs
+@findex sql-mode
+@findex shell-mode
+@cindex setbuf, using in subprocesses to prevent buffering
+@cindex setvbuf, using in subprocesses to prevent buffering
+
+You may notice that some programs, when run in a shell in
+@code{shell-mode},
+have their output buffered (e.g., people have found this happening to
+them with @code{sql-mode}).  When the program has a lot of output, it
+overflows the buffering and gets printed to the shell buffer; however,
+if the program only outputs a small amount of text, it will remain
+buffered and won't appear in the shell buffer.  The same can happen
+in other subprocesses that themselves run other programs as
+subprocesses, for example when using @command{cvs} from Emacs, which
+is itself configured to use @command{ssh}, password prompts fail to
+appear when expected, and @command{cvs} appears to hang.
+
+Although it may at first seem like the shell is buffering the output
+from the program, it is actually the program that is buffering
+output.  The C runtime typically decides how to buffer output based
+upon whether stdout is bound to a handle to a console window or
+not.  If bound to a console window, output is buffered line by line; if
+bound to a block device, such as a file, output is buffered block by
+block.
+
+In a shell buffer, stdout is a pipe handle and so is buffered in
+blocks.  If you would like the buffering behavior of your program to
+behave differently, the program itself is going to have to be changed;
+you can use @code{setbuf} and @code{setvbuf} to manipulate
+the buffering semantics.
+
+Some programs handle this by having an explicit flag to control their
+buffering behaviour, typically @option{-i} for interactive.  Other
+programs manage to detect that they are running under Emacs, by
+using @samp{getenv("emacs")} internally.
+
+@menu
+* Perl script buffering::
+@end menu
+
+@node Perl script buffering
+@subsection Perl script buffering
+@cindex perl, avoiding buffering when used as a subprocess of Emacs
+
+A handy solution for Perl scripts to the above problem is to use:
+
+@example
+# Turn all buffering off.
+select((select(STDOUT), $| = 1)[0]);
+select((select(STDERR), $| = 1)[0]);
+select((select(STDIN), $| = 1)[0]);
+@end example
+
+@node Subprocesses and floppy drive
+@section 16-bit subprocesses accessing the floppy drive
+@cindex floppy drive, access when subprocesses started
+@cindex subprocess starting causes floppy drive access
+
+If you are finding the 16 bit DOS subprocesses cause your A: drive to
+be accessed, hanging Emacs until the read times out if there is no
+floppy in the drive, check to see if your virus software is causing
+the problem.
+
+@node Killing subprocesses
+@section Killing subprocesses on Windows 95/98/Me
+@cindex subprocess, killing on Windows 95/98/ME
+@cindex killing subprocesses, Windows 95/98/ME
+@cindex shutdown, complaints about cmdproxy.exe running
+
+Emacs cannot guarantee that a subprocess gets killed on Windows 95 and
+its descendants, and it is a difficult limitation to work around.  To
+avoid problems on these systems, you should let subprocesses run to
+completion including explicitly exiting shells before killing the
+associated buffer.
+
+If you find that while shutting down, Windows complains that there is
+a running @command{cmdproxy.exe} even though you carefully exited all
+shells and none were showing in Task Manager before the shutdown, this
+could be due to buggy interaction with your virus scanner.
+
+@node Subprocess EOF
+@section Sending EOF to subprocesses
+@cindex EOF, sending to subprocesses
+@cindex shell terminates when EOF sent to subprocess
+@findex process-send-eof
+
+When an EOF is sent to a subprocess running in an interactive shell
+with @code{process-send-eof}, the shell terminates unexpectedly as
+if its input was closed.  This affects the use of @kbd{C-c C-d} in
+shell buffers.  See
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/todo/shell-ctrl-d,
+this discussion} for more details.
+
+@node Using shell
+@section How do I use a shell in Emacs?
+@cindex interactive shell, using
+@cindex shell within emacs, using
+@findex shell
+@findex  shell-command
+@vindex shell-file-name
+@vindex explicit-shell-file-name
+
+You can start an interactive shell in Emacs by typing @kbd{M-x shell}.
+Emacs uses the @env{SHELL} environment variable to determine which
+program to use as the shell.  To instruct Emacs to use a non-default
+shell, you can either set this environment variable, or customize 
+@code{explicit-shell-file-name}.  You can also customize
+@code{shell-file-name} to change the shell that will be used by
+subprocesses that are started with @code{shell-command} and
+related non-interactive shell commands.
+
+@menu
+* Bash::
+@end menu
+
+@node Bash
+@subsection bash
+@cindex cygwin bash as shell within Emacs
+@cindex shell, using cygwin bash within Emacs
+@cindex bash, using cygwin shell within Emacs
+@vindex comint-scroll-show-maximum-output
+@vindex comint-completion-addsuffix
+@vindex comint-eol-on-send
+@vindex w32-quote-process-args
+@vindex shell-mode-hook
+
+Cygwin bash is a popular shell for use with Emacs.  To use bash as the
+default shell in Emacs, you can place the following in your init file:
+
+@example
+(defun my-shell-setup ()
+  "For Cygwin bash under Emacs 20"
+  (setq comint-scroll-show-maximum-output 'this)
+  (make-variable-buffer-local 'comint-completion-addsuffix))
+  (setq comint-completion-addsuffix t)
+  ;; (setq comint-process-echoes t) ;; reported that this is no longer needed
+  (setq comint-eol-on-send t)
+  (setq w32-quote-process-args ?\")
+
+(setq shell-mode-hook 'my-shell-setup)
+@end example
+
+If you find that you are having trouble with Emacs tracking drive
+changes with bash, see Mike Fabian's
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/drive-tracking,
+note}.
+
+WARNING: Some versions of bash set and use the environment variable
+PID.  For some as yet unknown reason, if @env{PID} is set and Emacs
+passes it on to bash subshells, bash dies (Emacs can inherit the
+@env{PID} variable if it's started from a bash shell).  If you clear
+the @env{PID} variable in your init file, you should be able to
+continue to use bash as your subshell:
+@example
+    (setenv "PID" nil)
+@end example
+
+@node Cygwin paths
+@section How do I use Cygwin style paths in Emacs?
+@cindex cygwin paths, using within Emacs
+@cindex mount points, cygwin
+@cindex cygwin mount points, using within Emacs
+
+The package
+@uref{http://www.emacswiki.org/cgi-bin/wiki/cygwin-mount.el,
+cygwin-mount.el} teaches Emacs about Cygwin mount points.
+
+@node Dired ls
+@section How do I make dired use my ls program?
+@cindex dired, using an external ls program
+@cindex dired, interpreting symlinks the same way as cygwin
+@cindex symlinks in dired, interpreting the same way as cygwin
+@cindex cygwin symlinks in dired
+@vindex ls-lisp-use-insert-directory-program
+@vindex insert-directory-program
+
+Dired uses an internal lisp implementation of @command{ls} by default
+on Windows.  For consistent display of symbolic links and other
+information with other programs (eg Cygwin) and performance reasons,
+you may want to use a Windows port of @command{ls} instead.
+
+@example
+(setq ls-lisp-use-insert-directory-program t)      ;; use external ls
+(setq insert-directory-program "c:/cygwin/bin/ls") ;; ls program name
+@end example
+
+@node Shell echo
+@section How do I prevent shell commands from being echoed?
+@cindex echo, suppressing for shell input
+@cindex shell commands, suppressing echo
+@vindex comint-process-echoes
+@vindex comint-mode-hook
+@vindex explicit-cmd.exe-args
+@vindex explicit-cmdproxy.exe-args
+@vindex explicit-bash.exe-args
+@vindex explicit-bash-args
+@cindex shell specific arguments
+
+Some shells echo the commands that you send to them, and the echoed
+commands appear in the output buffer.  In particular, the default
+shells, @command{command.com} and @command{cmd.exe}, have this behavior.
+
+To prevent echoed commands from being printed, you can place the
+following in your init file:
+
+@example
+    (defun my-comint-init ()
+      (setq comint-process-echoes t))
+    (add-hook 'comint-mode-hook 'my-comint-init)
+@end example
+
+If @code{shell-mode} still is not stripping echoed commands, then
+you'll have to explicitly tell the shell to not echo commands.  You can
+do this by setting the @code{explicit-@var{SHELL}-args} variable
+appropriately; where @var{SHELL} is the value of your @env{SHELL}
+environment variable (do a @kbd{M-: (getenv "SHELL")} to see what it
+is currently set to).  Assuming that you are on NT and that your
+@env{SHELL} environment variable is set to @command{cmd.exe},
+then placing the following in your init file will tell
+@command{cmd.exe} to not echo commands:
+
+@example
+    (setq explicit-cmd.exe-args '("/q"))
+@end example
+
+The comint package will use the value of this variable as an argument
+to @command{cmd.exe} every time it starts up a new shell; the
+@option{/q} is the argument to @command{cmd.exe} that stops the
+echoing (invoking @samp{cmd /?} in a shell will show you all of the
+command line arguments to @command{cmd.exe}).
+
+Note that this variable is case sensitive; if the value of your
+@env{SHELL} environment variable is @command{CMD.EXE} instead, then
+this variable needs to be named @code{explicit-CMD.EXE-args} instead.
+
+@node Shell completion forward slash
+@section How can I make shell completion use forward slashes?
+@cindex completion, using forward slashes in shell buffers
+@cindex forward slashes for completion in shell buffers
+@vindex comint-completion-addsuffix
+
+The character appended to directory names when completing in a shell
+buffer is controlled by the variable @code{comint-completion-addsuffix}.
+See its documentation (with @kbd{C-h v}) for details.
+
+@node Incorrect DOS version
+@section Why do I get incorrect DOS version messages?
+@cindex nmake, Incorrect DOS version messages
+@cindex shell, Incorrect DOS version messages
+@cindex COMSPEC, effect on subprocesses of subprocesses
+
+This might happen if, for example, you invoke @command{nmake} in a
+shell and it tries to create sub-shells.  The problem happens because
+when the shell is initially created, the first argument to the shell
+is not the directory in which the shell program resides.  When this
+happens, @command{command.com} fabricates a value for its
+@env{COMSPEC} environment variable that is incorrect.  Then, when
+other programs go to use @env{COMSPEC} to find the shell, they are
+given the wrong value.
+
+The fix for this is to either prevent any arguments from being sent to
+the shell when it starts up (in which case @command{command.com} will
+use a default, and correct, value for @env{COMSPEC}), or to have the
+first argument be the directory in which the shell executable resides.
+
+@node Shell commands do nothing
+@section Why is nothing happening when I enter shell commands?
+@cindex shell commands not working
+@cindex anti-virus software, bad interaction with
+@cindex virus software, bad interaction with
+@cindex firewall, bad interaction with
+@cindex scan all files, anti-virus option causing problems
+@cindex auto protect, anti-virus option causing problems
+@cindex shell, interacting badly with anti-virus
+
+Some anti-virus software has been reported to cause problems with
+shells in the past.  Try turning off options such as ``Scan all
+files''.  @xref{Installing Emacs,,What known problems are there with anti-virus software?}.
+
+@c ------------------------------------------------------------
+@node Network access
+@chapter Network access
+
+@menu
+* Mail::
+* Attachments with Gnus::
+* Using FTP::
+* Tramp ssh::
+* telnet::
+@end menu
+
+@node Mail
+@section How do I use mail in Emacs?
+
+Emacs comes with several options for reading and writing mail.  These
+are documented in the manual, and the choice of which method to use
+depends on personal taste.  There are some issues specific to Windows
+however, related to the fact that Windows machines do not have the
+mail infrastructure that is commonly installed on other platforms, so
+mail will not work without some configuration.
+
+@menu
+* Outgoing mail::
+* Incoming mail with Rmail::
+* Incoming mail with Gnus::
+* Incoming mail other::
+@end menu
+
+@node Outgoing mail
+@subsection Outgoing mail
+@cindex mail, outgoing
+@cindex smtp server
+@vindex user-full-name
+@vindex user-mail-address
+@vindex smtpmail-default-smtp-server
+@vindex smtpmail-smtp-server
+@vindex send-mail-command
+@vindex message-send-mail-function
+@findex smtpmail-send-it
+@vindex smtpmail-debug-info
+
+For outgoing mail, you will need to use @file{smtpmail.el} which
+allows Emacs to talk directly to SMTP mail servers.  This is included
+with Emacs, and can be set up as follows:
+
+@example
+(setq user-full-name "@var{Your full name}")
+(setq user-mail-address "@var{Your@@email.address}")
+(setq smtpmail-default-smtp-server "@var{domain.name.of.your.smtp.server}")
+
+(setq send-mail-command 'smtpmail-send-it) ; For mail-mode (Rmail)
+(setq message-send-mail-function 'smtpmail-send-it) ; For message-mode (Gnus)
+@end example
+
+Note that if you want to change the name of the SMTP server after
+smtpmail is loaded, then you'll need to change
+@code{smtpmail-smtp-server}.
+
+If you are experiencing problems with sending large messages, check
+the value of the variable @code{smtpmail-debug-info}. If it is non-nil, you
+should set it to @code{nil}:
+
+@node Incoming mail with Rmail
+@subsection Incoming mail with Rmail and POP3
+@cindex mail, incoming with rmail
+@cindex pop3, using rmail
+@cindex rmail, mail client
+@cindex movemail, using pop3
+@cindex MAILHOST
+@vindex rmail-primary-inbox-list
+@vindex rmail-pop-password-required
+
+For incoming mail using the Rmail package and a POP3 server, you will
+need the following configuration:
+
+@example
+(setenv "MAILHOST" "@var{domain.name.of.your.pop3.server}")
+(setq rmail-primary-inbox-list '("po:@var{your logon id}"))
+(setq rmail-pop-password-required t)
+@end example
+
+@node Incoming mail with Gnus
+@subsection Incoming mail with Gnus
+@cindex mail, incoming with Gnus
+@cindex pop3, using Gnus
+@cindex imap, using Gnus
+@cindex gnus, mail and news client
+
+Although Gnus started life as a Usenet news reader, it also makes a
+good mail reader, particularly if you subscribe to a lot of mailing
+lists, or you want to use IMAP rather than POP3, which is not
+supported by Rmail.  @xref{Top,The Gnus manual,,gnus, The Gnus manual}.
+
+@node Incoming mail other
+@subsection Other incoming mail options
+@cindex mail, other options
+@cindex wanderlust, mail and news client
+@cindex vm, mail client
+@cindex mh-e, mail client
+
+Other options for reading mail in Emacs include VM, MH-E and Wanderlust.
+MH-E is included with Emacs.  The others require lisp or executable code
+that does not come with Emacs, so you should seek help where you
+obtained the packages from if you want to use them.
+
+@node Attachments with Gnus
+@section How do I open attachments in Gnus?
+@cindex gnus, attachments
+@cindex attachments, in gnus
+@cindex mail, attachments in gnus
+@cindex .mailcap
+@cindex MIME, configuration for Gnus
+
+In your @env{HOME} directory create a file called @file{.mailcap},
+with contents like the following:
+@example
+application/zip "C:/Program Files/7-Zip/7zFM.exe"
+video/* "C:/Program Files/VideoLAN/VLC/vlc.exe"
+@end example
+
+@strong{Warning:} Associating MIME types with @command{start} or other
+generic Windows commands to open arbitrary files might seem like a
+good idea, but it leaves your system as open to attack as Outlook
+Express was at its worst.  Especially dangerous is associating
+application/* or */* in this way.
+
+@node Using FTP
+@section How do I use FTP within Emacs?
+@cindex ftp, using within Emacs
+@cindex ange-ftp
+@cindex tramp, ftp
+@cindex remote hosts via ftp
+@vindex ange-ftp-ftp-program-name
+
+Windows built in FTP client can be used with ange-ftp.  Ange-ftp is
+the Emacs package that provides FTP connectivity to tramp, a
+multi-protocol remote file access package for Emacs that is enabled by
+default.
+
+The Windows FTP client does have problems with some firewalls, due to
+lack of passive mode support, so you may want to try an alternative
+ftp client instead.  Make sure that the client you are trying is in
+your @env{PATH} before the default Windows client, or rename the
+default Windows client to avoid it getting in the way.  Alternatively
+you can customize @code{ange-ftp-ftp-program-name} to the full path to
+the version you are trying.  @xref{Other useful ports}.
+
+@node Tramp ssh
+@section How do I use Tramp to work in Emacs via SSH?
+@cindex tramp, ssh
+@cindex ssh, accessing remote hosts within Emacs
+@cindex remote hosts via ssh
+@cindex openssh
+@cindex PuTTY
+@cindex plink
+@vindex tramp-default-method
+@vindex tramp-default-method-alist
+
+Tramp can use a number of protocols to connect to remote machines to
+read files and even run commands on those files remotely.  A popular
+one is ssh.  As well as Cygwin versions of openssh, you can use
+PuTTY's command line plink program as the ssh client.  The relevant
+methods to use in @code{tramp-default-method} or
+@code{tramp-default-method-alist} for these options are:
+@itemize @w{}
+@item
+openssh
+@itemize
+@item @code{scp} Uses scp for copying, ssh for shell operations.
+@item @code{scp1} scp with forced SSH protocol version 1
+@item @code{scp2} scp with forced SSH protocol version 2
+@item @code{ssh} Uses ssh with encoding on stdin/stdout for file transfer.
+@item @code{ssh1} ssh with forced SSH protocol version 1
+@item @code{ssh2} ssh with forced SSH protocol version 2
+@end itemize
+
+@item
+PuTTY
+@itemize
+@item @code{pscp} Uses pscp for copying, plink for shell operations.
+@item @code{pscp1} pscp, with forced SSH protocol version 1
+@item @code{pscp2} pscp, with forced SSH protocol version 2
+@item @code{plink} Uses plink with encoding on stdin/stdout for file transfer.
+@item @code{plink1} plink with forced SSH protocol version 1
+@item @code{plink2} plink with forced SSH protocol version 2
+@end itemize
+@end itemize
+
+@node telnet
+@section How do I use telnet with Emacs?
+@cindex telnet, in Emacs
+@findex telnet
+@cindex telnet client, that works with Emacs
+
+To use telnet-mode on Windows, you need a telnet client that uses
+stdin and stdout for input and output.  The default Windows client is
+a Windows application, and will not work as a subprocess.  Several
+options exist, but information that was formerly in this FAQ is out of
+date now, so no concrete pointers are available.
+
+@c ------------------------------------------------------------
+@node Text and Utility modes
+@chapter Text and Utility modes
+
+@menu
+* TeX::
+* Spell check::
+* Encryption::
+* Mouse wheel::
+* Grep::
+@end menu
+
+@node TeX
+@section How do I use TeX with Emacs?
+@cindex tex
+@cindex typesetting
+
+You will need an implementation of TeX for Windows.
+A number of implementations are listed on the
+@uref{http://www.tug.org/interest.html#free, TeX Users Group} website.
+
+@menu
+* AUCTeX::
+@end menu
+
+@node AUCTeX
+@subsection AUCTeX
+@cindex auctex, precompiled for Windows
+@cindex latex
+@cindex preview-latex
+
+AUCTeX is an Emacs package for writing LaTeX files, which also
+includes preview-latex, an Emacs mode for previewing the formatted
+contents of LaTeX documents.  Pre-compiled versions for Windows are
+available from
+@uref{http://www.gnu.org/software/auctex/download-for-windows.html, the
+AUCTeX site}.
+
+@node Spell check
+@section How do I perform spell checks?
+@cindex spell checking
+@cindex ispell
+@cindex aspell
+@cindex flyspell
+@vindex ispell-program-name
+@findex flyspell-mode
+
+Emacs has support for spell checking on demand (@code{ispell}) and as
+your type (@code{flyspell}).  Both packages depend on a copy of
+@command{ispell} 3.2 or a compatible spell-checking program.
+GNU Aspell is a popular choice these days, Windows installers are
+available from the @uref{http://aspell.net/win32/, official site}.
+
+Once installed, you will need to configure @code{ispell-program-name}
+to tell ispell and flyspell to use @command{aspell} as a replacement for
+ispell.  You can include the full path to the @file{aspell} binary, which
+means you do not need to add its installation directory to the @env{PATH}.
+
+@node Encryption
+@section Emacs and encryption
+@cindex encryption
+@cindex gpg, Windows binaries
+@cindex pgp encryption, with GNU Privacy Guard
+@cindex signatures on Emacs distribution, checking
+@cindex Emacs distribution, checking digital signatures
+
+GNU Privacy Guard is a Free replacement for PGP, with Windows binaries
+available.  See @uref{http://www.gnupg.org/}.
+
+@node Mouse wheel
+@section Why doesn't my wheel mouse work in Emacs?
+@cindex mouse wheel
+@cindex wheel mouse
+@cindex middle button, on wheel mouse
+@cindex scrolling, with mouse wheel
+
+Some wheel mice ship with default settings that do not send the
+standard wheel events to programs, but instead try to simulate scroll
+bar events.  Usually this is configurable from the hardware specific
+pages on the mouse control panel.  The middle button is often mapped
+in the same settings to have some functionality other than sending
+middle mouse button events.  In some cases, uninstalling the
+manufacturer's drivers and telling Windows to use the generic USB or
+PS/2 drivers is the only way to make the mouse work properly.
+
+@node Grep
+@section How do I use grep with Emacs?
+@cindex searching through files with grep
+@cindex grep
+@cindex findstr
+@findex grep
+
+The best way to use @kbd{M-x grep} with Emacs is to download a port of
+GNU @command{grep}. @xref{Other useful ports}.
+
+If you want a quick solution without installing extra tools, a poor
+substitute that works for simple text searches is to specify the built
+in Windows command @command{findstr} as the command to run at the
+@kbd{M-x grep} prompt.  Normally you will want to use the @option{/n}
+argument to @command{findstr}.
+
+@menu
+* Recursive grep::
+@end menu
+
+@node Recursive grep
+@subsection How do I do a recursive grep?
+@cindex recursive searching with grep
+@cindex grep, recursive through subdirectories
+@cindex findstr, recursive
+@cindex find, using with grep
+@cindex find, the POSIX command
+@findex rgrep
+@findex grep-find
+@findex find-grep-dired
+@vindex find-program
+@vindex grep-find-command
+
+The Emacs commands @code{rgrep}, @code{grep-find}
+and @code{find-grep-dired} are all different interfaces for
+grepping recursively into subdirectories.  By default, they use the
+command @command{find} to determine which files to work on, and either
+run @command{grep} directly from find, or use @command{xargs} to batch
+up files and reduce the number of invocations of @command{grep}.
+
+Windows also comes with a @command{find} command, but it is not in any
+way compatible with the POSIX @command{find} that Emacs tries to use.
+Emacs expects a @command{find} compatible with GNU findutils.
+@xref{Other useful ports}.  After you have installed it, you will need
+to make sure that Emacs finds this version, not the standard Windows
+@command{find} command.  You can do this by either renaming the
+Windows command, changing your @env{PATH} to ensure that the directory
+containing the findutils @file{bin} directory comes before the Windows
+system directory, or set the variable @code{find-program} to the full
+path to the findutils @command{find} command.
+
+An alternative if you have a recent version of grep is to customize
+@code{grep-find-command} to use @samp{grep -r} instead of both find
+and grep.  Another alternative if you don't need the full capabilities
+of grep is to use @samp{findstr /n /r}.
+
+@c ------------------------------------------------------------
+@node Developing with Emacs
+@chapter Developing with Emacs
+
+@menu
+* MSVC::
+* Borland C++ Builder::
+* Version control::
+* Perldb::
+@end menu
+
+@node MSVC
+@section How do I use Emacs with Microsoft Visual C++
+
+There are two ways you can use Emacs in conjunction with MSVC.  You
+can use Emacs as the editor, and do everything else in the DevStudio
+IDE.  Or you can use Emacs as an IDE, calling the MSVC command line
+tools to build your project.
+
+@menu
+* DevStudio::
+* MSVC command line::
+@end menu
+
+@node DevStudio
+@subsection Emacs as the text editor for DevStudio
+@cindex DevStudio, using Emacs as editor in
+@cindex MSVC++, using Emacs as editor with
+@cindex Visual Studio, using Emacs as editor in
+@cindex VisEmacs, add in for MS Developer Studio
+
+Christopher Payne wrote a Visual Studio add-in that makes Emacs the
+default text editor, this has now been taken over by Jeff Paquette.
+See the following two URLS for details:
+@itemize
+@item @uref{http://sourceforge.net/projects/visemacs/} for the latest version.
+@item @uref{http://www.smathers.net/VisEmacs.htm} for notes on usage.
+@end itemize
+
+@node MSVC command line
+@subsection Using MSVC command line tools from Emacs
+@cindex MSVC++, compiling within Emacs
+@findex compile
+
+This is an app note on how to use Microsoft Visual C++ with Emacs. The
+experiments done below were done with Emacs 19.34.1 on Windows 95,
+using Visual C++ 4.0 Standard Edition. Your mileage may vary.
+
+This writeup assumes minimal knowledge of Emacs hacking on the part of
+the reader.
+
+@menu
+* VC++ environment::
+* Default compile command::
+* Reverting buffers::
+* Edit MSVC::
+@end menu
+
+@node VC++ environment
+@subsubsection VC++ Environment Variables
+@cindex vcvars32.bat
+@cindex MSVC++, environment variables
+
+There is a batch file in your VC++ installation's bin directory called
+@file{vcvars32.bat}, which sets up the environment variables needed to
+run the VC++ command line tools.  Arrange for those same environment
+variables to be set in your Emacs session.  You can do this on Windows
+9x by calling the @file{vcvars32.bat} script from @file{autoexec.bat}.
+On other versions of Windows you can set the environment variables
+globally using the System control panel.
+
+For all versions of Windows you can alternatively set the variables
+just inside Emacs by using @code{setenv} calls in your init file.
+@xref{Installing Emacs,,Where do I put my init file?}.
+
+You should now be able to compile from Emacs. Load a source file from
+a VC++ project. Type @kbd{M-x compile}. Replace the proposed command line
+with:
+@example
+nmake -f @var{ProjectName}.mak
+@end example
+
+You will find that this defaults to a debug build. You can change it
+to a release build with:
+@example
+nmake -f @var{ProjectName}.mak CFG="@var{ProjectName} - Win32 Release"
+@end example
+
+@node Default compile command
+@subsubsection Setting the default compile command
+@cindex compile, setting default command
+@cindex nmake, as default compile command
+@vindex compile-command
+
+Now set the default value for the compile command line.  Add the
+following to your init file:
+
+@example
+;; Set up for Visual C++ compiling
+(setq compile-command "nmake -f ")
+@end example
+
+If you work on the same project long term, you can add the project
+makefile to the string.
+
+David Biesack suggests that perhaps it's
+easy to write a @file{Makefile} in the project directory which does
+
+@example
+PROJECT=MyProject
+all: debug
+debug: FORCE
+        nmake /f $(PROJECT).mak CFG="$(PROJECT) - Win32 Debug"
+release: FORCE
+        nmake /f $(PROJECT).mak CFG="$(PROJECT) - Win32 Release"
+FORCE:
+@end example
+
+and then you can simply change compile-command to @command{nmake}.
+
+Caleb T. Deupree reports that on VC++
+5.0 and up, "You can also set an option in Options/Build to export a
+makefile every time the project is saved, which you can then use to
+compile with @samp{nmake -f project.mak}."  VC++ 4.0 builds the make file
+every time, and there is no option.
+
+@node Reverting buffers
+@subsubsection Reverting Buffers
+@cindex DevStudio, keeping source in sync
+@cindex Visual Studio, keeping source in sync
+@cindex MSVC++, keeping source in sync
+@findex auto-revert-mode
+@findex global-auto-revert-mode
+
+It is recommended that you use @code{auto-revert-mode} in buffers
+that you have open in both Emacs and MSVC++ at the same time.  Then if
+you mistakenly edit the file in MSVC++, Emacs will pick up your
+changes immediately, rather than after you have written lots more code
+and attempt to save.
+
+@node Edit MSVC
+@subsubsection Edit with Emacs function for MSVC
+@cindex DevStudio, load in Emacs command
+@cindex Visual Studio, load in Emacs command
+@cindex MSVC++, load in Emacs command
+@cindex emacsclient, calling from Visual Studio
+
+You can also set up VC++ to import a file into Emacs for you, all
+ready for editing.  In VC++, go to the @code{Tools} pull-down menu, and
+click on @code{Customize...}.  In the @code{Tools} tab, click on
+@code{Add}.  Use @code{Browse} to locate the
+@file{emacsclientw.exe} file in your Emacs bin directory, and
+select it.  For arguments, use @option{+$(CurLine)}
+@option{"$(FilePath)"} and for the directory use the @code{$(WkspDir)}
+(the quotes around FilePath handle paths with spaces in them). Set the
+Menu Text to say "Em&acs". The @option{+$(CurLine)} will set point in
+Emacs to the same line as the cursor position in VC++. The ampersand
+in the word @code{Em&acs} allows you to select emacs from the keyboard. (E
+is already used for the OLE control test container.)
+
+You should now be able to go to any source file in your project. Then,
+use the pull-down menu @code{Tools->Emacs}. The active file in your
+VC++ IDE should now be front and center in Emacs, all ready to edit as
+you wish. If you use keystrokes to work the menus, try @kbd{Alt-T A} to
+move the file into Emacs. Binding this tool to a keystroke will be
+left as an exercise for the student.
+
+If you have the option of saving files before running tools, make sure
+this option is set. (I don't see it on VC++ 4.0.)
+
+@node Borland C++ Builder
+@section Emacs and Borland C++ Builder
+@cindex Borland C++, integration with Emacs
+
+Jonathan Arnold has written an
+@uref{http://www.buddydog.org/C++Builder/c++builder.html, EmacsEdit
+``expert''} for interfacing C++ Builder and Emacs.
+
+@node Version control
+@section Is there a version of my VC software I can use with Emacs?
+@cindex version control, integration with Emacs
+@cindex revision control, integration with Emacs
+@cindex source control,  integration with Emacs
+@cindex cvs, version control integration with Emacs
+@cindex rcs, version control integration with Emacs
+@cindex svn, version control integration with Emacs
+@cindex git, version control integration with Emacs
+@cindex bzr, version control integration with Emacs
+@cindex arch, version control integration with Emacs
+@cindex mercurial, version control integration with Emacs
+@cindex hg, version control integration with Emacs
+@cindex monotone, version control integration with Emacs
+@cindex mcvs, version control integration with Emacs
+
+If you are using a graphical revision control tool already, check if
+it comes with command-line tools.  Many such GUI tools are just
+wrappers for the same command line tools that Emacs requires for its
+VC integration.  Most of the supported VC systems have well supported
+Free native Windows binaries.  For those that don't Cygwin may be an option.
+@xref{Other useful ports}.
+
+@node Perldb
+@section How do I use the Perl debugger with Emacs?
+@cindex perl, debugging within Emacs
+@cindex perldb, using with Emacs
+
+From Jay Rogers:
+
+Some versions of the perl debugger itself need to be patched to work
+with emacs. They are perl versions 5.001 and less, and version
+5.004_01. To fix, locate and change the code similar to the following
+code in lib/perl5db.pl
+@example
+        if (-e "/dev/tty") @{
+            $console = "/dev/tty";
+            $rcfile=".perldb";
+        @}
+        elsif (-e "con") @{
+            $console = "";                 <---- change "con" to ""
+            $rcfile="perldb.ini";
+        @}
+        else @{
+            $console = "sys\$command";
+            $rcfile="perldb.ini";
+        @}
+@end example
+
+Doug Campbell also has some
+@uref{http://www.gnu.org/software/emacs/windows/ntemacs/discuss/perldb,
+suggestions} for improving the interaction of perldb and Emacs.
+
+@c ------------------------------------------------------------
+@node Other useful ports
+@chapter Other useful ports
+@cindex useful tools
+@cindex subprocesses, useful tools
+
+@menu
+* Cygwin::
+* MinGW::
+* UWIN::
+* GnuWin32::
+* GTK::
+* Read man pages::
+@end menu
+
+@node Cygwin
+@section Cygwin
+@cindex cygwin environment
+@cindex cygwin, library conflicts
+@cindex library conflicts with cygwin
+@cindex interoperability with cygwin
+@cindex subprocesses, cygwin tools
+@vindex exec-path
+
+@uref{http://www.cygwin.com/}.
+
+Cygwin is a popular complete POSIX emulation environment for Windows.
+Most of its tools can be used with Emacs, and it covers a wide range
+of ported software.  The main shell used by Cygwin is GNU
+@command{bash}, but other shells are also available.  Some Cygwin
+tools may not interoperate well with Emacs or other native Windows
+tools, due to the total immersion aspect of Cygwin, including its
+non-native filesystem mapping.
+
+If you choose to use Cygwin, then its tools will probably be all that
+you need, but you will need to get image libraries from elsewhere, as
+the Cygwin ones are not compatible with non-Cygwin software.  In fact,
+if Cygwin is on your PATH when you run Emacs, and Emacs does not find
+other versions of the image libraries first, then the Cygwin ones can
+cause problems.  Cygwin developers recommend that you do not put
+Cygwin on your system @env{PATH} for this reason.  Instead you can
+make the Cygwin tools available within Emacs by setting @code{exec-path}
+in your init file.
+
+@node MinGW
+@section MinGW and MSYS
+@cindex mingw tools
+@cindex msys environment
+@cindex subprocesses, mingw and msys
+
+@uref{http://www.mingw.org/}
+
+MinGW is a set of development tools that produce native Windows
+executables, not dependent on Cygwin's POSIX emulation DLLs.
+
+MSYS is a POSIX shell and minimal set of tools that are commonly used in
+configure scripts.  Like Cygwin, this environment uses a non-native
+filesystem mapping to appear more POSIX like to the scripts that it
+runs.  This is intended to complement the MinGW tools to make it easier
+to port software to Windows.
+
+@node UWIN
+@section UWIN
+@cindex uwin environment
+@cindex subprocesses, uwin
+
+@uref{http://www.research.att.com/sw/tools/uwin/}
+
+UWIN is another POSIX emulation environment, like Cygwin and MSYS,
+that provides a large number of ported tools.  The shell used by UWIN
+is @command{ksh}, the Korn shell.
+
+@node GnuWin32
+@section GnuWin32
+@cindex gnuwin32 tools
+@cindex subprocesses, gnuwin32
+@cindex image libraries, gnuwin32
+@cindex image libraries, development
+
+@uref{http://gnuwin32.sourceforge.net/}
+
+GnuWin32 provides precompiled native Windows ports of a wide selection
+of Free software and libraries.  Tools available here that are useful
+for Emacs include:
+
+@itemize
+@item Arc - used by @code{archive-mode} to edit .arc files.
+@item Bzip2 - used by Emacs to automatically decompress .bz2 files.
+@item CompFace - used by @code{gnus} to display XFace headers in messages.
+@item CoreUtils - GNU file, shell and text utilities (also in MSYS)
+@item DiffUtils - for @code{ediff} and producing patches
+@item FindUtils - for @code{grep-find} and other file searches.
+@item GifLib - library to support GIF images.
+@item Grep - for searching through files with @code{grep}.
+@item Gzip - used by Emacs to automatically decompress .gz files.
+@item Jpeg - library to support JPEG images (also in GTK).
+@item Lha - used by @code{archive-mode} to edit .lzh files.
+@item LibPng - library to support PNG images (also in GTK).
+@item LibTiff - library to support TIFF images (also in GTK).
+@item Make - used by @code{compile} for building projects (also in MinGW)
+@item OpenSSL - used by @code{gnus} to talk to servers over SSL.
+@item Patch - used by @code{ediff-patch-file} and others to apply patches.
+@item Tar - used by @code{tar-mode} to edit tar files.
+@item TexInfo - used to build Emacs' manuals.
+@item Unzip - used by @code{archive-mode} for extracting zip files.
+@item Xpm - library to support XPM images (bundled with Emacs binaries)
+@item Zip - used by @code{archive-mode} for editing zip files.
+@item Zlib - required by LibPng (also in GTK).
+@end itemize
+
+@node GTK
+@section GTK
+@cindex GTK image libraries
+@cindex image libraries, GTK
+@cindex addpm, using GTK image libraries
+
+GTK is a potential source for some of the image libraries that Emacs
+requires.  GTK is installed along with other ports of GUI software,
+such as the GIMP image editor, and Pidgin instant messenger client.
+If GTK is installed when you run @command{addpm}, Emacs will use the
+image libraries that it provides, even if they are not on the
+@env{PATH}.  GTK ships with JPEG, PNG and TIFF support.
+
+@node Read man pages
+@section How do I read man pages?
+@cindex man pages
+@findex woman
+@findex man
+
+Man pages for Emacs and other ported programs that you have can be
+read using Emacs' built-in manual reader @code{woman}.  This
+requires no external programs, but if you do have a port of
+@command{man}, there is also an Emacs wrapper @code{man} that
+which may be slightly faster.
+
+@c ------------------------------------------------------------
+@node Further information
+@chapter Further information
+
+@menu
+* More information::
+* Mailing lists::
+@end menu
+
+@node More information
+@section Where can I get more information about Emacs?
+@cindex other sources of information
+@cindex faqs, general
+@cindex faqs, old
+@cindex help, manuals and other sources
+@cindex manuals
+@cindex wiki
+
+If you have general questions about Emacs, the best places to start
+looking are @ref{Top,,, emacs, The GNU Emacs Manual}, and
+@ref{Top,,, efaq, the standard Emacs FAQ}.
+In Emacs, you can browse the manual using Info by typing @kbd{C-h r},
+and you can view the FAQ by typing @kbd{C-h C-f}. Other resources include:
+
+@itemize
+@item @uref{http://www.gnu.org/software/emacs/, The Emacs homepage}
+@item @uref{http://www.gnu.org/software/emacs/manual/, Other Emacs manuals}
+@item @uref{http://www.emacswiki.org/, Emacs Wiki}
+@end itemize
+
+@node Mailing lists
+@section What mailing lists are there for discussing Emacs on Windows?
+@cindex mailing lists
+@cindex help, mailing lists
+
+The official mailing list for Windows specific help and discussion is
+@url{http://lists.gnu.org/mailman/listinfo/help-emacs-windows,
+help-emacs-windows}.  See that link for information on how to subscribe
+or unsubscribe.  The
+@uref{http://lists.gnu.org/archive/html/help-emacs-windows/, list archives}
+are available online.
+
+@c ------------------------------------------------------------
+@node Indexes
+@unnumbered Indexes
+
+@unnumberedsec Function and Variable Index
+
+@printindex fn
+
+@unnumberedsec Concept Index
+
+@printindex cp
+
+@bye
diff --git a/doc/misc/faq.texi b/doc/misc/efaq.texi
index 1354f68cc9f..54e067d65bd 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/efaq.texi
@@ -3452,8 +3452,9 @@ lack certain features, such as the Emacs Lisp extension language.
 @cindex Emacs for MS-Windows
 @cindex Microsoft Windows, Emacs for
 
-There is a @uref{http://www.gnu.org/software/emacs/windows/ntemacs.html,
-separate FAQ} for Emacs on MS-Windows.  For MS-DOS, @pxref{Emacs for MS-DOS}.
+There is a separate FAQ for Emacs on MS-Windows,
+@pxref{Top,,,efaq-w32,FAQ for Emacs on MS Windows}.
+For MS-DOS, @pxref{Emacs for MS-DOS}.
 
 
 @node Emacs for GNUstep
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index c8e8fb6d2e2..e199417aa9d 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -256,7 +256,7 @@ concepts.  Therefore, it is highly recommended to learn these from a
 textbook or tutorial first, especially if you only know OOP from
 languages like C++ or Java.  If on the other hand you are already
 familiar with CLOS, you should be aware that @eieio{} does not implement
-the full CLOS specificiation and also differs in some other aspects
+the full CLOS specification and also differs in some other aspects
 (@xref{Introduction}, and @ref{CLOS compatibility}).
 
 A @dfn{class} is a definition for organizing data and methods
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index cbb78af9d59..2c0e929e532 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -871,15 +871,15 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}).
 @vindex mm-coding-system-priorities
 Prioritize coding systems to use for outgoing messages.  The default
 is @code{nil}, which means to use the defaults in Emacs, but is
-@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when
-running Emacs in the Japanese language environment.  It is a list of
-coding system symbols (aliases of coding systems are also allowed, use
-@kbd{M-x describe-coding-system} to make sure you are specifying correct
-coding system names).  For example, if you have configured Emacs
-to prefer UTF-8, but wish that outgoing messages should be sent in
-ISO-8859-1 if possible, you can set this variable to
-@code{(iso-8859-1)}.  You can override this setting on a per-message
-basis by using the @code{charset} @acronym{MML} tag (@pxref{MML Definition}).
+@code{(iso-8859-1 iso-2022-jp utf-8)} when running Emacs in the Japanese
+language environment.  It is a list of coding system symbols (aliases of
+coding systems are also allowed, use @kbd{M-x describe-coding-system} to
+make sure you are specifying correct coding system names).  For example,
+if you have configured Emacs to prefer UTF-8, but wish that outgoing
+messages should be sent in ISO-8859-1 if possible, you can set this
+variable to @code{(iso-8859-1)}.  You can override this setting on a
+per-message basis by using the @code{charset} @acronym{MML} tag
+(@pxref{MML Definition}).
 
 As different hierarchies prefer different charsets, you may want to set
 @code{mm-coding-system-priorities} according to the hierarchy in Gnus.
@@ -904,7 +904,7 @@ Here's an example:
           (mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
          ("^fj\\." ;; Japanese
           (mm-coding-system-priorities
-           '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
+           '(iso-8859-1 iso-2022-jp utf-8)))
          ("^ru\\." ;; Cyrillic
           (mm-coding-system-priorities
            '(koi8-r iso-8859-5 iso-8859-1 utf-8))))
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index adc63cc0bdb..bdba071be55 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -106,7 +106,7 @@ This chapter introduces various commands for typical use cases.
 * Cryptographic operations on files::
 * Dired integration::
 * Mail-mode integration::
-* Encrypting/decrypting *.gpg files::
+* Encrypting/decrypting gpg files::
 @end menu
 
 @node Key management
@@ -346,8 +346,8 @@ key in the recipient list, use @samp{encrypt-to} option in
 
 @end table
 
-@node Encrypting/decrypting *.gpg files
-@section Encrypting/decrypting *.gpg files
+@node Encrypting/decrypting gpg files
+@section Encrypting/decrypting gpg files
 By default, every file whose name ends with @samp{.gpg} will be
 treated as encrypted.  That is, when you open such a file, the
 decrypted text is inserted in the buffer rather than encrypted one.
@@ -464,7 +464,7 @@ To set up gpg-agent, follow the instruction in GnuPG manual.
 
 To set up elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.
-@xref{Encrypting/decrypting *.gpg files}.
+@xref{Encrypting/decrypting gpg files}.
 
 @node Bug Reports
 @chapter Bug Reports
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 4edc1d62f1a..f7f373664c6 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14796,14 +14796,16 @@ and says what authentication scheme to use.  The default is
 
 @item :leave
 Non-@code{nil} if the mail is to be left on the @acronym{POP} server
-after fetching.  Mails once fetched will never be fetched again by the
-@acronym{UIDL} control.  Only the built-in @code{pop3-movemail} program
-(the default) supports this keyword.
-
-If this is neither @code{nil} nor a number, all mails will be left on
-the server.  If this is a number, leave mails on the server for this
-many days since you first checked new mails.  If this is @code{nil}
-(the default), mails will be deleted on the server right after fetching.
+after fetching.  Only the built-in @code{pop3-movemail} program (the
+default) supports this keyword.
+
+If this is a number, leave mails on the server for this many days since
+you first checked new mails.  In that case, mails once fetched will
+never be fetched again by the @acronym{UIDL} control.  If this is
+@code{nil} (the default), mails will be deleted on the server right
+after fetching.  If this is neither @code{nil} nor a number, all mails
+will be left on the server, and you will end up getting the same mails
+again and again.
 
 @vindex pop3-uidl-file
 The @code{pop3-uidl-file} variable specifies the file to which the
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index e45234872e2..4bb6a9d6900 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -1275,6 +1275,7 @@ normally be applied.
 @vindex hfy-html-quote-regex
 @anchor{hfy-html-quote-regex}
 
+@c FIXME: the cross-reference below looks ugly
 Regex to match (with a single back-reference per match) strings in HTML
 which should be quoted with @ref{hfy-html-quote}
 (and @pxref{hfy-html-quote-map}) to make them safe.
@@ -1340,31 +1341,6 @@ See also: @ref{hfy-page-footer}
 
 String to add to the @samp{<style> a} variant of an Htmlfontify CSS class.
 
-@item hfy-fast-lock-save
-@vindex hfy-fast-lock-save
-@anchor{hfy-fast-lock-save}
-
-Minimum size of a buffer for cached fontification.
-This value is temporarily assigned to @code{fast-lock-minimum-size} during
-html-fontification.
-
-Only buffers more than this can have associated Font Lock cache files saved.
-
-If nil, means cache files are never created.
-
-If a list, each element should be a cons pair of the form
-@code{(@var{major-mode} . @var{size})}, where @var{major-mode}
-is a symbol or t (meaning the default).  For example:
-
-@lisp
- ((c-mode     . 25600  )
-  (c++-mode   . 25600  )
-  (rmail-mode . 1048576))
-@end lisp
-
-means that the minimum size is 25K for buffers in C or C++ modes, one megabyte
-for buffers in Rmail mode, and size is irrelevant (i.e., no saves) otherwise.
-
 @item hfy-split-index
 @vindex hfy-split-index
 @anchor{hfy-split-index}
@@ -1383,7 +1359,7 @@ be large and take a long time to render or be difficult to navigate.
 @vindex hfy-extn
 @anchor{hfy-extn}
 
-File extension used for output files
+File extension used for output files.
 
 @item hfy-default-face-def
 @vindex hfy-default-face-def
@@ -1464,7 +1440,7 @@ which can never slow you down, but may result in incomplete fontification.
 @vindex hfy-src-doc-link-unstyle
 @anchor{hfy-src-doc-link-unstyle}
 
-Regex to remove from the <style> a variant of an Htmlfontify CSS class.
+Regex to remove from the @samp{<style> a} variant of an Htmlfontify CSS class.
 
 @item hfy-link-extn
 @vindex hfy-link-extn
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index dbc35b09bb8..623fb4bfa79 100644
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -53,45 +53,46 @@ modify this GNU manual.''
 @end ifnottex
 
 @menu
-* Overview::                       Basics, activation.
-* Matching::                       Interactivity, matching, scrolling.
-* Highlighting::                   Highlighting of matching items.
-* Hidden Buffers and Files::       Hidden buffers, files, and directories.
-* Customization::                  Change the Ido functionality.
-* Misc::                           Various other features.
+* Overview::                    Basics, activation.
+* Matching::                    Interactivity, matching, scrolling.
+* Highlighting::                Highlighting of matching items.
+* Hidden Buffers and Files::    Hidden buffers, files, and directories.
+* Customization::               Change the Ido functionality.
+* Misc::                        Various other features.
 
 Appendices
-* GNU Free Documentation License:: The license for this documentation.
+* GNU Free Documentation License::  The license for this documentation.
 
 Indexes
-* Variable Index::                 An entry for each documented variable.
+* Variable Index::              An entry for each documented variable.
 
 @detailmenu
  --- The Detailed Node Listing ---
 
 Overview
 
-* Activation::                     How to use this package.
+* Activation::                  How to use this package.
+* Working Directories::         Where files have most recently been opened.
 
 Matching
 
-* Interactive Substring Matching:: Interactivity, matching, scrolling.
-* Prefix Matching::                Standard completion.
-* Flexible Matching::              More flexible matching.
-* Regexp Matching::                Matching using regular expression.
+* Interactive Substring Matching::  Interactivity, matching, scrolling.
+* Prefix Matching::             Standard completion.
+* Flexible Matching::           More flexible matching.
+* Regexp Matching::             Matching using regular expression.
 
 Customization
 
-* Changing List Order::            Changing the list of files.
-* Find File At Point::             Make Ido guess the context.
-* Ignoring::                       Ignorance is bliss.
-* Misc Customization::             Miscellaneous customization for Ido.
+* Changing List Order::         Changing the list of files.
+* Find File At Point::          Make Ido guess the context.
+* Ignoring::                    Ignorance is bliss.
+* Misc Customization::          Miscellaneous customization for Ido.
 
 Miscellaneous
 
-* All Matching::                   Seeing all the matching buffers or files.
-* Replacement::                    Replacement for @code{read-buffer} and @code{read-file-name}.
-* Other Packages::                 Don't want to depend on @code{ido-everywhere}?
+* All Matching::                Seeing all the matching buffers or files.
+* Replacement::                 Replacement for @code{read-buffer} and @code{read-file-name}.
+* Other Packages::              Don't want to depend on @code{ido-everywhere}?
 
 @end detailmenu
 @end menu
@@ -116,7 +117,8 @@ This package was originally written by Kim F. Storm, based on the
  @file{iswitchb.el} package by Stephen Eglen.
 
 @menu
-* Activation::                          How to use this package.
+* Activation::                  How to use this package.
+* Working Directories::         Where files have most recently been opened.
 @end menu
 
 @node Activation
@@ -140,9 +142,48 @@ package.
 (ido-mode t)
 @end example
 
-@c @node Working Directories
-@c @section Working Directories
-@c @cindex working directories
+@node Working Directories
+@section Working Directories
+@cindex working directories
+
+@vindex ido-work-directory-list
+@noindent
+@dfn{Working directories} are directories where files have most
+recently been opened.  The current directory is inserted at the front
+of this @code{ido-work-directory-list} whenever a file is opened with
+@code{ido-find-file} and other file-related functions.
+
+@c @cindex merge
+@c or maybe a new node for ``merge''
+
+@c @deffn Command ido-merge-work-directories
+
+@c @deffn Command ido-prev-work-directory
+
+@c @deffn Command ido-next-work-directory
+
+@c @deffn Command ido-forget-work-directory
+
+@c @defvar ido-use-merged-list
+@c @defvar ido-try-merged-list
+@c @defvar ido-pre-merge-state
+
+@defopt ido-max-work-directory-list
+This user option specifies maximum number of working directories to
+record.
+@end defopt
+
+@c see (info "(elisp) File Name Completion")
+@defopt ido-max-dir-file-cache
+This user option specifies maximum number of working directories to be
+cached.  This is the size of the cache of
+@code{file-name-all-completions} results.  Each cache entry is time
+stamped with the modification time of the directory.  Some systems,
+like MS-Windows, have unreliable directory modification times, so you
+may choose to disable caching on such systems, or explicitly refresh
+the cache contents using the command @code{ido-reread-directory}
+(usually @kbd{C-l}) in the minibuffer.
+@end defopt
 
 @node Matching
 @chapter Matching
@@ -153,10 +194,10 @@ This section describes features of this package that have to
 do with various kinds of @emph{matching}: among buffers, files, and directories.
 
 @menu
-* Interactive Substring Matching:: Interactivity, matching, scrolling.
-* Prefix Matching::                Standard completion.
-* Flexible Matching::              More flexible matching.
-* Regexp Matching::                Matching using regular expression.
+* Interactive Substring Matching::  Interactivity, matching, scrolling.
+* Prefix Matching::             Standard completion.
+* Flexible Matching::           More flexible matching.
+* Regexp Matching::             Matching using regular expression.
 @end menu
 
 @node Interactive Substring Matching
@@ -265,7 +306,7 @@ of the list and hit @key{RET}.
 To go up to the parent directory, delete any partial file name already
 specified (e.g. using @key{DEL}) and hit @key{DEL}.
 
-@c @defun ido-delete-backward-updir
+@c @deffn Command ido-delete-backward-updir
 
 @cindex root directory
 @cindex home directory
@@ -279,11 +320,11 @@ directory, enter @samp{~/}.  To enter Dired for this directory, use
 @cindex ftp hosts
 You can also visit files on other hosts using the ange-ftp
 notations @samp{/host:} and @samp{/user@@host:}.
-@c @defvr {User Option} ido-record-ftp-work-directories
-@c @defvr {User Option} ido-merge-ftp-work-directories
-@c @defvr {User Option} ido-cache-ftp-work-directory-time
-@c @defvr {User Option} ido-slow-ftp-hosts
-@c @defvr {User Option} ido-slow-ftp-host-regexps
+@c @defopt ido-record-ftp-work-directories
+@c @defopt ido-merge-ftp-work-directories
+@c @defopt ido-cache-ftp-work-directory-time
+@c @defopt ido-slow-ftp-hosts
+@c @defopt ido-slow-ftp-host-regexps
 
 You can type @kbd{M-p} and @kbd{M-n} to change to previous/next
 directories from the history, @kbd{M-s} to search for a file matching
@@ -295,22 +336,20 @@ If for some reason you cannot specify the proper file using
 @code{ido-switch-buffer}.
 
 @c @kindex C-x b
-@c @findex ido-switch-buffer
-@c @defun ido-switch-buffer
+@c @deffn Command ido-switch-buffer
 @c This command switch to another buffer interactively.
-@c @end defun
+@c @end deffn
 
 @c @kindex C-x C-f
-@c @findex ido-find-file
-@c @defun ido-find-file
+@c @deffn Command ido-find-file
 @c Edit file with name obtained via minibuffer.
-@c @end defun
+@c @end deffn
 
 @c @kindex C-x d
 @c @findex ido-dired
-@c @defun ido-dired
+@c @deffn Command ido-dired
 @c Call Dired the Ido way.
-@c @end defun
+@c @end deffn
 
 @node Prefix Matching
 @section Prefix Matching
@@ -338,12 +377,12 @@ of the buffer names.
 @section Flexible Matching
 @cindex flexible matching
 
-@defvr {User Option} ido-enable-flex-matching
+@defopt ido-enable-flex-matching
 If non-@code{nil}, Ido will do flexible string matching.  Flexible
 matching means that if the entered string does not match any item, any
 item containing the entered characters in the given sequence will
 match.
-@end defvr
+@end defopt
 
 @noindent
 If @code{ido-enable-flex-matching} is non-@code{nil}, Ido will do a
@@ -371,11 +410,11 @@ through @code{ido-enable-regexp} (toggle with @kbd{C-t}).  This allows
 you to type @samp{[ch]$} for example and see all file names ending in
 @samp{c} or @samp{h}.
 
-@defvr {User Option} ido-enable-regexp
+@defopt ido-enable-regexp
 If the value of this user option is non-@code{nil}, Ido will do regexp
 matching.  The value of this user option can be toggled within
 ido-mode using @code{ido-toggle-regexp}.
-@end defvr
+@end defopt
 
 @strong{Please notice:} Ido-style completion is inhibited when you
 enable regexp matching.
@@ -405,7 +444,7 @@ buffers or files.
 You can toggle display of the hidden buffers and files with @kbd{C-a}
 (@code{ido-toggle-ignore}).
 
-@c @defun ido-toggle-ignore
+@c @deffn Command ido-toggle-ignore
 
 @node Customization
 @chapter Customization
@@ -435,6 +474,9 @@ To modify the keybindings, use the @code{ido-setup-hook}.  For example:
  (define-key ido-completion-map " " 'ido-next-match))
 @end example
 
+@c @defopt ido-setup-hook
+@c a new node for Ido hooks?
+
 @menu
 * Changing List Order::         Changing the list of files.
 * Find File At Point::          Make Ido guess the context.
@@ -479,17 +521,17 @@ The following expression will make Ido guess the context:
 (setq ido-use-filename-at-point 'guess)
 @end example
 
-@c @defvr {User Option} ido-use-filename-at-point
+@c @defopt ido-use-filename-at-point
 @c If the value of this user option is non-@code{nil}, ...
-@c @end defvr
+@c @end defopt
 
 You can disable URL ffap support by toggling
 @code{ido-use-url-at-point}.
 
-@defvr {User Option} ido-use-url-at-point
+@defopt ido-use-url-at-point
 If the value of this user option is non-@code{nil}, Ido will look for
 a URL at point.  If found, call @code{find-file-at-point} to visit it.
-@end defvr
+@end defopt
 
 @node Ignoring
 @section Ignoring Buffers and Files
@@ -500,28 +542,29 @@ a URL at point.  If found, call @code{find-file-at-point} to visit it.
 Ido is capable of ignoring buffers, directories, files and extensions
 using regular expression.
 
-@defvr {User Option} ido-ignore-buffers
+@defopt ido-ignore-buffers
 This variable takes a list of regular expressions for buffers to
 ignore in @code{ido-switch-buffer}.
-@end defvr
+@end defopt
 
-@defvr {User Option} ido-ignore-directories
+@defopt ido-ignore-directories
 This variable takes a list of regular expressions for (sub)directories
 names to ignore in @code{ido-dired} and @code{ido-find-file}.
-@end defvr
+@end defopt
 
-@defvr {User Option} ido-ignore-files
+@defopt ido-ignore-files
 This variable takes a list of regular expressions for files to ignore
 in @code{ido-find-file}.
-@end defvr
+@end defopt
 
-@defvr {User Option} ido-ignore-unc-host-regexps
+@defopt ido-ignore-unc-host-regexps
 This variable takes a list of regular expressions matching UNC hosts
 to ignore.  The letter case will be ignored if
 @code{ido-downcase-unc-hosts} is non-@code{nil}.
-@end defvr
+@end defopt
 
-@c @defvr {User Option} ido-work-directory-list-ignore-regexps
+@c FIXME: Where to add this variable?  This node or ``working directory''?
+@c @defopt ido-work-directory-list-ignore-regexps
 
 To make Ido use @code{completion-ignored-extensions} you need to
 enable it:
@@ -542,69 +585,117 @@ the name of an ignored file, Ido will still let you open it just fine.
 @section Miscellaneous Customization
 @cindex miscellaneous customization for Ido
 
-@defvr {User Option} ido-mode
+@c Variables described in this sections may be moved to new nodes in
+@c the future.
+
+@defopt ido-mode
 This user option determines for which functional group (buffer and
 files) Ido behavior should be enabled.
-@end defvr
+@end defopt
 
-@defvr {User Option} ido-case-fold
+@defopt ido-case-fold
 If the value of this user option is non-@code{nil}, searching of
 buffer and file names should ignore case.
-@end defvr
+@end defopt
 
-@defvr {User Option} ido-show-dot-for-dired
-If the value of this user option is non-@code{nil} , always put
+@defopt ido-show-dot-for-dired
+If the value of this user option is non-@code{nil}, always put
 @samp{.}  as the first item in file name lists.  This allows the
 current directory to be opened immediately with Dired
-@end defvr
+@end defopt
 
-@defvr {User Option} ido-enable-dot-prefix
+@defopt ido-enable-dot-prefix
 If the value of this user option is non-@code{nil}, Ido will match
 leading dot as prefix.  I.e., hidden files and buffers will match only
 if you type a dot as first char (even if @code{ido-enable-prefix} is
 @code{nil}).
-@end defvr
-
-@c @defvr {User Option} ido-confirm-unique-completion
-@c @defvr {User Option} ido-cannot-complete-command
-@c @defvr {User Option} ido-record-commands
-@c @defvr {User Option} ido-max-file-prompt-width
-@c @defvr {User Option} ido-max-window-height
-@c @defvr {User Option} ido-enable-last-directory-history
-@c @defvr {User Option} ido-max-work-directory-list
-@c @defvr {User Option} ido-enable-tramp-completion
-@c @defvr {User Option} ido-unc-hosts
-@c @defvr {User Option} ido-downcase-unc-hosts
-@c @defvr {User Option} ido-cache-unc-host-shares-time
-@c @defvr {User Option} ido-max-work-file-list
-@c @defvr {User Option} ido-work-directory-match-only
-@c @defvr {User Option} ido-auto-merge-work-directories-length
-@c @defvr {User Option} ido-auto-merge-delay-time
-@c @defvr {User Option} ido-auto-merge-inhibit-characters-regexp
-@c @defvr {User Option} ido-merged-indicator
-@c @defvr {User Option} ido-max-dir-file-cache
-@c @defvr {User Option} ido-max-directory-size
-@c @defvr {User Option} ido-rotate-file-list-default
-@c @defvr {User Option} ido-enter-matching-directory
-@c @defvr {User Option} ido-create-new-buffer
-@c @defvr {User Option} ido-setup-hook
-@c @defvr {User Option} ido-separator
-@c @defvr {User Option} ido-decorations
-@c @defvr {User Option} ido-use-virtual-buffers
-@c @defvr {User Option} ido-use-faces
-@c @defvr {User Option} ido-make-file-list-hook
-@c @defvr {User Option} ido-make-dir-list-hook
-@c @defvr {User Option} ido-make-buffer-list-hook
-@c @defvr {User Option} ido-rewrite-file-prompt-functions
-@c @defvr {User Option} ido-completion-buffer
-@c @defvr {User Option} ido-completion-buffer-all-completions
-@c @defvr {User Option} ido-all-frames
-@c @defvr {User Option} ido-minibuffer-setup-hook
-@c @defvr {User Option} ido-save-directory-list-file
-@c @defvr {User Option} ido-read-file-name-as-directory-commands
-@c @defvr {User Option} ido-read-file-name-non-ido
-@c @defvr {User Option} ido-before-fallback-functions
-@c @defvr {User Option} ido-buffer-disable-smart-matches
+@end defopt
+
+@defopt ido-confirm-unique-completion
+If the value of this user option is non-@code{nil}, even a unique
+completion must be confirmed.  This means that @code{ido-complete}
+(@key{TAB}) must always be followed by @code{ido-exit-minibuffer}
+(@key{RET}) even when there is only one unique completion.
+@end defopt
+
+@defopt ido-cannot-complete-command
+When @code{ido-complete} can't complete any more, it will run the
+command specified by this user option.  The most useful values are
+@code{ido-completion-help}, which pops up a window with completion
+alternatives, or @code{ido-next-match} or @code{ido-prev-match}, which
+cycle the buffer list.
+@end defopt
+
+@defopt ido-max-file-prompt-width
+This user option specifies the upper limit of the prompt string.  If
+its value is an integer, it specifies the number of characters of the
+string.  If its value is a floating point number, it specifies a
+fraction of the frame width.
+@end defopt
+
+@defopt ido-max-window-height
+If the value of this user option is non-@code{nil}, its value will
+override the variable @code{max-mini-window-height}, which is the
+maximum height for resizing mini-windows (the minibuffer and the echo
+area).  If it's a floating point number, it specifies a fraction of
+the mini-window frame's height.  If it's an integer, it specifies the
+number of lines.
+@end defopt
+
+@defopt ido-record-commands
+If the value of this user option is non-@code{nil}, Ido will record
+commands in the variable @code{command-history}.  Note that non-Ido
+equivalent is recorded.
+@end defopt
+
+@defopt ido-all-frames
+This user option will be passed to @code{walk-windows} as its
+@var{all-frames} argument when Ido is finding buffers.  @xref{Cyclic
+Window Ordering, , Cyclic Ordering of Windows, elisp, GNU Emacs Lisp
+Reference Manual}.
+@end defopt
+
+@defopt ido-minibuffer-setup-hook
+This hook variable contains Ido-specific customization of minibuffer
+setup.  It is run during minibuffer setup if Ido is active, and is
+intended for use in customizing ido for interoperation with other
+packages.
+@end defopt
+
+@c @defopt ido-enable-tramp-completion
+@c cross-reference to tramp.texi
+
+@c @cindex UNC host names, completion
+@c @defopt ido-unc-hosts
+@c @defopt ido-downcase-unc-hosts
+@c @defopt ido-cache-unc-host-shares-time
+
+@c @defopt ido-enable-last-directory-history
+@c @defopt ido-max-work-file-list
+@c @defopt ido-work-directory-match-only
+@c @defopt ido-auto-merge-work-directories-length
+@c @defopt ido-auto-merge-delay-time
+@c @defopt ido-auto-merge-inhibit-characters-regexp
+@c @defopt ido-merged-indicator
+@c @defopt ido-max-directory-size
+@c @defopt ido-rotate-file-list-default
+@c @defopt ido-enter-matching-directory
+@c @defopt ido-create-new-buffer
+@c @defopt ido-separator
+@c @defopt ido-decorations
+@c @defopt ido-use-virtual-buffers
+@c @defopt ido-use-faces
+@c @defopt ido-make-file-list-hook
+@c @defopt ido-make-dir-list-hook
+@c @defopt ido-make-buffer-list-hook
+@c @defopt ido-rewrite-file-prompt-functions
+@c @defopt ido-completion-buffer
+@c @defopt ido-completion-buffer-all-completions
+@c @defopt ido-save-directory-list-file
+@c @defopt ido-read-file-name-as-directory-commands
+@c @defopt ido-read-file-name-non-ido
+@c @defopt ido-before-fallback-functions
+@c @defopt ido-buffer-disable-smart-matches
 
 @node Misc
 @chapter Miscellaneous
@@ -624,8 +715,8 @@ and you find that the file you are after is not in any buffer, you can
 press @kbd{C-f} to immediately drop into @code{ido-find-file}.  And
 you can switch back to buffer selection with @kbd{C-b}.
 
-@c @defun ido-magic-forward-char
-@c @defun ido-magic-backward-char
+@c @deffn Command ido-magic-forward-char
+@c @deffn Command ido-magic-backward-char
 
 You can also use Ido in your Emacs Lisp programs:
 
@@ -657,7 +748,7 @@ Also, to improve the responsiveness of Ido, the maximum number of
 matching items is limited to 12, but you can increase or removed this
 limit via the @code{ido-max-prospects} user option.
 
-@c @defvr {User Option} ido-max-prospects
+@c @defopt ido-max-prospects
 
 To see a full list of all matching buffers in a separate buffer, hit
 @kbd{?} or press @key{TAB} when there are no further completions to
@@ -675,8 +766,8 @@ functions @code{read-buffer} and @code{read-file-name}.
 To use ido for all buffer and file selections in Emacs, customize the
 variable @code{ido-everywhere}.
 
-@c @defun ido-everywhere
-@c @defvr {User Option} ido-everywhere
+@c @deffn Command ido-everywhere
+@c @defopt ido-everywhere
 
 @node Other Packages
 @section Other Packages
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 73a1294d28d..210b709c1ea 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -55,15 +55,15 @@ database.
 @end ifnottex
 
 @menu
-* About mairix and mairix.el::  About the mairix search engine and mairix.el
-* Configuring mairix::          How to configure mairix
-* Setting up mairix.el::        Set up mairix.el
-* Using mairix.el::             List of interactive functions
-* Extending mairix.el::         Support your favorite mail reader!
+* About::                       About the mairix search engine and mairix.el.
+* Configuring mairix::          How to configure mairix.
+* Setting up the mairix interface:: Set up mairix.el.
+* Using::                       List of interactive functions
+* Extending::                   Support your favorite mail reader!
 * GNU Free Documentation License::  The license for this documentation.
 @end menu
 
-@node About mairix and mairix.el
+@node About
 @chapter About mairix and mairix.el
 
 Mairix is a tool for indexing and searching words in locally stored
@@ -98,7 +98,7 @@ Currently, @code{mairix.el} is only tested with mbox output together
 with RMail, Gnus, or VM as the Emacs mail program.  However, it should
 also work with Maildir or MH, and it should be very easy to integrate
 other Emacs mail programs into @code{mairix.el}
-(@pxref{Extending mairix.el}).
+(@pxref{Extending}).
 
 If you use Gnus with maildir or MH, you should really use the native
 Gnus back end @code{nnmairix} instead, since it is more tightly
@@ -165,8 +165,8 @@ Now simply call @code{mairix} to create the index for the first time.
 Note that this may take a few minutes, but every following index will do
 the updates incrementally and hence is very fast.
 
-@node Setting up mairix.el
-@chapter Setting up mairix.el
+@node Setting up the mairix interface
+@chapter Setting up the mairix interface
 
 First, put @code{mairix.el} in your Emacs search path and put
 @code{(require 'mairix)} into your @file{.emacs} file.  Then, use
@@ -179,13 +179,12 @@ If you use Gnus with maildir or mh, use the native Gnus back end
 nnmairix instead.
 
 If you use another Emacs mail program which is not yet supported by
-mairix.el, it is pretty easy to integrate it.  @xref{Extending
-mairix.el}, on how to integrate it into mairix.el.
+mairix.el, it is pretty easy to integrate it.  @xref{Extending},
+on how to integrate it into mairix.el.
 
-Now you should be ready to go. @xref{Using mairix.el}, for the available
-commands.
+Now you should be ready to go. @xref{Using}, for the available commands.
 
-@node Using mairix.el
+@node Using
 @chapter Using mairix.el
 
 There are currently no default key bindings for mairix.el, since those
@@ -314,7 +313,7 @@ will still be usable while the update is done.
 @end table
 
 
-@node Extending mairix.el
+@node Extending
 @chapter Extending mairix.el
 
 Your favorite Emacs mail program is not supported?  Shame on me.  But
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index ab3bffc2ce9..afb44a6a396 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -169,9 +169,9 @@ single buffer, called @samp{*newsticker*}.  The modeline in the
 @samp{*newsticker*} buffer informs you whenever new headlines have
 arrived.
 @end itemize
-In both views clicking mouse-button 2 or pressing RET on a headline
-will call @code{browse-url} to load the corresponding news story in
-your favorite web browser.
+In both views clicking mouse-button 2 or pressing @key{RET} on a
+headline will call @code{browse-url} to load the corresponding news
+story in your favorite web browser.
 
 @findex newsticker-start-ticker
 @findex newsticker-stop-ticker
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index b9cf2335647..ba83d8129a8 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -153,7 +153,7 @@ Labels and References
 * Defining Label Environments::        ... and environments it doesn't.
 * Reference Info::                   View the label corresponding to a \ref.
 * Reference Styles::                 Macros to be used instead of \ref.
-* xr (LaTeX package)::               References to external documents.
+* LaTeX xr Package::                 References to external documents.
 
 Defining Label Environments
 
@@ -196,17 +196,17 @@ AUCTeX
 
 Options, Keymaps, Hooks
 
-* Options (Table of Contents)::
-* Options (Defining Label Environments)::
-* Options (Creating Labels)::
-* Options (Referencing Labels)::
-* Options (Creating Citations)::
-* Options (Index Support)::
-* Options (Viewing Cross-References)::
-* Options (Finding Files)::
-* Options (Optimizations)::
-* Options (Fontification)::
-* Options (Misc)::
+* Options - Table of Contents::
+* Options - Defining Label Environments::
+* Options - Creating Labels::
+* Options - Referencing Labels::
+* Options - Creating Citations::
+* Options - Index Support::
+* Options - Viewing Cross-References::
+* Options - Finding Files::
+* Options - Optimizations::
+* Options - Fontification::
+* Options - Misc::
 
 @end detailmenu
 @end menu
@@ -581,8 +581,8 @@ called.
 @item mouse-2
 @vindex reftex-highlight-selection
 Clicking with mouse button 2 on a line has the same effect as @key{RET}.
-See also variable @code{reftex-highlight-selection}, @ref{Options
-(Fontification)}.
+See also variable @code{reftex-highlight-selection},
+@ref{Options - Fontification}.
 
 @item f
 @vindex reftex-toc-follow-mode
@@ -701,9 +701,8 @@ buffer.
 
 @item x
 Switch to the @file{*toc*} buffer of an external document.  When the
-current document is using the @code{xr} package (@pxref{xr (LaTeX
-package)}), @RefTeX{} will switch to one of the external
-documents.
+current document is using the @code{xr} package (@pxref{LaTeX xr Package}),
+@RefTeX{} will switch to one of the external documents.
 
 
 @tablesubheading{Automatic recentering}
@@ -796,7 +795,7 @@ equation counter.
 * Defining Label Environments::        ... and environments it doesn't.
 * Reference Info::                   View the label corresponding to a \ref.
 * Reference Styles::                 Macros to be used instead of \ref.
-* xr (LaTeX package)::               References to external documents.
+* LaTeX xr Package::                 References to external documents.
 @end menu
 
 @node Creating Labels
@@ -859,8 +858,8 @@ this label later.
 
 @vindex reftex-insert-label-flags
 If you want to change the way certain labels are created, check out the
-variable @code{reftex-insert-label-flags} (@pxref{Options (Creating
-Labels)}).
+variable @code{reftex-insert-label-flags} (@pxref{Options - Creating
+Labels}).
 
 If you are using @AUCTeX{} to write your @LaTeX{} documents, you can
 set it up to delegate the creation of labels to
@@ -981,7 +980,7 @@ references all marked labels.
 @vindex reftex-highlight-selection
 Clicking with mouse button 2 on a label will accept it like @key{RET}
 would.  See also variable @code{reftex-highlight-selection},
-@ref{Options (Misc)}.
+@ref{Options - Misc}.
 
 @vindex reftex-multiref-punctuation
 @item m - + ,
@@ -1034,7 +1033,7 @@ buffer.
 @tablesubheading{Controlling what gets displayed}
 @vindex reftex-label-menu-flags
 The defaults for the following flags can be configured with the variable
-@code{reftex-label-menu-flags} (@pxref{Options (Referencing Labels)}).
+@code{reftex-label-menu-flags} (@pxref{Options - Referencing Labels}).
 
 @item c
 Toggle the display of the one-line label definition context in the
@@ -1082,8 +1081,7 @@ a menu for that category will be shown.
 Reference a label from an external document.  With the @LaTeX{} package
 @code{xr} it is possible to reference labels defined in another
 document.  This key will switch to the label menu of an external
-document and let you select a label from there (@pxref{xr (LaTeX
-package),,xr}).
+document and let you select a label from there (@pxref{LaTeX xr Package,,xr}).
 
 @end table
 
@@ -1203,8 +1201,8 @@ them (@pxref{Defining Label Environments}).
 @vindex reftex-label-alist
 @RefTeX{} can be configured to recognize additional labeled
 environments and macros.  This is done with the variable
-@code{reftex-label-alist} (@pxref{Options (Defining Label
-Environments)}).  If you are not familiar with Lisp, you can use the
+@code{reftex-label-alist} (@pxref{Options - Defining Label
+Environments}).  If you are not familiar with Lisp, you can use the
 @code{custom} library to configure this rather complex variable.  To do
 this, use
 
@@ -1302,8 +1300,7 @@ a @code{\macro} or after the @code{\begin} statement).  @code{t} is
 @code{nil} means to use the text right after the label definition.
 @item
 For more complex ways of getting context, see the variable
-@code{reftex-label-alist} (@ref{Options (Defining Label
-Environments)}).
+@code{reftex-label-alist} (@ref{Options - Defining Label Environments}).
 @end itemize
 
 The following list of strings is used to guess the correct label type
@@ -1356,9 +1353,8 @@ Reftex Label Alist: [Hide]
 Depending on how you would like the label insertion and selection for
 the new environments to work, you might want to add the letters @samp{a}
 and @samp{h} to some of the flags in the variables
-@code{reftex-insert-label-flags} (@pxref{Options (Creating Labels)})
-and @code{reftex-label-menu-flags} (@pxref{Options (Referencing
-Labels)}).
+@code{reftex-insert-label-flags} (@pxref{Options - Creating Labels})
+and @code{reftex-label-menu-flags} (@pxref{Options - Referencing Labels}).
 
 
 @node Quick Equation
@@ -1749,7 +1745,7 @@ and @code{reftex-fref-is-default} respectively.  While still working,
 these variables are deprecated now.  Instead of setting them, the
 variable @code{reftex-ref-style-default-list} should be adapted now.
 
-@node xr (LaTeX package)
+@node LaTeX xr Package
 @section @code{xr}: Cross-Document References
 @cindex @code{xr}, LaTeX package
 @cindex LaTeX packages, @code{xr}
@@ -1883,8 +1879,8 @@ which the selection process was started.
 @item mouse-2
 @vindex reftex-highlight-selection
 Clicking with mouse button 2 on a citation will accept it like @key{RET}
-would.  See also variable @code{reftex-highlight-selection}, @ref{Options
-(Misc)}.
+would.  See also variable @code{reftex-highlight-selection},
+@ref{Options - Misc}.
 
 @item m
 Mark the current entry.  When one or several entries are marked,
@@ -2403,8 +2399,9 @@ Abort the indexing process.
 
 The @samp{Find and Index in Document} menu in the phrases buffer also
 lists a few options for the indexing process.  The options have
-associated customization variables to set the defaults (@pxref{Options
-(Index Support)}).  Here is a short explanation of what the options do:
+associated customization variables to set the defaults
+(@pxref{Options - Index Support}).  Here is a short explanation of
+what the options do:
 
 @table @i
 @item Match Whole Words
@@ -2759,7 +2756,7 @@ variants@footnote{all macros that start with @samp{ref} or end with
 @samp{ref} or @samp{refrange}} of the @code{\ref} macro are active for
 cross-reference display.  This works also for labels defined in an
 external document when the current document refers to them through the
-@code{xr} interface (@pxref{xr (LaTeX package)}).
+@code{xr} interface (@pxref{LaTeX xr Package}).
 
 @item @code{\label}
 @cindex @code{\label}
@@ -2908,7 +2905,7 @@ the ones defined in @file{font-lock.el}.  Therefore, @RefTeX{} will
 use faces only when @code{font-lock} is loaded.  This seems to be
 reasonable because people who like faces will very likely have it
 loaded.  If you wish to turn off fontification or change the involved
-faces, see @ref{Options (Fontification)}.
+faces, see @ref{Options - Fontification}.
 
 @node Multifile Documents
 @section Multifile Documents
@@ -3894,21 +3891,21 @@ Lisp (and even if you are) you might find it more comfortable to use
 reftex-customize} will get you there.
 
 @menu
-* Options (Table of Contents)::
-* Options (Defining Label Environments)::
-* Options (Creating Labels)::
-* Options (Referencing Labels)::
-* Options (Creating Citations)::
-* Options (Index Support)::
-* Options (Viewing Cross-References)::
-* Options (Finding Files)::
-* Options (Optimizations)::
-* Options (Fontification)::
-* Options (Misc)::
+* Options - Table of Contents::
+* Options - Defining Label Environments::
+* Options - Creating Labels::
+* Options - Referencing Labels::
+* Options - Creating Citations::
+* Options - Index Support::
+* Options - Viewing Cross-References::
+* Options - Finding Files::
+* Options - Optimizations::
+* Options - Fontification::
+* Options - Misc::
 * Keymaps and Hooks::
 @end menu
 
-@node Options (Table of Contents)
+@node Options - Table of Contents
 @section Table of Contents
 @cindex Options, table of contents
 @cindex Table of contents, options
@@ -4032,7 +4029,7 @@ The keymap which is active in the @file{*toc*} buffer.
 (@pxref{Table of Contents}).
 @end deffn
 
-@node Options (Defining Label Environments)
+@node Options - Defining Label Environments
 @section Defining Label Environments
 @cindex Options, defining label environments
 @cindex Defining label environments, options
@@ -4259,7 +4256,7 @@ labels fn:xxx, you may want to set this variable to the value "^fn:$" or
 non-footnote labels.
 @end defopt
 
-@node Options (Creating Labels)
+@node Options - Creating Labels
 @section Creating Labels
 @cindex Options, creating labels
 @cindex Creating labels, options
@@ -4375,7 +4372,7 @@ Character class after  abbrev point in word.
 @end table
 @end defopt
 
-@node Options (Referencing Labels)
+@node Options - Referencing Labels
 @section Referencing Labels
 @cindex Options, referencing labels
 @cindex Referencing labels, options
@@ -4497,7 +4494,7 @@ The keymap which is active in the labels selection process
 (@pxref{Referencing Labels}).
 @end deffn
 
-@node Options (Creating Citations)
+@node Options - Creating Citations
 @section Creating Citations
 @cindex Options, creating citations
 @cindex Creating citations, options
@@ -4676,7 +4673,7 @@ Footer to insert in BibTeX files generated by
 @end defopt
 
 
-@node Options (Index Support)
+@node Options - Index Support, Options - Viewing Cross-References, Options - Creating Citations,  Options
 @section Index Support
 @cindex Options, Index support
 @cindex Index support, options
@@ -4896,7 +4893,7 @@ The keymap which is active in the @file{*Index*} buffer
 (@pxref{Index Support}).
 @end deffn
 
-@node Options (Viewing Cross-References)
+@node Options - Viewing Cross-References
 @section Viewing Cross-References
 @cindex Options, viewing cross-references
 @cindex Viewing cross-references, options
@@ -4955,7 +4952,7 @@ saved along with the parsing information.  The cache survives document
 scans.  In order to clear it, use @kbd{M-x reftex-reset-mode}.
 @end defopt
 
-@node Options (Finding Files)
+@node Options - Finding Files
 @section Finding Files
 @cindex Options, Finding Files
 @cindex Finding files, options
@@ -5045,7 +5042,7 @@ non-@code{nil}.
 @end defopt
 
 @page
-@node Options (Optimizations)
+@node Options - Optimizations
 @section Optimizations
 @cindex Options, optimizations
 @cindex Optimizations, options
@@ -5154,7 +5151,7 @@ effect when @code{reftex-use-multiple-selection-buffers} is
 non-@code{nil}.
 @end defopt
 
-@node Options (Fontification)
+@node Options - Fontification
 @section Fontification
 @cindex Options, fontification
 @cindex Fontification, options
@@ -5252,7 +5249,7 @@ Face name for index names (for multiple indices).
 Face name for index entries.
 @end defopt
 
-@node Options (Misc)
+@node Options - Misc
 @section Miscellaneous
 @cindex Options, misc
 
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index cfd040f0e82..aa0752c80cd 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -84,12 +84,15 @@ into the following chapters.
 @node  Introduction
 @chapter Introduction
 
-Supercite is a GNU Emacs package written entirely in Emacs Lisp. It
+@cindex MUA
+@cindex NUA
+Supercite is a GNU Emacs package written entirely in Emacs Lisp.  It
 interfaces to most of the commonly used Emacs mail user agents
 (@dfn{MUAs}) and news user agents (@dfn{NUAs}), and provides
 sophisticated facilities for the citing and attributing of message
-replies.  Supercite has a very specific and limited role in the process
-of composing replies to both USENET network news and electronic mail.
+replies.  Supercite has a very specific and limited role in the
+process of composing replies to both USENET network news and
+electronic mail.
 
 The preferred way to spell Supercite is with a capital @samp{S},
 lowercase @samp{upercite}.
@@ -100,8 +103,7 @@ lowercase @samp{upercite}.
 * What Supercite Does::
 @end menu
 
-@cindex MUA
-@cindex NUA
+@c FIXME: move it above the menu?  --xfq
 Supercite is only useful in conjunction with MUAs and NUAs such as VM,
 Gnus, RMAIL, MH-E, etc.  Supercite is typically called by the MUA after a
 reply buffer has been setup.  Thereafter, Supercite's many commands and
@@ -118,21 +120,22 @@ sent.  Supercite is re-initialized in each new reply buffer.
 @cindex cite, citing
 @cindex attribute, attributing
 
-Typical usage is as follows. You want to reply or followup to a message
-in your MUA@. You will probably hit @kbd{r} (i.e., ``reply'') or @kbd{f}
-(i.e., ``forward'') to begin composing the reply.  In response, the MUA
-will create a reply buffer and initialize the outgoing mail headers
-appropriately.  The body of the reply will usually be empty at this
-point.  You now decide that you would like to include part of the
-original message in your reply. To do this, you @dfn{yank} the original
-message into the reply buffer, typically with a key stroke such as
-@kbd{C-c C-y}.  This sequence will invoke an MUA-specific function which
-fills the body of the reply with the original message and then
-@dfn{attributes} this text to its author.  This is called @dfn{citing}
-and its effect is to prefix every line from the original message with a
-special text tag.  Most MUAs provide some default style of citing; by
-using Supercite you gain a wider flexibility in the look and style of
-citations.  Supercite's only job is to cite the original message.
+Typical usage is as follows.  You want to reply or followup to a
+message in your MUA@.  You will probably hit @kbd{r} (i.e., ``reply'')
+or @kbd{f} (i.e., ``forward'') to begin composing the reply.  In
+response, the MUA will create a reply buffer and initialize the
+outgoing mail headers appropriately.  The body of the reply will
+usually be empty at this point.  You now decide that you would like to
+include part of the original message in your reply.  To do this, you
+@dfn{yank} the original message into the reply buffer, typically with
+a key stroke such as @kbd{C-c C-y}.  This sequence will invoke an
+MUA-specific function which fills the body of the reply with the
+original message and then @dfn{attributes} this text to its author.
+This is called @dfn{citing} and its effect is to prefix every line
+from the original message with a special text tag.  Most MUAs provide
+some default style of citing; by using Supercite you gain a wider
+flexibility in the look and style of citations.  Supercite's only job
+is to cite the original message.
 
 @node  What Supercite Does Not Do
 @section What Supercite Doesn't Do
@@ -183,7 +186,7 @@ string carrying details about the citation it is about to perform.
 
 @cindex modeline
 Next, Supercite visits each line in the reply, transforming the line
-according to a customizable ``script.''  Lines which were not previously
+according to a customizable ``script''.  Lines which were not previously
 cited in the original message are given a citation, while already cited
 lines remain untouched, or are coerced to your preferred style.
 Finally, Supercite installs a keymap into the reply buffer so that you
@@ -253,10 +256,10 @@ make the message very difficult for the eye to scan.
 
 @cindex non-nested citations
 In @dfn{non-nested citations}, each cited line begins with an
-informative string attributing that line to the original author. Only
-the first level of attribution will be shown; subsequent citations don't
-nest the citation strings. The above dialog might look like this when
-non-nested citations are used:
+informative string attributing that line to the original author.  Only
+the first level of attribution will be shown; subsequent citations
+don't nest the citation strings.  The above dialog might look like
+this when non-nested citations are used:
 
 @example
 John> John originally wrote this
@@ -272,19 +275,20 @@ message did not result in a line cited with @samp{Jane>John>}.
 @vindex sc-nested-citation-p
 @vindex nested-citation-p (sc-)
 Supercite supports both styles of citation, and the variable
-@code{sc-nested-citation-p} controls which style it will use when citing
-previously uncited text. When this variable is @code{nil} (the default),
-non-nested citations are used.  When non-@code{nil}, nested citations
-are used.
+@code{sc-nested-citation-p} controls which style it will use when
+citing previously uncited text.  When this variable is @code{nil} (the
+default), non-nested citations are used.  When non-@code{nil}, nested
+citations are used.
 
 
 @node  Citation Elements
 @section Citation Elements
 @cindex citation string
 
-@dfn{Citation strings} are composed of one or more elements. Non-nested
-citations are composed of four elements, three of which are directly
-user definable.  The elements are concatenated together, in this order:
+@dfn{Citation strings} are composed of one or more elements.
+Non-nested citations are composed of four elements, three of which are
+directly user definable.  The elements are concatenated together, in
+this order:
 
 @cindex citation leader
 @vindex citation-leader (sc-)
@@ -337,10 +341,10 @@ multi-level nested citations.
 @section Recognizing Citations
 
 Supercite also recognizes citations in the original article, and can
-transform these already cited lines in a number of ways. This is how
+transform these already cited lines in a number of ways.  This is how
 Supercite suppresses the multiple citing of non-nested citations.
-Recognition of cited lines is controlled by variables analogous to those
-that make up the citation string as mentioned previously.
+Recognition of cited lines is controlled by variables analogous to
+those that make up the citation string as mentioned previously.
 
 @vindex sc-citation-leader-regexp
 @vindex citation-leader-regexp (sc-)
@@ -387,16 +391,16 @@ change @code{sc-citation-root-regexp} you should always also change
 
 @dfn{Mail header information keys} are nuggets of information that
 Supercite extracts from the various mail headers of the original
-message, placed in the reply buffer by the MUA@.  Information is kept in
-the @dfn{Info Alist} as key-value pairs, and can be retrieved for use in
-various places within Supercite, such as in header rewrite functions and
-attribution selection.  Other bits of data, composed and created by
-Supercite, are also kept as key-value pairs in this alist. In the case
-of mail fields, the key is the name of the field, omitting the trailing
-colon.  Info keys are always case insensitive (as are mail headers), and
-the value for a corresponding key can be retrieved from the alist with
-the @code{sc-mail-field} function.  Thus, if the following fields were
-present in the original article:@refill
+message, placed in the reply buffer by the MUA@.  Information is kept
+in the @dfn{Info Alist} as key-value pairs, and can be retrieved for
+use in various places within Supercite, such as in header rewrite
+functions and attribution selection.  Other bits of data, composed and
+created by Supercite, are also kept as key-value pairs in this alist.
+In the case of mail fields, the key is the name of the field, omitting
+the trailing colon.  Info keys are always case insensitive (as are
+mail headers), and the value for a corresponding key can be retrieved
+from the alist with the @code{sc-mail-field} function.  Thus, if the
+following fields were present in the original article:@refill
 
 @example
 Date:@: 08 April 1991, 17:32:09 EST
@@ -419,7 +423,7 @@ then, the following lisp constructs return:
 Since the argument to @code{sc-mail-field} can be any string, it is
 possible that the mail field will not be present on the info alist
 (possibly because the mail header was not present in the original
-message). In this case, @code{sc-mail-field} will return the value of
+message).  In this case, @code{sc-mail-field} will return the value of
 the variable @code{sc-mumble}.
 
 Supercite always places all mail fields found in the yanked original
@@ -510,8 +514,8 @@ header.
 @vindex sc-rewrite-header-list
 @vindex rewrite-header-list (sc-)
 There are a number of built-in @dfn{header rewrite functions} supplied
-by Supercite, but you can write your own custom header rewrite functions
-(perhaps using the built-in ones as examples). The variable
+by Supercite, but you can write your own custom header rewrite
+functions (perhaps using the built-in ones as examples).  The variable
 @code{sc-rewrite-header-list} contains the list of such header rewrite
 functions.  This list is consulted both when inserting the initial
 reference header, and when displaying @dfn{electric references}.
@@ -521,7 +525,7 @@ reference header, and when displaying @dfn{electric references}.
 @vindex preferred-header-style (sc-)
 When Supercite is initially run on a reply buffer (via
 @code{sc-cite-original}), it will automatically call one of these
-functions. The one it uses is defined in the variable
+functions.  The one it uses is defined in the variable
 @code{sc-preferred-header-style}.  The value of this variable is an
 integer which is an index into the @code{sc-rewrite-header-list},
 beginning at zero.
@@ -556,9 +560,9 @@ problem either in your MUA or in Supercite's installation).
 @findex sc-no-header
 @findex no-header (sc-)
 @item sc-no-header
-This function produces no header. It should be used instead of
-@code{nil} to produce a blank header.  This header can possibly contain
-a blank line after the @code{mail-header-separator} line.
+This function produces no header.  It should be used instead of
+@code{nil} to produce a blank header.  This header can possibly
+contain a blank line after the @code{mail-header-separator} line.
 
 @item sc-no-blank-line-or-header
 @findex sc-no-blank-line-or-header
@@ -612,11 +616,11 @@ line after the @code{mail-header-separator} line will be removed.
 By default, when Supercite cites the original message for the first
 time, it just goes ahead and inserts the reference header indexed by
 @code{sc-preferred-header-style}.  However, you may want to select
-different reference headers based on the type of reply or forwarding you
-are doing. You may also want to preview the reference header before
-deciding whether to insert it into the reply buffer or not. Supercite
-provides an optional @dfn{electric reference} mode which you can drop
-into to give you this functionality.
+different reference headers based on the type of reply or forwarding
+you are doing.  You may also want to preview the reference header
+before deciding whether to insert it into the reply buffer or
+not. Supercite provides an optional @dfn{electric reference} mode
+which you can drop into to give you this functionality.
 
 @vindex sc-electric-references-p
 @vindex electric-references-p (sc-)
@@ -629,7 +633,7 @@ through all the reference header rewrite functions in your
 @code{sc-rewrite-header-list}.
 
 You can also set a new preferred header style, jump to any header, or
-jump to the preferred header. The header will be shown in the electric
+jump to the preferred header.  The header will be shown in the electric
 reference buffer and the header index and function name will appear in
 the echo area.
 
@@ -643,7 +647,7 @@ The following commands are available while in electric reference mode
 @kindex n
 @vindex sc-electric-circular-p
 @vindex electric-circular-p (sc-)
-Displays the next reference header in the electric reference buffer. If
+Displays the next reference header in the electric reference buffer.  If
 the variable @code{sc-electric-circular-p} is non-@code{nil}, invoking
 @code{sc-eref-next} while viewing the last reference header in the list
 will wrap around to the first header.@refill
@@ -854,7 +858,7 @@ affect alternative citing styles.
 @vindex mail-warn-if-non-rfc822-p (sc-)
 All previously retrieved info key-value pairs are deleted from the info
 alist, then the mail headers in the body of the yanked message are
-scanned. Info key-value pairs are created for each header found. Also,
+scanned.  Info key-value pairs are created for each header found.  Also,
 such useful information as the author's name and email address are
 extracted.  If the variable @code{sc-mail-warn-if-non-rfc822-p} is
 non-@code{nil}, then Supercite will warn you if it finds a mail header
@@ -931,7 +935,7 @@ in the original message should be cited or not.  If this variable is
 non-@code{nil}, blank lines will be cited just like non-blank lines.
 Otherwise, blank lines will be treated as paragraph separators.
 
-Citing of the original message is highly configurable. Supercite's
+Citing of the original message is highly configurable.  Supercite's
 default setup does a pretty good job of citing many common forms of
 previously cited messages.  But there are as many citation styles out
 there as people on the net, or just about!  It would be impossible for
@@ -945,8 +949,8 @@ recognize those styles you see often.
 @vindex sc-post-hook
 @vindex post-hook (sc-)
 This variable is very similar to @code{sc-pre-hook}, except that it runs
-after @code{sc-cite-original} is finished. This hook is provided mostly
-for completeness and backward compatibility. Perhaps it could be used to
+after @code{sc-cite-original} is finished.  This hook is provided mostly
+for completeness and backward compatibility.  Perhaps it could be used to
 reset certain variables set in @code{sc-pre-hook}.@refill
 @end enumerate
 
@@ -1012,7 +1016,7 @@ both of these variables is provided on the key binding
 @pxref{Post-yank Formatting Commands}).@refill
 
 You will noticed that the minor mode string will
-show the state of these variables as qualifier characters. When both
+show the state of these variables as qualifier characters.  When both
 variables are @code{nil}, the Supercite minor mode string will display
 @samp{SC}.  When just @code{sc-auto-fill-region-p} is non-@code{nil}, the
 string will display @samp{SC:f}, and when just
@@ -1036,11 +1040,11 @@ fill cited text.
 @vindex preferred-attribution-list (sc-)
 
 As you know, the attribution string is the part of the author's name
-that will be used to composed a non-nested citation string. Supercite
+that will be used to composed a non-nested citation string.  Supercite
 scans the various mail headers present in the original article and uses
 a number of heuristics to extract strings which it puts into the
-@dfn{attribution association list} or @dfn{attribution alist}. This is
-analogous, but different than, the info alist previously mentioned. Each
+@dfn{attribution association list} or @dfn{attribution alist}.  This is
+analogous, but different than, the info alist previously mentioned.  Each
 element in the attribution alist is a key-value pair containing such
 information as the author's first name, middle names, and last name, the
 author's initials, and the author's email terminus.
@@ -1083,7 +1087,7 @@ the author's last name.
 the author's first middle name.
 
 @item "sc-lastchoice"
-the last attribution string you have selected. This is useful when you
+the last attribution string you have selected.  This is useful when you
 recite paragraphs in the reply.@refill
 
 @item "sc-consult"
@@ -1094,7 +1098,7 @@ be used to select special attributions based on the value of any info
 key.  See below for details.
 
 @item "x-attribution"
-the original author's suggestion for attribution string choice. See below
+the original author's suggestion for attribution string choice.  See below
 for details.@refill
 @end table
 
@@ -1141,7 +1145,7 @@ Each element in this list contains lists of the following form:
 @findex sc-mail-field
 @findex mail-field (sc-)
 where @var{infokey} is a key for @code{sc-mail-field} and @var{regexp}
-is a regular expression to match against the @var{infokey}'s value. If
+is a regular expression to match against the @var{infokey}'s value.  If
 @var{regexp} matches the @var{infokey}'s value, the @var{attribution} is
 used as the attribution string.  Actually, @var{attribution} can be a
 string or a list; if it is a list, it is @code{eval}uated and the return
@@ -1166,7 +1170,7 @@ The fallback author name is contained in the variable
 @code{sc-default-author-name} and the fallback attribution string is
 contained in the variable @code{sc-default-attribution}.  Default values
 for these variables are @code{"Anonymous"} and @code{"Anon"},
-respectively. Note that in most circumstances, getting the default
+respectively.  Note that in most circumstances, getting the default
 author name or attribution is a sign that something is set up
 incorrectly.
 
@@ -1174,7 +1178,7 @@ incorrectly.
 @vindex use-only-preference-p (sc-)
 Also, if the preferred attribution, which you specified in your
 @code{sc-preferred-attribution-list} variable cannot be found, a
-secondary method can be employed to find a valid attribution string. The
+secondary method can be employed to find a valid attribution string.  The
 variable @code{sc-use-only-preference-p} controls what happens in this
 case.  If the variable's value is non-@code{nil}, then
 @code{sc-default-author-name} and @code{sc-default-attribution} are
@@ -1209,11 +1213,11 @@ attribution alist.
 @vindex sc-confirm-always-p
 @vindex confirm-always-p (sc-)
 Once the attribution string has been automatically selected, a number of
-things can happen. If the variable @code{sc-confirm-always-p} is
+things can happen.  If the variable @code{sc-confirm-always-p} is
 non-@code{nil}, you are queried for confirmation of the chosen
-attribution string. The possible values for completion are those strings
+attribution string.  The possible values for completion are those strings
 in the attribution alist, however you are not limited to these choices.
-You can type any arbitrary string at the confirmation prompt. The string
+You can type any arbitrary string at the confirmation prompt.  The string
 you enter becomes the value associated with the @code{"sc-lastchoice"}
 key in the attribution alist.
 
@@ -1279,7 +1283,7 @@ author's name proper.  Examples include the titles ``Dr.'', ``Mr.'',
 Also, some companies prepend or append the name of the division,
 organization, or project on the author's name.  All of these titles are
 noise which should be ignored.  The variable @code{sc-name-filter-alist}
-is used for this purpose. As implied by its name, this variable is an
+is used for this purpose.  As implied by its name, this variable is an
 association list, where each element is a cons cell of the form:
 
 @example
@@ -1290,7 +1294,7 @@ association list, where each element is a cons cell of the form:
 where @var{regexp} is a regular expression that is matched (using
 @code{string-match}) against each element of the @samp{From:@:} field's
 author name.  @var{position} is a position indicator, starting at zero.
-Thus to strip out all titles of ``Dr.'', ``Mr.'', etc. from the name,
+Thus to strip out all titles of ``Dr.'', ``Mr.'', etc.  from the name,
 @code{sc-name-filter-alist} would have an entry such as:
 
 @example
@@ -1380,10 +1384,10 @@ The four special symbol values for @var{pred} are recognized:
 @item t
 Always produces a true outcome.
 @item begin
-Always executed before the frame is interpreted. This can be used to
+Always executed before the frame is interpreted.  This can be used to
 initialize some global variables for example.
 @item end
-Always executed after frame interpreting is completed. This can be used
+Always executed after frame interpreting is completed.  This can be used
 to perform any necessary post-processing.
 @item every
 Executes whenever the frame is reset, usually after the entire frame has
@@ -1406,12 +1410,12 @@ of the following elements:@refill
 @table @asis
 @item the symbol @code{continue}
 This tells Regi to continue processing entries after a match, instead of
-resetting the frame and moving @samp{point}. In this way, lines of text
+resetting the frame and moving @samp{point}.  In this way, lines of text
 can have multiple matches, but you have to be careful to avoid entering
 infinite loops.
 
 @item the symbol @code{abort}
-This tells Regi to terminate frame processing. However, any @code{end}
+This tells Regi to terminate frame processing.  However, any @code{end}
 entry is still processed.
 
 @item the list @code{(frame . @var{newframe})}
@@ -1422,7 +1426,7 @@ can be the frame in-lined.@refill
 
 @item the list @code{(step . @var{step})}
 Tells Regi to move @var{step} number of lines forward as it continues
-processing. By default, Regi moves forward one line.  @var{step} can be
+processing.  By default, Regi moves forward one line.  @var{step} can be
 zero or negative of course, but watch out for infinite loops.@refill
 @end table
 
@@ -1510,12 +1514,12 @@ is not found from the alist, then the appropriate default frame is used.
 
 Once the original message has been yanked into the reply buffer, and
 @code{sc-cite-original} has had a chance to do its thing, a number of
-useful Supercite commands will be available to you. Since there is wide
+useful Supercite commands will be available to you.  Since there is wide
 variety in the keymaps that MUAs set up in their reply buffers, it is
 next to impossible for Supercite to properly sprinkle its commands into
 the existing keymap.  For this reason Supercite places its commands on a
 separate keymap, putting this keymap onto a prefix key in the reply
-buffer. You can customize the prefix key Supercite uses by changing the
+buffer.  You can customize the prefix key Supercite uses by changing the
 variable @code{sc-mode-map-prefix}.  By default, the
 @code{sc-mode-map-prefix} is @kbd{C-c C-p}; granted, not a great choice,
 but unfortunately the best general solution so far.  In the rest of this
@@ -1536,7 +1540,7 @@ prefix.@refill
 
 Probably the three most common post-yank formatting operations that you
 will perform will be the manual citing, reciting, and unciting of
-regions of text in the reply buffer. Often you may want to recite a
+regions of text in the reply buffer.  Often you may want to recite a
 paragraph to use a nickname, or manually cite a message when setting
 @code{sc-cite-region-limit} to @code{nil}.  The following commands
 perform these functions on the region of text between @samp{point} and
@@ -1582,7 +1586,7 @@ cited line in the region by interpreting the selected frame from
 @item @code{sc-recite-region} (@kbd{C-c C-p r})
 This command recites each line the region by interpreting the selected
 frame from @code{sc-recite-frame-alist}, or the default reciting frame
-@code{sc-default-recite-frame}. It runs the hook
+@code{sc-default-recite-frame}.  It runs the hook
 @code{sc-pre-recite-hook} before interpreting the frame.
 @xref{Configuring the Citation Engine}.@refill
 
@@ -1606,7 +1610,7 @@ These two functions insert various strings into the reply buffer.
 @vindex preferred-header-style (sc-)
 Inserts a reference header into the reply buffer at @samp{point}.  With
 no arguments, the header indexed by @code{sc-preferred-header-style} is
-inserted. An optional numeric argument is the index into
+inserted.  An optional numeric argument is the index into
 @code{sc-rewrite-header-list} indicating which reference header to
 write.@refill
 
@@ -1719,7 +1723,7 @@ Allows you to interactively view, modify, add, and delete info alist
 key-value pairs.  With no argument, you are prompted (with completion)
 for a info key.  The value associated with that key is displayed in the
 minibuffer.  With an argument, this command will first ask if you want
-to view, modify, add, or delete an info key. Viewing is identical to
+to view, modify, add, or delete an info key.  Viewing is identical to
 running the command with no arguments.
 
 If you want to modify the value of a key, Supercite will first prompt
@@ -1770,7 +1774,7 @@ an optional numeric argument inserts that many new lines.@refill
 @chapter Hints to MUA Authors
 
 In June of 1989, some discussion was held between the various MUA
-authors, the Supercite author, and other Supercite users. These
+authors, the Supercite author, and other Supercite users.  These
 discussions centered around the need for a standard interface between
 MUAs and Supercite (or any future Supercite-like packages).  This
 interface was formally proposed by Martin Neitzel on Fri, 23 Jun 89, in
@@ -1810,14 +1814,14 @@ some default citing when that is the case.@refill
 
 If you are writing a new MUA package, or maintaining an existing MUA
 package, you should make it conform to this interface so that your users
-will be able to link Supercite easily and seamlessly. To do this, when
+will be able to link Supercite easily and seamlessly.  To do this, when
 setting up a reply or forward buffer, your MUA should follow these
 steps:
 
 @enumerate
 @item
 Insert the original message, including the mail headers into the reply
-buffer. At this point you should not modify the raw text in any way
+buffer.  At this point you should not modify the raw text in any way
 (except for any necessary decoding, e.g., of quoted-printable text), and
 you should place all the original headers into the body of the reply.
 This means that many of the mail headers will be duplicated, one copy
@@ -1826,7 +1830,7 @@ there will probably be more headers below this line.@refill
 
 @item
 Set @samp{point} to the beginning of the line containing the first mail
-header in the body of the reply. Set @samp{mark} at the end of the
+header in the body of the reply.  Set @samp{mark} at the end of the
 message text.  It is very important that the region be set around the
 text Supercite is to modify and that the mail headers are within this
 region.  Supercite will not venture outside the region for any reason,
@@ -1834,7 +1838,7 @@ and anything within the region is fair game, so don't put anything that
 @strong{must} remain unchanged inside the region.@refill
 
 @item
-Run the hook @code{mail-citation-hook}. You will probably want to
+Run the hook @code{mail-citation-hook}.  You will probably want to
 provide some kind of default citation functions in cases where the user
 does not have Supercite installed.  By default, your MUA should
 @code{defvar} @code{mail-citation-hook} to @code{nil}, and in your
@@ -1853,9 +1857,9 @@ this interface ``out of the box.''
 
 The Supercite package was derived from its predecessor Superyank 1.11
 which was inspired by various bits of code and ideas from Martin Neitzel
-and Ashwin Ram. They were the folks who came up with the idea of
+and Ashwin Ram.  They were the folks who came up with the idea of
 non-nested citations and implemented some rough code to provide this
-style. Superyank and Supercite version 2 evolved to the point where much
+style.  Superyank and Supercite version 2 evolved to the point where much
 of the attribution selection mechanism was automatic, and features have
 been continuously added through the comments and suggestions of the
 Supercite mailing list participants.
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 3427d2ad0e3..9ba8c949fd1 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2013-06-23.10}
+\def\texinfoversion{2013-08-20.10}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -281,9 +281,9 @@
   \toks6=\expandafter{\prevsectiondefs}%
   \toks8=\expandafter{\lastcolordefs}%
   \mark{%
-                   \the\toks0 \the\toks2
-      \noexpand\or \the\toks4 \the\toks6
-    \noexpand\else \the\toks8
+                   \the\toks0 \the\toks2  % 0: top marks (\last...)
+      \noexpand\or \the\toks4 \the\toks6  % 1: bottom marks (default, \prev...)
+    \noexpand\else \the\toks8             % 2: color marks
   }%
 }
 % \topmark doesn't work for the very first chapter (after the title
@@ -2377,8 +2377,10 @@ end
   \ifx\next,%
   \else\ifx\next-%
   \else\ifx\next.%
+  \else\ifx\next\.%
+  \else\ifx\next\comma%
   \else\ptexslash
-  \fi\fi\fi
+  \fi\fi\fi\fi\fi
   \aftersmartic
 }
 
@@ -2519,7 +2521,9 @@ end
       \ifx\codedashprev\codedash 
       \else \discretionary{}{}{}\fi
     \fi
-    \global\let\codedashprev=\next
+    % we need the space after the = for the case when \next itself is a
+    % space token; it would get swallowed otherwise.  As in @code{- a}.
+    \global\let\codedashprev= \next
   }
 }
 \def\normaldash{-}
@@ -5905,7 +5909,7 @@ end
     %
     % Now the second mark, after the heading break.  No break points
     % between here and the heading.
-    \let\prevsectiondefs=\lastsectiondefs
+    \global\let\prevsectiondefs=\lastsectiondefs
     \domark
     %
     % Only insert the space after the number if we have a section number.
diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi
new file mode 100644
index 00000000000..a622298ba12
--- /dev/null
+++ b/doc/misc/todo-mode.texi
@@ -0,0 +1,1760 @@
+\input texinfo.tex   @c -*-texinfo-*-
+@c %**start of header
+@setfilename ../../info/todo-mode
+@settitle Todo Mode User Manual
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex ky cp
+@c %**end of header
+
+@copying
+Copyright @copyright{} 2013 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.''
+@end quotation
+@end copying
+
+@dircategory Emacs misc features
+@direntry
+* Todo Mode: (todo-mode).             Make and maintain todo lists.
+@end direntry
+
+@titlepage
+@title Todo Mode User Manual
+@subtitle Facilities for making and maintaining todo lists.
+
+@author Stephen Berman
+@page
+
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@contents
+
+@ifnottex
+
+@node Top
+@top Todo Mode User Manual
+
+This manual describes the version of Todo mode first appearing in
+Emacs 24.4.
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Overview::
+* Todo Mode Entry Points::
+* Key Binding Conventions::
+* Navigation::                  Moving within and between categories.
+* Editing::                     Adding, deleting and changing todo
+                                  files, categories and items.
+* Todo Archives::               Files of done todo items.
+* Marked Items::                Acting on multiple items simultaneously.
+* Todo Categories Mode::        Table of categories and item counts.
+* Searching for Items::
+* Todo Filtered Items Mode::    Making virtual categories of items from
+                                  different categories and files.
+* Todo Display Features::
+* Printing Todo Buffers::
+* Legacy Todo Mode Files::      Converting old-style todo files.
+
+* GNU Free Documentation License::
+
+@detailmenu
+--- The Detailed Node Listing ---
+
+Overview
+
+* Levels of Organization::
+* Todo Items as Diary Entries::
+
+Editing
+
+* File Editing::
+* Category Editing::
+* Item Editing::
+
+Item Editing
+
+* Inserting New Items::
+* Editing Item Headers and Text::
+* Relocating and Removing Items::
+
+Relocating and Removing Items
+
+* Reprioritizing Items::
+* Moving and Deleting Items::
+* Done Items::
+
+Todo Archives
+
+* Creating and Visiting Archives::
+* Todo Archive Mode::
+
+Todo Categories Mode
+
+* Table of Item Counts::
+* Reordering Categories::
+
+Todo Filtered Items Mode
+
+* Filtering Items::
+* Todo Filtered Items Mode Commands::
+* Files of Filtered Items::
+
+Todo Display Features
+
+* Faces::
+* Item Prefix::
+* Other Display Commands and Options::
+@end detailmenu
+@end menu
+
+@node Overview, Todo Mode Entry Points, Top, Top
+@chapter Overview
+
+The Todo mode package provides facilities for making and maintaining
+todo lists.  A todo list is a list of todo items---things to do (in the
+widest sense)---arranged in order of priority, with the highest priority
+item at the top of the list and the lowest priority item at the bottom.
+
+This manual describes the Todo mode user interface.  Todo mode comprises
+a large number of commands and user options for creating, displaying,
+navigating and editing todo lists, distributed across five major modes.
+The principle major mode is Todo mode; the other four (Todo Edit mode,
+Todo Archive mode, Todo Categories mode, and Todo Filtered Items mode)
+are subsidiary to and accessible from Todo mode.
+
+This version of Todo mode greatly expands on, and in significant ways
+differs from, the original version; for details and consequences of the
+most important differences, @ref{Legacy Todo Mode Files}.
+
+@menu
+* Levels of Organization::
+* Todo Items as Diary Entries::
+@end menu
+
+@node Levels of Organization, Todo Items as Diary Entries, , Overview
+@section Levels of Organization
+
+In Todo mode each todo list is identified with a named category, so you
+can group together thematically related todo items.  Each category is
+stored in a file, which thus provides a further level of organization.
+You can create as many todo files, and in each as many categories, as
+you want.
+
+All todo files reside in a single directory, whose location is specified
+by the user option @code{todo-directory}.  This directory may also
+contain other types of Todo files, which are discussed later
+(@pxref{Todo Archive Mode} and @ref{Todo Filtered Items Mode}).  Emacs
+recognizes Todo files by their extension, so when you visit the files
+the buffer is in the appropriate mode and the current category is
+correctly displayed.
+
+When you use a Todo mode command to create a todo file, the extension
+@samp{.todo} is automatically added to the base name you choose (as a
+rule, this name is also used for the other types of Todo files, which
+have their own extensions).  As a user, you only have to deal with the
+base name of a Todo file.
+
+When you create a new todo file, you must also add at least one category
+to it, and each todo item belongs to a category.  It is not possible to
+have an uncategorized todo list, but you can always make a catch-all
+category with a generic name like ``Todo'', which is in fact the default
+name assigned to the first category when you create a new todo file, if
+you don't provide a different name; you can change the default by
+customizing @code{todo-initial-category}.
+
+The most basic level of organization is the todo item itself, since it
+contains the information about what you want to do.  As detailed in
+subsequent sections of this manual, most Todo mode commands and user
+options concern ways of classifying and deploying this information by
+associating various kinds of metadata with it, e.g., the category it
+belongs to, its priority, whether it is to be included in the Emacs
+diary, date and time stamps, whether it is done or still to do.
+
+@node Todo Items as Diary Entries, , Levels of Organization, Overview
+@section Todo Items as Diary Entries
+
+Each todo item is also a potential diary item: if you include a todo
+file in the Emacs diary file (@pxref{Fancy Diary Display,,, emacs}), the
+Fancy Diary display will show those todo items that are not marked with
+@code{todo-nondiary-marker}.  This effectively augments the Emacs diary
+with categorized diary entries.  For the various options available for
+making a todo item a diary entry, see @ref{Inserting New Items} and
+@ref{Editing Item Headers and Text}.
+
+To ensure the proper display of todo items in the Fancy Diary display,
+they must have the format of diary entries, i.e., they have to begin
+with a date string recognized by the Emacs diary,@footnote{Two types of
+dates recognized by the Emacs diary are not supported in the current
+Todo mode implementation: sexp diary entries and date strings in which
+the year is omitted (however, the latter type is equivalent to using
+@samp{*} for an arbitrary year, which Todo mode does support).} and if
+they are longer than one line, all lines but the first must begin with
+white space.  Todo mode ensures that these requirements are satisfied
+(@pxref{Other Display Commands and Options}).
+
+The Fancy Diary display is also Todo mode aware: if it contains an item
+from a Todo mode file, clicking or typing @key{RET} on this item will
+switch to the buffer visiting that file and properly display the item's
+category, with point on the item.
+
+@node Todo Mode Entry Points, Key Binding Conventions, Overview, Top
+@chapter Todo Mode Entry Points
+
+To initialize your first todo file, invoke the command @code{todo-show}.
+This prompts you for a file name (defaulting to the value of
+@code{todo-initial-file}), prompts you for the name of the first
+category (defaulting to the value of @code{todo-initial-category}),
+creates and visits the file and displays the category in Todo mode, and
+then prompts you to enter the first item.  If you choose not to enter an
+item now, simply type @kbd{C-g}, which leaves the category empty but
+otherwise well-formed.  If you prefer not to be prompted to enter an
+item on adding a new category, disable the option
+@code{todo-add-item-if-new-category}.
+
+Once at least one todo file exists, invoking @code{todo-show} enters
+Todo mode.  Invoked with a prefix argument, the command prompts for
+which todo file to visit.  Otherwise, the first invocation of this
+command after loading the Todo mode package visits the default todo file
+(option @code{todo-default-todo-file}) and shows its first category.
+(You can get a different display with the first invocation of
+@code{todo-show} by customizing the option @code{todo-show-first};
+@pxref{Todo Categories Mode} and @ref{Files of Filtered Items}.)
+
+If you leave Todo mode and later invoke @code{todo-show} to re-enter it,
+by default this returns you to the current (i.e., last displayed)
+category of the current todo file, which is the one in the most recently
+selected and still live buffer visiting a todo file.  If you disable the
+option @code{todo-show-current-file}, then non-initial invocations of
+@code{todo-show} always return to the first or current category of the
+default todo file.
+
+If you want to enter Todo mode and go directly to a specific category
+instead the first or current category in the current or default todo
+file, use the command @code{todo-jump-to-category}; @ref{Navigation}, for
+details.  You can also enter Todo mode by invoking a todo item insertion
+command; @ref{Inserting New Items}, for details.
+
+The most convenient way to use these commands to enter Todo mode is to
+define global key bindings for them in your init file.  Good choices are
+for @code{todo-show} and @code{todo-jump-to-category} are @kbd{C-c t}
+and @kbd{C-c j}, since these commands are bound to @kbd{t} and @kbd{j},
+respectively, in Todo mode.  For invoking item insertion from outside of
+Todo mode, it is useful to bind @code{todo-insertion-map}, which is the
+key map containing the bindings of all Todo item insertion commands, to
+@kbd{C-c i}, since it is bound to @kbd{i} in Todo mode; to complete the
+invocation, supply the rest of the key sequence (@pxref{Inserting New
+Items}).
+
+You can also visit a Todo file via @code{find-file} or Dired, like any
+other file, and since Emacs recognizes it, the buffer will automatically
+be in the appropriate Todo mode.  Moreover, as long as the command you
+use to visit the file is listed in the option
+@code{todo-visit-files-commands} (which by default contains
+@code{find-file} and @code{dired-find-file}), it will also correctly
+display the file's first category on first visiting the file (otherwise
+you have to use one of the commands for navigating between categories in
+order to get a proper display).
+
+You can leave Todo mode by typing @kbd{q} (@code{todo-quit}), which
+buries the current todo file buffer.  Doing this also saves any changes
+you have made to the file, and leaves both the file and the category
+that was displayed on quitting current for subsequent Todo mode commands
+(unless the buffer made current by quitting is visiting another file and
+category in Todo mode, in which case the latter become current for Todo
+mode commands).
+
+@node Key Binding Conventions, Navigation, Todo Mode Entry Points, Top
+@chapter Key Binding Conventions
+
+For Todo mode commands to function properly, it is essential to maintain
+the correct format at all three levels of organization---item, category,
+and file.  Todo mode tries to minimize the risk of format corruption by
+hiding certain parts of the format from the user, making the buffer
+read-only and suppressing the self-insertion keys.  Consequently, it is
+normally impossible to make changes to your todo files without
+explicitly invoking Todo mode commands.
+
+A beneficial side effect of this restrictiveness is that you can invoke
+almost all Todo commands by typing ordinary printing characters, either
+singly or in specified sequences, without using modifier keys, except
+for the shift key for capitalization and the raw prefix argument
+@kbd{C-u}; numeric prefix arguments can be entered just by typing a
+number key.
+
+The predefined key bindings in Todo are more or less mnemonic.  As a
+rule, key sequences beginning with @kbd{C} are bound to commands
+applying to categories, sequences beginning with @kbd{F} apply to
+(non-archive) file-level commands, and those beginning with @kbd{A}
+apply to archives (a special type of Todo file; @ref{Todo Archive
+Mode}).  Todo commands applying to items, which constitute the majority,
+are bound to lower case key sequences.
+
+@node Navigation, Editing, Key Binding Conventions, Top
+@chapter Navigation
+
+The navigation commands are for making another todo file, category, or
+item the current one by moving point to it.@footnote{Many editing
+commands can also do this by side effect, but since that is not their
+main function, they are not included in this section.} Since these
+commands are likely to be used frequently and repetitively, it is
+convenient for their key bindings to be single lower case keys, even for
+navigation commands applying to categories and files.
+
+Two of the navigation commands were already mentioned in the section on
+Todo mode entry points:
+
+@table @kbd
+
+@item t
+Display another todo file in the selected window (@code{todo-show}).
+When you invoke this command in Todo mode, it prompts for a file name,
+which you can choose via minibuffer completion (like invoking
+@code{todo-show} with a prefix argument outside of Todo mode).  If a
+buffer is already visiting that file, it displays its current category;
+if invoking @kbd{t} opens the file, it display its first category (by
+default; see the option @code{todo-show-first} for other possibilities).
+
+@item j
+Display another todo category in the selected window
+(@code{todo-jump-to-category}).  When you invoke this command, it
+prompts for a category name, which you can choose via minibuffer
+completion.  The candidates for completion include the categories in the
+current todo file as well as those in the files listed in the option
+@code{todo-category-completions-files}.  If you type @key{RET} without
+choosing a category, the current category of the current todo file is
+automatically selected (this can be a useful shortcut when you invoke
+@code{todo-jump-to-category} outside of Todo mode).  If you type the
+name of a non-existing category, you can add this to the file as a new
+category and jump to it.  If you invoke this command with a prefix
+argument, it first you prompts for which todo file to jump to (which you
+can also choose with minibuffer completion) and then for which category
+from that file; in this case, completion is only against the categories
+in the selected file.
+@end table
+
+It is also convenient to navigate back and forth sequentially between
+the categories of a single todo file.  The categories of a todo file are
+numbered consecutively starting with @samp{1}.@footnote{A category's
+number is automatically assigned when the category is created: the
+category is appended to the end of the file, so its number is simply the
+highest until another category is added.  There is no command in Todo
+mode to reorder the numbering of the categories in a todo file, but this
+is possible from the file's table of categories; @ref{Todo Categories
+Mode}.}  The current category's number and name appear in the mode line.
+
+@table @kbd
+
+@item f
+Move point to the first item of the category numerically directly
+following the current category (@code{todo-forward-category}).
+
+@item b
+Move point to the first item of the category numerically directly
+preceding the current category (@code{todo-backward-category}).
+@end table
+
+With @kbd{f} and @kbd{b} you can cycle through the categories, so for example,
+if the last category is current and you type @kbd{f}, then the first
+category becomes current.
+
+You can also navigate between the items in the current category:
+
+@table @kbd
+
+@item n
+Move point down to the next item below the current one (i.e., to the
+item with the next lower priority) (@code{todo-next-item}).
+
+@item p
+Move point up to the item directly above the current one (i.e., to the
+item with the next higher priority) (@code{todo-previous-item}).
+@end table
+
+These commands also accept a positive numeric prefix argument; e.g.,
+typing @kbd{5 n} or @kbd{5 p} navigates in one step to the item five items lower
+or higher than the current one.
+
+Navigation to other types of Todo files is discussed in the relevant
+sections below.
+
+@node Editing, Todo Archives, Navigation, Top
+@chapter Editing
+
+Editing in Todo mode means making structural or textual changes at one
+of the levels of organization (file, category, or item).  Structural
+editing includes adding, relocating and removing, textual editing includes
+renaming files or categories and changing an item's content or date, or
+adding certain kinds of marks or tags to items.  To save changes you
+make to the current todo file, type @kbd{s} (@code{todo-save}).  Changes
+are also saved on quitting Todo mode with @kbd{q}.
+
+@menu
+* File Editing::
+* Category Editing::
+* Item Editing::
+@end menu
+
+@node File Editing, Category Editing, , Editing
+@section File Editing and Todo Edit Mode
+
+There are four file-level editing commands:
+
+@table @kbd
+
+@item F a
+Add a new todo file (@code{todo-add-file}).  This command prompts for a
+name and creates the file in @code{todo-directory}, adding the
+@samp{.todo} extension (so you should not include the extension in the
+name you enter).  The command also prompts for the file's first category and, if
+option @code{todo-add-item-if-new-category} is enabled (the default),
+for that category's first item.
+
+@item F r
+Rename the current todo file (@code{todo-rename-file}).  If called with
+a prefix argument, prompt for a todo file and rename it.  If the todo
+file has an archive (@pxref{Todo Archive Mode}) or there are
+corresponding filtered items files (@pxref{Todo Filtered Items Mode}),
+this command renames these accordingly.  If there are live buffers
+visiting any of these files, the command also rename them accordingly.
+
+@item F k
+Delete the current todo file (@code{todo-delete-file}).@footnote{The key
+binding of this command is mnemonic for ``kill'' to parallel the binding
+@kbd{k} for item deletion, since @kbd{d} is bound to another item
+editing command (@pxref{Done Items}).}  If the todo file has an archive
+(@pxref{Todo Archive Mode}), prompt whether to delete that as well.
+This command also kill the buffers visiting the deleted files.
+
+@item F e
+This command (@code{todo-edit-file}) changes the buffer's major mode to
+Todo Edit mode.  In this mode the entire file is visible, the buffer is
+writeable and you can use the self-insertion keys and standard Emacs
+editing commands to make changes.  To return to Todo mode, type @kbd{C-x
+C-q} (@code{todo-edit-quit}).
+
+The command @kbd{F e} is not intended for normal editing of items and
+categories, as it circumvents the restrictions that Todo imposes to
+protect against file format corruption (i.e., all categories, not just
+the current one, and all internal formatting are exposed and editable).
+It is provided primarily as a convenience for two types of use cases
+that are likely to arise infrequently.  One is to be able to use
+standard Emacs commands like @code{query-replace} to replace a piece of
+text that occurs in different categories throughout the file.  The other
+use case is to recover from a mistake, such as accidentally deleting an
+item, since this cannot be undone in Todo mode.
+
+Using @kbd{C-x C-q} to quit Todo Edit mode provides a measure of safety,
+since it runs a file format check, signaling an error if the format has
+become invalid.  However, this check cannot tell if the number of items
+changed, which could result in the file containing inconsistent
+information (see the cautionary note in @ref{Reordering Categories}, for
+more details).  For this reason @kbd{F e} should be used with caution.
+@end table
+
+@node Category Editing, Item Editing, File Editing, Editing
+@section Category Editing
+
+The following commands are available for editing at the category level
+(for additional category-editing commands, which are extensions of item
+commands, @pxref{Editing Item Headers and Text}):
+
+@table @kbd
+
+@item C a
+Add a new category to the current todo file and make that category
+current (@code{todo-add-category}).  If called with a prefix argument,
+prompt for a file name and add the new category to that file.  This
+command is similar to using @kbd{j}, but it only accepts category names
+that are not the name of an existing category in the file.
+
+@item C r
+Rename the current category (@code{todo-rename-category}).  If this
+category's file has an archive (@pxref{Todo Archive Mode}) with a
+corresponding category, rename the category there as well.
+
+@item C m
+Move the current category (with all its items) to another todo file
+(@code{todo-move-category}).  If this category's file has an archive
+(@pxref{Todo Archive Mode}) with a corresponding category, this command
+also moves that category to the archive file corresponding to the moved
+to todo file; if there is no such archive file, the command creates it
+and adds the category.
+
+@item C k
+Delete the current category (@code{todo-delete-category}).@footnote{This
+binding is mnemonic for ``kill'' to parallel the binding @kbd{k} for
+item deletion, since @kbd{d} is bound to another item editing command
+(@pxref{Done Items}).}  To delete a category that contains items, you
+have to confirm your intent; if the category is empty, deletion is
+immediate.
+
+@item C g
+Merge the items of one category into another category, delete the first
+category and make the second category current
+(@code{todo-merge-category}).  If both the first and second categories
+also have archived items (@pxref{Todo Archive Mode}), merge the former
+to the latter.  If only the first category has archived items, rename
+the archive category to the merged to category.  Minibuffer completion
+of the name of the category merged to works as with the navigation
+command @kbd{j}, and as with that command, passing a prefix argument,
+i.e., typing @kbd{C-u C g}, prompts for a file and confines merging to a
+category in that file.
+@end table
+
+@node Item Editing, , Category Editing, Editing
+@section Item Editing
+
+Todo mode provides a wide variety of commands for adding and textually
+changing items, as well as for deleting and relocating items.
+
+@menu
+* Inserting New Items::
+* Editing Item Headers and Text::
+* Relocating and Removing Items::
+@end menu
+
+@node  Inserting New Items, Editing Item Headers and Text, , Item Editing
+@subsection Inserting New Items
+
+There are many commands for adding new todo items.  The command names
+contain the word ``insert'' instead of ``add'' and their key bindings are
+sequences beginning with @kbd{i}.  The motivation for this terminology is
+that speaking of adding an item to a category suggests appending it to
+the top or bottom, whereas you can insert an item into the category
+anywhere, giving each new item any priority in the list.
+
+@table @kbd
+
+@item i i
+This is the basic command for inserting new items into a category
+(@code{todo-insert-item}).  Called without a prefix argument, it prompts
+for the text of the item and its priority (a number between 1 and one
+more than the number of items already in the category), both of which
+you enter in the minibuffer, and inserts the item into the current
+category of the current todo file at the position in the list
+corresponding to the priority you chose.  Called with one prefix
+argument, it also prompts for a category, and called with two prefix
+arguments, it prompts for both a file and a category from that file, and
+inserts the item accordingly.  Category name completion works as with
+the navigation command @kbd{j}.
+@end table
+
+Each invocation of @kbd{i i} adds a header string to the item, which
+includes at least the current date in the same format used by
+@code{diary-insert-entry} (@pxref{Date Formats,,, emacs}).  You can
+control what other information is included in the header by customizing
+the following options:
+
+@itemize @bullet
+
+@item
+@code{todo-always-add-time-string} is for including or omitting the
+current time.  The time string is omitted by default.
+
+@item
+@code{todo-include-in-diary} is for specifying whether the item appears
+in the Fancy Diary display by adding or omitting
+@code{todo-nondiary-marker}.  By default, new todo items are marked for
+exclusion from the diary.
+
+@item
+@code{todo-diary-nonmarking} is for adding or omitting
+@code{diary-nonmarking-symbol} to items displayed in the diary, to
+control whether they are marked in the calendar (@pxref{Format of Diary
+File,,, emacs}).  By default, todo items that are diary entries are
+marked in the calendar.
+@end itemize
+
+Instead of always adding the same header information to a new item, you
+can use more specific insertion commands that let you decide what to
+include in the item header each time you insert a new item.  And instead
+of always being prompted to choose the new item's priority, you can
+invoke a command to insert it at the position (hence with the priority)
+of the item at point.  Finally, instead of always typing the text of the
+new item in the minibuffer, you can invoke a command that makes the
+selected region in an Emacs buffer automatically become the new item's
+text.  The following paragraphs discuss how to invoke these commands by
+typing certain key sequences.
+
+There are eight parameters of item insertion in Todo mode, six
+concerning the item header, and one each concerning its priority and its
+text.  Each unique combination of these parameters produces a different
+insertion command.  The command @kbd{i i} realizes one of these
+combinations.  For the commands that realize the remaining combinations
+it is convenient to associate each parameter with a mnemonically chosen
+key.  Then by typing certain sequences of these keys, you complete the
+insertion command invocation that realizes the specified combination.
+As with @kbd{i i}, the effect of many of these commands also depends on
+the values of the item insertion options mentioned above (see the
+examples below).
+
+Here is a list of the parameters and their associated keys, in the order
+in which you must type them when building a key sequence (this order
+roughly reflects the order in which the corresponding parts of the item
+occur in a category listing):
+
+@enumerate
+
+@item
+@kbd{y} for diary (non)inclusion;
+@item
+@kbd{k} for adding or omitting `diary-nonmarking-symbol';
+@item
+@kbd{c} for adding the date header by clicking a date in the Emacs
+calendar, or@*
+@kbd{d} for interactively entering the date header as a string of year,
+month and day number components in the minibuffer, or@*
+@kbd{n} for interactively entering the date header as a weekday name in
+the minibuffer;
+@item
+@kbd{t} for adding a time string to the header in the minibuffer
+(including the empty string, which amounts to omitting the time);
+@item
+@kbd{h} for inserting the new item in the position of the item at point
+(``here''), or@*
+@kbd{r} to use the text of the selected region as the item's text.
+@end enumerate
+
+Each insertion command key sequence begins (disregarding prefix
+arguments) with @kbd{i}, followed by one or more of these eight keys, in
+the order listed.  But as you can see in the above table, since some of
+the insertion parameters are mutually exclusive, they occupy only five
+positions, so the complete (unprefixed) sequences are maximally six keys
+long.  Shorter sequences are also possible, since a parameter may be
+omitted.  But since the order in any key sequence is fixed, if the last
+key in the sequence could be followed by another insertion key, i.e., if
+the last key is not @kbd{h} or @kbd{r}, it has to be doubled to complete
+the sequence, otherwise it would be interpreted as a prefix sequence
+(this is why the binding for the basic item insertion command is @kbd{i
+i} and not @kbd{i}).
+
+Here are some examples of item insertion command key sequences:
+
+@itemize @bullet
+
+@item
+@kbd{i h} inserts a new item at the position of the item at point (pushing
+the latter down) with a header containing the current date and,
+depending on the values of the mentioned options, possibly the current
+time and diary-related markings.
+@item
+@kbd{i y h} does the same as the preceding command, except that
+@code{todo-nondiary-marker} is added if @code{todo-include-in-diary} is
+non-nil and omitted if that option is nil; that is, the diary key @kbd{y}
+overrides the setting of this option.
+@item
+@kbd{i y t h} does the same as the preceding command, except that it
+prompts for a time string instead of automatically inserting the
+current time; however, typing @key{RET} at the prompt returns the
+current time if @code{todo-always-add-time-string} is non-nil, otherwise
+the empty string (i.e., no time string).
+@item
+@kbd{i y t t} does the same as the preceding command, except that it
+prompts for the item's priority and inserts it accordingly.
+@end itemize
+
+Note that the commands whose key sequences include @kbd{y}, @kbd{k} or @kbd{t}
+reverse the effect of the options @code{todo-include-in-diary},
+@code{todo-diary-nonmarking} and @code{todo-always-add-time-string},
+respectively, thus temporarily overriding their values.
+
+The names of the item insertion commands correspond to their key
+bindings, e.g., @kbd{i h} is bound to @code{todo-insert-item-here}, @kbd{i y h} to
+@code{todo-insert-item-diary-here}, etc.  But since there are so many
+combinations, instead of trying to memorize either the names or the key
+sequences, you can, as usual, just type an initial part of a key
+sequence (minimally @kbd{i}), followed by @kbd{C-h} to see the valid
+completions.
+
+An alternative to using the key @kbd{c} for choosing the item's date
+from the calendar is also available: if point is on a date in the
+calendar, typing @kbd{i t} (@code{todo-insert-item-from-calendar}) will
+prompt for a new item and its priority and insert it in the current
+category.  Like @kbd{i i} and the other item insertion commands, this
+also accepts one or two prefix arguments for choosing the category via
+minibuffer completion.  Note, however, that the key sequence @kbd{i t}
+is not defined in Todo mode but in the Calendar mode keymap.  It is a
+convenient shortcut if you happen to be using the calendar when you
+decide to make a new todo item.  (Contrast this with a command like
+@kbd{i c c}, which pops open the calendar after you have entered the
+item's text, and then you can choose a date from the calendar.)
+
+There is one more item insertion command, which does not derive from the
+item insertion parameters:
+
+@table @kbd
+
+@item i p
+This command (@code{todo-copy-item}) makes a complete copy of the item
+at point, including its header, prompts for its priority in the current
+category and inserts it accordingly.
+@end table
+
+@noindent
+This command is useful for quickly adding a todo item whose text or
+header you want to differ only partly from that of an existing item:
+after inserting the copy, you can quickly edit it as needed by using
+commands described in the next section.
+
+@node  Editing Item Headers and Text, Relocating and Removing Items, Inserting New Items, Item Editing
+@subsection Editing Item Headers and Text
+
+There are a number of commands for editing an existing item's text or
+header; these commands are bound to key sequences with @kbd{e}.
+
+There are two commands for editing an item's text (and manually editing
+its header), one appropriate for short items and simple edits and one
+better suited for more complex changes or for editing lengthy items:
+
+@table @kbd
+
+@item e e
+Edit the text of the current item in the minibuffer
+(@code{todo-edit-item}).  If called with a prefix argument (@kbd{C-u e
+e}), the item's header is also included in the minibuffer and so can be
+edited manually.
+
+@item e m
+Edit the text of the current item in a special buffer in Todo Edit mode
+(@code{todo-edit-multiline-item}).  When you have finished editing, type
+@kbd{C-x C-q} to return to Todo mode; this runs a format check to ensure
+the item is well-formed.@footnote{Unlike the command @kbd{F e}
+(@pxref{File Editing}), @kbd{e m} does not expose you to the risk of
+putting the file in an inconsistent state, since it puts only the
+current item in Todo Edit mode.}
+@end table
+
+A number of commands are available for interactively editing all or part
+of the item header, permitting quick edits and helping avoid formatting
+errors.
+
+The following three commands are for editing any or all of the year,
+month and day components of a date header:
+
+@table @kbd
+
+@item e d t
+Successively prompt for changes to the date's year, month and
+day number, and if the option @code{todo-always-add-time-string} is
+non-nil, also for editing the time string (see also @kbd{e t} below).
+
+@item e d a
+Change the date to today's date.
+
+@item e d c
+This command pops up the Emacs calendar, and after you type @key{RET} on
+a date in the calendar makes that date the item's date.
+@end table
+
+@noindent
+You can also use these commands on items whose date header consists of a
+weekday name, which then changes to a header with year, month and day
+components.
+
+Each of the following three commands, in contrast to the preceding
+three, changes only a single date component and has no effect on a date
+header consisting of a weekday name:
+
+@table @kbd
+@item e d y
+@itemx e d m
+@itemx e d d
+Prompt for changing just the year, month or day number, respectively; if
+invoked with a positive or negative numeric prefix argument, directly
+increment or decrement the date component accordingly and automatically
+adjust the other date component if necessary.  For example, if the date
+string is ``January 1, 2013'', typing @kbd{- 3 e d d} results in
+``December 29, 2012''.
+@end table
+
+@table @kbd
+@item e d n
+Prompt for a weekday name and make it the item's date header.  Note that
+this replaces an existing date string, it does not add the day name to
+the date string.
+
+@item e t
+Edit just the item's time string.  A time string can be added both to a
+date string and to a weekday name.  If you type @key{RET} at the
+prompt, this omits a time string from the header, or deletes an existing
+time string.
+
+@item e y y
+Change the item's diary inclusion status by adding or removing
+@code{todo-nondiary-marker}.
+
+@item e y k
+Change the item's diary marking status by adding or removing
+@code{diary-nonmarking-symbol} (this command has an effect only if the
+item is not marked for exclusion from the diary).
+@end table
+
+@noindent
+Parallel to the latter two item-level commands are the
+following category-level commands:
+
+@table @kbd
+
+@item C e y
+@itemx C e k
+Add @code{todo-nondiary-marker} and @code{diary-nonmarking-symbol},
+respectively, to all todo items in the current category; if invoked with
+a prefix argument, these markings are removed from all items in the
+category.
+@end table
+
+@node  Relocating and Removing Items,  , Editing Item Headers and Text, Item Editing
+@subsection Relocating and Removing Items
+
+In addition to inserting a new todo item and changing the text or header
+of an existing item, you can also move an item to another category
+(i.e., recategorize it), change its priority within its category, delete
+it from the category and file, or mark it as a ``done'' item, which
+removes it from the todo list but does not delete it.
+
+@menu
+* Reprioritizing Items::
+* Moving and Deleting Items::
+* Done Items::
+@end menu
+
+@node Reprioritizing Items, Moving and Deleting Items, , Relocating and Removing Items
+@subsubsection Reprioritizing Items
+
+There are three ways to change a todo item's priority:
+
+@table @kbd
+
+@item r
+Raise the current item's priority by one, exchanging its position in the list
+with that of the item directly above it (@code{todo-raise-item-priority}).
+
+@item l
+Lower the current item's priority by one, exchanging its position in the list
+with that of the item directly below it (@code{todo-lower-item-priority}).
+
+@item #
+Prompt for a number and relocate the item to the corresponding position
+in the list (@code{todo-set-item-priority}).  For example, entering
+@kbd{3} at the prompt makes the item the third in the category, i.e.,
+gives it third highest priority.  You can also pass the desired priority
+as a numeric prefix argument, e.g., @kbd{3 #} gives the item third
+highest priority without prompting.  (Prefix arguments have no effect
+with @kbd{r} or @kbd{l}.)
+@end table
+
+@node Moving and Deleting Items, Done Items, Reprioritizing Items, Relocating and Removing Items
+@subsubsection Moving and Deleting Items
+
+You can move an item to another category, thereby recategorizing it:
+
+@table @kbd
+
+@item m
+Move the item at point to another category (@code{todo-move-item}).
+This prompts for a category to move the item to, displays that category,
+prompts for the priority of the moved item in the category moved to and
+inserts the item accordingly.  Minibuffer completion of the name of the
+category moved to works as with the navigation command @kbd{j}, and as
+with that command, passing a prefix argument prompts for a file and
+moves the item to a category in that file; and if the category name you
+enter is new, then you are asked whether to add the category to the
+file, and if you affirm, the item is moved to the new category.
+@end table
+
+You delete an item, thereby permanently removing it:
+
+@table @kbd
+
+@item k
+Delete the todo item at point (@code{todo-delete-item}; the binding is
+mnemonic for ``kill'', since @kbd{d} is used for marking items as done
+(@pxref{Done Items}); but note that @kbd{k} does not put the item into
+the kill ring).  This command requires confirmation that you want to
+delete the item, since you cannot undo the deletion in Todo mode.  (You
+could use @kbd{F e} to recover the item, but be aware that this would
+put the file in an inconsistent state, which you can recover from, but
+not without a risk; cf.@: the cautionary note in @ref{Reordering
+Categories}.)
+@end table
+
+@quotation Note
+Todo commands that require user confirmation, such as @kbd{k}, use a
+modified form of @code{y-or-n-p}, which by default only accepts @kbd{y}
+or @kbd{Y}, but not @key{SPC}, as an affirmative answer.  This is to
+diminish the risk of unintentionally executing the command, which is
+especially important with commands that do deletion, since there is no
+Todo command to undo a deletion.  If you want to be able to use SPC for
+confirmation, enable the option @code{todo-y-with-space}.
+@end quotation
+
+@node Done Items, , Moving and Deleting Items, Relocating and Removing Items
+@subsubsection Done Items
+
+When the activity or thing that a todo item is about has been done, it
+is natural to eliminate the item from the todo list.  But instead of
+deleting it permanently, you may prefer to keep a record of your
+accomplishments by marking the item as done.  In Todo mode, this removes
+the done item from the todo list, so as not to clutter it up, and stores
+it elsewhere.  Such stored items form a record or diary of things done.
+The Todo package provides two such stores: the ``done items'' section of
+a Todo category, described here, and done item archives (@pxref{Todo
+Archive Mode}).
+
+@table @kbd
+
+@item d
+This command (@code{todo-item-done}) removes the todo item at point from
+the todo list, appends to the original header a header consisting of
+@code{todo-done-string} (by default ``DONE '') and the current date, and
+if @code{todo-always-add-time-string} is enabled, also the current time,
+and adds the resulting done item to the top of the done items section of
+the category.  Invoked with a prefix argument, it also prompts you to
+enter a comment, which is appended to the end of the done item, prefixed
+with @code{todo-comment-string} (by default ``COMMENT: '').
+@end table
+
+A category's done items section is located below the last todo (i.e.,
+not done) item in the category.  By default this section is hidden from
+view.  There are two commands for viewing and hiding done items; since
+these are toggle commands, for convenience they also have a single key
+binding:
+
+@table @kbd
+
+@item C v
+@itemx v
+Make the done items section of the current category visible if it is
+hidden, or hide it if it is visible
+(@code{todo-toggle-view-done-items}).  If you always want to see the
+done items section on entering a category, enable the option
+@code{todo-show-with-done}; you can still use @kbd{C v} or @kbd{v} to
+hide (and unhide) it.
+
+@item F V
+@itemx V
+Toggle the standard category display in the current todo file, i.e.,
+display only the done items section of each category in the file, or if
+this is visible, hide it again and display only the todo items section
+(@code{todo-toggle-view-done-only}).
+@end table
+
+Three editing commands for done items are available:
+
+@table @kbd
+
+@item e c
+If you type this command (@code{todo-edit-done-item-comment}) when point is
+on a done item that has a comment, you can edit the text of the
+comment.  If you invoke it with a prefix argument (@kbd{C-u e c}), the
+comment is deleted on confirmation.  If the done item does not have a
+comment, this command allows you to add one.
+
+@item m
+Move the done item at point to the top of the done items section of
+another category (@code{todo-move-item}).  This is useful in case, after
+having relocated an item to its category's done items section, you
+create a category that is better suited to the content of the done item
+than its current category, so you can recategorize the done item.
+
+@item u
+If you decide the done item at point is not done after all, this command
+``undoes'' it, i.e., restores it to the todo list of its category, with
+the priority you choose for it (@code{todo-item-undone}).  If the done
+item has a comment, you are asked whether to delete it from the restored
+item.
+@end table
+
+@node Todo Archives, Marked Items, Editing, Top
+@chapter Todo Archives
+
+When the done items section of a category itself starts to become
+cluttered, or if you just want to store some accomplished todo items in
+a separate file, you can move them to a Todo archive.  This is a file
+with exactly the same structure as a todo file, i.e., divided into
+categories, but differs in that the categories contain only done items.
+Todo archives reside, like todo files, in @code{todo-directory} but have
+the extension @samp{.toda} instead of @samp{.todo}.
+
+@menu
+* Creating and Visiting Archives::
+* Todo Archive Mode::
+@end menu
+
+@node Creating and Visiting Archives, Todo Archive Mode, , Todo Archives
+@section Creating and Visiting Archives
+
+Todo mode provides the following command for archiving items:
+
+@table @kbd
+
+@item A d
+This command (@code{todo-archive-done-item}) archives the done item at point.
+Invoked with a prefix argument, it archives all done items in the
+current todo category.  If an archive for the current todo file
+already exists and contains a category with the same name as the
+current todo category, then this command moves the done item to the
+top of the corresponding archive category.  If the archive exists but
+it does not have a corresponding category, this command creates the
+category in the archive and moves the done item to it.  If no archive
+for the todo file exists, the command creates both the archive file,
+using the same base name as that of the todo file, as well as the
+category, and moves the done item to it.
+@end table
+
+Typing @kbd{A d} is also the only way within the Todo mode package to
+create an archive file and its categories.  Consequently, as a rule each
+archive file corresponds to exactly one todo file and has the same base
+name as this file, and each category in an archive file corresponds to
+and has the same name as a category in the corresponding todo file.
+Exceptions can only arise if you delete a todo file but not the
+corresponding archive, or if you delete a category in a todo file that
+has a corresponding category in an archive.
+
+You might be inclined to do the latter if you have archived all the
+items from a given todo category and you don't plan to add new items to
+it.  In particular, if you have numerous such empty categories in a todo
+file, this can make sequential navigation in the file annoying.  You can
+avoid this annoyance by deleting these categories, but only at the cost
+of putting the todo file out of synch with the archive file.
+
+You may find it preferable not to delete empty todo categories but to
+enable the option @code{todo-skip-archived-categories}.  When this is
+non-nil, such empty todo categories are skipped over by the sequential
+category navigation commands @kbd{f} and @kbd{b}, so they don't distract you
+while navigating and you maintain the structural correspondence between
+todo and archive files (you can also still jump to empty todo categories
+with @kbd{j}).
+
+If you rename a todo category that has a corresponding category in an
+archive, the archive category is also automatically identically renamed.
+Likewise, if you move such a todo category to another file; in this
+case, if there is no archive file corresponding to the todo file the
+category is moved to, then the archive is automatically created and the
+archived category is moved to it.
+
+There are two commands in Todo mode for visiting archive files:
+
+@table @kbd
+
+@item A f
+Switch to a buffer displaying the archived category corresponding to the
+current todo category (@code{todo-find-archive}).  If the todo category
+has no archived items, the command asks if you want to visit the archive
+anyway.  If there is no archive for this todo file, it asks if you want
+to visit another archive, which you can select via minibuffer
+completion.
+
+@item A c
+Choose an archive to visit, whether or not the current todo file has an
+archive (@code{todo-choose-archive}).
+@end table
+
+As with todo files, you can also visit a Todo archive by invoking a
+standard Emacs file-visiting command; this displays the first (on the
+initial invocation) or current category of the archive.
+
+@node Todo Archive Mode, , Creating and Visiting Archives, Todo Archives
+@section Todo Archive Mode
+
+When you visit a Todo archive, the buffer is in Todo Archive mode.  It
+displays categories just as in Todo mode, except that they only contain
+done items.  It provides the same sequential navigation commands as
+Todo mode: @kbd{f} and @kbd{b} navigate between the categories of the current
+archive, and @kbd{n} and @kbd{p} navigate between the done items of the current
+archive category.
+
+The commands @kbd{t} and @kbd{j} are also available in Todo Archive
+mode, and they work the same as in Todo mode, which means they can only
+be used to return to Todo mode: @kbd{t} prompt for and switch to a todo
+file, and with @kbd{j} you can only jump to a todo category.  These
+commands exclude archives because an archive file has the same base name
+as the corresponding todo file, and category name completion uses only
+the base names, so the commands cannot know which type of file you want
+to visit.  For this reason, there is a special command in Todo Archive
+mode for jumping to another archive category or visiting another archive
+file:
+
+@table @kbd
+
+@item a
+This command (@code{todo-jump-to-archive-category}) prompts for a category in the
+current archive and jumps to it.  Called with a prefix argument, it
+prompts for another archive, then for a category in it and jumps to
+that category.
+@end table
+
+None of the Todo mode editing commands are available in Todo Archive
+mode, since archives are meant to be static records of accomplished todo
+items.  Should you, however, archive an item by mistake or simply change
+your mind about the archival status of an item, you can ``unarchive'' it:
+
+@table @kbd
+
+@item u
+Restore the done item at point to the top of the done items section of
+the corresponding category in the corresponding todo file, i.e., an
+unarchived item remains a done item (@code{todo-unarchive-items}).  When
+the last item in an archive category has been unarchived, the category
+is automatically deleted from the archive.  If this was the only
+category in the archive, the archive file is also automatically deleted.
+@end table
+
+Since it is natural to visit an archive from the corresponding todo
+file, it would be convenient to easily return to the todo file when you
+have finished browsing the archive.  If you type `q' to quit Todo
+Archive mode, this switches to the corresponding todo file and shows the
+todo category corresponding to the archive category you were just
+visiting.
+
+The command @kbd{F k} (@pxref{File Editing}) is also available in Todo
+Archive mode.  It deletes the current archive file and prompts you
+whether to delete the corresponding todo file.
+
+@node Marked Items, Todo Categories Mode, Todo Archives, Top
+@chapter Marked Items
+
+For many item editing commands it can make sense and be convenient to
+apply them simultaneously to more than one item in the current category.
+Todo facilitates this by means of marked items.
+
+@table @kbd
+
+@item *
+Mark the item at point if it is unmarked, and remove the mark it is
+already marked (@code{todo-toggle-mark-item}).  The mark is a string
+specified by the option @code{todo-item-mark} (by default @samp{*})
+appended in front of the item header (more precisely, in front of the
+item's priority number or prefix; see @ref{Todo Display Features}, for
+details of the latter).  After marking the current item, the command
+advances point to the next item.  It also accepts a numeric prefix
+argument, which allows toggling the mark of multiple consecutive items.
+
+@item C *
+Mark all todo items in the current category.
+
+@item C u
+Unmark all todo item in the current category.
+@end table
+
+You can also use the last two commands to mark or unmark all done items in
+the category, but only when only the done items section is being
+displayed, i.e., after invoking @kbd{C V} or @kbd{V}.
+
+The following commands operate on marked items: @kbd{k} (deleting), @kbd{m}
+(moving to another category), @kbd{d} (moving to the done items section;
+note that @kbd{C-u d} adds the same comment to all marked items), @kbd{A d}
+(archiving), @kbd{u} (both in Todo mode for undoing a done item and in
+Todo Archive mode for unarchiving an item), as well as the commands for
+editing the item header (those beginning with the prefix @kbd{e d} as well
+as @kbd{e t}, @kbd{e y y} and @kbd{e y k}).  The item insertion, textual editing and
+priority changing commands do not operate on marked items.
+
+If you use @kbd{m}, @kbd{d}, @kbd{A d} or @kbd{u} on multiple noncontiguous marked
+items, the relocated items retain their relative order but are now
+listed consecutively en bloc.
+
+You can mark both todo and done items, but note that only @kbd{m} can apply
+to both; other commands only affect either marked todo or marked done
+items, so if both types of items are marked, invoking these commands
+has no effect and informs you of your erroneous attempt.
+
+@node Todo Categories Mode, Searching for Items, Marked Items, Top
+@chapter Todo Categories Mode
+
+It can be helpful to have a compact overview of the categories in a todo
+file and the types of items it contains; Todo provides a tabular view
+of this information.
+
+@table @kbd
+
+@item F c
+Typing this command (@code{todo-show-categories-table}) in Todo mode or Todo
+Archive mode switches to a buffer displaying a table that gives an
+overview of the categories in the current todo or archive file.  This
+buffer is in Todo Categories mode.
+@end table
+
+The table consists of a column containing the names of the categories in
+the file, followed by columns containing counts of certain types of
+items in each category.  With todo files there are four count types: all
+todo (i.e., not done) items, diary items (i.e., those todo items lacking
+the @code{todo-nondiary-marker}, which hence can appear in the Fancy Diary
+display), done (but not archived) items, and archived items.  With
+archive files all items are done, so the table only has a column for
+this count.  The final row of the table gives total item counts across
+all categories in the file.
+
+Aside from explicitly invoking @kbd{F c} to display the table of
+categories, you can also arrange to have it displayed on the first
+invocation of @code{todo-show} for a given file (i.e., either using
+@code{todo-show} to initiate a Todo session, or calling it in Todo mode
+to visit another todo file).  To do this customize the option
+@code{todo-show-first}.
+
+@menu
+* Table of Item Counts::
+* Reordering Categories::
+@end menu
+
+@node Table of Item Counts, Reordering Categories, , Todo Categories Mode
+@section Table of Item Counts
+
+Above each column of the table is a labeled button you can press by
+clicking with the mouse or by typing @key{RET} on it.  Pressing an item
+count button sorts the table alternately in ascending or descending
+order according to the type of count.  Pressing the category button
+alternates between the initial numerical order of the categories and
+alphabetical order.  In numerical order the column of category names is
+preceded by a column containing the corresponding category numbers; this
+column is not displayed in the alphabetical listing.  Instead of
+pressing the buttons, you can also sort the table by typing the
+following keys:
+
+@itemize
+
+@item @kbd{c}
+to sort by category numerically or alphabetically;
+@item @kbd{t}
+to sort by todo item counts;
+@item @kbd{y}
+to sort by diary item counts;
+@item @kbd{d}
+to sort by done item counts;
+@item @kbd{a}
+to sort by archived item counts.
+@end itemize
+
+Each row of the table is also buttonized; pressing one of these exits
+the buffer (killing it), returns to the buffer of the file from which
+you had invoked `F c', and displays the category that was named in the
+row button you pressed (i.e., pressing this button jumps to that
+category).  However, if the category named in the row is in a todo file
+and all of its items have been archived, and you have enabled the option
+@code{todo-skip-archived-categories}, then pressing the button jumps to
+the archive category instead of the empty todo category.  You can
+recognize such categories by their items counts in the table---all
+columns but the archived one have counts of zero---and in addition,
+their lines in the table are also distinguished from the others by a
+different face.
+
+You can navigate around the table:
+
+@table @kbd
+
+@item n
+@itemx @key{TAB}
+Advance point to the next button.
+
+@item p
+@itemx S-@key{TAB}
+Put point on the previous button.
+@end table
+
+These commands are cyclic, e.g. when point is on the last button,
+pressing @kbd{n} moves it to the first button.
+
+Typing @kbd{q} exits Todo Categories mode, killing the buffer and returning
+to the current category in the Todo mode or Todo Archive mode buffer
+from which you had invoked @kbd{F c}.
+
+@node Reordering Categories, , Table of Item Counts, Todo Categories Mode
+@section Reordering Categories
+
+Todo Categories mode provide commands with which you can change the
+numbering of the categories in the current file.  This renumbering has
+the effect of reordering the categories for sequential navigation by
+@kbd{f} and @kbd{b} in Todo mode and Todo Archive mode.  These commands
+are only operative when the table displays the categories in their
+numerical order.  They work just like reprioritizing items in Todo mode,
+hence have the same key bindings:
+
+@table @kbd
+
+@item r
+Raise the current line of the table (the one the cursor is on),
+decreasing the category's number by one (@code{todo-raise-category}).
+This command exchanges lines, and hence the numbers, of the category at
+point and the one above it before invoking the command.
+
+@item l
+Lower the current line of the table, increasing the category's number by
+one (@code{todo-lower-category}).  This command exchanges lines, and
+hence the numbers, of the category at point and the one below it before
+invoking the command.
+
+@item #
+Prompt for a number between 1 and the number of categories in the file
+and reorder the table accordingly (@code{todo-set-category-number}).  If
+called with a numeric prefix argument within the allowed range, reorder
+the table without prompting.
+@end table
+
+The reordering done by these commands remains in effect when you return
+to Todo mode or Todo Archive mode and, as long as you save the todo
+or archive file after reordering, in subsequent sessions as well.
+
+@quotation @strong{Caution}
+It is important to be aware that renumbering the categories does not
+change the textual order of the categories in the file.  This is
+significant if you should invoke @kbd{F e} to edit the entire file
+manually and in so doing alter the number of items in a category: this
+will make the item count shown in the table of categories of this file
+inconsistent with the actual number.  You can repair this inconsistency
+by invoking the command @code{todo-repair-categories-sexp} (which lacks
+a key binding, since it is meant to be a rarely needed rescue
+operation).  But this will revert any renumbering of the categories you
+have made, so you will have to renumber them again.  This is the reason
+why you should exercise caution when using @kbd{F e}.
+@end quotation
+
+@node Searching for Items, Todo Filtered Items Mode, Todo Categories Mode, Top
+@chapter Searching for Items
+
+It can be useful to be able to locate and examine all todo items that
+fit certain criteria, regardless of which category they belong to.  One
+way to do this in Todo mode is by sequentially searching in the file:
+
+@table @kbd
+
+@item S
+This command (@code{todo-search}; the key is capital @kbd{S}) prompts for a
+regular expression, searches from the beginning of the current todo file
+and displays the category containing the first match it finds, with the
+match highlighted.  If there are further matches, a message saying how
+many are left is displayed and you are asked if you want to go to the
+next match.  When you reach the last match, or if you decide not to go
+to further matches, you are asked whether the match highlighting should
+be removed.
+
+@item X
+This command (@code{todo-clear-matches}) removes any highlighting added by @kbd{S}.
+This is so you can leave the matches highlighted at the end of the
+search and remove the highlighting later.
+@end table
+
+These commands are also available in Todo Archive mode.
+
+@node Todo Filtered Items Mode, Todo Display Features, Searching for Items, Top
+@chapter Todo Filtered Items Mode
+
+A more powerful alternative to sequential searching is item filtering,
+by which items from different categories that match specified criteria
+are gathered and displayed in a new buffer as a kind of virtual
+category in a distinct mode, Todo Filtered Items mode.
+
+@menu
+* Filtering Items::
+* Todo Filtered Items Mode Commands::
+* Files of Filtered Items::
+@end menu
+
+@node Filtering Items, Todo Filtered Items Mode Commands, , Todo Filtered Items Mode
+@section Filtering Items
+
+Todo mode provides three ways to filter items: a general filter for
+items matching a user-entered regular expression, as with the search
+command; and two specific filters, one for diary-displayable items
+(i.e., those lacking @code{todo-nondiary-marker}) and one for top
+priority items (more on the latter below).  The commands for each
+filter come in pairs, one for filtering just the current todo file and
+one for filtering a user-specified list of todo files.  Thus, there
+are six item filtering commands:@footnote{The use of @kbd{F} in the key
+sequences of these commands naturally recalls ``filter'', but is also
+consistent with the Todo mode mnemonic key binding convention, since the
+commands involve one or more whole files.}
+
+@itemize @bullet
+
+@item
+@kbd{F x x} (@code{todo-filter-regexp-items})
+@item
+@kbd{F x m} (@code{todo-filter-regexp-items-multifile})
+@item
+@kbd{F y y} (@code{todo-filter-diary-items})
+@item
+@kbd{F y m} (@code{todo-filter-diary-items-multifile})
+@item
+@kbd{F t t} (@code{todo-filter-top-priorities})
+@item
+@kbd{F t m} (@code{todo-filter-top-priorities-multifile})
+@end itemize
+
+There are two ways to specify which files the multifile filtering
+commands apply to.  If there are files you want to filter every time you
+use these commands, customize the option @code{todo-filter-files}.  If you
+leave this option empty (the default), invoking a multifile filtering
+command pops up a buffer similar to the Customization buffer for
+@code{todo-filter-files}, in which you can select files to filter just for
+this invocation.
+
+Diary and top priority items are by definition non-done todo items, but
+when filtering by regular expression, you can extend the scope of the
+command to done items by enabling the option @code{todo-filter-done-items}.
+Then @kbd{F x x} and @kbd{F x m} will gather both matching todo and matching
+done items (including done items from any archive files corresponding to
+the selected todo files) into the virtual category of filtered items.
+
+There are several ways to specify how many items in each category count
+as top priorities and hence get filtered by @kbd{F t t} and @kbd{F t m}:
+
+@itemize @bullet
+
+@item
+The option @code{todo-top-priorities} specifies a single default number
+for all categories and all todo files; its default value is 1, which
+means just the highest priority item in every category is filtered,
+unless otherwise specified.
+@item
+The option @code{todo-top-priorities-overrides} lists file-wide overrides
+of @code{todo-top-priorities} as well as category-specific overrides.  It
+is empty by default.  However, using the Custom facility to set this
+option would be tedious and error-prone, so instead you should use the
+commands @kbd{F t s} and @kbd{C t s}.  The former sets (i.e., overrides) the
+default number of top priorities for all categories in the current
+todo file, and the latter sets the number of top priorities for the
+current category.  To exclude a category or file from filtering by @kbd{F t t}
+and @kbd{F t m}, set the number to @samp{0}.
+@item
+You can invoke `F t t' and `F t m' with a numeric prefix argument,
+which specifies the number of top priorities in each category just for
+this invocation, overriding both @code{todo-top-priorities-overrides} and
+@code{todo-top-priorities}.
+@end itemize
+
+@node Todo Filtered Items Mode Commands, Files of Filtered Items, Filtering Items, Todo Filtered Items Mode
+@section Todo Filtered Items Mode Commands
+
+The output of the item filtering commands looks similar to a regular
+Todo category, but it is not contained in any todo file and does not
+have a name on being created, so it is not a ``real'' category but a
+``virtual'' category.  Another difference is the lack of a done items
+section; either there are no done items in the list (when the filtered
+items are diary or top priority items), or these are displayed in the
+same list as todo items (if you filtered by regular expression and
+allowed done items).  A further difference is that the items have an
+additional header, between the item's date/time header and its text,
+specifying which category (and if you invoked a multifile command, also
+which file) the item comes from, and if you filtered by regular
+expression, also whether the item comes from a Todo archive.
+
+The sequential item navigation commands @kbd{n} and @kbd{p} work the same in
+Todo Filtered Items mode as in Todo mode, as do the file and category
+jumping commands @kbd{t} and @kbd{j}; however, the sequential category
+navigation commands are unavailable, since virtual categories of
+filtered items are not ordered with respect to ``real'' categories.  In
+addition, Todo Filtered Items mode provides a special navigation
+command:
+
+@table @kbd
+
+@item g
+@itemx @key{RET}
+If you type this command (@code{todo-go-to-source-item}) with point on a
+filtered item, the buffer switches to the item's source file (in Todo
+mode or Todo Archive mode, as the case may be) and displays its
+category, with point on the item.
+@end table
+
+Filtered items cannot be textually edited, moved to another category,
+marked done or archived like items in a real todo category, since these
+would then be out of synch with each other.  But there is one type of
+editing command that does work in Todo Filtered Items mode: changing an
+item's priority:
+
+@table @kbd
+
+@item r
+@itemx l
+@itemx #
+These commands raise, lower, or set, respectively, the current item's
+priority in the virtual category.
+@end table
+
+@noindent
+Using these commands, you can create a cross-category (and even
+cross-file) prioritized list of filtered items.  However, there is a
+restriction on these commands in Todo Filtered Items mode: you cannot
+change the relative priorities of items from the same real category,
+since that would make the filtered list inconsistent with the source
+todo list.
+
+@node Files of Filtered Items, , Todo Filtered Items Mode Commands, Todo Filtered Items Mode
+@section Files of Filtered Items
+
+Typing @kbd{s} in Todo Filtered Items mode saves the buffer of filtered
+items to a file in @code{todo-directory}.  Files of items filtered by
+regular expression have the extension @samp{.todr}, those with filtered
+diary items have the extension @samp{.tody} and those with filtered top
+priorities have the extension @samp{.todt}.  The extensions are added
+automatically the first time you save the buffer to a file.
+
+With filtered top priority or diary items, the file is automatically
+named on first saving it, using as the base name either the same base
+name as the single todo file it was generated from, or combining the
+base names of the todo files used in multifile filtering commands.
+With items filtered by regular expression, it can be useful to save
+separate lists generated from the same file(s) using different regular
+expressions, so when saving such a list, you are prompted for a short
+identifying string to add to the file name.
+
+When you invoke one of the item filtering commands without a prefix
+argument and a corresponding file already exists, the command visits
+this file (if, for the current file or chosen files, there are multiple
+files of items filtered by regular expression, you are prompted to
+choose one).  To force generation of a new filtered list, invoke the
+command with a prefix argument (in the case of top priority items,
+either numeric as described above, or the raw prefix argument @kbd{C-u} to
+use the values of @code{todo-top-priorities-overrides} or
+@code{todo-top-priorities}).
+
+Aside from explicitly invoking an item filtering command to display a
+saved list of items filtered by a given method from given todo files,
+there are two other ways to visit a saved file of filtered items:
+
+@table @kbd
+@item F f
+Visit a saved file of filtered items, which you choose via minibuffer
+completion (@code{todo-find-filtered-items-file}).
+@end table
+
+@itemize @bullet
+@item
+As with tables of categories, by customizing @code{todo-show-first} you
+can have the first invocation of @code{todo-show} for a given todo file
+display the corresponding saved file of filtered items.  If there is
+no saved filtered items list for the file, @code{todo-show} simply
+defaults to visiting the file and displaying its first category, as
+usual.
+@end itemize
+
+The command @kbd{F k} (@pxref{File Editing}) is also available in Todo
+Filtered Items mode.  It deletes the current filtered items file.
+
+@node Todo Display Features, Printing Todo Buffers, Todo Filtered Items Mode, Top
+@chapter Todo Display Features
+
+You can change the appearance of Todo mode buffers in a variety of ways.
+
+@menu
+* Faces::
+* Item Prefix::
+* Other Display Commands and Options::
+@end menu
+
+@node Faces, Item Prefix, , Todo Display Features
+@section Faces
+
+Each of the Todo modes uses faces to distinguish various aspects of the
+display, both structural and informational.  For example, the faces for
+the date and time strings of todo item headers by default inherit the
+attributes of the corresponding faces used by the Emacs diary; but when
+the date and time of a Todo diary item (i.e., an item lacking
+@code{todo-nondiary-marker}) is earlier than the current date and time,
+they are displayed in a different face.  In this way, you can readily
+recognize diary items that have ``expired'' and act accordingly (e.g.,
+by tagging them as done or by updating the deadlines).
+
+Another example of an informational face is the face used to distinguish
+top priority items.  A third case is the face used in Todo Categories
+mode to mark rows of the table containing categories with only archived
+items.
+
+The @code{todo-faces} customization group contains a complete list of
+Todo mode faces and brief descriptions of their use.
+
+
+@node Item Prefix, Other Display Commands and Options, Faces, Todo Display Features
+@section Item Prefix
+
+In the default display of (real or virtual) categories in Todo mode,
+Todo Archive mode and Todo Filtered Item mode the items are visually
+numbered in ascending order, starting with @samp{1} on the top item,
+displayed to the left of its header (date/time string).  With todo items
+the numbers indicate each item's priority in the list, so when you
+reprioritize an item with @kbd{#} or move it with @kbd{m}, these numbers make
+it easier to choose the item's new priority.  The numbering also lets
+you to see at a glance how many items there are in the list.  When an
+item is inserted, deleted, or moved, the numbering is automatically
+updated.  In Todo mode, the todo and done items sections in each
+category are separately numbered.
+
+If you prefer not to have item numbering displayed, disable the option
+@code{todo-number-prefix}; then the display of each item starts by default
+simply with its header.  But you can also replace the numbering with a
+visually distinctive string of your choice by customizing the option
+@code{todo-prefix} (the empty string by default).  Another alternative is to
+temporarily hide the item numbering:
+
+@table @kbd
+
+@item F N
+@itemx N
+Toggle between displaying item numbering and displaying the
+@code{todo-prefix} string in the current Todo file (todo, archive, or
+saved virtual category of filtered items.  This command also works in
+buffers of filtered items that have not yet been written to a file.)
+@end table
+
+In the todo items section of each Todo mode category, the item prefix
+(whether a priority number or a fixed string) of the top priority items
+(determined as specified in @pxref{Filtering Items}) is displayed in a
+different face from the prefix of the other items, so you see at a
+glance how many items in the category are top priorities.
+
+@node Other Display Commands and Options, , Item Prefix, Todo Display Features
+@section Other Display Commands and Options
+
+There are two additional toggle commands that affect display in the
+current file:
+
+@table @kbd
+
+@item F h
+@itemx h
+Hide the item headers if visible, or show them if they are hidden.
+With done items, only the done header (i.e. the done tag and date-time
+string inserted when the item was marked done) is hidden, the original
+date-time string is not. With filtered items, the category (or
+category-file) tag is not hidden.
+
+@item F H
+@itemx H
+Highlight the current item if unhighlighted, or remove its highlighting.
+When item highlighting is enabled, it follows navigation by @kbd{n} or
+@kbd{p}.  If you want to have current item highlighting by default,
+enable the option @code{todo-highlight-item}.  @kbd{F H} or @kbd{H} will
+still toggle it.
+@end table
+
+There are two options which affect the display of items whose content is
+longer than one screen line:
+
+@itemize @bullet{}
+
+@item
+@code{todo-indent-to-here} sets the amount of indentation for all lines
+after the first in multiline todo items, which is necessary in order
+for todo diary items to be fully visible in the Fancy Diary display.
+The default indentation is 3 spaces.  For a uniform appearance this
+option applies to all items, i.e., diary and nondiary todo items and
+also done items.
+
+@item
+@code{todo-wrap-lines} allows you to choose, for the purposes of
+insertion and editing, between treating multiline todo items as
+containing multiple logical lines with hard line breaks or as multiple
+visual lines using Visual Line mode; the latter is the default.  Since
+multiparagraph items also contain hard line breaks in Visual Line mode,
+for a uniform appearance this display shows indentation on wrapped lines
+by using a wrap-prefix of @code{todo-indent-to-here} spaces.
+@end itemize
+
+The indentation inserted after a hard newline is actually a tab
+character, and the Todo modes that display items bind @code{tab-width} to
+@code{todo-indent-to-here}, so if you change the default value of the
+latter, the next time you visit a Todo file, the indentation will
+reflect your change.
+
+By default, the todo and done items sections of a todo category are
+visually separated by a line as wide as the window the buffer is
+displayed in.  You can change the appearance and width of the separator
+by customizing @code{todo-done-separator-string}; you can also change the
+face of the separator string.
+
+There are also several options for changing the appearance in Todo
+Categories mode and Todo Filtered Items mode, beyond those mentioned
+above in the sections on these modes; see the customization groups
+@code{todo-categories} and @code{todo-filtered} for details.
+
+@node Printing Todo Buffers, Legacy Todo Mode Files, Todo Display Features, Top
+@chapter Printing Todo Buffers
+
+If you print a Todo buffer using one of the standard Emacs printing
+commands, it does not look exactly like what you see in the buffer.
+This is because some of the display features are non-printable
+(specifically, those using overlays, word-wrap and wrap-prefix).  Todo
+mode provides two print commands that produce output which includes
+printable counterparts of such display features:
+
+@table @kbd
+
+@item P B
+Send the printable buffer output directly to your printer.
+
+@item P F
+Prompt for a file name and write the printable output to that file.
+@end table
+
+By default, Todo uses @code{ps-print-buffer-with-faces} to make the
+printable version; you can change this by setting the option
+@code{todo-print-function}.
+
+@node Legacy Todo Mode Files, GNU Free Documentation License, Printing Todo Buffers, Top
+@chapter Legacy Todo Mode Files
+
+Users of the original version of Todo mode will recognize from the
+description in this user manual that, although the new version shares
+with the original version the same basic user interface and handling of
+todo items, there are some incompatible differences between them, such
+as the done items sections (there are also other file format
+incompatibilities behind the scenes that are normally not visible to
+users).
+
+The most significant incompatibility concerns the item prefix.  In the
+earlier version of Todo mode the prefix was the initial part of the item
+string itself, so in order for the item to be displayable in the Emacs
+diary, the prefix had to be a date/time pattern recognizable by the
+diary (although the todo item also has its own date/time header).
+Moreover, since all items had the same prefix string in the original
+version, this means that either only all or no items could appear in the
+Fancy Diary display on any given date.  This considerably restricts the
+practicality of including todo items in the diary.  In contrast, the
+current version of Todo mode uses overlays for item priority numbering
+or prefixes, and item-specific diary-compatible date/time headers and
+special marks for todo items to be excluded from the diary, so you can
+determine for each item whether and when it appears in the Fancy Diary
+display.
+
+Due to these incompatibilities, files created with the original version
+of Todo mode cannot be displayed or edited with the current version.
+However, this version provides a function that converts the two main
+types of files used by the original version into new-style valid todo
+and archive files, respectively, and saves them in
+@code{todo-directory}.@footnote{The original version of Todo mode also
+allowed saving a file of top priority items, but since you can readily
+create such a file with the new version, which is also more flexible,
+no conversion is provided for this file.}
+
+This conversion function is automatically called the first time you
+invoke @code{todo-show} (i.e., before you have created a todo file with
+the new version), and if it finds the old-style files, it offers to
+convert them, making them the first new-style todo and archive files.
+If you choose not to convert the old-style files at this time, you can
+do so later by invoking the command @code{todo-convert-legacy-files}
+(there is no key binding for it, since it shouldn't be necessary to use
+it often).  (A delicate part of the conversion concerns the customizable
+format of item date/time headers in the old-style; see the documentation
+string of @code{todo-todo-mode-date-time-regexp} for details.)
+
+@node GNU Free Documentation License, , Legacy Todo Mode Files, Top
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
+@bye
+
+@c End:
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 44a8b5573fa..8005d58ce8a 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -67,7 +67,12 @@ modify this GNU manual.''
 @display
 As distributed with Emacs @value{EMACSVER}.
 
+@ifnothtml
 @email{F.J.Wright@@qmw.ac.uk, Francis J. Wright}
+@end ifnothtml
+@ifhtml
+Francis J. Wright
+@end ifhtml
 @uref{http://centaur.maths.qmw.ac.uk/, School of Mathematical Sciences}
 Queen Mary and Westfield College (University of London)
 Mile End Road, London E1 4NS, UK