Merge from trunk

39 files changed, 1352 insertions, 814 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 79a2b0ec2f2..5c0ff3da206 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,91 @@
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MAKEINFO): Add explicit -I$srcdir.
+
+        * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
+        (DVIPS): New variable.
+        (.PHONY): Add html, ps.
+        (html, emacs.html, ps, emacs.ps, emacs-xtra.ps): New targets.
+        (clean): Delete html, ps files.
+
+2010-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (EMACSSOURCES): Add emacsver.texi.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (VPATH): Remove.
+        (infodir): Make it absolute.
+        (mkinfodir, $(infodir)/emacs, infoclean): No need to cd $srcdir.
+
+        * Makefile.in (dist): Anchor regexps.
+
+        * Makefile.in (EMACSSOURCES): Put emacs.texi first.
+        ($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
+        (emacs-xtra.pdf): Use $<.
+
+        * Makefile.in (infoclean): Remove harmless, long-standing error.
+
+        * Makefile.in ($(infodir)): Delete rule.
+        (mkinfodir): New.
+        ($(infodir)/emacs): Use $mkinfodir instead of infodir.
+
+        * Makefile.in (distclean): Do not delete emacsver.texi.
+        (dist): Remove reference to emacsver.texi.in.
+        * emacsver.texi: New file, replacing emacsver.texi.in.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * emacsver.texi.in: New file.
+        * emacs.texi: Set EMACSVER by including emacsver.texi.
+        * Makefile.in (distclean): Delete emacsver.texi.
+        (dist): Copy emacsver.texi.
+        (EMACSSOURCES): Add emacsver.texi.
+
+        * ack.texi (Acknowledgments): No more b2m.c.
+
+        * Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
+        (emacs): Remove rule.
+        (dist): No need to deal with the emacs rule any more.
+
+2010-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): New, set by configure.
+        (clean): Delete dist tar file.
+        (dist): Use version in tar name.
+
+2010-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (EMACS_XTRA): Add the main source file.
+        (emacs-xtra.dvi, emacs-xtra.pdf): Remove explicit emacs-xtra.texi.
+        (mostlyclean): No core files, reorder other files.
+        (clean): Delete specific dvi and pdf files.
+        (infoclean, dist): New rules.
+        (maintainer-clean): Use infoclean.
+        ($(infodir)): Add parallel build workaround.
+
+2010-10-04  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SHELL): Set it.
+        (INFO_TARGETS, DVI_TARGETS): Remove variables.
+        (info, dvi): Replace above variables with their expansions.
+        (info): Move mkdir from here...
+        ($(infodir)/emacs): ... to here (for parallel builds).
+        (pdf): New target.
+        ($(infodir)/emacs): Pass -o option to makeinfo.
+        (.PHONY): Declare clean rules.
+        (maintainer-clean): Delete dvi and pdf files.
+        Guard against cd failures.  Use a more restrictive delete.
+
+2010-10-02  Glenn Morris  <rgm@gnu.org>
+
+        * misc.texi (Shell Mode): Remove reference to old function name.
+
+2010-09-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * maintaining.texi (VC Mode Line): Mention all the possible VC status
+        indicator characters.
+
 2010-09-29  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (top_srcdir): Remove unused variable.
@@ -7335,12 +7423,11 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; fill-column: 79
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-      2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -7356,5 +7443,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: f1d62776-3ed5-4811-9d96-267252577dbd
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index e2eb905128e..cdbd718a58d 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -19,41 +19,38 @@
 # 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
 
-# Where to find the source code.  $(srcdir) will be the man
-# subdirectory of the source tree.  This is
-# set by the configure script's `--srcdir' option.
+# Where to find the source code.  $(srcdir) will be the doc/emacs subdirectory
+# of the source tree.  This is set by configure's `--srcdir' option.
 srcdir=@srcdir@
 
-# Tell make where to find source files; this is needed for the makefiles.
-VPATH=@srcdir@
+# Only for make dist.
+version=@version@
 
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
-infodir=../../info
+## This is a bit funny.  Because the info files are in the
+## distribution tarfiles, they are always made in $scrdir/../../info,
+## even for out-of-tree builds.
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
-
-INFO_TARGETS = $(infodir)/emacs
-DVI_TARGETS  = emacs.dvi
-
+MAKEINFO = makeinfo --force -I $(srcdir)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
+DVIPS = dvips
 
-# The following rule does not work with all versions of `make'.
-.SUFFIXES: .texi .dvi
-.texi.dvi:
-        $(TEXI2DVI) $<
 
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
 
-EMACS_XTRA=\
+EMACS_XTRA= \
+        ${srcdir}/emacs-xtra.texi \
         $(srcdir)/arevert-xtra.texi \
         $(srcdir)/cal-xtra.texi \
         $(srcdir)/dired-xtra.texi \
@@ -66,6 +63,7 @@ EMACS_XTRA=\
 
 EMACSSOURCES= \
         ${srcdir}/emacs.texi \
+        ${srcdir}/emacsver.texi \
         ${srcdir}/doclicense.texi \
         ${srcdir}/gpl.texi \
         ${srcdir}/screen.texi \
@@ -111,56 +109,85 @@ EMACSSOURCES= \
         ${srcdir}/kmacro.texi \
         $(EMACS_XTRA)
 
-info: $(infodir) $(INFO_TARGETS)
+## This seems pointless.  The info/ directory exists in both the
+## repository and the release tarfiles.  We do not use any
+## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## solution anyway.  The second test -d is for parallel builds.
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-$(infodir):
-        mkdir $@
+.PHONY: info dvi html pdf ps
 
-dvi: $(DVI_TARGETS)
+info: $(infodir)/emacs
+dvi: emacs.dvi
+html: emacs.html
+pdf: emacs.pdf
+ps: emacs.ps
 
-# 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.
+# 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.
 
-emacs : $(infodir)/emacs
-
 $(infodir)/emacs: ${EMACSSOURCES}
-        cd $(srcdir); $(MAKEINFO) emacs.texi
+        $(mkinfodir)
+        $(MAKEINFO) -o $@ $<
 
 emacs.dvi: ${EMACSSOURCES}
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+        $(ENVADD) $(TEXI2DVI) $<
+
+emacs.ps: emacs.dvi
+        $(DVIPS) -o $@ $<
 
 emacs.pdf: ${EMACSSOURCES}
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
+emacs.html: ${EMACSSOURCES}
+        $(MAKEINFO) --html -o $@ $<
 
-emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
+emacs-xtra.dvi: $(EMACS_XTRA)
+        $(ENVADD) $(TEXI2DVI) $<
 
-emacs-xtra.pdf: emacs-xtra.texi $(EMACS_XTRA)
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi
+emacs-xtra.ps: emacs-xtra.dvi
+        $(DVIPS) -o $@ $<
 
+emacs-xtra.pdf: $(EMACS_XTRA)
+        $(ENVADD) $(TEXI2PDF) $<
 
+.PHONY: mostlyclean clean distclean maintainer-clean infoclean
+
+## Temp files.
 mostlyclean:
-        rm -f *.log *.cp *.fn *.ky *.op *.ops *.pg *.vr core *.tp *.core
-        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+        rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
+          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
 
+## Products not in the release tarfiles.
 clean: mostlyclean
-        rm -f *.dvi
+        rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \
+          emacs.ps emacs-xtra.ps
+        rm -rf emacs.html/
+        rm -f emacs-manual-${version}.tar*
 
 distclean: clean
-#       rm -f Makefile
-
-maintainer-clean: distclean
-        for file in $(INFO_TARGETS); do rm -f $${file}*; done
-
-
-# Formerly this directory had texindex.c and getopt.c in it
-# and this makefile built them to make texindex.
-# That caused trouble because this is run entirely in the source directory.
-# Since we expect to get texi2dvi from elsewhere,
-# it is ok to expect texindex from elsewhere also.
 
+## In the standalone tarfile, the clean rule runs this.
+infoclean:
+        -cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
+
+maintainer-clean: distclean infoclean
+
+.PHONY: dist
+
+## Make a standalone tarfile of the Emacs manual sources.
+## The [c] is a dumb way to prevent configure expanding it.
+dist:
+        rm -rf emacs-manual-${version}
+        mkdir emacs-manual-${version}
+        cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
+          ${srcdir}/ChangeLog* emacs-manual-${version}/
+        sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
+          -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+          -e "s/@ver[s]ion@/${version}/" \
+          ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
+        tar -cf emacs-manual-${version}.tar emacs-manual-${version}
+        rm -rf emacs-manual-${version}
 
 ### Makefile ends here
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 7277a395ff4..3b22392b12e 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1321,10 +1321,6 @@ Directory Client; and @code{eshell}, a command shell implemented
 entirely in Emacs Lisp.  He also contributed to Org mode (q.v.@:).
 
 @item
-Ed Wilkinson wrote @file{b2m.c}, a program to convert mail files from
-RMAIL format to Unix @code{mbox} format.
-
-@item
 Mike Williams wrote @file{mouse-sel.el}, providing enhanced mouse
 selection; and @file{thingatpt.el}, a library of functions for finding
 the ``thing'' (word, line, s-expression) containing point.
@@ -1418,7 +1414,3 @@ Detlev Zundel wrote @file{re-builder.el}, a package for building regexps
 with visual feedback.
 
 @end itemize
-
-@ignore
-   arch-tag: bb1d0fa4-0240-4992-b5d4-8602d1e3d4ba
-@end ignore
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 17337d2c592..1ece1ea6dd8 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  24.0.50
+@include emacsver.texi
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
@@ -51,7 +51,6 @@ developing GNU and promoting software freedom.''
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset
@@ -1575,7 +1574,3 @@ Lisp programming.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: ed48740a-410b-46ea-9387-c9a9252a3392
-@end ignore
diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
new file mode 100644
index 00000000000..ffa860585ba
--- /dev/null
+++ b/doc/emacs/emacsver.texi
@@ -0,0 +1,4 @@
+@c It would be nicer to generate this using configure and @version@.
+@c However, that would mean emacsver.texi would always be newer
+@c then the info files in release tarfiles.
+@set EMACSVER 24.0.50
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index f5a93ec60e7..b407f5b9c99 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -362,10 +362,16 @@ change, and later use the @kbd{C-x v a} command to copy it to
 
 @node VC Mode Line
 @subsection Version Control and the Mode Line
+@cindex VC, mode line indicator
 
   When you visit a file that is under version control, Emacs indicates
-this on the mode line.  For example, @samp{RCS-1.3} says that RCS is
-used for that file, and the current version is 1.3.
+this on the mode line.  For example, @samp{RCS-1.3} says that the RCS
+back end is used for that file, and the current version of the file is
+1.3.
+
+  The first part of the VC mode-line indicator is the name of the back
+end: @samp{RCS}, @samp{CVS}, @samp{Bzr}, etc.  The back-end name is
+followed by a single character and the version of the file.
 
   The character between the back-end name and the revision ID
 indicates the version control status of the file.  @samp{-} means that
@@ -373,6 +379,12 @@ the work file is not locked (if locking is in use), or not modified (if
 locking is not in use).  @samp{:} indicates that the file is locked, or
 that it is modified.  If the file is locked by some other user (for
 instance, @samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
+@samp{@@} means that the file was locally added, but not yet committed
+to the master repository.  @samp{!} indicates that the file contains
+conflicts as result of a recent merge operation (@pxref{Merging}), or
+that the file was removed from the version control.  Finally, @samp{?}
+means that the file is under version control, but is missing from the
+working tree.
 
   On a graphical display, you can move the mouse over this mode line
 indicator to pop up a ``tool-tip'', which displays a more verbose
diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 7e2aa36a5f0..213077cbc8f 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -56,6 +56,7 @@ EMACS_XTRA=\
 
 EMACSSOURCES= \
         $(srcdir)/emacs.texi \
+        $(srcdir)/emacsver.texi \
         $(srcdir)/doclicense.texi \
         $(srcdir)/screen.texi \
         $(srcdir)/commands.texi \
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index ea4b39bdece..11d6ad70e62 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -786,8 +786,7 @@ pending in the shell buffer and not yet sent.
 @findex comint-delete-output
 Delete the last batch of output from a shell command
 (@code{comint-delete-output}).  This is useful if a shell command spews
-out lots of output that just gets in the way.  This command used to be
-called @code{comint-kill-output}.
+out lots of output that just gets in the way.
 
 @item C-c C-s
 @kindex C-c C-s @r{(Shell mode)}
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index ff227a1f119..101e5b1d8b7 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,53 @@
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (.dvi.ps): Remove unnecessary suffix rule.
+        (.PHONY): Add ps.
+        (ps, emacs-lisp-intro.ps): New targets.
+        (clean): Delete ps file.
+        (MAKEINFO): Use --force like the other doc/ Makefiles do.
+        Add explicit -I$srcdir.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (VPATH): Remove.
+        (infodir): Make it absolute.
+        (mkinfodir, $(infodir)/eintr, infoclean): No need to cd $srcdir.
+
+        * Makefile.in (dist): Anchor regexps.
+
+        * Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
+        (emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
+
+        * Makefile.in (infoclean): Remove harmless, long-standing error.
+
+        * Makefile.in ($(infodir)): Delete rule.
+        (mkinfodir): New.
+        ($(infodir)/eintr): Use $mkinfodir instead of infodir.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.
+
+2010-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): New, set by configure.
+        (clean): Delete dist tar file.
+        (dist): Use version in tar name.
+
+2010-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SHELL): Use /bin/sh, like every other Makefile.in.
+        (INFO_SOURCES, INFO_TARGETS, DVI_TARGETS): Remove variables.
+        ($(infodir), html, pdf, infoclean, dist): New rules.
+        (${infodir}/eintr): Ensure $infodir exists.  Use $@.
+        (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html):
+        Use $^.
+        (.PHONY): Declare clean rules.
+        (mostlyclean): Delete more temp files.
+        (clean): Delete specific dvi, pdf and html files.
+        (maintainer-clean): Use infoclean.
+        (.NOEXPORT): Remove, unused by any other Makefile.in.
+
 2010-09-21  Glenn Morris  <rgm@gnu.org>
 
         * cons-1.eps, cons-2.eps, cons-2a.eps, cons-3.eps, cons-4.eps:
@@ -392,11 +442,10 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-        2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+    2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -412,5 +461,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d834ef70889..366a0a10e5d 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,7 +1,8 @@
 #### Makefile for the Emacs Lisp Introduction manual
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -18,60 +19,80 @@
 # 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 = @SHELL@
+SHELL = /bin/sh
 
 srcdir = @srcdir@
-VPATH = @srcdir@
+version=@version@
 
-infodir = ../../info
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-INFO_SOURCES = ${srcdir}/emacs-lisp-intro.texi
-# The file name eintr must fit within 5 characters, to allow for
-# -NN extensions to fit into DOS 8+3 limits without clashing
-INFO_TARGETS = ${infodir}/eintr
-DVI_TARGETS = emacs-lisp-intro.dvi
-
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --force -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
-.SUFFIXES: .dvi .ps .texi
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-info: $(INFO_TARGETS)
+.PHONY: info dvi html pdf ps
 
-dvi: $(DVI_TARGETS)
+info: ${infodir}/eintr
 
-${infodir}/eintr: ${INFO_SOURCES}
-        cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr
+dvi: emacs-lisp-intro.dvi
+html: emacs-lisp-intro.html
+pdf: emacs-lisp-intro.pdf
+ps: emacs-lisp-intro.ps
+
+# The file name eintr must fit within 5 characters, to allow for
+# -NN extensions to fit into DOS 8+3 limits without clashing.
+${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
+        $(mkinfodir)
+        $(MAKEINFO) -o $@ $<
 
-emacs-lisp-intro.dvi: ${INFO_SOURCES}
-        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/emacs-lisp-intro.texi
+emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
+        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
-emacs-lisp-intro.pdf: ${INFO_SOURCES}
-        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/emacs-lisp-intro.texi
+emacs-lisp-intro.ps: emacs-lisp-intro.dvi
+        $(DVIPS) -o $@ $<
 
-emacs-lisp-intro.html: $(INFO_SOURCES)
-        $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi
+emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
+        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
-.dvi.ps:
-        $(DVIPS) $< -o $@
+emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
+        $(MAKEINFO) --html -o $@ $<
+
+.PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
 mostlyclean:
-        rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
+        rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
+          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
 
 clean: mostlyclean
-        rm -f *.dvi
+        rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf emacs-lisp-intro.ps
+        rm -rf emacs-lisp-intro.html/
+        rm -f emacs-lispintro-${version}.tar*
 
 distclean: clean
 
-maintainer-clean: distclean
-        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
-        cd $(infodir); rm -f eintr eintr-[1-9]
+infoclean:
+        -cd $(infodir) && rm -f eintr eintr-[1-9]
+
+maintainer-clean: distclean infoclean
+
+.PHONY: dist
+
+dist:
+        rm -rf emacs-lispintro-${version}
+        mkdir emacs-lispintro-${version}
+        cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \
+          ${texinfodir}/texinfo.tex \
+          ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/
+        sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
+          -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+          -e "s/@ver[s]ion@/${version}/" \
+          ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
+        tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
+        rm -rf emacs-lispintro-${version}
 
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
+### Makefile ends here
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ec065e9ce76..f5878dfed74 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,102 @@
+2010-10-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * os.texi (Dynamic Libraries): New node, with slightly modified
+        text deleted from "Image Formats".
+        (System Interface): Add @menu entry for "Dynamic Libraries".
+
+        * display.texi (Image Formats): Remove description of
+        image-library-alist.  (Renamed in 2010-10-13T14:50:06Z!lekktu@gmail.com.)
+
+2010-10-12  Glenn Morris  <rgm@gnu.org>
+
+        * book-spine.texinfo: Rename to book-spine.texi.
+
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MAKEINFO): Add explicit -I$srcdir.
+
+        * Makefile.in (DVIPS): New variable.
+        (.PHONY): Add html, ps.
+        (html, elisp.html, ps, elisp.ps): New targets.
+        (clean): Delete html, ps files.
+        ($(infodir)/elisp): Remove unnecessary includes.
+
+2010-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (emacsdir): New variable.
+        (srcs): Add emacsver.texi.
+        ($(infodir)/elisp, elisp.dvi): Add -I$(emacsdir).
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (VPATH): Remove.
+        (infodir): Make it absolute.
+        (mkinfodir, $(infodir)/elisp, infoclean): No need to cd $srcdir.
+
+        * Makefile.in (dist): Anchor regexps.
+
+        * Makefile.in (srcs): Put elisp.texi first.
+        ($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.
+
+        * Makefile.in (infoclean): Remove harmless, long-standing error.
+
+        * Makefile.in ($(infodir)): Delete rule.
+        (mkinfodir): New.
+        ($(infodir)/elisp): Use $mkinfodir instead of infodir.
+
+        * Makefile.in (dist): Remove reference to emacsver.texi.in.
+        Also copy emacsver.texi, and edit $emacsdir.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (emacsdir): New variable.
+        (MAKEINFO): Add -I $emacsdir.
+        (dist): Copy emacsver.texi.
+        (srcs): Add emacsver.texi.
+
+        * book-spine.texinfo, elisp.texi, vol2.texi, vol1.texi:
+        Set EMACSVER by including emacsver.texi.
+
+        * Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
+
+2010-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): New, set by configure.
+        (clean): Delete dist tar file.
+        (dist): Use version in tar name.
+
+2010-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Rearrange to more closely resemble doc/emacs/Makefile.
+        (INSTALL_INFO): Remove unused variable.
+        (mostlyclean, infoclean, dist): New rules.
+        (clean): Delete dvi and pdf files.
+        (maintainer-clean): Remove elisp.oaux, use infoclean.
+        ($(infodir)): Add parallel build workaround.
+
+2010-10-04  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (dvi, pdf, $(infodir)): New targets.
+        ($(infodir)/elisp): Ensure target directory exists.  Use $@.
+        Fix -I typo.
+        (clean): No 'make.out' or 'core' files.
+        (.PHONY): Declare clean rules.
+        (maintainer-clean): Delete pdf file.  Guard against cd failures.
+
+2010-10-03  Glenn Morris  <rgm@gnu.org>
+
+        * files.texi (File Name Components): Remove ignored section about
+        deleted variable directory-sep-char.
+
+2010-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.texi (Magic File Names): New defopt
+        remote-file-name-inhibit-cache.
+
+2010-10-02  Glenn Morris  <rgm@gnu.org>
+
+        * os.texi (Killing Emacs): Hook now runs in batch mode.
+
 2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * text.texi (Special Properties): Clarify when modification-hooks run.
@@ -2420,6 +2519,12 @@
 
         * display.texi (Images): Delete redundant @findex.
 
+2007-08-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * text.texi (Change Hooks): (after|before)-change-functions are no
+        longer bound to nil while running; rather inhibit-modification-hooks
+        is t.
+
 2007-08-16  Richard Stallman  <rms@gnu.org>
 
         * processes.texi (Asynchronous Processes): Clarify
@@ -8652,11 +8757,10 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+    2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -8672,5 +8776,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index bc13a63b1b0..f1caa9abfa2 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -19,26 +19,29 @@
 # 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
 
 # Standard configure variables.
 srcdir = @srcdir@
 
-# Tell make where to find source files; this is needed for the makefiles.
-VPATH=@srcdir@
+version=@version@
 
-infodir = ../../info
+infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
+# Directory with emacsver.texi.
+emacsdir =  $(srcdir)/../emacs
 
+MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
-SHELL = /bin/sh
-INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+DVIPS = dvips
 
 # List of all the texinfo files in the manual:
 
 srcs = \
+  $(srcdir)/elisp.texi \
+  $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
   $(srcdir)/anti.texi \
@@ -52,7 +55,6 @@ srcs = \
   $(srcdir)/debugging.texi \
   $(srcdir)/display.texi \
   $(srcdir)/edebug.texi \
-  $(srcdir)/elisp.texi \
   $(srcdir)/errors.texi \
   $(srcdir)/eval.texi \
   $(srcdir)/files.texi \
@@ -92,28 +94,67 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-.PHONY: clean
+.PHONY: info dvi pdf ps
 
-# The info file is named `elisp'.
 info: $(infodir)/elisp
+dvi: elisp.dvi
+html: elisp.html
+pdf: elisp.pdf
+ps: elisp.ps
 
 $(infodir)/elisp: $(srcs)
-        cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp
+        $(mkinfodir)
+        $(MAKEINFO) -o $@ $<
 
 elisp.dvi: $(srcs)
-        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
+
+elisp.html: $(srcs)
+        $(MAKEINFO) --html -o $@ $<
+
+elisp.ps: elisp.dvi
+        $(DVIPS) -o $@ $<
 
 elisp.pdf: $(srcs)
-        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
+
+.PHONY: mostlyclean clean distclean maintainer-clean infoclean
+
+## [12] stuff is from two-volume.make.
+mostlyclean:
+        rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
+          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
+        rm -f elisp[12]*
 
-clean:
-        rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
-              *.vr *.vrs *.pg *.pgs *.ky *.kys elisp[12]*
-        rm -f make.out core
+clean: mostlyclean
+        rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf
+        rm -rf elisp.html
+        rm -f emacs-lispref-${version}.tar*
 
 distclean: clean
 
-maintainer-clean: clean
-        rm -f elisp.dvi elisp.oaux
-        cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+infoclean:
+        -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+
+maintainer-clean: distclean infoclean
+
+.PHONY: dist
+
+## Note this excludes the two-volume stuff.
+dist:
+        rm -rf emacs-lispref-${version}
+        mkdir emacs-lispref-${version}
+        cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
+          $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
+          ${srcdir}/README emacs-lispref-${version}/
+        sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
+          -e 's/^\(emacsdir *=\).*/\1 ./' \
+          -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+          -e "s/@ver[s]ion@/${version}/" \
+          ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
+        tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
+        rm -rf emacs-lispref-${version}
+
+### Makefile ends here
diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texi
index 732df503ec0..270def6d8b3 100644
--- a/doc/lispref/book-spine.texinfo
+++ b/doc/lispref/book-spine.texi
@@ -4,6 +4,8 @@
 @settitle book-spine
 @c %**end of header
 
+@include emacsver.texi
+
 @c need dot in text so first space command works!
 .
 @sp 7
@@ -11,7 +13,7 @@
 @center @titlefont{GNU Emacs Lisp Reference Manual}
 @sp 5
 @center GNU
-@center Emacs Version 24.0.50
+@center Emacs Version @value{EMACSVER}
 @center for Unix Users
 @sp 5
 
@@ -23,7 +25,3 @@
 @sp 5
 @center Free Software Foundation
 @bye
-
-@ignore
-   arch-tag: 4466c7ca-e549-4119-948c-6eed34e1ff87
-@end ignore
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 037c334ab88..f4092cfa7ea 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4055,10 +4055,12 @@ displayed (@pxref{Display Feature Testing}).
 
   Emacs can display a number of different image formats; some of them
 are supported only if particular support libraries are installed on
-your machine.  In some environments, Emacs can load image
-libraries on demand; if so, the variable @code{image-library-alist}
-can be used to modify the set of known names for these dynamic
-libraries (though it is not possible to add new image formats).
+your machine.  In some environments, Emacs can load support libraries
+on demand; if so, the variable @code{dynamic-library-alist}
+(@pxref{Dynamic Libraries}) can be used to modify the set of known
+names for these dynamic libraries (though it is not possible to add
+new image formats).  Note that image types @code{pbm} and @code{xbm}
+do not depend on external libraries and are always available in Emacs.
 
   The supported image formats include XBM, XPM (this requires the
 libraries @code{libXpm} version 3.4k and @code{libz}), GIF (requiring
@@ -4082,24 +4084,6 @@ To know which image types are really available, use
 @code{image-type-available-p}.
 @end defvar
 
-@defvar image-library-alist
-This in an alist of image types vs external libraries needed to
-display them.
-
-Each element is a list @code{(@var{image-type} @var{library}...)},
-where the car is a supported image format from @code{image-types}, and
-the rest are strings giving alternate filenames for the corresponding
-external libraries to load.
-
-Emacs tries to load the libraries in the order they appear on the
-list; if none is loaded, the running session of Emacs won't support
-the image type.  @code{pbm} and @code{xbm} don't need to be listed;
-they're always supported.
-
-This variable is ignored if the image libraries are statically linked
-into Emacs.
-@end defvar
-
 @defun image-type-available-p type
 This function returns non-@code{nil} if image type @var{type} is
 available, i.e., if images of this type can be loaded and displayed in
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 7f0a2ff5a37..252c6afb1bd 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -8,7 +8,7 @@
 @c Please remember to update the edition number in README as well.
 @c And also the copies in vol1.texi and vol2.texi.
 @set VERSION  3.0
-@set EMACSVER 24.0.50
+@include emacsver.texi
 @set DATE July 2009
 
 @c in general, keep the following line commented out, unless doing a
@@ -1530,7 +1530,3 @@ Object Internals
 
 
 These words prevent "local variables" above from confusing Emacs.
-
-@ignore
-   arch-tag: f7e9a219-a0e1-4776-b631-08eaa1d49b34
-@end ignore
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 23fd2376a57..2b539f00975 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1758,20 +1758,6 @@ Note that the @samp{.~3~} in the two last examples is the backup part,
 not an extension.
 @end defun
 
-@ignore
-Andrew Innes says that this
-
-@c @defvar directory-sep-char
-This variable holds the character that Emacs normally uses to separate
-file name components.  The default value is @code{?/}, but on MS-Windows
-you can set it to @code{?\\}; then the functions that transform file names
-use backslashes in their output.
-
-File names using backslashes work as input to Lisp primitives even on
-MS-DOS and MS-Windows, even if @code{directory-sep-char} has its default
-value of @code{?/}.
-@end defvar
-@end ignore
 
 @node Relative File Names
 @subsection Absolute and Relative File Names
@@ -2857,6 +2843,34 @@ non-magic directory to serve as its current directory, and this function
 is a good way to come up with one.
 @end defun
 
+@defopt remote-file-name-inhibit-cache
+Whether to use the remote file-name cache for read access.
+
+File attributes of remote files are cached for better performance.  If
+they are changed out of Emacs' control, the cached values become
+invalid, and must be reread.
+
+When set to @code{nil}, cached values are always used.  This shall be
+set with care.  When set to @code{t}, cached values are never used.
+ALthough this is the safest value, it could result in performance
+degradation.
+
+A compromise is to set it to a positive number.  This means that
+cached values are used for that amount of seconds since they were
+cached.
+
+In case a remote file is checked regularly, it might be reasonable to
+let-bind this variable to a value less then the time period between
+two checks.  Example:
+
+@example
+(defun display-time-file-nonempty-p (file)
+  (let ((remote-file-name-inhibit-cache (- display-time-interval 5)))
+    (and (file-exists-p file)
+         (< 0 (nth 7 (file-attributes (file-chase-links file)))))))
+@end example
+@end defopt
+
 @node Format Conversion
 @section File Format Conversion
 
diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 008870b3c5c..86a0de33095 100644
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -25,6 +25,9 @@ srcdir = .
 infodir = $(srcdir)/../../info
 usermanualdir = $(srcdir)/../emacs
 
+# Directory with emacsver.texi.
+emacsdir = $(srcdir)/../emacs
+
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
 TEX=tex
@@ -43,6 +46,7 @@ manual = elisp-manual-23-$(VERSION)
 # List of all the texinfo files in the manual:
 
 srcs = \
+  $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
   $(srcdir)/anti.texi \
@@ -107,10 +111,12 @@ $(infodir)/dir:
         $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs)
-        $(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi
+        $(MAKEINFO) -I. -I$(srcdir) -I$(emacsdir) \
+          -o $(infodir)/elisp $(srcdir)/elisp.texi
 
 elisp.dvi: $(srcs)
-        $(texinputdir) $(TEX) -I $(usermanualdir) $(srcdir)/elisp.texi
+        $(texinputdir) $(TEX) -I $(usermanualdir) -I$(emacsdir) \
+          $(srcdir)/elisp.texi
 
 clean:
         - $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index dd827234272..e99e3fe89d8 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -37,6 +37,7 @@ terminal and the screen.
 * X11 Keysyms::         Operating on key symbols for X Windows.
 * Batch Mode::          Running Emacs without terminal interaction.
 * Session Management::  Saving and restoring state with X Session Management.
+* Dynamic Libraries::   On-demand loading of support libraries.
 @end menu
 
 @node Starting Up
@@ -577,7 +578,6 @@ does not run the remaining functions in this hook.  Calling
 This variable is a normal hook; once @code{save-buffers-kill-emacs} is
 finished with all file saving and confirmation, it calls
 @code{kill-emacs} which runs the functions in this hook.
-@code{kill-emacs} does not run this hook in batch mode.
 
 @code{kill-emacs} may be invoked directly (that is not via
 @code{save-buffers-kill-emacs}) if the terminal is disconnected, or in
@@ -2187,6 +2187,57 @@ Emacs is restarted by the session manager.
 @end group
 @end example
 
+@node Dynamic Libraries
+@section Dynamically Loaded Libraries
+@cindex dynamic libraries
+
+  A @dfn{dynamically loaded library} is a library that is loaded on
+demand, when its facilities are first needed.  Emacs supports such
+on-demand loading of support libraries for some of its features.
+
+@defvar dynamic-library-alist
+This is an alist of dynamic libraries and external library files
+implementing them.
+
+Each element is a list of the form
+@w{@code{(@var{library} @var{files}@dots{})}}, where the @code{car} is
+a symbol representing a supported external library, and the rest are
+strings giving alternate filenames for that library.
+
+Emacs tries to load the library from the files in the order they
+appear in the list; if none is found, the running session of Emacs
+won't have access to that library, and the features that depend on the
+library will be unavailable.
+
+Image support on some platforms uses this facility.  Here's an example
+of setting this variable for supporting images on MS-Windows:
+
+@lisp
+(setq dynamic-library-alist
+      '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
+        (png "libpng12d.dll" "libpng12.dll" "libpng.dll"
+         "libpng13d.dll" "libpng13.dll")
+        (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
+        (tiff "libtiff3.dll" "libtiff.dll")
+        (gif "giflib4.dll" "libungif4.dll" "libungif.dll")
+        (svg "librsvg-2-2.dll")
+        (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
+        (glib "libglib-2.0-0.dll")
+        (gobject "libgobject-2.0-0.dll")))
+@end lisp
+
+Note that image types @code{pbm} and @code{xbm} do not need entries in
+this variable because they do not depend on external libraries and are
+always available in Emacs.
+
+Also note that this variable is not meant to be a generic facility for
+accessing external libraries; only those already known by Emacs can
+be loaded through it.
+
+This variable is ignored if the given @var{library} is statically
+linked into Emacs.
+@end defvar
+
 @ignore
    arch-tag: 8378814a-30d7-467c-9615-74a80b9988a7
 @end ignore
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index b4b4c23b1ed..6cc7d451a6e 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -918,7 +918,11 @@ for Font Lock mode.
 If the optional argument @var{paren} is non-@code{nil}, then the
 returned regular expression is always enclosed by at least one
 parentheses-grouping construct.  If @var{paren} is @code{words}, then
-that construct is additionally surrounded by @samp{\<} and @samp{\>}.
+that construct is additionally surrounded by @samp{\<} and @samp{\>};
+alternatively, if @var{paren} is @code{symbols}, then that construct
+is additionally surrounded by @samp{\_<} and @samp{\_>}
+(@code{symbols} is often appropriate when matching
+programming-language keywords and the like).
 
 This simplified definition of @code{regexp-opt} produces a
 regular expression which is equivalent to the actual value
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index cbc26ebcec6..3ac3f58a330 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -27,7 +27,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  3.0
-@set EMACSVER 24.0.50
+@include emacsver.texi
 @set DATE July 2009
 
 @dircategory Emacs
@@ -1550,7 +1550,3 @@ Object Internals
 
 
 These words prevent "local variables" above from confusing Emacs.
-
-@ignore
-   arch-tag: 9594760d-8801-4d1b-aeb9-f3b3166b5be2
-@end ignore
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 44052e5bd5d..59222ad00e2 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -27,7 +27,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  3.0
-@set EMACSVER 24.0.50
+@include emacsver.texi
 @set DATE July 2009
 
 @dircategory Emacs
@@ -1549,7 +1549,3 @@ Object Internals
 
 
 These words prevent "local variables" above from confusing Emacs.
-
-@ignore
-   arch-tag: dfdbecf8-fec2-49c1-8427-3e8ac8b0b849
-@end ignore
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 4688c27f9b5..f2810be7f97 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-12  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.1: Small fixes.
+
+2010-10-12  Ulrich Mueller  <ulm@gentoo.org>
+
+        * emacs.1: Update license description.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * b2m.1: Remove file.
+
 2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
 
         * etags.1: xz compression is now supported.
diff --git a/doc/man/b2m.1 b/doc/man/b2m.1
deleted file mode 100644
index ae361573c33..00000000000
--- a/doc/man/b2m.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" See section COPYING for copyright and redistribution information.
-.TH b2m 1
-.SH NAME
-b2m \- convert old Emacs Rmail Babyl format to mbox format
-.SH SYNOPSIS
-.B b2m
-<
-.I babyl-file
->
-.I mbox-file
-.SH DESCRIPTION
-.B b2m
-accepts Babyl format mail (as used by older versions of
-.BR Rmail
-in
-.BR "GNU Emacs" )
-on standard input, and converts it to mbox format on standard output.
-Babyl was the storage format used by Rmail prior to Emacs 23.1.  Since
-then, it uses standard mbox format.  This program is distributed with
-.BR "GNU Emacs" .
-.PP
-.SH OPTIONS
-The program accepts unambiguous abbreviations for long option names.
-.TP
-.B \-V, \-\-version
-Display version information.
-.TP
-.B \-h, \-\-help
-Display basic usage information.
-.
-.SH SEE ALSO
-The Babyl format is described in the file
-.B etc/BABYL
-in the Emacs distribution.
-.B Rmail
-is documented in the GNU Emacs manual, which  you  can  read  using
-.BR Info ,
-either from Emacs or as a standalone program.
-.
-.SH AUTHORS
-.I b2m
-was originally written by Ed Wilkinson.  Francesco Potorti updated it
-according to the GNU coding standards.
-.SH COPYING
-Copyright 
-.if t \(co
-.if n (C)
-2008, 2009, 2010 Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-.
-.\" arch-tag: 7586e605-c400-447e-82ff-4d38e3c0a37d
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 2ad9e2c543a..ae2bc82c920 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -41,9 +41,9 @@ CTRL-h or F1 enters the Help facility.
 Help Tutorial (CTRL-h t) starts an interactive tutorial to quickly
 teach beginners the fundamentals of
 .I Emacs.
-Help Apropos (CTRL-h a) helps you find a command given its
-functionality, Help Key (CTRL-h k) describes a given key sequence, and
-Help Function (CTRL-h f) describes a given Lisp function.
+Help Apropos (CTRL-h a) helps you find a command with a name matching
+a given pattern, Help Key (CTRL-h k) describes a given key sequence,
+and Help Function (CTRL-h f) describes a given Lisp function.
 .PP
 .IR "GNU Emacs" 's
 many special packages handle mail reading (RMail) and sending (Mail),
@@ -531,12 +531,12 @@ is the number of color planes.
 .SH MANUALS
 You can order printed copies of the GNU Emacs Manual from the Free
 Software Foundation, which develops GNU software.
-See the file ORDERS for ordering information.
+See the online store at <http://shop.fsf.org/>.
 .br
-Your local Emacs maintainer might also have copies available.
+Your local administrator might also have copies available.
 As with all software and publications from FSF, everyone is permitted
 to make and distribute copies of the Emacs manual.
-The TeX source to the manual is also included in the Emacs source
+The Texinfo source to the manual is also included in the Emacs source
 distribution.
 .
 .
@@ -545,7 +545,8 @@ distribution.
 The complete text of the Emacs reference manual is included in a
 convenient tree structured form.
 Also includes the Emacs Lisp Reference Manual, useful to anyone
-wishing to write programs in the Emacs Lisp extension language.
+wishing to write programs in the Emacs Lisp extension language,
+and the Introduction to Programming in Emacs Lisp.
 
 /usr/local/share/emacs/$VERSION/lisp \(em Lisp source files and
 compiled files that define most editing commands.
@@ -572,9 +573,8 @@ There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs
 bugs and fixes.
 But before reporting something as a bug, please try to be sure that
 it really is a bug, not a misunderstanding or a deliberate feature.
-We ask you to read the section ``Reporting Emacs Bugs'' near the
-end of the reference manual (or Info system) for hints on how and
-when to report bugs.
+We ask you to read the section ``Reporting Bugs'' in the Emacs manual
+for hints on how and when to report bugs.
 Also, include the version number of the Emacs you are running in
 \fIevery\fR bug report that you send in.
 Bugs tend actually to be fixed if they can be isolated, so it is
@@ -596,10 +596,7 @@ file /usr/local/share/emacs/$VERSION/etc/MAILINGLISTS.
 .I Emacs
 is free; anyone may redistribute copies of
 .I Emacs
-to
-anyone under the terms stated in the
-.I Emacs
-General Public License,
+to anyone under the terms stated in the GNU General Public License,
 a copy of which accompanies each copy of
 .I Emacs
 and which also
@@ -611,7 +608,7 @@ may sometimes be received packaged with distributions of Unix systems,
 but it is never included in the scope of any license covering those
 systems.
 Such inclusion violates the terms on which distribution is permitted.
-In fact, the primary purpose of the General Public License is to
+In fact, the primary purpose of the GNU General Public License is to
 prohibit anyone from attaching any other restrictions to
 redistribution of
 .IR Emacs .
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8584e4c26b5..df6e478a34e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,160 @@
+2010-10-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * auth.texi (GnuPG and EasyPG Assistant Configuration): Fix last
+        change.
+
+2010-10-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * auth.texi (GnuPG and EasyPG Assistant Configuration): Fix up the
+        @item syntax for in-Emacs makeinfo.
+
+2010-10-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth.texi (GnuPG and EasyPG Assistant Configuration): Fix syntax and
+        trim sentence.
+
+2010-10-12  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.texi (Caching Passphrases):
+        * auth.texi (GnuPG and EasyPG Assistant Configuration): Clarify
+        some configurations require to set up gpg-agent.
+
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
+
+2010-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Spam Package Introduction): Mention `$'.
+
+2010-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (emacsdir): New variable.
+        ($(infodir)/efaq, faq.dvi): Depend on emacsver.texi.
+        (ENVADD, $(infodir)/efaq): Add -I$(emacsdir).
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (mostlyclean): Delete *.toc.
+
+        * Makefile.in: Use $< in rules.
+
+        * Makefile.in (maintainer-clean): Remove harmless, long-standing error.
+
+        * Makefile.in ($(infodir)): Delete rule.
+        (mkinfodir): New.  Use it in all the info rules, rather than depending
+        on infodir.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * gnus.texi (Article Washing): Fix previous change.
+
+        * Makefile.in (emacsdir): New variable.
+        ($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
+        Depend on emacsver.texi.
+
+        * faq.texi (VER): Replace with EMACSVER from emacsver.texi.
+
+        * Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.
+
+2010-10-08  Julien Danjou  <julien@danjou.info>
+
+        * gnus.texi: Add mm-shr.
+
+2010-10-08  Ludovic Courtès  <ludo@gnu.org>
+
+        * gnus.texi (Finding the Parent, The Gnus Registry)
+        (Registry Article Refer Method): Update docs for nnregistry.el.
+
+2010-10-08  Daiki Ueno  <ueno@unixuser.org>
+
+        * auth.texi (Help for users)
+        (GnuPG and EasyPG Assistant Configuration): Update docs.
+
+2010-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * cl.texi (Organization, Installation, Old CL Compatibility):
+        Deprecate cl-compat for new code.
+        (Usage, Installation): Remove outdated information.
+
+        * eudc.texi (CCSO PH/QI, LDAP Requirements): Remove old information.
+
+2010-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Gravatars): Document gnus-gravatar-too-ugly.
+
+2010-10-06  Julien Danjou  <julien@danjou.info>
+
+        * sieve.texi (Manage Sieve API): Document sieve-manage-authenticate.
+
+        * message.texi (PGP Compatibility): Remove reference to gpg-2comp,
+        broken link.
+
+        * gnus-faq.texi (FAQ 8-3): Remove references to my.gnus.org.
+
+        * gnus.texi (Comparing Mail Back Ends): Remove broken link and allusion
+        to ReiserFS.
+
+        * gnus-faq.texi (FAQ 5-5): Fix Flyspell URL.
+        (FAQ 7-1): Fix getmail URL.
+
+2010-10-06  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.texi (Caching Passphrases): New section.
+
+2010-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SHELL): Set it.
+        (info): Move the mkdir dependency to the individual info files.
+        (mostlyclean): Tidy up.
+        (clean): Only delete the specific dvi and pdf files.
+        (maintainer-clean): Be more restrictive in what we delete.
+        ($(infodir)): Add parallel build workaround.
+
+2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Misc Article): Document gnus-widen-article-window.
+
+2010-10-03  Julien Danjou  <julien@danjou.info>
+
+        * emacs-mime.texi (Display Customization): Update
+        mm-inline-large-images documentation and add documentation for
+        mm-inline-large-images-proportion.
+
+2010-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Mention
+        remote-file-name-inhibit-cache.
+
+2010-10-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Splitting Mail): Fix @xref syntax.
+        (Splitting Mail): Really fix the @ref syntax.
+
+2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Splitting Mail): Mention the new fancy splitting
+        function.
+        (Article Hiding): Add google banner example.  Suggested by Benjamin
+        Xu.
+
+2010-09-30  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus.texi (Spam Package Configuration Examples, SpamOracle): Remove
+        nnimap-split-rule from examples.
+
+2010-09-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Mail Source Specifiers): Remove webmail.el mentions.
+        (NNTP): Document nntp-server-list-active-group.  Suggested by Barry
+        Fishman.
+        (Client-Side IMAP Splitting): Add nnimap-split-fancy.
+
+2010-09-30  Julien Danjou  <julien@danjou.info>
+
+        * gnus.texi (Gravatars): Fix documentation about
+        gnu-gravatar-properties.
+
 2010-09-29  Daiki Ueno  <ueno@unixuser.org>
 
         * epa.texi (Bug Reports): New section.
@@ -6,6 +163,16 @@
 
         * Makefile.in (top_srcdir): Remove unused variable.
 
+2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Using IMAP): Remove the @acronyms from the headings.
+        (Client-Side IMAP Splitting): Document 'default.
+
+2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Customizing the IMAP Connection): Document
+        nnimap-fetch-partial-articles.
+
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-news.texi: Mention nnimap-inbox.
@@ -14,7 +181,7 @@
 
 2010-09-26  Julien Danjou  <julien@danjou.info>
 
-        * gnus.texi (Oort Gnus): Remove mention of ssl.el
+        * gnus.texi (Oort Gnus): Remove mention of ssl.el.
 
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -44,7 +211,7 @@
 
 2010-09-25  Julien Danjou  <julien@danjou.info>
 
-        * gnus.texi (Customizing Articles): Remove gnus-treat-translate
+        * gnus.texi (Customizing Articles): Remove gnus-treat-translate.
 
 2010-09-24  Glenn Morris  <rgm@gnu.org>
 
@@ -6976,12 +7143,11 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; fill-column: 79
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-      2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -6997,5 +7163,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;; arch-tag: 08b2903e-900c-4c72-a4a9-e76416a80803
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 063b40975bf..d5afabd0374 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -19,6 +19,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
 
 # Where to find the source code.  $(srcdir) will be the man-aux
 # subdirectory of the source tree.  This is
@@ -26,11 +27,18 @@
 srcdir=@srcdir@
 
 # Tell make where to find source files; this is needed for the makefiles.
+# Note the other doc Makefiles do not use VPATH anymore, instead
+# they set infodir to an absolute path.  Not doing that here in
+# case INFO_TARGETS gets too long for some feeble shells.
+# (cf src/Makefile.in's shortlisp)
 VPATH=@srcdir@
 
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
 infodir=../../info
+## Directory with emacsver.texi.
+## Currently only used by efaq; could be added to MAKEINFO.
+emacsdir = $(srcdir)/../emacs
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
@@ -190,18 +198,13 @@ PDF_TARGETS = \
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 
-# The following rule does not work with all versions of `make'.
-.SUFFIXES: .texi .dvi
-.texi.dvi:
-        $(TEXI2DVI) $<
-
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
+mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-info: $(infodir) $(INFO_TARGETS)
+.PHONY: info dvi pdf
 
-$(infodir):
-        mkdir $@
+info: $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)
 
@@ -215,183 +218,205 @@ pdf: $(PDF_TARGETS)
 ## "short" target names for convenience, to just rebuild one manual.
 ada-mode : $(infodir)/ada-mode
 $(infodir)/ada-mode: ada-mode.texi
-        cd $(srcdir); $(MAKEINFO) ada-mode.texi
-ada-mode.dvi: ada-mode.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
-ada-mode.pdf: ada-mode.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+ada-mode.dvi: ${srcdir}/ada-mode.texi
+        $(ENVADD) $(TEXI2DVI) $<
+ada-mode.pdf: ${srcdir}/ada-mode.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 auth : $(infodir)/auth
 $(infodir)/auth: auth.texi
-        cd $(srcdir); $(MAKEINFO) auth.texi
-auth.dvi: auth.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
-auth.pdf: auth.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+auth.dvi: ${srcdir}/auth.texi
+        $(ENVADD) $(TEXI2DVI) $<
+auth.pdf: ${srcdir}/auth.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 autotype : $(infodir)/autotype
 $(infodir)/autotype: autotype.texi
-        cd $(srcdir); $(MAKEINFO) autotype.texi
-autotype.dvi: autotype.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
-autotype.pdf: autotype.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+autotype.dvi: ${srcdir}/autotype.texi
+        $(ENVADD) $(TEXI2DVI) $<
+autotype.pdf: ${srcdir}/autotype.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 calc : $(infodir)/calc
 $(infodir)/calc: calc.texi
-        cd $(srcdir); $(MAKEINFO) calc.texi
-calc.dvi: calc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
-calc.pdf: calc.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+calc.dvi: ${srcdir}/calc.texi
+        $(ENVADD) $(TEXI2DVI) $<
+calc.pdf: ${srcdir}/calc.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 ccmode : $(infodir)/ccmode
 $(infodir)/ccmode: cc-mode.texi
-        cd $(srcdir); $(MAKEINFO) cc-mode.texi
-cc-mode.dvi: cc-mode.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
-cc-mode.pdf: cc-mode.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+cc-mode.dvi: ${srcdir}/cc-mode.texi
+        $(ENVADD) $(TEXI2DVI) $<
+cc-mode.pdf: ${srcdir}/cc-mode.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 cl : $(infodir)/cl
 $(infodir)/cl: cl.texi
-        cd $(srcdir); $(MAKEINFO) cl.texi
-cl.dvi: cl.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
-cl.pdf: cl.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+cl.dvi: ${srcdir}/cl.texi
+        $(ENVADD) $(TEXI2DVI) $<
+cl.pdf: ${srcdir}/cl.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 dbus : $(infodir)/dbus
 $(infodir)/dbus: dbus.texi
-        cd $(srcdir); $(MAKEINFO) dbus.texi
-dbus.dvi: dbus.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
-dbus.pdf: dbus.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+dbus.dvi: ${srcdir}/dbus.texi
+        $(ENVADD) $(TEXI2DVI) $< 
+dbus.pdf: ${srcdir}/dbus.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 dired-x : $(infodir)/dired-x
 $(infodir)/dired-x: dired-x.texi
-        cd $(srcdir); $(MAKEINFO) dired-x.texi
-dired-x.dvi: dired-x.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
-dired-x.pdf: dired-x.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+dired-x.dvi: ${srcdir}/dired-x.texi
+        $(ENVADD) $(TEXI2DVI) $<
+dired-x.pdf: ${srcdir}/dired-x.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 ebrowse : $(infodir)/ebrowse
 $(infodir)/ebrowse: ebrowse.texi
-        cd $(srcdir); $(MAKEINFO) ebrowse.texi
-ebrowse.dvi: ebrowse.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
-ebrowse.pdf: ebrowse.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+ebrowse.dvi: ${srcdir}/ebrowse.texi
+        $(ENVADD) $(TEXI2DVI) $<
+ebrowse.pdf: ${srcdir}/ebrowse.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 ede : $(infodir)/ede
 $(infodir)/ede: ede.texi
-        cd $(srcdir); $(MAKEINFO) ede.texi
-ede.dvi: ede.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
-ede.pdf: ede.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+ede.dvi: ${srcdir}/ede.texi
+        $(ENVADD) $(TEXI2DVI) $<
+ede.pdf: ${srcdir}/ede.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 ediff : $(infodir)/ediff
 $(infodir)/ediff: ediff.texi
-        cd $(srcdir); $(MAKEINFO) ediff.texi
-ediff.dvi: ediff.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
-ediff.pdf: ediff.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+ediff.dvi: ${srcdir}/ediff.texi
+        $(ENVADD) $(TEXI2DVI) $<
+ediff.pdf: ${srcdir}/ediff.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 edt : $(infodir)/edt
 $(infodir)/edt: edt.texi
-        cd $(srcdir); $(MAKEINFO) edt.texi
-edt.dvi: edt.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
-edt.pdf: edt.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+edt.dvi: ${srcdir}/edt.texi
+        $(ENVADD) $(TEXI2DVI) $<
+edt.pdf: ${srcdir}/edt.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 eieio : $(infodir)/eieio
 $(infodir)/eieio: eieio.texi
-        cd $(srcdir); $(MAKEINFO) eieio.texi
-eieio.dvi: eieio.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
-eieio.pdf: eieio.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+eieio.dvi: ${srcdir}/eieio.texi
+        $(ENVADD) $(TEXI2DVI) $<
+eieio.pdf: ${srcdir}/eieio.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 emacs-mime : $(infodir)/emacs-mime
 $(infodir)/emacs-mime: emacs-mime.texi
-        cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
-emacs-mime.dvi: emacs-mime.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
-emacs-mime.pdf: emacs-mime.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) --enable-encoding $<
+emacs-mime.dvi: ${srcdir}/emacs-mime.texi
+        $(ENVADD) $(TEXI2DVI) $<
+emacs-mime.pdf: ${srcdir}/emacs-mime.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 epa : $(infodir)/epa
 $(infodir)/epa: epa.texi
-        cd $(srcdir); $(MAKEINFO) epa.texi
-epa.dvi: epa.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
-epa.pdf: epa.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+epa.dvi: ${srcdir}/epa.texi
+        $(ENVADD) $(TEXI2DVI) $<
+epa.pdf: ${srcdir}/epa.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 erc : $(infodir)/erc
 $(infodir)/erc: erc.texi
-        cd $(srcdir); $(MAKEINFO) erc.texi
-erc.dvi: erc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
-erc.pdf: erc.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+erc.dvi: ${srcdir}/erc.texi
+        $(ENVADD) $(TEXI2DVI) $<
+erc.pdf: ${srcdir}/erc.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 eshell : $(infodir)/eshell
 $(infodir)/eshell: eshell.texi
-        cd $(srcdir); $(MAKEINFO) eshell.texi
-eshell.dvi: eshell.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
-eshell.pdf: eshell.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+eshell.dvi: ${srcdir}/eshell.texi
+        $(ENVADD) $(TEXI2DVI) $<
+eshell.pdf: ${srcdir}/eshell.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 eudc : $(infodir)/eudc
 $(infodir)/eudc: eudc.texi
-        cd $(srcdir); $(MAKEINFO) eudc.texi
-eudc.dvi: eudc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
-eudc.pdf: eudc.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+eudc.dvi: ${srcdir}/eudc.texi
+        $(ENVADD) $(TEXI2DVI) $<
+eudc.pdf: ${srcdir}/eudc.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 efaq : $(infodir)/efaq
-$(infodir)/efaq: faq.texi
-        cd $(srcdir); $(MAKEINFO) faq.texi
-faq.dvi: faq.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
-faq.pdf: faq.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
+$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) -I $(emacsdir) $<
+faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
+        $(ENVADD) $(TEXI2DVI) $<
+faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 flymake : $(infodir)/flymake
 $(infodir)/flymake: flymake.texi
-        cd $(srcdir); $(MAKEINFO) flymake.texi
-flymake.dvi: flymake.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
-flymake.pdf: flymake.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+flymake.dvi: ${srcdir}/flymake.texi
+        $(ENVADD) $(TEXI2DVI) $<
+flymake.pdf: ${srcdir}/flymake.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 forms : $(infodir)/forms
 $(infodir)/forms: forms.texi
-        cd $(srcdir); $(MAKEINFO) forms.texi
-forms.dvi: forms.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
-forms.pdf: forms.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+forms.dvi: ${srcdir}/forms.texi
+        $(ENVADD) $(TEXI2DVI) $<
+forms.pdf: ${srcdir}/forms.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
 gnus : $(infodir)/gnus
 $(infodir)/gnus: gnus.texi gnus-faq.texi
-        cd $(srcdir); $(MAKEINFO) gnus.texi
-gnus.dvi: gnus.texi gnus-faq.texi
-        sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi
+        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
         $(ENVADD) $(TEXI2DVI) gnustmp.texi
         cp gnustmp.dvi $*.dvi
         rm gnustmp.*
-gnus.pdf: gnus.texi gnus-faq.texi
-        sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi
+        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
         $(ENVADD) $(TEXI2PDF) gnustmp.texi
         cp gnustmp.pdf $@
         rm gnustmp.*
@@ -400,229 +425,259 @@ gnus.pdf: gnus.texi gnus-faq.texi
 # names clash on DOS 8+3 filesystems
 idlwave : $(infodir)/idlwave
 $(infodir)/idlwave: idlwave.texi
-        cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
-idlwave.dvi: idlwave.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
-idlwave.pdf: idlwave.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) --no-split $<
+idlwave.dvi: ${srcdir}/idlwave.texi
+        $(ENVADD) $(TEXI2DVI) $<
+idlwave.pdf: ${srcdir}/idlwave.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 # The following target uses an explicit -o switch to work around
 # the @setfilename directive in info.texi, which is required for
 # the Texinfo distribution.
 ###info : $(infodir)/info   # circular!
 $(infodir)/info: info.texi
-        cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
-info.dvi: info.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
-info.pdf: info.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) --no-split $< -o $@
+info.dvi: ${srcdir}/info.texi
+        $(ENVADD) $(TEXI2DVI) $<
+info.pdf: ${srcdir}/info.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 mairix-el : $(infodir)/mairix-el
 $(infodir)/mairix-el: mairix-el.texi
-        cd $(srcdir); $(MAKEINFO) mairix-el.texi
-mairix-el.dvi: mairix-el.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
-mairix-el.pdf: mairix-el.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+mairix-el.dvi: ${srcdir}/mairix-el.texi
+        $(ENVADD) $(TEXI2DVI) $<
+mairix-el.pdf: ${srcdir}/mairix-el.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 message : $(infodir)/message
 $(infodir)/message: message.texi
-        cd $(srcdir); $(MAKEINFO) message.texi
-message.dvi: message.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
-message.pdf: message.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+message.dvi: ${srcdir}/message.texi
+        $(ENVADD) $(TEXI2DVI) $<
+message.pdf: ${srcdir}/message.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 mh-e : $(infodir)/mh-e
 $(infodir)/mh-e: mh-e.texi
-        cd $(srcdir); $(MAKEINFO) mh-e.texi
-mh-e.dvi: mh-e.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
-mh-e.pdf: mh-e.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+mh-e.dvi: ${srcdir}/mh-e.texi
+        $(ENVADD) $(TEXI2DVI) $<
+mh-e.pdf: ${srcdir}/mh-e.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 newsticker : $(infodir)/newsticker
 $(infodir)/newsticker: newsticker.texi
-        cd $(srcdir); $(MAKEINFO) newsticker.texi
-newsticker.dvi: newsticker.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
-newsticker.pdf: newsticker.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+newsticker.dvi: ${srcdir}/newsticker.texi
+        $(ENVADD) $(TEXI2DVI) $<
+newsticker.pdf: ${srcdir}/newsticker.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 nxml-mode : $(infodir)/nxml-mode
 $(infodir)/nxml-mode: nxml-mode.texi
-        cd $(srcdir); $(MAKEINFO) nxml-mode.texi
-nxml-mode.dvi: nxml-mode.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
-nxml-mode.pdf: nxml-mode.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+nxml-mode.dvi: ${srcdir}/nxml-mode.texi
+        $(ENVADD) $(TEXI2DVI) $<
+nxml-mode.pdf: ${srcdir}/nxml-mode.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 org : $(infodir)/org
 $(infodir)/org: org.texi
-        cd $(srcdir); $(MAKEINFO) org.texi
-org.dvi: org.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
-org.pdf: org.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+org.dvi: ${srcdir}/org.texi
+        $(ENVADD) $(TEXI2DVI) $<
+org.pdf: ${srcdir}/org.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 pcl-cvs : $(infodir)/pcl-cvs
 $(infodir)/pcl-cvs: pcl-cvs.texi
-        cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
-pcl-cvs.dvi: pcl-cvs.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
-pcl-cvs.pdf: pcl-cvs.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi
+        $(ENVADD) $(TEXI2DVI) $<
+pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 pgg : $(infodir)/pgg
 $(infodir)/pgg: pgg.texi
-        cd $(srcdir); $(MAKEINFO) pgg.texi
-pgg.dvi: pgg.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
-pgg.pdf: pgg.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+pgg.dvi: ${srcdir}/pgg.texi
+        $(ENVADD) $(TEXI2DVI) $<
+pgg.pdf: ${srcdir}/pgg.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 rcirc : $(infodir)/rcirc
 $(infodir)/rcirc: rcirc.texi
-        cd $(srcdir); $(MAKEINFO) rcirc.texi
-rcirc.dvi: rcirc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
-rcirc.pdf: rcirc.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+rcirc.dvi: ${srcdir}/rcirc.texi
+        $(ENVADD) $(TEXI2DVI) $<
+rcirc.pdf: ${srcdir}/rcirc.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 reftex : $(infodir)/reftex
 $(infodir)/reftex: reftex.texi
-        cd $(srcdir); $(MAKEINFO) reftex.texi
-reftex.dvi: reftex.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
-reftex.pdf: reftex.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+reftex.dvi: ${srcdir}/reftex.texi
+        $(ENVADD) $(TEXI2DVI) $<
+reftex.pdf: ${srcdir}/reftex.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 remember : $(infodir)/remember
 $(infodir)/remember: remember.texi
-        cd $(srcdir); $(MAKEINFO) remember.texi
-remember.dvi: remember.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
-remember.pdf: remember.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+remember.dvi: ${srcdir}/remember.texi
+        $(ENVADD) $(TEXI2DVI) $<
+remember.pdf: ${srcdir}/remember.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 sasl : $(infodir)/sasl
 $(infodir)/sasl: sasl.texi
-        cd $(srcdir); $(MAKEINFO) sasl.texi
-sasl.dvi: sasl.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
-sasl.pdf: sasl.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+sasl.dvi: ${srcdir}/sasl.texi
+        $(ENVADD) $(TEXI2DVI) $<
+sasl.pdf: ${srcdir}/sasl.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 sc : $(infodir)/sc
 $(infodir)/sc: sc.texi
-        cd $(srcdir); $(MAKEINFO) sc.texi
-sc.dvi: sc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
-sc.pdf: sc.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+sc.dvi: ${srcdir}/sc.texi
+        $(ENVADD) $(TEXI2DVI) $<
+sc.pdf: ${srcdir}/sc.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 semantic : $(infodir)/semantic
 $(infodir)/semantic: semantic.texi sem-user.texi
-        cd $(srcdir); $(MAKEINFO) semantic.texi
-semantic.dvi: semantic.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
-semantic.pdf: semantic.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+semantic.dvi: ${srcdir}/semantic.texi sem-user.texi
+        $(ENVADD) $(TEXI2DVI) $<
+semantic.pdf: ${srcdir}/semantic.texi sem-user.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 ses : $(infodir)/ses
 $(infodir)/ses: ses.texi
-        cd $(srcdir); $(MAKEINFO) ses.texi
-ses.dvi: ses.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
-ses.pdf: ses.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+ses.dvi: ${srcdir}/ses.texi
+        $(ENVADD) $(TEXI2DVI) $<
+ses.pdf: ${srcdir}/ses.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 sieve : $(infodir)/sieve
 $(infodir)/sieve: sieve.texi
-        cd $(srcdir); $(MAKEINFO) sieve.texi
-sieve.dvi: sieve.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
-sieve.pdf: sieve.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+sieve.dvi: ${srcdir}/sieve.texi
+        $(ENVADD) $(TEXI2DVI) $<
+sieve.pdf: ${srcdir}/sieve.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 smtpmail : $(infodir)/smtpmail
 $(infodir)/smtpmail: smtpmail.texi
-        cd $(srcdir); $(MAKEINFO) smtpmail.texi
-smtpmail.dvi: smtpmail.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
-smtpmail.pdf: smtpmail.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+smtpmail.dvi: ${srcdir}/smtpmail.texi
+        $(ENVADD) $(TEXI2DVI) $<
+smtpmail.pdf: ${srcdir}/smtpmail.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 speedbar : $(infodir)/speedbar
 $(infodir)/speedbar: speedbar.texi
-        cd $(srcdir); $(MAKEINFO) speedbar.texi
-speedbar.dvi: speedbar.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
-speedbar.pdf: speedbar.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+speedbar.dvi: ${srcdir}/speedbar.texi
+        $(ENVADD) $(TEXI2DVI) $<
+speedbar.pdf: ${srcdir}/speedbar.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 tramp : $(infodir)/tramp
 $(infodir)/tramp: tramp.texi trampver.texi
-        cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
-tramp.dvi: tramp.texi trampver.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
-tramp.pdf: tramp.texi trampver.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) -D emacs $<
+tramp.dvi: ${srcdir}/tramp.texi trampver.texi
+        $(ENVADD) $(TEXI2DVI) $<
+tramp.pdf: ${srcdir}/tramp.texi trampver.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 url : $(infodir)/url
 $(infodir)/url: url.texi
-        cd $(srcdir); $(MAKEINFO) url.texi
-url.dvi: url.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
-url.pdf: url.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+url.dvi: ${srcdir}/url.texi
+        $(ENVADD) $(TEXI2DVI) $<
+url.pdf: ${srcdir}/url.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 vip : $(infodir)/vip
 $(infodir)/vip: vip.texi
-        cd $(srcdir); $(MAKEINFO) vip.texi
-vip.dvi: vip.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
-vip.pdf: vip.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+vip.dvi: ${srcdir}/vip.texi
+        $(ENVADD) $(TEXI2DVI) $<
+vip.pdf: ${srcdir}/vip.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 viper : $(infodir)/viper
 $(infodir)/viper: viper.texi
-        cd $(srcdir); $(MAKEINFO) viper.texi
-viper.dvi: viper.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
-viper.pdf: viper.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+viper.dvi: ${srcdir}/viper.texi
+        $(ENVADD) $(TEXI2DVI) $<
+viper.pdf: ${srcdir}/viper.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 widget : $(infodir)/widget
 $(infodir)/widget: widget.texi
-        cd $(srcdir); $(MAKEINFO) widget.texi
-widget.dvi: widget.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
-widget.pdf: widget.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+widget.dvi: ${srcdir}/widget.texi
+        $(ENVADD) $(TEXI2DVI) $<
+widget.pdf: ${srcdir}/widget.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 woman : $(infodir)/woman
 $(infodir)/woman: woman.texi
-        cd $(srcdir); $(MAKEINFO) woman.texi
-woman.dvi: woman.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
-woman.pdf: woman.texi
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
+        $(mkinfodir)
+        cd $(srcdir); $(MAKEINFO) $<
+woman.dvi: ${srcdir}/woman.texi
+        $(ENVADD) $(TEXI2DVI) $<
+woman.pdf: ${srcdir}/woman.texi
+        $(ENVADD) $(TEXI2PDF) $<
+
 
+.PHONY: mostlyclean clean distclean maintainer-clean
 
 mostlyclean:
-        rm -f *.log *.cp *.fn *.ky *.op *.ops *.pg *.vr core *.tp \
-        *.tps *.core gnustmp.*
-        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+        rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
+          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
+        rm -f gnustmp.*
 
 clean: mostlyclean
-        rm -f *.dvi *.pdf
+        rm -f $(DVI_TARGETS) $(PDF_TARGETS)
 
 distclean: clean
 #       rm -f Makefile
 
+## infodir is relative to srcdir.
 maintainer-clean: distclean
-        for file in $(INFO_TARGETS); do rm -f $${file}*; done
-
+        cd $(srcdir); for file in $(INFO_TARGETS); do \
+          rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \
+        done
 
 ### Makefile ends here
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index ed04d98ef92..2ab8fc18817 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -59,6 +59,7 @@ It is a way for multiple applications to share a single configuration
 * Help for users::              
 * Secret Service API::          
 * Help for developers::         
+* GnuPG and EasyPG Assistant Configuration::  
 * Index::                       
 * Function Index::              
 * Variable Index::              
@@ -176,16 +177,8 @@ for details.
 
 If you don't customize @code{auth-sources}, you'll have to live with
 the defaults: any host and any port are looked up in the netrc
-file @code{~/.authinfo.gpg}.  This is an encrypted file if and only if
-you set up EPA, which is strongly recommended.
-
-@lisp
-(require 'epa-file)
-(epa-file-enable)
-;;; VERY important if you want symmetric encryption
-;;; irrelevant if you don't
-(setq epa-file-cache-passphrase-for-symmetric-encryption t)
-@end lisp
+file @code{~/.authinfo.gpg}, which is a GnuPG encrypted file
+(@pxref{GnuPG and EasyPG Assistant Configuration}).
 
 The simplest working netrc line example is one without a port.
 
@@ -271,6 +264,56 @@ users' netrc files.
 
 @end defun
 
+@node GnuPG and EasyPG Assistant Configuration
+@appendix GnuPG and EasyPG Assistant Configuration
+
+If you don't customize @code{auth-sources}, the auth-source library
+reads @code{~/.authinfo.gpg}, which is a GnuPG encrypted file.
+
+In Emacs 23 or later there is an option @code{auto-encryption-mode} to
+automatically decrypt @code{*.gpg} files.  It is enabled by default.
+If you are using earlier versions of Emacs, you will need:
+
+@lisp
+(require 'epa-file)
+(epa-file-enable)
+@end lisp
+
+If you want your GnuPG passwords to be cached, set up @code{gpg-agent}
+or EasyPG Assitant
+(@pxref{Caching Passphrases, , Caching Passphrases, epa}).
+
+To quick start, here are some questions:
+
+@enumerate
+@item
+Do you use GnuPG version 2 instead of GnuPG version 1?
+@item
+Do you use symmetric encryption rather than public key encryption?
+@item
+Do you want to use gpg-agent?
+@end enumerate
+
+Here are configurations depending on your answers:
+
+@multitable {111} {222} {333} {configuration configuration configuration}
+@item @b{1} @tab @b{2} @tab @b{3} @tab Configuration
+@item Yes @tab Yes @tab Yes @tab Set up gpg-agent.
+@item Yes @tab Yes @tab No @tab You can't, without gpg-agent.
+@item Yes @tab No @tab Yes @tab Set up gpg-agent.
+@item Yes @tab No @tab No @tab You can't, without gpg-agent.
+@item No @tab Yes @tab Yes @tab Set up elisp passphrase cache.
+@item No @tab Yes @tab No @tab Set up elisp passphrase cache.
+@item No @tab No @tab Yes @tab Set up gpg-agent.
+@item No @tab No @tab No @tab You can't, without gpg-agent.
+@end multitable
+
+To set up gpg-agent, follow the instruction in GnuPG manual
+(@pxref{Invoking GPG-AGENT, , Invoking GPG-AGENT, gnupg}).
+
+To set up elisp passphrase cache, set
+@code{epa-file-cache-passphrase-for-symmetric-encryption}.
+
 @node Index
 @chapter Index
 @printindex cp
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index de57ff7d095..79038792a3e 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -163,19 +163,6 @@ include at the beginning:
 @end example
 
 @noindent
-If you want to ensure that the new (Gillespie) version of @dfn{CL}
-is the one that is present, add an additional @code{(require 'cl-19)}
-call:
-
-@example
-(require 'cl)
-(require 'cl-19)
-@end example
-
-@noindent
-The second call will fail (with ``@file{cl-19.el} not found'') if
-the old @file{cl.el} package was in use.
-
 It is safe to arrange to load @dfn{CL} at all times, e.g.,
 in your @file{.emacs} file.  But it's a good idea, for portability,
 to @code{(require 'cl)} in your code even if you do this.
@@ -219,39 +206,26 @@ will take care of pulling in the other files when they are
 needed.
 
 There is another file, @file{cl-compat.el}, which defines some
-routines from the older @file{cl.el} package that are no longer
+routines from the older @file{cl.el} package that are not otherwise
 present in the new package.  This includes internal routines
 like @code{setelt} and @code{zip-lists}, deprecated features
 like @code{defkeyword}, and an emulation of the old-style
-multiple-values feature.  @xref{Old CL Compatibility}.
+multiple-values feature.  This file is obsolete and should not be used
+in new code.  @xref{Old CL Compatibility}.
 
 @node Installation, Naming Conventions, Organization, Overview
 @section Installation
 
 @noindent
-Installation of the @dfn{CL} package is simple:  Just put the
-byte-compiled files @file{cl.elc}, @file{cl-extra.elc},
-@file{cl-seq.elc}, @file{cl-macs.elc}, and @file{cl-compat.elc}
-into a directory on your @code{load-path}.
-
-There are no special requirements to compile this package:
-The files do not have to be loaded before they are compiled,
-nor do they need to be compiled in any particular order.
-
-You may choose to put the files into your main @file{lisp/}
-directory, replacing the original @file{cl.el} file there.  Or,
-you could put them into a directory that comes before @file{lisp/}
-on your @code{load-path} so that the old @file{cl.el} is
-effectively hidden.
-
-Also, format the @file{cl.texinfo} file and put the resulting
-Info files in the @file{info/} directory or another suitable place.
-
-You may instead wish to leave this package's components all in
-their own directory, and then add this directory to your
-@code{load-path} and @code{Info-directory-list}.
-Add the directory to the front of the list so the old @dfn{CL}
-package and its documentation are hidden.
+The @dfn{CL} package is distributed with Emacs, so there is no need
+to install anything.
+
+If you do need to install it, just put the byte-compiled files
+@file{cl.elc}, @file{cl-extra.elc}, @file{cl-seq.elc},
+@file{cl-macs.elc}, and (if necessary) @file{cl-compat.elc} into a
+directory on your @code{load-path}.  Also, format the @file{cl.texi}
+file and put the resulting Info files into a directory in your
+@code{Info-directory-list}.
 
 @node Naming Conventions,  , Installation, Overview
 @section Naming Conventions
@@ -5076,8 +5050,8 @@ Lisp.
 @noindent
 The @dfn{CL} package includes emulations of some features of the
 old @file{cl.el}, in the form of a compatibility package
-@code{cl-compat}.  To use it, put @code{(require 'cl-compat)} in
-your program.
+@code{cl-compat}.  This file is obsolete and may be removed in future,
+so it should not be used in new code.
 
 The old package defined a number of internal routines without
 @code{cl-} prefixes or other annotations.  Call to these routines
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 2a0e8569266..475ce2bb53f 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -374,12 +374,18 @@ message as follows:
 @vindex mm-inline-large-images
 When displaying inline images that are larger than the window, Emacs
 does not enable scrolling, which means that you cannot see the whole
-image.  To prevent this, the library tries to determine the image size
+image. To prevent this, the library tries to determine the image size
 before displaying it inline, and if it doesn't fit the window, the
 library will display it externally (e.g. with @samp{ImageMagick} or
-@samp{xv}).  Setting this variable to @code{t} disables this check and
+@samp{xv}). Setting this variable to @code{t} disables this check and
 makes the library display all inline images as inline, regardless of
-their size.
+their size. If you set this variable to @code{resize}, the image will
+be displayed resized to fit in the window, if Emacs has the ability to
+resize images.
+
+@item mm-inline-large-images-proportion
+@vindex mm-inline-images-max-proportion
+The proportion used when resizing large images.
 
 @item mm-inline-override-types
 @vindex mm-inline-override-types
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 36f74415974..32bf9e7fe1d 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -66,6 +66,7 @@ called EasyPG Library.
 * Overview::                    
 * Quick start::                 
 * Commands::                    
+* Caching Passphrases::         
 * Bug Reports::                 
 @end menu
 
@@ -399,6 +400,43 @@ If non-@code{nil}, disable auto-saving when opening an encrypted file.
 The default value is @code{t}.
 @end defvar
 
+@node Caching Passphrases
+@chapter Caching Passphrases
+
+Typing passphrases is an irritating task if you frequently open and
+close the same file.  GnuPG and EasyPG Assistant provide mechanisms to
+remember your passphrases.  However, the configuration is a bit
+confusing since it depends on your GnuPG installation (GnuPG version 1 or
+GnuPG version 2), encryption method (symmetric or public key), and whether or
+not you want to use gpg-agent.  Here are some questions:
+
+@enumerate
+@item Do you use GnuPG version 2 instead of GnuPG version 1?
+@item Do you use symmetric encryption rather than public key encryption?
+@item Do you want to use gpg-agent?
+@end enumerate
+
+Here are configurations depending on your answers:
+
+@multitable {111} {222} {333} {configuration configuration configuration}
+@item @b{1} @tab @b{2} @tab @b{3} @tab Configuration
+@item Yes @tab Yes @tab Yes @tab Set up gpg-agent.
+@item Yes @tab Yes @tab No @tab You can't, without gpg-agent.
+@item Yes @tab No @tab Yes @tab Set up gpg-agent.
+@item Yes @tab No @tab No @tab You can't, without gpg-agent.
+@item No @tab Yes @tab Yes @tab Set up elisp passphrase cache.
+@item No @tab Yes @tab No @tab Set up elisp passphrase cache.
+@item No @tab No @tab Yes @tab Set up gpg-agent.
+@item No @tab No @tab No @tab You can't, without gpg-agent.
+@end multitable
+
+To set up gpg-agent, follow the instruction in GnuPG manual.
+@pxref{Invoking GPG-AGENT, , Invoking GPG-AGENT, gnupg}.
+
+To set up elisp passphrase cache, set
+@code{epa-file-cache-passphrase-for-symmetric-encryption}.
+@xref{Encrypting/decrypting *.gpg files}.
+
 @node Bug Reports
 @chapter Bug Reports
 
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 48606e0d664..b62c0ed75ea 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -137,7 +137,7 @@ complement to the DAP itself.
 LDAP servers usually store (but are not limited to) information about
 people such as their name, phone number, email address, office
 location, etc@enddots{} More information about LDAP can be found at
-@url{http://www.openldap.org/}
+@url{http://www.openldap.org/}.
 
 EUDC requires external support to access LDAP directory servers
 (@pxref{LDAP Requirements})
@@ -148,17 +148,15 @@ EUDC requires external support to access LDAP directory servers
 @section CCSO PH/QI
 
 The Central Computing Services Office (CCSO) of the University of
-Illinois at Urbana Champaign (UIUC) created and freely distributes a
-directory system that is currently in use in more than 300 organizations
-around the world.  The system records information about people such as
-their address, phone number, email, academic information or any other
-details it was configured to.
+Illinois at Urbana Champaign created and freely distributed a
+directory system that was used by many organizations in the 1990s.
+The system records information about people such as their address,
+phone number, email, academic information or any other details it was
+configured to.  Nowadays this system is not widely used.
 
 The system consists of two parts: a database server traditionally called
-@samp{qi} and a command-line client called @samp{ph}.
-@url{ftp://uiarchive.cso.uiuc.edu/pub/packages/ph} is the main
-distribution site.  @url{http://www.uiuc.edu/cgi-bin/ph/lookup?Query=.}
-provides a listing of the active @samp{qi} servers.
+@samp{qi} and a command-line client called @samp{ph}.  As of 2010, the
+code can still be downloaded from @url{http://www-dev.cites.uiuc.edu/ph/}.
 
 The original command-line @samp{ph} client that comes with the
 @samp{ph/qi} distribution provides additional features like the
@@ -225,18 +223,10 @@ email composition buffers (@pxref{Inline Query Expansion})
 @comment  node-name,  next,  previous,  up
 @section LDAP Requirements
 
-LDAP support is added by means of @file{ldap.el} which is part of Emacs.
+LDAP support is added by means of @file{ldap.el}, which is part of Emacs.
 @file{ldap.el} needs an external command line utility named
-@file{ldapsearch} which is available as part of LDAP toolkits:
-
-@itemize @bullet
-@item
-Open LDAP Libraries
-(@url{http://www.openldap.org/})
-@item
-University of Michigan's LDAP Client software
-(@url{http://www.umich.edu/~dirsvcs/ldap/})
-@end itemize
+@file{ldapsearch}, available as part of Open LDAP
+(@url{http://www.openldap.org/}).
 
 
 @node Usage, Credits, Installation, Top
@@ -968,7 +958,3 @@ in testing and proofreading the code and docs of @file{ph.el}.
 @printindex vr
 
 @bye
-
-@ignore
-   arch-tag: 1b79460b-4ea1-441d-ab45-05ddd16ef241
-@end ignore
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index f4dc0247197..ee5f72ac300 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -4,8 +4,7 @@
 @settitle GNU Emacs FAQ
 @c %**end of header
 
-@c This is used in many places
-@set VER 24.0.50
+@include emacsver.texi
 
 @c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
 @c Feel free to install changes without prior permission (but I'd
@@ -67,7 +66,7 @@ This FAQ is maintained as a part of GNU Emacs.  If you find any errors,
 or have any suggestions, please use @kbd{M-x report-emacs-bug} to report
 them.
 
-This is the version of the FAQ distributed with Emacs @value{VER}, and
+This is the version of the FAQ distributed with Emacs @value{EMACSVER}, and
 mainly describes that version.  Although there is some information on
 older versions, details about very old releases (now only of historical
 interest) have been removed.  If you are interested in this, consult
@@ -1010,7 +1009,7 @@ conventions}).
 @cindex Repository, Emacs
 @cindex Bazaar repository, Emacs
 
-Emacs @value{VER} is the current version as of this writing.  A version
+Emacs @value{EMACSVER} is the current version as of this writing.  A version
 number with two components (e.g. @samp{22.1}) indicates a released
 version; three components indicate a development
 version (e.g. @samp{23.0.50} is what will eventually become @samp{23.1}).
@@ -4479,7 +4478,3 @@ to the end of the @file{*Newsgroup*} buffer.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: fee0d62d-06cf-43d8-ac21-123408eaf10f
-@end ignore
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index ed74092eb0a..d9df9c8db18 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -4,9 +4,6 @@
 @c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 @c   2009, 2010 Free Software Foundation, Inc.
 @c
-@c Do not modify this file, it was generated from gnus-faq.xml, available from
-@c <URL:http://my.gnus.org/FAQ/>.
-@c
 @setfilename gnus-faq.info
 @settitle Frequently Asked Questions
 @c %**end of header
@@ -40,20 +37,9 @@
 @subheading Abstract
 
 This is the new Gnus Frequently Asked Questions list.
-If you have a Web browser, the official hypertext version is at
-@uref{http://my.gnus.org/FAQ/},
-the Docbook source is available from
-@uref{http://sourceforge.net/projects/gnus/, http://sourceforge.net}.
 
 Please submit features and suggestions to the 
-@email{faq-discuss@@my.gnus.org, FAQ discussion list}.
-The list is protected against junk mail with
-@uref{http://smarden.org/qconfirm/index.html, qconfirm}. As
-a subscriber, your submissions will automatically pass.  You can
-also subscribe to the list by sending a blank email to
-@email{faq-discuss-subscribe@@my.gnus.org, faq-discuss-subscribe@@my.gnus.org}
-and @uref{http://mail1.kens.com/cgi-bin/ezmlm-browse?command=monthbythread%26list=faq-discuss, browse
-the archive (BROKEN)}.
+@email{ding@@gnus.org, ding list}.
 
 @node FAQ - Changes
 @subheading Changes
@@ -98,8 +84,6 @@ would like to thank Steve Baur and Per Abrahamsen for doing a wonderful
 job with this FAQ before him. We would like to do the same - thanks,
 Justin!
 
-If you have a Web browser, the official hypertext version is at:
-@uref{http://my.gnus.org/FAQ/}.
 This version is much nicer than the unofficial hypertext
 versions that are archived at Utrecht, Oxford, Smart Pages, Ohio
 State, and other FAQ archives. See the resources question below
@@ -107,7 +91,7 @@ if you want information on obtaining it in another format.
 
 The information contained here was compiled with the assistance
 of the Gnus development mailing list, and any errors or
-misprints are the my.gnus.org team's fault, sorry.
+misprints are the Gnus team's fault, sorry.
 
 @node FAQ 1 - Installation FAQ
 @subsection Installation FAQ
@@ -1042,8 +1026,7 @@ in Gnus Country :-). It's a three step process: First we
 make faces (specifications of how summary-line shall look
 like) for those postings, then we'll give them some
 special score and finally we'll tell Gnus to use the new
-faces. You can find detailed instructions on how to do it on
-@uref{http://my.gnus.org/node/view/224, my.gnus.org}
+faces.
 
 @node FAQ 4-12
 @subsubheading Question 4.12
@@ -1414,7 +1397,7 @@ or @uref{http://aspell.sourceforge.net/, aspell}
 installed and in your Path. Then you need 
 @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el}
 and for on-the-fly spell-checking 
-@uref{http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}.
+@uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}.
 Ispell.el is shipped with Emacs and available through the XEmacs package system, 
 flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is 
 available through the package system, so there should be no need to install them 
@@ -1987,7 +1970,7 @@ server like
 @uref{http://www.isc.org/products/INN/, inn}. 
 Then you want to fetch your Mail, popular choices
 are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail}
-and @uref{http://www.qcc.ca/~charlesc/software/getmail-3.0/, getmail}.
+and @uref{http://pyropus.ca/software/getmail/, getmail}.
 You should tell those to write the mail to your disk and
 Gnus to read it from there. Last but not least the mail
 sending part: This can be done with every MTA like
@@ -2141,12 +2124,8 @@ Which websites should I know?
 
 @subsubheading Answer
 
-The two most important ones are the
+The most important one is the
 @uref{http://www.gnus.org, official Gnus website}.
-and it's sister site 
-@uref{http://my.gnus.org, my.gnus.org (MGO)},
-hosting an archive of lisp snippets, howtos, a (not
-really finished) tutorial and this FAQ.
 
 Tell me about other sites which are interesting.
 
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index 028539a7fb4..1136d52e51d 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -356,6 +356,8 @@ moving articles to a group that has not turned auto-expire on.
 
 @item NoCeM support has been removed.
 
+@item Carpal mode has been removed.
+
 @end itemize
 
 @end itemize
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c1acf7e0d8a..1a1f0d48eb9 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -629,7 +629,7 @@ Select Methods
 
 * Server Buffer::               Making and editing virtual servers.
 * Getting News::                Reading USENET news with Gnus.
-* Using @acronym{IMAP}::                  Reading mail from @acronym{IMAP}.
+* Using IMAP::                  Reading mail from @acronym{IMAP}.
 * Getting Mail::                Reading your personal mail with Gnus.
 * Browsing the Web::            Getting messages from a plethora of Web sources.
 * Other Sources::               Reading directories, files.
@@ -797,7 +797,6 @@ Various
 * Compilation::                 How to speed Gnus up.
 * Mode Lines::                  Displaying information in the mode lines.
 * Highlighting and Menus::      Making buffers look all nice and cozy.
-* Buttons::                     Get tendinitis in ten easy steps!
 * Daemons::                     Gnus can do things behind your back.
 * Undo::                        Some actions can be undone.
 * Predicate Specifiers::        Specifying predicates.
@@ -828,6 +827,7 @@ Image Enhancements
 * Smileys::                     Show all those happy faces the way they were
                                   meant to be shown.
 * Picons::                      How to display pictures of what you're reading.
+* Gravatars::                   Display the avatar of people you read.
 * XVarious::                    Other XEmacsy Gnusey variables.
 
 Thwarting Email Spam
@@ -9477,6 +9477,14 @@ signature should be removed, or other symbol, meaning that the
 corresponding regular expression in @code{gnus-article-banner-alist} is
 used.
 
+For instance:
+
+@lisp
+(setq gnus-article-banner-alist
+      ((googleGroups .
+       "^\n*--~--~---------\\(.+\n\\)+")))
+@end lisp
+
 Regardless of a group, you can hide things like advertisements only when
 the sender of an article has a certain mail address specified in
 @code{gnus-article-address-banner-alist}.
@@ -9804,6 +9812,9 @@ Customization, emacs-mime, The Emacs MIME Manual}) to convert the
 can use include:
 
 @table @code
+@item mm-shr
+Use Gnus simple html renderer.
+
 @item gnus-article-html
 Use Gnus rendered based on w3m.
 
@@ -10797,7 +10808,7 @@ article is to use Muttprint (@pxref{Saving Articles}).
 @item A C
 @vindex gnus-fetch-partial-articles
 @findex gnus-summary-show-complete-article
-If @code{gnus-fetch-partial-articles} is non-@code{nil}, Gnus will
+If @code{<backend>-fetch-partial-articles} is non-@code{nil}, Gnus will
 fetch partial articles, if the backend it fetches them from supports
 it.  Currently only @code{nnimap} does.  If you're looking at a
 partial article, and want to see the complete article instead, then
@@ -10981,9 +10992,12 @@ do not do a particularly excellent job at it.  That is, @code{nnmbox},
 @code{nnbabyl}, @code{nnmaildir}, @code{nnml}, are able to locate
 articles from any groups, while @code{nnfolder}, and @code{nnimap} are
 only able to locate articles that have been posted to the current
-group.  (Anything else would be too time consuming.)  @code{nnmh} does
-not support this at all.
+group.  @code{nnmh} does not support this at all.
 
+Fortunately, the special @code{nnregistry} back end is able to locate
+articles in any groups, regardless of their back end (@pxref{Registry
+Article Refer Method, fetching by @code{Message-ID} using the
+registry}).
 
 @node Alternative Approaches
 @section Alternative Approaches
@@ -12444,7 +12458,7 @@ section only describes the default method.
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
 If set to @code{gnus-article-html}, Gnus will use the built-in method,
-that's based on @code{curl} and @code{w3m}.
+that's based on @code{w3m}.
 
 @item gnus-blocked-images
 @vindex gnus-blocked-images
@@ -12839,6 +12853,11 @@ If non-@code{nil}, use the same article buffer for all the groups.
 (This is the default.)  If @code{nil}, each group will have its own
 article buffer.
 
+@item gnus-widen-article-window
+@cindex gnus-widen-article-window
+If non-@code{nil}, selecting the article buffer with the @kbd{h}
+command will ``widen'' the article window to take the entire frame.
+
 @vindex gnus-article-decode-hook
 @item gnus-article-decode-hook
 @cindex @acronym{MIME}
@@ -13700,7 +13719,7 @@ The different methods all have their peculiarities, of course.
 @menu
 * Server Buffer::               Making and editing virtual servers.
 * Getting News::                Reading USENET news with Gnus.
-* Using @acronym{IMAP}::                  Reading mail from @acronym{IMAP}.
+* Using IMAP::                  Reading mail from @acronym{IMAP}.
 * Getting Mail::                Reading your personal mail with Gnus.
 * Browsing the Web::            Getting messages from a plethora of Web sources.
 * Other Sources::               Reading directories, files.
@@ -14394,6 +14413,12 @@ inhibit Gnus to add a @code{Message-ID} header, you could say:
 Note that not all servers support the recommended ID.  This works for
 INN versions 2.3.0 and later, for instance.
 
+@item nntp-server-list-active-group
+If @code{nil}, then always use @samp{GROUP} instead of @samp{LIST
+ACTIVE}.  This is usually slower, but on misconfigured servers that
+don't update their active files often, this can help.
+
+
 @end table
 
 @menu
@@ -14787,8 +14812,8 @@ there.
 @end table
 
 
-@node Using @acronym{IMAP}
-@section Using @acronym{IMAP}
+@node Using IMAP
+@section Using IMAP
 @cindex imap
 
 The most popular mail backend is probably @code{nnimap}, which
@@ -14798,14 +14823,14 @@ This means that it's a convenient choice when you're reading your mail
 from different locations, or with different user agents.
 
 @menu
-* Connecting to an @acronym{IMAP} Server::     Getting started with @acronym{IMAP}.
-* Customizing the @acronym{IMAP} Connection::  Variables for @acronym{IMAP} connection.
-* Client-Side @acronym{IMAP} Splitting::       Put mail in the correct mail box.
+* Connecting to an IMAP Server::     Getting started with @acronym{IMAP}.
+* Customizing the IMAP Connection::  Variables for @acronym{IMAP} connection.
+* Client-Side IMAP Splitting::       Put mail in the correct mail box.
 @end menu
 
 
-@node Connecting to an @acronym{IMAP} Server
-@subsection Connecting to an @acronym{IMAP} Server
+@node Connecting to an IMAP Server
+@subsection Connecting to an IMAP Server
 
 Connecting to an @acronym{IMAP} can be very easy.  Type @kbd{B} in the
 group buffer, or (if your primary interest is reading email), say
@@ -14826,17 +14851,17 @@ machine imap.gmail.com login <username> password <password> port imap
 That should basically be it for most users.
 
 
-@node Customizing the @acronym{IMAP} Connection
-@subsection Customizing the @acronym{IMAP} Connection
+@node Customizing the IMAP Connection
+@subsection Customizing the IMAP Connection
 
 Here's an example method that's more complex:
 
 @example
 (nnimap "imap.gmail.com"
         (nnimap-inbox "INBOX")
-        (nnimap-split-methods ,nnmail-split-methods)
+        (nnimap-split-methods default)
         (nnimap-expunge t)
-        (nnimap-stream 'ssl)
+        (nnimap-stream ssl)
         (nnir-search-engine imap)
         (nnimap-expunge-inbox t))
 @end example
@@ -14878,11 +14903,17 @@ this should be set to @code{anonymous}.
 Virtually all @code{IMAP} server support fast streaming of data.  If
 you have problems connecting to the server, try setting this to @code{nil}.
 
+@item nnimap-fetch-partial-articles
+If non-@code{nil}, fetch partial articles from the server.  If set to
+a string, then it's interpreted as a regexp, and parts that have
+matching types will be fetched.  For instance, @samp{"text/"} will
+fetch all textual parts, while leaving the rest on the server.
+
 @end table
 
 
-@node Client-Side @acronym{IMAP} Splitting
-@subsection Client-Side @acronym{IMAP} Splitting
+@node Client-Side IMAP Splitting
+@subsection Client-Side IMAP Splitting
 
 Many people prefer to do the sorting/splitting of mail into their mail
 boxes on the @acronym{IMAP} server.  That way they don't have to
@@ -14897,7 +14928,11 @@ This is the @acronym{IMAP} mail box that will be scanned for new mail.
 
 @item nnimap-split-methods
 Uses the same syntax as @code{nnmail-split-methods} (@pxref{Splitting
-Mail}).
+Mail}), except the symbol @code{default}, which means that it should
+use the value of the @code{nnmail-split-methods} variable.
+
+@item nnimap-split-fancy
+Uses the same syntax as @code{nnmail-split-fancy}.
 
 @end table
 
@@ -15086,6 +15121,9 @@ arguments in a buffer narrowed to the headers of an incoming mail
 message.  The function should return a list of group names that it
 thinks should carry this mail message.
 
+This variable can also be a fancy split method.  For the syntax,
+see @ref{Fancy Mail Splitting}.
+
 Note that the mail back ends are free to maul the poor, innocent,
 incoming headers all they want to.  They all add @code{Lines} headers;
 some add @code{X-Gnus-Group} headers; most rename the Unix mbox
@@ -15460,7 +15498,7 @@ Get mail from a @acronym{IMAP} server.  If you don't want to use
 @acronym{IMAP} as intended, as a network mail reading protocol (ie
 with nnimap), for some reason or other, Gnus let you treat it similar
 to a @acronym{POP} server and fetches articles from a given
-@acronym{IMAP} mailbox.  @xref{Using @acronym{IMAP}}, for more information.
+@acronym{IMAP} mailbox.  @xref{Using IMAP}, for more information.
 
 Keywords:
 
@@ -15552,45 +15590,6 @@ An example @acronym{IMAP} mail source:
       :fetchflag "\\Seen")
 @end lisp
 
-@item webmail
-Get mail from a webmail server, such as @uref{http://www.hotmail.com/},
-@uref{http://webmail.netscape.com/}, @uref{http://www.netaddress.com/},
-@uref{http://mail.yahoo.com/}.
-
-NOTE: Webmail largely depends on cookies.  A "one-line-cookie" patch is
-required for url "4.0pre.46".
-
-WARNING: Mails may be lost.  NO WARRANTY.
-
-Keywords:
-
-@table @code
-@item :subtype
-The type of the webmail server.  The default is @code{hotmail}.  The
-alternatives are @code{netscape}, @code{netaddress}, @code{my-deja}.
-
-@item :user
-The user name to give to the webmail server.  The default is the login
-name.
-
-@item :password
-The password to give to the webmail server.  If not specified, the user is
-prompted.
-
-@item :dontexpunge
-If non-@code{nil}, only fetch unread articles and don't move them to
-trash folder after finishing the fetch.
-
-@end table
-
-An example webmail source:
-
-@lisp
-(webmail :subtype 'hotmail
-         :user "user-name"
-         :password "secret")
-@end lisp
-
 @item group
 Get the actual mail source from the @code{mail-source} group parameter,
 @xref{Group Parameters}.
@@ -15929,7 +15928,7 @@ after @code{save-excursion} and @code{save-restriction} in the example
 above.  Also note that with the nnimap backend, message bodies will
 not be downloaded by default.  You need to set
 @code{nnimap-split-download-body} to @code{t} to do that
-(@pxref{Client-Side @acronym{IMAP} Splitting}).
+(@pxref{Client-Side IMAP Splitting}).
 
 @item (! @var{func} @var{split})
 If the split is a list, and the first element is @code{!}, then
@@ -17409,13 +17408,12 @@ incompatible group parameters, slightly different from those of other
 mail back ends.
 
 @code{nnmaildir} is largely similar to @code{nnml}, with some notable
-differences.  Each message is stored in a separate file, but the
-filename is unrelated to the article number in Gnus.  @code{nnmaildir}
+differences. Each message is stored in a separate file, but the
+filename is unrelated to the article number in Gnus. @code{nnmaildir}
 also stores the equivalent of @code{nnml}'s overview files in one file
-per article, so it uses about twice as many inodes as @code{nnml}.  (Use
-@code{df -i} to see how plentiful your inode supply is.)  If this slows
-you down or takes up very much space, consider switching to
-@uref{http://www.namesys.com/, ReiserFS} or another non-block-structured
+per article, so it uses about twice as many inodes as @code{nnml}.
+(Use @code{df -i} to see how plentiful your inode supply is.) If this
+slows you down or takes up very much space, a non-block-structured
 file system.
 
 Since maildirs don't require locking for delivery, the maildirs you use
@@ -21729,7 +21727,6 @@ four days, Gnus will decay the scores four times, for instance.
 * Compilation::                 How to speed Gnus up.
 * Mode Lines::                  Displaying information in the mode lines.
 * Highlighting and Menus::      Making buffers look all nice and cozy.
-* Buttons::                     Get tendinitis in ten easy steps!
 * Daemons::                     Gnus can do things behind your back.
 * Undo::                        Some actions can be undone.
 * Predicate Specifiers::        Specifying predicates.
@@ -22190,8 +22187,7 @@ glitches.  Use at your own peril.
 buffer should be given.  Here's an excerpt of this variable:
 
 @lisp
-((group (vertical 1.0 (group 1.0 point)
-                      (if gnus-carpal (group-carpal 4))))
+((group (vertical 1.0 (group 1.0 point)))
  (article (vertical 1.0 (summary 0.25 point)
                         (article 1.0))))
 @end lisp
@@ -22229,7 +22225,6 @@ Here's a more complicated example:
 @lisp
 (article (vertical 1.0 (group 4)
                        (summary 0.25 point)
-                       (if gnus-carpal (summary-carpal 4))
                        (article 1.0)))
 @end lisp
 
@@ -22240,20 +22235,16 @@ occupy, not a percentage.
 If the @dfn{split} looks like something that can be @code{eval}ed (to be
 precise---if the @code{car} of the split is a function or a subr), this
 split will be @code{eval}ed.  If the result is non-@code{nil}, it will
-be used as a split.  This means that there will be three buffers if
-@code{gnus-carpal} is @code{nil}, and four buffers if @code{gnus-carpal}
-is non-@code{nil}.
+be used as a split.
 
 Not complicated enough for you?  Well, try this on for size:
 
 @lisp
 (article (horizontal 1.0
              (vertical 0.5
-                 (group 1.0)
-                 (gnus-carpal 4))
+                 (group 1.0))
              (vertical 1.0
                  (summary 0.25 point)
-                 (summary-carpal 4)
                  (article 1.0))))
 @end lisp
 
@@ -22630,62 +22621,6 @@ Hook called after creating the score mode menu.
 @end table
 
 
-@node Buttons
-@section Buttons
-@cindex buttons
-@cindex mouse
-@cindex click
-
-Those new-fangled @dfn{mouse} contraptions is very popular with the
-young, hep kids who don't want to learn the proper way to do things
-these days.  Why, I remember way back in the summer of '89, when I was
-using Emacs on a Tops 20 system.  Three hundred users on one single
-machine, and every user was running Simula compilers.  Bah!
-
-Right.
-
-@vindex gnus-carpal
-Well, you can make Gnus display bufferfuls of buttons you can click to
-do anything by setting @code{gnus-carpal} to @code{t}.  Pretty simple,
-really.  Tell the chiropractor I sent you.
-
-
-@table @code
-
-@item gnus-carpal-mode-hook
-@vindex gnus-carpal-mode-hook
-Hook run in all carpal mode buffers.
-
-@item gnus-carpal-button-face
-@vindex gnus-carpal-button-face
-Face used on buttons.
-
-@item gnus-carpal-header-face
-@vindex gnus-carpal-header-face
-Face used on carpal buffer headers.
-
-@item gnus-carpal-group-buffer-buttons
-@vindex gnus-carpal-group-buffer-buttons
-Buttons in the group buffer.
-
-@item gnus-carpal-summary-buffer-buttons
-@vindex gnus-carpal-summary-buffer-buttons
-Buttons in the summary buffer.
-
-@item gnus-carpal-server-buffer-buttons
-@vindex gnus-carpal-server-buffer-buttons
-Buttons in the server buffer.
-
-@item gnus-carpal-browse-buffer-buttons
-@vindex gnus-carpal-browse-buffer-buttons
-Buttons in the browse buffer.
-@end table
-
-All the @code{buttons} variables are lists.  The elements in these list
-are either cons cells where the @code{car} contains a text to be displayed and
-the @code{cdr} contains a function symbol, or a simple string.
-
-
 @node Daemons
 @section Daemons
 @cindex demons
@@ -23263,12 +23198,15 @@ The following variables offer control over how things are displayed.
 The size in pixels of gravatars. Gravatars are always square, so one
 number for the size is enough.
 
-@item gnus-gravatar-relief
-@vindex gnus-gravatar-relief
-If non-nil, adds a shadow rectangle around the image. The value,
-relief, specifies the width of the shadow lines, in pixels. If relief
-is negative, shadows are drawn so that the image appears as a pressed
-button; otherwise, it appears as an unpressed button.
+@item gnus-gravatar-properties
+@vindex gnus-gravatar-properties
+List of image properties applied to Gravatar images.
+
+@item gnus-gravatar-too-ugly
+@vindex gnus-gravatar-too-ugly
+Regexp that matches mail addresses or names of people of which avatars
+should not be displayed, or @code{nil}.  It default to the value of
+@code{gnus-article-x-face-too-ugly} (@pxref{X-Face}).
 
 @end table
 
@@ -23618,7 +23556,7 @@ call the external tools during splitting.  Example fancy split method:
 Note that with the nnimap back end, message bodies will not be
 downloaded by default.  You need to set
 @code{nnimap-split-download-body} to @code{t} to do that
-(@pxref{Client-Side @acronym{IMAP} Splitting}).
+(@pxref{Client-Side IMAP Splitting}).
 
 That is about it.  As some spam is likely to get through anyway, you
 might want to have a nifty function to call when you happen to read
@@ -23812,12 +23750,14 @@ yourself, so that the message is processed as spam when you exit the
 group:
 
 @table @kbd
-@item M-d
+@item $
+@itemx M-d
 @itemx M s x
 @itemx S x
-@kindex M-d
-@kindex S x
-@kindex M s x
+@kindex $ (Summary)
+@kindex M-d (Summary)
+@kindex S x (Summary)
+@kindex M s x (Summary)
 @findex gnus-summary-mark-as-spam
 @findex gnus-summary-mark-as-spam
 Mark current article as spam, showing it with the @samp{$} mark
@@ -23907,7 +23847,7 @@ the message headers; @code{nnimap-split-download-body} tells it to
 retrieve the message bodies as well.  We don't set this by default
 because it will slow @acronym{IMAP} down, and that is not an
 appropriate decision to make on behalf of the user.  @xref{Client-Side
-@acronym{IMAP} Splitting}.
+IMAP Splitting}.
 
 You have to specify one or more spam back ends for @code{spam-split}
 to use, by setting the @code{spam-use-*} variables.  @xref{Spam Back
@@ -24192,8 +24132,8 @@ From Ted Zlatanov <tzz@@lifelogs.com>.
  spam-move-spam-nonspam-groups-only nil
  spam-mark-only-unseen-as-spam t
  spam-mark-ham-unread-before-move-from-spam-group t
- nnimap-split-rule 'nnimap-split-fancy
  ;; @r{understand what this does before you copy it to your own setup!}
+ ;; @r{for nnimap you'll probably want to set nnimap-split-methods, see the manual}
  nnimap-split-fancy '(|
                       ;; @r{trace references to parents and put in their group}
                       (: gnus-registry-split-fancy-with-parent)
@@ -24915,8 +24855,8 @@ messages stay in @samp{INBOX}:
 @example
 (setq spam-use-spamoracle t
       spam-split-group "Junk"
+      ;; @r{for nnimap you'll probably want to set nnimap-split-methods, see the manual}
       nnimap-split-inbox '("INBOX")
-      nnimap-split-rule 'nnimap-split-fancy
       nnimap-split-fancy '(| (: spam-split) "INBOX"))
 @end example
 
@@ -25442,6 +25382,13 @@ the sender in addition to the Message-ID.  Several strategies are
 available.
 
 @item
+Refer to messages by ID
+
+Commands like @code{gnus-summary-refer-parent-article} can take
+advantage of the registry to jump to the referred article, regardless
+of the group the message is in.
+
+@item
 Store custom flags and keywords
 
 The registry can store custom flags and keywords for a message.  For
@@ -25460,6 +25407,7 @@ of all messages matching a particular set of criteria.
 @menu
 * Setup::
 * Fancy splitting to parent::
+* Registry Article Refer Method::
 * Store custom flags and keywords::
 * Store arbitrary data::
 @end menu
@@ -25536,6 +25484,42 @@ registry will keep.
 The file where the registry will be stored between Gnus sessions.
 @end defvar
 
+@node Registry Article Refer Method
+@subsection Fetching by @code{Message-ID} Using the Registry
+
+The registry knows how to map each @code{Message-ID} to the group it's
+in.  This can be leveraged to enhance the ``article refer method'',
+the thing that tells Gnus how to look up an article given its
+Message-ID (@pxref{Finding the Parent}).
+
+@vindex nnregistry
+@vindex gnus-refer-article-method
+
+The @code{nnregistry} refer method does exactly that.  It has the
+advantage that an article may be found regardless of the group it's
+in---provided its @code{Message-ID} is known to the registry.  It can
+be enabled by augmenting the start-up file with something along these
+lines:
+
+@example
+;; Keep enough entries to have a good hit rate when referring to an
+;; article using the registry.  Use long group names so that Gnus
+;; knows where the article is.
+(setq gnus-registry-max-entries 2500
+      gnus-registry-use-long-group-names t)
+
+(gnus-registry-initialize)
+
+(setq gnus-refer-article-method
+      '(current
+        (nnregistry)
+        (nnweb "gmane" (nnweb-type gmane))))
+@end example
+
+The example above instructs Gnus to first look up the article in the
+current group, or, alternatively, using the registry, and finally, if
+all else fails, using Gmane.
+
 @node Fancy splitting to parent
 @subsection Fancy splitting to parent
 
@@ -26235,7 +26219,7 @@ wrong show.
 Masanobu @sc{Umeda}---the writer of the original @sc{gnus}.
 
 @item
-Shenghuo Zhu---uudecode.el, mm-uu.el, rfc1843.el, webmail.el,
+Shenghuo Zhu---uudecode.el, mm-uu.el, rfc1843.el,
 nnwarchive and many, many other things connected with @acronym{MIME} and
 other types of en/decoding, as well as general bug fixing, new
 functionality and stuff.
@@ -26666,10 +26650,6 @@ Buttons}).
 You can do lots of strange stuff with the Gnus window & frame
 configuration (@pxref{Window Layout}).
 
-@item
-You can click on buttons instead of using the keyboard
-(@pxref{Buttons}).
-
 @end itemize
 
 
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 1c5fec41095..f4887738411 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -27,6 +27,10 @@ srcdir=.
 
 infodir = $(srcdir)/../../info
 
+## Directory with emacsver.texi.
+## Currently only used by efaq; could be added to MAKEINFO.
+emacsdir = $(srcdir)/../emacs
+
 # The makeinfo program is part of the Texinfo distribution.
 MAKEINFO = makeinfo --force
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
@@ -66,7 +70,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-         "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+         "MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(emacsdir)" /C
 
 
 info: $(INFO_TARGETS)
@@ -213,9 +217,9 @@ $(infodir)/widget: widget.texi
 widget.dvi: widget.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
 
-$(infodir)/efaq: faq.texi
-        $(MAKEINFO) faq.texi
-faq.dvi: faq.texi
+$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
+        $(MAKEINFO) -I$(emacsdir) faq.texi
+faq.dvi: faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
 
 $(infodir)/autotype: autotype.texi
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index ad56520f892..8e9eca55177 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1149,11 +1149,8 @@ If you have imported your old PGP 2.x key into GnuPG, and want to send
 signed and encrypted messages to your fellow PGP 2.x users, you'll
 discover that the receiver cannot understand what you send. One
 solution is to use PGP 2.x instead (i.e., if you use @code{pgg}, set
-@code{pgg-default-scheme} to @code{pgp}).  If you do want to use
-GnuPG, you can use a compatibility script called @code{gpg-2comp}
-available from
-@uref{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/}.  You
-could also convince your fellow PGP 2.x users to convert to GnuPG.
+@code{pgg-default-scheme} to @code{pgp}). You could also convince your
+fellow PGP 2.x users to convert to GnuPG.
 @vindex mml-signencrypt-style-alist
 As a final workaround, you can make the sign and encryption work in
 two steps; separately sign, then encrypt a message.  If you would like
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index edf429aea77..b8f09904858 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -264,10 +264,6 @@ in the @code{sieve} group (@kbd{M-x customize-group RET sieve RET}):
 
 @table @code
 
-@item sieve-manage-default-user
-@vindex sieve-manage-default-user
-Sets the default username.
-
 @item sieve-manage-default-port
 @vindex sieve-manage-default-port
 Sets the default port to use, the suggested port number is @code{2000}.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 775e4788de0..2c82becf6ae 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2753,7 +2753,10 @@ Use an external method, like @option{scpc}.
 Use caching.  This is already enabled by default.  Information about
 the remote host as well as the remote files are cached for reuse.  The
 information about remote hosts is kept in the file specified in
-@code{tramp-persistency-file-name}.  Keep this file.
+@code{tramp-persistency-file-name}.  Keep this file.  If you are
+confident, that files on remote hosts are not changed out of
+@value{emacsname}' control, set @code{remote-file-name-inhibit-cache}
+to @code{nil}.
 
 Disable version control.  If you access remote files which are not
 under version control, a lot of check operations can be avoided by