merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now

20 files changed, 336 insertions, 161 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4cae3d0a478..e4a66e19877 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,84 @@
+2013-07-06  Glenn Morris  <rgm@gnu.org>
+
+        * mh-e.texi: Fix external links.
+        (Using This Manual): Printed elisp manuals no longer available.
+
+        * newsticker.texi (Overview): Update URL.
+
+        * nxml-mode.texi (Introduction): Update URL.
+
+        * org.texi (JavaScript support): Fix URL.
+
+        * wisent.texi (Wisent Overview): Remove incorrect, unnecessary uref.
+
+        * eudc.texi (CCSO PH/QI): Remove defunct URL.
+
+        * dbus.texi (Introspection): Update URL to a less defunct one.
+
+        * gnus.texi (Top): Restrict "Other related manuals" to info output.
+        (Foreign Groups): Use @indicateurl for examples.
+        (Direct Functions): Remove defunct URL.
+        (RSS): Update URL.
+
+        * gnus-faq.texi (FAQ 5-8, FAQ 6-3): Remove defunct URLs.
+        (FAQ 7-1): Update URL.
+
+        * pgg.texi (Top, Overview): Add note about obsolescence.
+
+2013-07-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Merge from gnulib.
+
+2013-07-03  Glenn Morris  <rgm@gnu.org>
+
+        * bovine.texi (top):
+        * cc-mode.texi (AWK Mode Font Locking):
+        * mh-e.texi (Preface):
+        * url.texi (URI Parsing): Fix cross-references to other manuals.
+
+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
+        for keys q and Q.
+        (Standards): Reference RFC5804 as the defining document of the
+        managesieve protocol.
+
 2013-06-10  Aidan Gauland  <aidalgol@amuri.net>
 
         * eshell.texi (Input/Output): Expand to cover new visual-command
@@ -39,7 +120,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>
@@ -78,8 +159,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>
 
@@ -117,8 +198,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>
 
@@ -198,8 +279,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>
@@ -338,8 +419,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>
 
@@ -494,7 +575,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.
@@ -556,8 +637,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.
 
@@ -576,8 +657,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>
@@ -677,14 +758,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>
@@ -807,8 +888,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>
 
@@ -840,8 +921,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".
@@ -868,8 +949,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
@@ -950,7 +1031,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.
 
@@ -998,7 +1079,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
@@ -1039,13 +1120,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>
@@ -1077,8 +1158,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>
 
@@ -1270,8 +1351,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.
@@ -1304,8 +1385,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>
@@ -1408,7 +1489,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>
@@ -1509,8 +1590,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>
 
@@ -1581,8 +1662,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>
 
@@ -1667,8 +1748,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>
 
@@ -1829,7 +1910,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.
@@ -2031,8 +2112,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>
 
@@ -2059,15 +2140,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>
@@ -2097,12 +2178,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>
 
@@ -2158,15 +2239,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)
 
@@ -2193,8 +2274,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>
 
@@ -2257,7 +2338,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>
 
@@ -3378,8 +3459,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.
@@ -6033,7 +6114,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
@@ -6837,7 +6918,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>
 
@@ -7069,7 +7150,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/bovine.texi b/doc/misc/bovine.texi
index 978345e5cc8..81ec2eb80ec 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -76,7 +76,7 @@ The @dfn{bovine} parser is the original @semantic{} parser, and is an
 implementation of an @acronym{LL} parser.  It is good for simple
 languages.  It has many conveniences making grammar writing easy.  The
 conveniences make it less powerful than a Bison-like @acronym{LALR}
-parser.  For more information, @inforef{top, the Wisent Parser Manual,
+parser.  For more information, @inforef{Top, The Wisent Parser Manual,
 wisent}.
 
 Bovine @acronym{LL} grammars are stored in files with a @file{.by}
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 4fa4e12cf88..4cc5d9c5767 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -2111,7 +2111,7 @@ contributing it: send a note to @email{bug-cc-mode@@gnu.org}.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 The general appearance of font-locking in AWK mode is much like in any
-other programming mode.  @xref{Faces For Font Lock,,,elisp, GNU Emacs
+other programming mode.  @xref{Faces for Font Lock,,,elisp, GNU Emacs
 Lisp Reference Manual}.
 
 The following faces are, however, used in a non-standard fashion in
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index c40a5e313f5..52c3c883cc8 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -403,8 +403,11 @@ Every dictionary entry has a string as key, and a variant as value.
 The interface offers also a signal, which returns 2 parameters: an
 integer, and an array consisting of elements which are a struct of a
 string and 2 boolean values.@footnote{ The interfaces of the service
-@samp{org.freedesktop.Hal} are described at
-@uref{http://people.freedesktop.org/~david/hal-spec/hal-spec.html#interfaces}.}
+@samp{org.freedesktop.Hal} are described in
+@c Previous link is gone.  Since HAL is now obsolete, this URL
+@c (unchanged in ~ 4 years) feels like it might go too...
+@uref{http://people.freedesktop.org/~dkukawka/hal-spec-git/hal-spec.html#interfaces,
+the HAL specification}.}
 @end defun
 
 @defun dbus-introspect-xml bus service path
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/eudc.texi b/doc/misc/eudc.texi
index 5b06cc7f11a..747494ffbde 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -150,14 +150,17 @@ 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}.  As of 2010, the
-code can still be downloaded from @url{http://www-dev.cites.uiuc.edu/ph/}.
-
-The original command-line @samp{ph} client that comes with the
-@samp{ph/qi} distribution provides additional features like the
-possibility to communicate with the server in login-mode which makes it
-possible to change records in the database.  This is not implemented in
-EUDC.
+@samp{qi} and a command-line client called @samp{ph}.
+@ignore
+Until 2010, the code could be downloaded from
+@url{http://www-dev.cites.uiuc.edu/ph/}.
+@end ignore
+
+The original command-line @samp{ph} client that came with the
+@samp{ph/qi} distribution provided additional features that are
+not implemented in EUDC, like the possibility to communicate with the
+server in login-mode, which made it possible to change records in the
+database.
 
 
 @node BBDB
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-faq.texi b/doc/misc/gnus-faq.texi
index cb900626670..ff29647d166 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -1518,8 +1518,9 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted
 
 If you can't use compface, there's an online X-face converter at
 @uref{http://www.dairiki.org/xface/}.
-If you use MS Windows, you could also use the WinFace program from
-@uref{http://www.xs4all.nl/~walterln/winface/}.
+If you use MS Windows, you could also use the WinFace program,
+which used to be available from
+@indicateurl{http://www.xs4all.nl/~walterln/winface/}.
 Now you only have to tell Gnus to include the X-face in your postings by saying
 
 @example
@@ -1812,15 +1813,20 @@ too.
 Of course you can also use grep to search through your
 local mail, but this is both slow for big archives and
 inconvenient since you are not displaying the found mail
-in Gnus. Here comes nnir into action. Nnir is a front end
+in Gnus.  Here nnir comes into action.  Nnir is a front end
 to search engines like swish-e or swish++ and
-others. You index your mail with one of those search
+others.  You index your mail with one of those search
 engines and with the help of nnir you can search through
 the indexed mail and generate a temporary group with all
-messages which met your search criteria. If this sound
-cool to you get nnir.el from
+messages which met your search criteria.  If this sounds
+cool to you, get nnir.el from
+@c FIXME Isn't this file in Gnus?
+@ignore
+@c Dead link 2013/7.
 @uref{ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/emacs/}
-or @uref{ftp://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
+or
+@end ignore
+@uref{ftp://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
 Instructions on how to use it are at the top of the file.
 
 @node FAQ 6-4
@@ -1943,7 +1949,7 @@ the easiest solution is a small nntp server like
 @uref{http://infa.abo.fi/~patrik/sn/, sn},
 of course you can also install a full featured news
 server like
-@uref{http://www.isc.org/products/INN/, inn}.
+@uref{http://www.isc.org/software/inn/, inn}.
 Then you want to fetch your Mail, popular choices
 are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail}
 and @uref{http://pyropus.ca/software/getmail/, getmail}.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b4d786c4d45..3d4bd378869 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -420,6 +420,9 @@ This manual corresponds to Gnus v5.13
 * Index::                    Variable, function and concept index.
 * Key Index::                Key Index.
 
+@c Doesn't work right in html.
+@c FIXME Do this in a more standard way.
+@ifinfo
 Other related manuals
 
 * Message:(message).         Composing messages.
@@ -427,6 +430,7 @@ Other related manuals
 * Sieve:(sieve).             Managing Sieve scripts in Emacs.
 * EasyPG:(epa).              @acronym{PGP/MIME} with Gnus.
 * SASL:(sasl).               @acronym{SASL} authentication in Emacs.
+@end ifinfo
 
 @detailmenu
  --- The Detailed Node Listing ---
@@ -2712,11 +2716,11 @@ the article range.
 This command is similar to @code{gnus-read-ephemeral-gmane-group}, but
 the group name and the article number and range are constructed from a
 given @acronym{URL}.  Supported @acronym{URL} formats include:
-@url{http://thread.gmane.org/gmane.foo.bar/12300/focus=12399},
-@url{http://thread.gmane.org/gmane.foo.bar/12345/},
-@url{http://article.gmane.org/gmane.foo.bar/12345/},
-@url{http://permalink.gmane.org/gmane.foo.bar/12345/}, and
-@url{http://news.gmane.org/group/gmane.foo.bar/thread=12345}.
+@indicateurl{http://thread.gmane.org/gmane.foo.bar/12300/focus=12399},
+@indicateurl{http://thread.gmane.org/gmane.foo.bar/12345/},
+@indicateurl{http://article.gmane.org/gmane.foo.bar/12345/},
+@indicateurl{http://permalink.gmane.org/gmane.foo.bar/12345/}, and
+@indicateurl{http://news.gmane.org/group/gmane.foo.bar/thread=12345}.
 
 @item gnus-read-ephemeral-emacs-bug-group
 @findex gnus-read-ephemeral-emacs-bug-group
@@ -13809,9 +13813,12 @@ installed.  You then define a server as follows:
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
 Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have @uref{http://www.openssl.org, OpenSSL} or
-@uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay} installed.  You
-then define a server as follows:
+this you must have @uref{http://www.openssl.org, OpenSSL}
+@ignore
+@c Defunct URL, ancient package, so don't mention it.
+or @uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay}
+@end ignore
+installed.  You then define a server as follows:
 
 @lisp
 ;; @r{"snews" is port 563 and is predefined in our @file{/etc/services}}
@@ -14240,7 +14247,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
@@ -16952,7 +16960,7 @@ Some web sites have an RDF Site Summary (@acronym{RSS}).
 @acronym{RSS} is a format for summarizing headlines from news related
 sites (such as BBC or CNN).  But basically anything list-like can be
 presented as an @acronym{RSS} feed: weblogs, changelogs or recent
-changes to a wiki (e.g., @url{http://cliki.net/recent-changes.rdf}).
+changes to a wiki (e.g., @url{http://cliki.net/site/recent-changes}).
 
 @acronym{RSS} has a quite regular and nice interface, and it's
 possible to get the information Gnus needs to keep groups updated.
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 154120f2e3b..a0ea0fe6de9 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -233,7 +233,7 @@ read an online tutorial by starting GNU Emacs and typing @kbd{C-h t}
 @cite{GNU Emacs Manual},
 @end iftex
 @ifinfo
-@ref{top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
+@ref{Top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
 @end ifinfo
 @ifhtml
 @uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/,
@@ -1121,38 +1121,23 @@ exist,
 @footnote{The @cite{GNU Emacs Lisp Reference Manual} may be available
 online in the Info system by typing @kbd{C-h i m Emacs Lisp
 @key{RET}}. It is also available online at @*
-@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
-You can also order a printed manual, which has the desirable
-side-effect of helping to support the Free Software Foundation which
-made all this great software available. You can find an order form by
-running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+@uref{http://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end iftex
 @ifinfo
 @footnote{@xref{Top, The GNU Emacs Lisp Reference Manual, , elisp, GNU
 Emacs Lisp Reference Manual}, which may be available online in the
 Info system. It is also available online at
-@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
-You can also order a printed manual, which has the desirable
-side-effect of helping to support the Free Software Foundation which
-made all this great software available. You can find an order form by
-running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+@uref{http://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end ifinfo
 @ifhtml
 @footnote{The
-@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/,
+@uref{http://www.gnu.org/software/emacs/manual/elisp.html,
 The GNU Emacs Lisp Reference Manual} may also be available online in
-the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}. You can
-also order a printed manual, which has the desirable side-effect of
-helping to support the Free Software Foundation which made all this
-great software available. You can find an order form by running
-@kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}.}
 @end ifhtml
 and you can look at the code itself for examples. Look in the Emacs
 Lisp directory on your system (such as
-@file{/usr/local/lib/emacs/lisp/mh-e}) and find all the @file{mh-*.el}
+@file{/usr/local/share/emacs/lisp/mh-e}) and find all the @file{mh-*.el}
 files there. When calling MH-E and other Emacs Lisp functions directly
 from Emacs Lisp code, you'll need to know the correct arguments. Use
 the online help for this. For example, try @kbd{C-h f
@@ -2848,7 +2833,7 @@ See @cite{The PGG Manual}.
 @end ifinfo
 @ifhtml
 See
-@uref{http://www.dk.xemacs.org/Documentation/packages/html/pgg.html,
+@uref{http://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
@@ -5058,7 +5043,7 @@ for the next hook function. The standard prefix
 @vindex mh-yank-behavior
 
 For example, if you use the hook function
-@uref{http://shasta.cs.uiuc.edu/~lrclause/tc.html,
+@uref{http://www.emacswiki.org/emacs/TrivialCite,
 @code{trivial-cite}} (which is NOT part of Emacs), set
 @code{mh-yank-behavior} to @samp{Body and Header}.
 
@@ -5615,7 +5600,7 @@ See @cite{The PGG Manual}.
 @end ifinfo
 @ifhtml
 See
-@uref{http://www.dk.xemacs.org/Documentation/packages/html/pgg.html,
+@uref{http://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 8f37453524c..ab3bffc2ce9 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -89,7 +89,7 @@ works with the following RSS formats:
 as well as the following Atom formats:
 @item Atom 0.3
 @item Atom 1.0 (see
-@uref{http://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt}).
+@uref{https://datatracker.ietf.org/doc/rfc4287/}).
 @end itemize
 
 That makes Newsticker.el an ``Atom aggregator'', ``RSS reader'', ``Feed
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 13e91d12819..8c81b6fbd20 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -86,7 +86,11 @@ convert a RELAX NG XML syntax schema to an RNC schema.
 
 @noindent To convert a RELAX NG XML syntax (@samp{.rng}) schema to a RNC
 one, you can also use the XSLT stylesheet from
+@url{https://github.com/oleg-pavliv/emacs/tree/master/xsl}.
+@ignore
+@c Original location, now defunct.
 @url{http://www.pantor.com/download.html}.
+@end ignore
 
 To convert a W3C XML Schema to an RNC schema, you need first to convert it
 to RELAX NG XML syntax using the RELAX NG converter tool @code{rngconv}
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 1d7de18ada6..832976e9ea0 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -10393,7 +10393,7 @@ view type is a @emph{folding} view much like Org provides inside Emacs.  The
 script is available at @url{http://orgmode.org/org-info.js} and you can find
 the documentation for it at @url{http://orgmode.org/worg/code/org-info-js/}.
 We host the script at our site, but if you use it a lot, you might
-not want to be dependent on @url{orgmode.org} and prefer to install a local
+not want to be dependent on @url{http://orgmode.org} and prefer to install a local
 copy on your own web server.
 
 To use the script, you need to make sure that the @file{org-jsinfo.el} module
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index a18a22e649f..370998c855a 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -54,6 +54,8 @@ modify this GNU manual.''
 PGG is an interface library between Emacs
 and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
+This package is obsolete; for new code we recommend EasyPG instead.
+@xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}.
 
 @ifnottex
 @insertcopying
@@ -78,6 +80,9 @@ communication.  Even though Mailcrypt has similar feature, it does not
 deal with detached PGP messages, normally used in PGP/MIME
 infrastructure.  This was the main reason why I wrote the new library.
 
+Note that the PGG library is now obsolete, replaced by EasyPG.
+@xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}.
+
 PGP/MIME is an application of MIME Object Security Services (RFC1848).
 The standard is documented in RFC2015.
 
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index b84c3047ec1..f69e2b9b948 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -149,7 +149,7 @@ When a server has been successfully contacted, the Manage Sieve buffer
 looks something like:
 
 @example
-Server  : mailserver:2000
+Server  : mailserver:sieve
 
 2 scripts on server, press RET on a script name edits it, or
 press RET on <new script> to create a new script.
@@ -214,6 +214,11 @@ Bury the Manage Sieve buffer without closing the connection.
 @findex sieve-help
 Displays help in the minibuffer.
 
+@item Q
+@kindex Q
+@findex sieve-manage-quit
+Quit Manage Sieve and close the connection.
+
 @end table
 
 @node Examples
@@ -342,7 +347,7 @@ lists the relevant ones.  They can all be fetched from
 @item RFC3028
 Sieve: A Mail Filtering Language.
 
-@item draft-martin-managesieve-03
+@item RFC5804
 A Protocol for Remotely Managing Sieve Scripts
 
 @end table
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 85f184cc4cb..3427d2ad0e3 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2013-02-01.11}
+\def\texinfoversion{2013-06-23.10}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2475,14 +2475,14 @@ end
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
+% (But see \codedashfinish below.)
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 %
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
-%  -- rms.
+% and arrange explicitly to hyphenate at a dash. -- rms.
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
@@ -2499,14 +2499,33 @@ end
      \let-\normaldash
      \let_\realunder
     \fi
+    % Given -foo (with a single dash), we do not want to allow a break
+    % after the hyphen.
+    \global\let\codedashprev=\codedash
+    %
     \codex
   }
+  %
+  \gdef\codedash{\futurelet\next\codedashfinish}
+  \gdef\codedashfinish{%
+    \normaldash % always output the dash character itself.
+    % 
+    % Now, output a discretionary to allow a line break, unless
+    % (a) the next character is a -, or
+    % (b) the preceding character is a -.
+    % E.g., given --posix, we do not want to allow a break after either -.
+    % Given --foo-bar, we do want to allow a break between the - and the b.
+    \ifx\next\codedash \else
+      \ifx\codedashprev\codedash 
+      \else \discretionary{}{}{}\fi
+    \fi
+    \global\let\codedashprev=\next
+  }
 }
-
+\def\normaldash{-}
+%
 \def\codex #1{\tclose{#1}\endgroup}
 
-\def\normaldash{-}
-\def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
   % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
@@ -4211,8 +4230,9 @@ end
 
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
-%
-% To get special treatment of `@end ifset,' call \makeond and the redefine.
+% 
+% To get the special treatment we need for `@end ifset,' we call
+% \makecond and then redefine.
 %
 \makecond{ifset}
 \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
@@ -6402,7 +6422,7 @@ end
 \newdimen\nonfillparindent
 \def\nonfillstart{%
   \aboveenvbreak
-  \hfuzz = 12pt % Don't be fussy
+  \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output
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
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 49f8f3f0959..fdec68b1c61 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -138,7 +138,7 @@ Given a parsed URI, this function returns the corresponding URI string.
   The return value of @code{url-generic-parse-url}, and the argument
 expected by @code{url-recreate-url}, is a @dfn{parsed URI}: a CL
 structure whose slots hold the various components of the URI@.
-@xref{top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
+@xref{Top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
 details about CL structures.  Most of the other functions in the
 @code{url} library act on parsed URIs.
 
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index d8557b84a4f..c0f18f6363a 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -113,9 +113,6 @@ of GNU Bison 1.28 & 1.31.
 
 For more details on the basic concepts for understanding Wisent, it is
 worthwhile to read the @ref{Top, Bison Manual, , bison}.
-@ifhtml
-@uref{http://www.gnu.org/manual/bison/html_node/index.html}.
-@end ifhtml
 
 Wisent can generate compilers compatible with the @semantic{} tool set.
 See the @ref{Top, Semantic Manual, , semantic}.