Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

6 files changed, 187 insertions, 92 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0837c8e06f2..d0f229a9c9e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,42 @@
+2013-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Client-Side IMAP Splitting):
+        Note that `nnimap-inbox' now can be a list.
+
+2013-06-24  Glenn Morris  <rgm@gnu.org>
+
+        * eshell.texi: Fix cross-references to other manuals.
+
+2013-06-23  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq):
+        Remove; not needed now we use a standard html layout for the faq.
+        (clean): Remove HTML_TARGETS, emacs-faq.text.
+
+2013-06-21  Eduard Wiebe  <usenet@pusto.de>
+
+        * flymake.texi (Parsing the output, Customizable variables):
+        Add reference to `flymake-warning-predicate'.
+
+2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Top, Configuration): Insert section `Predefined
+        connection information' in menu.
+        (Predefined connection information): New section.
+        (Android shell setup): Make a reference to `Predefined connection
+        information'.
+
+2013-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (version): New, set by configure.
+        (clean): Delete dist tar file.
+        (infoclean): New, split from maintainer-clean.
+        (maintainer-clean): Run infoclean.
+        (dist): New rule, to make tarfile for www.gnu.org.
+
 2013-06-13  Albert Krewinkel  <tarleb@moltkeplatz.de>
 
-        * sieve.texi: (Managing Sieve): Fix port in example, fix documentation
+        * sieve.texi (Managing Sieve): Fix port in example, fix documentation
         for keys q and Q.
         (Standards): Reference RFC5804 as the defining document of the
         managesieve protocol.
@@ -46,7 +82,7 @@
 
 2013-03-31  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.texi: (Basic Operations on Units): Streamline some
+        * calc.texi (Basic Operations on Units): Streamline some
         descriptions.
 
 2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
@@ -85,8 +121,8 @@
 
 2013-03-08  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.texi (Basic Operations on Units): Fix
-        cross-reference.
+        * calc.texi (Basic Operations on Units):
+        Fix cross-reference.
 
 2013-03-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -124,8 +160,8 @@
 
         * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1"
         and "plink2" entries.  "plink2" is obsolete for a long time.
-        (External methods): Remove "scp1" and "scp2" entries.  Explain
-        user name and host name specification for "adb".
+        (External methods): Remove "scp1" and "scp2" entries.
+        Explain user name and host name specification for "adb".
 
 2013-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -205,8 +241,8 @@
         from ede new.
         (Simple projects): Re-write to not talk about ede-simple-project
         which is deprecated, and instead use the term to mean projects
-        that don't do much management, just project wrapping.  Add
-        ede-generic-project link.
+        that don't do much management, just project wrapping.
+        Add ede-generic-project link.
         (ede-generic-project): New node (bug#11441).
 
 2013-02-07  Glenn Morris  <rgm@gnu.org>
@@ -345,8 +381,8 @@
 
 2012-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.texi (Browse Foreign Server): Document
-        `gnus-browse-delete-group'.
+        * gnus.texi (Browse Foreign Server):
+        Document `gnus-browse-delete-group'.
 
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
@@ -501,7 +537,7 @@
 
         Release MH-E manual version 8.4.
 
-        * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
+        * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH, Preface):
         Update for release 8.4.
 
         * mh-e.texi (Sequences): Add mh-whitelist-preserves-sequences-flag.
@@ -563,8 +599,8 @@
         * ses.texi: Doc for ses-rename-cell, ses-repair-cell-reference-all & ses-range.
         In all file place SES into @acronym{...}.
         (Advanced Features): Add key index and function index for
-        ses-set-header-row. Add description for function
-        ses-rename-cell. Add description for function
+        ses-set-header-row.  Add description for function
+        ses-rename-cell.  Add description for function
         ses-repair-cell-reference-all.
         (Ranges in formulas): Add description for ses-range flags.
 
@@ -583,8 +619,8 @@
         Improve docs for url-queue-*.
         (Supported URL Types): Copyedits.  Delete empty subnodes.
 
-        * url.texi (Introduction): Rename from Getting Started.  Rewrite
-        the introduction.
+        * url.texi (Introduction): Rename from Getting Started.
+        Rewrite the introduction.
         (URI Parsing): Rewrite.  Omit the obsolete attributes slot.
 
 2012-11-10  Glenn Morris  <rgm@gnu.org>
@@ -684,14 +720,14 @@
 
 2012-10-26  Bastien Guerry  <bzg@gnu.org>
 
-        * org.texi (Installation): Update the link to Org's ELPA.  Also
-        don't mention org-install.el anymore as the replacement file
+        * org.texi (Installation): Update the link to Org's ELPA.
+        Also don't mention org-install.el anymore as the replacement file
         org-loaddefs.el is now loaded by org.el.
 
 2012-10-25  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Frequently Asked Questions): Mention
-        `tramp-completion-reread-directory-timeout' for performance
+        * tramp.texi (Frequently Asked Questions):
+        Mention `tramp-completion-reread-directory-timeout' for performance
         improvement.
 
 2012-10-25  Glenn Morris  <rgm@gnu.org>
@@ -814,8 +850,8 @@
         (Referencing Labels): Update regarding reference styles.
         (Citation Styles): Mention support for ConTeXt.
         (Options (Defining Label Environments)): Fix typo.
-        (Options (Creating Citations)): Document
-        `reftex-cite-key-separator'.
+        (Options (Creating Citations)):
+        Document `reftex-cite-key-separator'.
 
 2012-09-30  Achim Gratz  <Stromeko@Stromeko.DE>
 
@@ -847,8 +883,8 @@
 
 2012-09-30  Bastien Guerry  <bzg@gnu.org>
 
-        * org.texi (Installation, Feedback, Batch execution): Use
-        (add-to-list 'load-path ... t) for the contrib dir.
+        * org.texi (Installation, Feedback, Batch execution):
+        Use (add-to-list 'load-path ... t) for the contrib dir.
 
         * org.texi (results): Update documentation for ":results drawer"
         and ":results org".
@@ -875,8 +911,8 @@
         (Agenda commands): Reorder.  Document `*' to toggle persistent
         marks.
 
-        * org.texi (Agenda dispatcher): Mention
-        `org-toggle-agenda-sticky'.
+        * org.texi (Agenda dispatcher):
+        Mention `org-toggle-agenda-sticky'.
         (Agenda commands, Exporting Agenda Views): Fix typo.
 
         * org.texi (Templates in contexts, Setting Options): Update to
@@ -957,7 +993,7 @@
 
         * org.texi: The sections in the Exporting section of the manual
         left out articles in the description of the org-export-as-*
-        commands, among other places. This patch adds them, adds a few
+        commands, among other places.  This patch adds them, adds a few
         missing prepositions, and switches instances of "an HTML" to "a
         html" for internal consistency.
 
@@ -1005,7 +1041,7 @@
 2012-09-30  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.texi (Literal examples): Remove reference to unknown
-        `org-export-latex-minted' variable. Also simplify footnote since
+        `org-export-latex-minted' variable.  Also simplify footnote since
         `org-export-latex-listings' documentation is exhaustive already.
 
         * org.texi (Plain lists): Remove reference to now hard-coded
@@ -1046,13 +1082,13 @@
         simplifications.
         (Basic Simplifications): Rename from "Limited Simplifications"
         Replace "limited" by "basic" throughout.
-        (Algebraic Simplifications):  Indicate that the algebraic
+        (Algebraic Simplifications): Indicate that the algebraic
         simplifications are done by default.
-        (Unsafe Simplifications):  Mention `m E'.
+        (Unsafe Simplifications): Mention `m E'.
         (Simplification of Units): Mention `m U'.
         (Trigonometric/Hyperbolic Functions, Reducing and Mapping)
-        (Kinds of Declarations, Functions for Declarations):  Mention
-        "algebraic simplifications" instead of `a s'.
+        (Kinds of Declarations, Functions for Declarations):
+        Mention "algebraic simplifications" instead of `a s'.
         (Algebraic Entry): Remove mention of default simplifications.
 
 2012-07-30  Jay Belanger  <jay.p.belanger@gmail.com>
@@ -1084,8 +1120,8 @@
 
 2012-07-06  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Multi-hops): Introduce
-        `tramp-restricted-shell-hosts-alist'.
+        * tramp.texi (Multi-hops):
+        Introduce `tramp-restricted-shell-hosts-alist'.
 
 2012-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -1277,8 +1313,8 @@
         (Synchronous Methods): Remove obsolete dbus-call-method-non-blocking.
         (Asynchronous Methods): Fix description of
         dbus-call-method-asynchronously.
-        (Receiving Method Calls): Fix some minor errors.  Add
-        dbus-interface-emacs.
+        (Receiving Method Calls): Fix some minor errors.
+        Add dbus-interface-emacs.
         (Signals): Describe unicast signals and the new match rules.
         (Alternative Buses): Add the PRIVATE optional argument to
         dbus-init-bus.  Describe its new return value.  Add dbus-setenv.
@@ -1311,8 +1347,8 @@
 
 2012-04-09  Eli Zaretskii  <eliz@gnu.org>
 
-        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add
-        emacs-gnutls.
+        * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean):
+        Add emacs-gnutls.
         ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets.
 
 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
@@ -1415,7 +1451,7 @@
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
 
-        * org.texi (Key bindings and useful functions): Updated babel key
+        * org.texi (Key bindings and useful functions): Update babel key
         binding documentation in manual.
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
@@ -1516,8 +1552,8 @@
 
 2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.texi (Customizing the IMAP Connection): Mention
-        nnimap-record-commands.
+        * gnus.texi (Customizing the IMAP Connection):
+        Mention nnimap-record-commands.
 
 2012-02-10  Glenn Morris  <rgm@gnu.org>
 
@@ -1588,8 +1624,8 @@
 
 2012-01-03  Bernt Hansen  <bernt@norang.ca>
 
-        * org.texi (Agenda commands): Document
-        `org-clock-report-include-clocking-task'.
+        * org.texi (Agenda commands):
+        Document `org-clock-report-include-clocking-task'.
 
 2012-01-03  Bastien Guerry  <bzg@gnu.org>
 
@@ -1674,8 +1710,8 @@
 
 2012-01-03  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Buffer-wide header arguments): Update
-        documentation to reflect removal of #+PROPERTIES.
+        * org.texi (Buffer-wide header arguments):
+        Update documentation to reflect removal of #+PROPERTIES.
 
 2012-01-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1836,7 +1872,7 @@
 
         * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
         release 8.3.
-        (Preface): Updated support information.
+        (Preface): Update support information.
         (From Bill Wohler): Reset text to original version.  As a
         historical quote, the tense should be correct in the time that it
         was written.
@@ -2038,8 +2074,8 @@
 
 2011-08-15  Bastien Guerry  <bzg@gnu.org>
 
-        * org.texi (Dynamic blocks, Structure editing): Mention
-        the function `org-narrow-to-block'.
+        * org.texi (Dynamic blocks, Structure editing):
+        Mention the function `org-narrow-to-block'.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2066,15 +2102,15 @@
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Conflicts): Changed "yasnippets" to "yasnippet" and
+        * org.texi (Conflicts): Change "yasnippets" to "yasnippet" and
         added extra whitespace around functions to be consistent with the
         rest of the section.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Evaluating code blocks): Expanded discussion of
+        * org.texi (Evaluating code blocks): Expand discussion of
         #+call: line syntax.
-        (Header arguments in function calls): Expanded discussion of
+        (Header arguments in function calls): Expand discussion of
         #+call: line syntax.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
@@ -2104,12 +2140,12 @@
 
 2011-08-15  Tom Dye  <tsd@tsdye.com>
 
-        * org.texi (cache): Improved documentation of code block caches.
+        * org.texi (cache): Improve documentation of code block caches.
 
 2011-08-15  Tom Dye  <tsd@tsdye.com>
 
-        * org.texi (Code block specific header arguments): Documentation
-        of multi-line header arguments.
+        * org.texi (Code block specific header arguments):
+        Documentation of multi-line header arguments.
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2165,15 +2201,15 @@
 
 2011-07-04  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Cleanup remote connections): Add
-        `tramp-cleanup-this-connection'.
+        * tramp.texi (Cleanup remote connections):
+        Add `tramp-cleanup-this-connection'.
 
 2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Subscription Methods): Link to "Group Levels" to explain
         zombies.
         (Checking New Groups): Ditto (bug#8974).
-        (Checking New Groups): Moved the reference to the right place.
+        (Checking New Groups): Move the reference to the right place.
 
 2011-07-03  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
@@ -2200,8 +2236,8 @@
 
 2011-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.texi (Summary Mail Commands): Document
-        `gnus-summary-reply-to-list-with-original'.
+        * gnus.texi (Summary Mail Commands):
+        Document `gnus-summary-reply-to-list-with-original'.
 
 2011-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -2264,7 +2300,7 @@
 
         * gnus.texi (nnmairix caveats, Setup, Registry Article Refer Method)
         (Fancy splitting to parent, Store arbitrary data):
-        Updated gnus-registry docs.
+        Update gnus-registry docs.
 
 2011-04-13  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -3385,8 +3421,8 @@
 
         Sync with Tramp 2.1.19.
 
-        * tramp.texi (Inline methods, Default Method): Mention
-        `tramp-inline-compress-start-size'.  Remove "kludgy" phrase.
+        * tramp.texi (Inline methods, Default Method):
+        Mention `tramp-inline-compress-start-size'.  Remove "kludgy" phrase.
         Remove remark about doubled "-t" argument.
         (Auto-save and Backup): Remove reference to Emacs 21.
         (Filename Syntax): Describe port numbers.
@@ -6040,7 +6076,7 @@
 2007-10-28  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus.texi (nntp-open-via-telnet-and-telnet): Fix grammar.
-        (Agent Parameters): Updated parameter names to match code.
+        (Agent Parameters): Update parameter names to match code.
         (Group Agent Commands): Corrected 'gnus-agent-fetch-series' as
         'gnus-agent-summary-fetch-series'.
         (Agent and flags): New section providing a generalized discussion
@@ -6844,7 +6880,7 @@
         (Tag searches): Document regular expression search for tags.
         (Stuck projects): New section.
         (In-buffer settings): New keywords.
-        (History and Acknowledgments): Updated description.
+        (History and Acknowledgments): Update description.
 
 2007-02-24  Alan Mackenzie  <acm@muc.de>
 
@@ -7076,7 +7112,7 @@
         (Custom agenda views): Section completely rewritten.
         (Summary): Compare with Planner.
         (Feedback): More info about creating backtraces.
-        (Plain lists): Modified example.
+        (Plain lists): Modify example.
         (Breaking down tasks): New section.
         (Custom time format): New section.
         (Time stamps): Document inactive timestamps.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index add1b42a545..4fb4865b8a4 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -24,6 +24,8 @@ SHELL = /bin/sh
 # set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
 
+version=@version@
+
 ## Where the output files go.
 buildinfodir = $(srcdir)/../../info
 ## Directory with emacsver.texi.
@@ -161,8 +163,6 @@ PDF_TARGETS = \
         wisent.pdf \
         woman.pdf
 
-HTML_TARGETS = emacs-faq.html
-
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 
@@ -192,8 +192,6 @@ webhack: clean
 
 dvi: $(DVI_TARGETS)
 
-html: $(HTML_TARGETS)
-
 pdf: $(PDF_TARGETS)
 
 # Note that all the Info targets build the Info files in srcdir.
@@ -400,15 +398,6 @@ faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
 faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
-## This is the name used on the Emacs web-page.
-## sed fixes up links to point to split version of the manual.
-emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(MAKEINFO) $(MAKEINFO_OPTS) --no-split \
-          --css-ref='/layout.css' --html -o $@ ${srcdir}/faq.texi
-        sed -i -e 's|a href="\([a-z]*\)\.html#\([^"]*\)"|a href="manual/html_node/\1/\2.html"|g' \
-          -e 's|/Top\.html|/|g' $@
-emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-        $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
 
 flymake : $(buildinfodir)/flymake$(INFO_EXT)
 $(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi ${gfdl}
@@ -718,16 +707,39 @@ mostlyclean:
         rm -f gnustmp.*
 
 clean: mostlyclean
-        rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS) emacs-faq.text
+        rm -f $(DVI_TARGETS) $(PDF_TARGETS)
+        rm -f emacs-misc-${version}.tar*
 
 distclean: clean
 #       rm -f Makefile
 
 ## buildinfodir is relative to srcdir.
-maintainer-clean: distclean
+infoclean:
         cd $(buildinfodir); for file in $(INFO_TARGETS); do \
           file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \
           rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \
         done
 
+maintainer-clean: distclean infoclean
+
+dist:
+        rm -rf emacs-misc-${version}
+        mkdir emacs-misc-${version}
+        cp ${srcdir}/*.texi ${srcdir}/texinfo.tex \
+          $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \
+          emacs-misc-${version}/
+        sed -e 's/@sr[c]dir@/./' \
+          -e 's/^\(emacsdir *=\).*/\1 ./' \
+          -e 's/^\(buildinfodir *=\).*/\1 ./' \
+          -e 's/^\(clean:.*\)/\1 infoclean/' \
+          -e "s/@ver[s]ion@/${version}/" \
+          -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
+          ${srcdir}/Makefile.in > emacs-misc-${version}/Makefile
+        @if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \
+          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+        fi
+        tar -cf emacs-misc-${version}.tar emacs-misc-${version}
+        rm -rf emacs-misc-${version}
+
 ### Makefile ends here
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 0da422fe14f..bd0ac0828cc 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -378,12 +378,13 @@ Similar to, but slightly different from, the GNU Coreutils
 
 @item define
 @cmindex define
-Define a varalias.  @xref{Variable Aliases, , , elisp}.
+Define a varalias.
+@xref{Variable Aliases, , , elisp, The Emacs Lisp Reference Manual}.
 
 @item diff
 @cmindex diff
 Use Emacs's internal @code{diff} (not to be confused with
-@code{ediff}).  @xref{Comparing Files, , , elisp}.
+@code{ediff}).  @xref{Comparing Files, , , emacs, The GNU Emacs Manual}.
 
 @item grep
 @cmindex grep
@@ -422,15 +423,18 @@ and @code{("foo" "bar")} both evaluate to @code{("foo" "bar")}.
 @item locate
 @cmindex locate
 Alias to Emacs's @code{locate} function, which simply runs the external
-@command{locate} command and parses the results.  @xref{Dired and `find', , , elisp}.
+@command{locate} command and parses the results.
+@xref{Dired and Find, , , emacs, The GNU Emacs Manual}.
 
 @item make
 @cmindex make
-Run @command{make} through @code{compile}.  @xref{Running Compilations under Emacs, , , elisp}.
+Run @command{make} through @code{compile}.
+@xref{Compilation, , , emacs, The GNU Emacs Manual}.
 
 @item occur
 @cmindex occur
-Alias to Emacs's @code{occur}.  @xref{Other Search-and-Loop Commands, , , elisp}.
+Alias to Emacs's @code{occur}.
+@xref{Other Repeating Search, , , emacs, The GNU Emacs Manual}.
 
 @item printnl
 @cmindex printnl
@@ -648,7 +652,8 @@ variables in command invocations.
 
 @item $#var
 Expands to the length of the value bound to @code{var}.  Raises an error
-if the value is not a sequence (@pxref{Sequences Arrays and Vectors, Sequences, , elisp}).
+if the value is not a sequence
+(@pxref{Sequences Arrays Vectors, Sequences, , elisp, The Emacs Lisp Reference Manual}).
 
 @item $(lisp)
 Expands to the result of evaluating the S-expression @code{(lisp)}.  On
@@ -680,7 +685,8 @@ any regular expression.  So to split on numbers, use @samp{$var["[0-9]+" 10 20]}
 
 @item $var[hello]
 Calls @code{assoc} on @code{var} with @code{"hello"}, expecting it to be
-an alist (@pxref{Association List Type, Association Lists, , elisp}).
+an alist (@pxref{Association List Type, Association Lists, , elisp,
+The Emacs Lisp Reference Manual}).
 
 @item $#var[hello]
 Returns the length of the cdr of the element of @code{var} who car is equal
@@ -693,9 +699,11 @@ to @code{"hello"}.
 Eshell's globbing syntax is very similar to that of Zsh.  Users coming
 from Bash can still use Bash-style globbing, as there are no
 incompatibilities.  Most globbing is pattern-based expansion, but there
-is also predicate-based expansion.  See @ref{Filename Generation, , , zsh}
+is also predicate-based expansion.  See
+@ref{Filename Generation, , , zsh, The Z Shell Manual}
 for full syntax.  To customize the syntax and behaviour of globbing in
-Eshell see the Customize@footnote{@xref{Customization Settings, Customize, , elisp}.}
+Eshell see the Customize@footnote{@xref{Easy Customization, , , emacs,
+The GNU Emacs Manual}.}
 groups ``eshell-glob'' and ``eshell-pred''.
 
 @node Input/Output
@@ -757,7 +765,8 @@ can be disabled and enabled without having to unload and reload them,
 and to provide a common parent Customize group for the
 modules.@footnote{ERC provides a similar module facility.}  An Eshell
 module is defined the same as any other library but one requirement: the
-module must define a Customize@footnote{@xref{Customization Settings, Customize, , elisp}.}
+module must define a Customize@footnote{@xref{Customization, , ,
+elisp, The Emacs Lisp Reference Manual}.}
 group using @code{eshell-defgroup} (in place of @code{defgroup}) with
 @code{eshell-module} as the parent group.@footnote{If the module has
 no user-customizable options, then there is no need to define it as an
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index f88bd95008c..d1f3e21c20e 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -311,6 +311,9 @@ Used when looking for a master file.  @xref{Locating a master file}.
 Patterns for error/warning messages in the form @code{(regexp file-idx
 line-idx col-idx err-text-idx)}.  @xref{Parsing the output}.
 
+@item flymake-warning-predicate
+Predicate to classify error text as warning. @xref{Parsing the output}.
+
 @item flymake-compilation-prevents-syntax-check
 A flag indicating whether compilation and syntax check of the same
 file cannot be run simultaneously.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b4d786c4d45..6df72f87fc7 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14240,7 +14240,8 @@ variables are relevant:
 
 @table @code
 @item nnimap-inbox
-This is the @acronym{IMAP} mail box that will be scanned for new mail.
+This is the @acronym{IMAP} mail box that will be scanned for new
+mail.  This can also be a list of mail box names.
 
 @item nnimap-split-methods
 Uses the same syntax as @code{nnmail-split-methods} (@pxref{Splitting
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 4c3740f02f7..1121a450ebd 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -214,6 +214,8 @@ Configuring @value{tramp} for use
 * Customizing Completion::      Selecting config files for user/host name completion.
 * Password handling::           Reusing passwords for several connections.
 * Connection caching::          Reusing connection related information.
+* Predefined connection information::
+                                Setting own connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
 * Android shell setup::         Android shell setup hints.
@@ -542,6 +544,8 @@ Method}.
 * Customizing Completion::      Selecting config files for user/host name completion.
 * Password handling::           Reusing passwords for several connections.
 * Connection caching::          Reusing connection related information.
+* Predefined connection information::
+                                Setting own connection related information.
 * Remote Programs::             How @value{tramp} finds and uses programs on the remote machine.
 * Remote shell setup::          Remote shell setup hints.
 * Android shell setup::         Android shell setup hints.
@@ -1727,6 +1731,35 @@ connection related information for this host, and opens the
 connection again.
 
 
+@node Predefined connection information
+@section Setting own connection related information
+
+Sometimes, @var{tramp} is not able to detect correct connection
+related information.  In such cases, you could tell @var{tramp} which
+value it has to take.  Since this could result in errors, it has to be
+used with care.
+
+@vindex tramp-connection-properties
+Such settings can be performed via the list
+@code{tramp-connection-properties}.  An entry in this list has the
+form @code{(@var{regexp} @var{property} @var{value})}.  @var{regexp}
+matches remote file names for which a property shall be predefined.
+It can be @code{nil}.  @var{property} is a string, and @var{value} the
+corresponding value.  @var{property} could be any property found in
+the file @code{tramp-persistency-file-name}.
+
+A special property is @code{"busybox"}.  This must be set, if the
+remote host runs a very restricted busybox as shell, which closes the
+connection at will.  Since there is no reliable test for this,
+@var{tramp} must be indicated this way.  Example:
+
+@lisp
+(add-to-list 'tramp-connection-properties
+             (list (regexp-quote "@trampfn{ssh, user, randomhost.your.domain,}")
+                   "busybox" t))
+@end lisp
+
+
 @node Remote Programs
 @section How @value{tramp} finds and uses programs on the remote machine
 
@@ -1874,7 +1907,7 @@ key.
 
 @var{tramp-password-prompt-regexp} handles the detection of such
 requests for English environments.  When you use another localization
-of your (local or remote) host, you might need to adapt this. Example:
+of your (local or remote) host, you might need to adapt this.  Example:
 
 @lisp
 (setq
@@ -2048,7 +2081,8 @@ You can instruct @value{tramp} by this form:
 @end lisp
 
 @noindent
-with @samp{192.168.0.26} being the IP address of your Android device.
+with @samp{192.168.0.26} being the IP address of your Android device
+(@pxref{Predefined connection information}).
 
 The user settings for the @code{$PATH} environment variable must be
 preserved.  It has also been reported, that the commands in