merge trunk

9 files changed, 379 insertions, 105 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 46fb672e28a..722d11c70f2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cl.texi (Function Bindings): Fix incorrect description of cl-let.
+
+2014-01-09  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * Makefile.in: Add eww.texi.
+        * eww.texi: New file.
+
 2014-01-07  Glenn Morris  <rgm@gnu.org>
 
         * efaq.texi (Problems with very large files): Fix superscript typo.
@@ -13,8 +22,8 @@
         (Advanced configuration)
         (Header arguments in Org mode properties): Spelling fixes.
         (Special blocks): Add #+BEGIN_ABSTRACT as another example.
-        (@LaTeX{} specific attributes): New index entries.  Use
-        #+BEGIN_ABSTRACT in the example.
+        (@LaTeX{} specific attributes): New index entries.
+        Use #+BEGIN_ABSTRACT in the example.
 
 2013-01-07  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -75,7 +84,7 @@
 
 2014-01-02  Aidan Gauland  <aidalgol@amuri.net>
 
-        * eshell.texi (Command Basics): Removed `Command basics' chapter.
+        * eshell.texi (Command Basics): Remove `Command basics' chapter.
 
 2014-01-02  Aidan Gauland  <aidalgol@amuri.net>
 
@@ -195,8 +204,8 @@
         * org.texi (Orgstruct mode): Fix suggested setting of
         `orgstruct-heading-prefix-regexp'.
 
-        * org.texi (Export settings): Document
-        `org-export-allow-bind-keywords'.
+        * org.texi (Export settings):
+        Document `org-export-allow-bind-keywords'.
 
         * org.texi (History and Acknowledgments): Small rephrasing.
 
@@ -204,8 +213,8 @@
         in a year datetree.
 
         * org.texi (Beamer export, @LaTeX{} and PDF export)
-        (Header and sectioning, @LaTeX{} specific attributes): Enhance
-        style.
+        (Header and sectioning, @LaTeX{} specific attributes):
+        Enhance style.
 
         * org.texi (Agenda commands): Add a footnote about dragging agenda
         lines: it does not persist and it does not change the .org files.
@@ -224,15 +233,15 @@
 
         * org.texi (Other built-in back-ends): New section.
 
-        * org.texi (Editing source code): Document
-        `org-edit-src-auto-save-idle-delay' and
+        * org.texi (Editing source code):
+        Document `org-edit-src-auto-save-idle-delay' and
         `org-edit-src-turn-on-auto-save'.
 
         * org.texi (External links): Document contributed link types
         separately.
 
-        * org.texi (Closing items): Document
-        `org-closed-keep-when-no-todo'.
+        * org.texi (Closing items):
+        Document `org-closed-keep-when-no-todo'.
 
         * org.texi (Export back-ends): Rename from "Export formats".
         (The Export Dispatcher): Remove reference to
@@ -268,8 +277,8 @@
         (Agenda commands): Move details about filtering commands to
         the new section, only include a summary here.
         (Customizing tables in ODT export)
-        (System-wide header arguments, Conflicts, Dynamic blocks): Use
-        spaces for indentation.
+        (System-wide header arguments, Conflicts, Dynamic blocks):
+        Use spaces for indentation.
 
         * org.texi (Emphasis and monospace): Mention `org-emphasis-alist'.
 
@@ -326,8 +335,8 @@
         (In-buffer settings): Update to reflect changes from the new
         export engine.
 
-        * org.texi (Matching tags and properties): More examples.  Explain
-        group tags expansion as regular expressions.
+        * org.texi (Matching tags and properties): More examples.
+        Explain group tags expansion as regular expressions.
 
         * org.texi (Tag groups): New section.
 
@@ -352,8 +361,8 @@
 
         * org.texi (Org syntax): New section.
 
-        * org.texi (Orgstruct mode): Document
-        `orgstruct-heading-prefix-regexp'.
+        * org.texi (Orgstruct mode):
+        Document `orgstruct-heading-prefix-regexp'.
 
         * org.texi (Speeding up your agendas): New section.
 
@@ -377,8 +386,8 @@
         * org.texi: Update the list contributions.
 
         * org.texi (Agenda commands): Exporting the agenda to an .org file
-        will not copy the subtrees and the inherited tags.  Document
-        `org-agenda-filter-by-regexp'.
+        will not copy the subtrees and the inherited tags.
+        Document `org-agenda-filter-by-regexp'.
 
         * org.texi (Publishing action, Complex example): Fix names of
         publishing functions.
@@ -392,8 +401,8 @@
         * org.texi (Capture): Mention that org-remember.el is not
         supported anymore.
 
-        * org.texi (Top, Exporting, Beamer class export): Delete
-        references to the TaskJuggler export.
+        * org.texi (Top, Exporting, Beamer class export):
+        Delete references to the TaskJuggler export.
         (History and Acknowledgments): Mention that the TaskJuggler has
         been rewritten by Nicolas and now lives in the contrib/ directory
         of Org's distribution.  Mention that Jambunathan rewrote the HTML
@@ -410,16 +419,16 @@
         (@LaTeX{} and PDF export, Header and sectioning)
         (Publishing options): Fix LaTeX options names.
 
-        * org.texi (Export options, CSS support, In-buffer settings): Fix
-        references to HTML_LINK_* and HTML_STYLE keywords.
+        * org.texi (Export options, CSS support, In-buffer settings):
+        Fix references to HTML_LINK_* and HTML_STYLE keywords.
 
         * org.texi (Export options, In-buffer settings): Fix references to
         #+SELECT_TAGS and #+EXCLUDE_TAGS and remove reference to #+XSLT.
 
         * org.texi (Top, Markup, Initial text, Images and tables)
         (@LaTeX{} fragments, @LaTeX{} fragments, Exporting)
-        (Export options, JavaScript support, Beamer class export): Remove
-        references to the DocBook export, which has been deleted.
+        (Export options, JavaScript support, Beamer class export):
+        Remove references to the DocBook export, which has been deleted.
         (History and Acknowledgments): Mention that DocBook has been
         deleted, suggest to use the Texinfo exporter instead, then to
         convert the .texi to DocBook with makeinfo.
@@ -428,8 +437,8 @@
         * org.texi (Deadlines and scheduling): Add a variable to the
         index.  Add documentation about delays for scheduled tasks.
 
-        * org.texi (Emphasis and monospace): Mention
-        `org-fontify-emphasized-text' and
+        * org.texi (Emphasis and monospace):
+        Mention `org-fontify-emphasized-text' and
         `org-emphasis-regexp-components'.
 
         * org.texi (References): Small enhancement.
@@ -486,7 +495,7 @@
 
         * org.texi (Extracting source code): Mention the prefix argument
         to org-babel-tangle.
-        (noweb): Removed erroneous negative.
+        (noweb): Remove erroneous negative.
         (Specific header arguments): Document new header arguments.
         Documentation for new tangle-mode header argument.
         (Top): Documentation for new tangle-mode header argument.
@@ -590,8 +599,8 @@
         * org.texi (Header and sectioning): Add a footnote about the
         different between LATEX_HEADER_EXTRA and LATEX_HEADER.
 
-        * org.texi (The Export Dispatcher): Document
-        `org-export-in-background'.
+        * org.texi (The Export Dispatcher):
+        Document `org-export-in-background'.
 
         * org.texi (Footnotes): Export back-ends do not use
         `org-footnote-normalize' anymore.
@@ -613,19 +622,19 @@
         * org.texi (Include files): Remove reference to :prefix1
         and :prefix.  Give more details for :minlevel.
 
-        * org.texi (Macro replacement): Fix macro name.  Update
-        documentation about possible locations and escaping mechanism.
+        * org.texi (Macro replacement): Fix macro name.
+        Update documentation about possible locations and escaping mechanism.
 
-        * org.texi (Table of contents): Update documentation.  Document
-        lists of listings and lists of tables.  Add documentation for
+        * org.texi (Table of contents): Update documentation.
+        Document lists of listings and lists of tables.  Add documentation for
         optional title and #+TOC: keyword.
 
 2013-11-12  Rick Frankel  <rick@rickster.com>
 
         * org.texi (results): Add Format section, broken out of Type
         section to match code.
-        (hlines, colnames): Remove incorrect Emacs Lisp exception.  Note
-        that the actual default handling (at least for python and
+        (hlines, colnames): Remove incorrect Emacs Lisp exception.
+        Note that the actual default handling (at least for python and
         emacs-lisp) does not seem to match the description.
 
 2013-11-12  Sacha Chua  <sacha@sachachua.com>  (tiny change)
@@ -635,8 +644,8 @@
 
 2013-11-12  Yasushi Shoji  <yashi@atmark-techno.com>
 
-        * org.texi (Resolving idle time): Document
-        `org-clock-x11idle-program-name'.
+        * org.texi (Resolving idle time):
+        Document `org-clock-x11idle-program-name'.
 
 2013-10-24  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -655,7 +664,7 @@
 
 2013-10-17  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.el (Data Type Formats): Don't specify the size at
+        * calc.texi (Data Type Formats): Don't specify the size at
         which integers begin to be represented by lists.
 
 2013-10-14  Xue Fuqiao  <xfq.free@gmail.com>
@@ -877,8 +886,8 @@
 
 2013-07-29  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp.texi (Frequently Asked Questions): Mention
-        `tramp-use-ssh-controlmaster-options'.
+        * tramp.texi (Frequently Asked Questions):
+        Mention `tramp-use-ssh-controlmaster-options'.
 
 2013-07-26  Tassilo Horn  <tsdh@gnu.org>
 
@@ -922,8 +931,8 @@
 2013-07-08  Tassilo Horn  <tsdh@gnu.org>
 
         * gnus.texi (lines): Correct description of
-        `gnus-registry-track-extra's default value.  Mention
-        `gnus-registry-remove-extra-data'.
+        `gnus-registry-track-extra's default value.
+        Mention `gnus-registry-remove-extra-data'.
 
 2013-07-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -6284,6 +6293,12 @@
 
         * org.texi: Massive changes, in many parts of the file.
 
+2008-04-27  Jason Riedy  <jason@acm.org>
+
+        * org.texi (A LaTeX example): Note that fmt may be a
+        one-argument function, and efmt may be a two-argument function.
+        (Radio tables): Document multiple destinations.
+
 2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus.texi (Oort Gnus): Add message-fill-column.
@@ -6516,6 +6531,10 @@
 
         * tramp.texi (Remote processes): Add `shell-command'.
 
+2008-02-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi: Use new FSF's Back-Cover Text.
+
 2008-01-28  Michael Sperber  <sperber@deinprogramm.de>
 
         * gnus.texi (Mail Source Specifiers): Document `group' specifier.
@@ -6616,7 +6635,7 @@
 
 2007-12-29  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc.tex (Yacas Language, Maxima Language, Giac Language):
+        * calc.texi (Yacas Language, Maxima Language, Giac Language):
         New sections.
 
 2007-12-29  Reiner Steib  <Reiner.Steib@gmx.de>
@@ -6634,6 +6653,10 @@
 
         * trampver.texi: Update release number.
 
+2007-12-22  Richard Stallman  <rms@gnu.org>
+
+        * cc-mode.texi (Getting Started): Change @ref to @pxref.
+
 2007-12-22  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbus.texi (Type Conversion): Correct input parameters mapping.
@@ -7895,11 +7918,6 @@
         * gnus.texi (Batching Agents): Fix example.  Reported by Tassilo Horn
         <tassilo@member.fsf.org>.
 
-2007-01-27  Eli Zaretskii  <eliz@gnu.org>
-
-        * msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and
-        ls-lisp-use-localized-time-format.
-
 2007-01-20  Markus Triska  <markus.triska@gmx.at>
 
         * flymake.texi (Flymake mode): find-file-hook instead of ...-hooks.
@@ -8195,7 +8213,6 @@
         * faq.texi (Escape sequences in shell output): EMACS is now set
         to Emacs's absolute file name, not to "t".
         (^M in the shell buffer): Likewise.
-        * misc.texi (Interactive Shell): Likewise.
 
 2006-09-11  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -8213,6 +8230,10 @@
 
         * smtpmail.texi (Authentication): Mention SSL.
 
+2006-09-03  Diane Murray  <disumu@x3y2z1.net>
+
+        * erc.texi (Getting Started, Connecting): Change erc-select to erc.
+
 2006-09-01  Eli Zaretskii  <eliz@gnu.org>
 
         * rcirc.texi (Internet Relay Chat, Useful IRC commands):
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 8b8d8a606c9..b3318ddd183 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -65,7 +65,7 @@ DOCMISC_W32 = @DOCMISC_W32@
 ## Info files to build and install on all platforms.
 INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
         dbus dired-x ebrowse ede ediff edt eieio \
-        emacs-mime epa erc ert eshell eudc efaq \
+        emacs-mime epa erc ert eshell eudc efaq eww \
         flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
         mairix-el message mh-e newsticker nxml-mode octave-mode \
         org pcl-cvs pgg rcirc remember reftex sasl \
@@ -410,6 +410,18 @@ eudc.pdf: $(eudc_deps)
 eudc.html: $(eudc_deps)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eudc.texi
 
+eww_deps = ${srcdir}/eww.texi $(emacsdir)/emacsver.texi ${gfdl}
+eww : $(buildinfodir)/eww$(INFO_EXT)
+$(buildinfodir)/eww$(INFO_EXT): $(eww_deps)
+        $(mkinfodir)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eww.texi
+eww.dvi: $(eww_deps)
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/eww.texi
+eww.pdf: $(eww_deps)
+        $(ENVADD) $(TEXI2PDF) ${srcdir}/eww.texi
+eww.html: $(eww_deps)
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eww.texi
+
 flymake_deps = ${srcdir}/flymake.texi ${gfdl}
 flymake : $(buildinfodir)/flymake$(INFO_EXT)
 $(buildinfodir)/flymake$(INFO_EXT): $(flymake_deps)
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index aacf4fad83e..7ca860486c2 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -302,7 +302,7 @@ of the same name as the command and can thus be overridden from your
   Various characters usually appear in pairs.  When, for example, you insert
 an open parenthesis, no matter whether you are programming or writing prose,
 you will surely enter a closing one later.  By entering both at the same time
-and leaving the cursor inbetween, Emacs can guarantee you that such
+and leaving the cursor in between, Emacs can guarantee you that such
 parentheses are always balanced.  And if you have a non-qwerty keyboard, where
 typing some of the stranger programming language symbols makes you bend your
 fingers backwards, this can be quite relieving too.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 10c863a9513..1700aee9dc1 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28053,8 +28053,8 @@ radiation related to the cesium-133 atom.  The only SI unit that is not
 based on a fundamental physical process (although there are efforts to
 change this) is the kilogram, which was originally defined as the mass
 of one liter of water, but is now defined as the mass of the
-International Prototype Kilogram (IPK), a cylinder of platinum-iridium
-kept at the Bureau International des Poids et Mesures in S@`evres,
+international prototype of the kilogram (IPK), a cylinder of platinum-iridium
+kept at the Bureau international des poids et mesures in S@`evres,
 France.  (There are several copies of the IPK throughout the world.)
 The British imperial units, once defined in terms of physical objects,
 were redefined in 1963 in terms of SI units.  The US customary units,
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 08f9610e594..0490cf639ac 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1282,13 +1282,8 @@ cells of symbols rather than on the value cells.  Each @var{binding}
 must be a list of the form @samp{(@var{name} @var{arglist}
 @var{forms}@dots{})}, which defines a function exactly as if
 it were a @code{cl-defun} form.  The function @var{name} is defined
-accordingly for the duration of the body of the @code{cl-flet}; then
-the old function definition, or lack thereof, is restored.
-
-You can use @code{cl-flet} to disable or modify the behavior of
-functions (including Emacs primitives) in a temporary, localized fashion.
-(Compare this with the idea of advising functions.
-@xref{Advising Functions,,,elisp,GNU Emacs Lisp Reference Manual}.)
+accordingly but only within the body of the @code{cl-flet}, hiding any external
+definition if applicable.
 
 The bindings are lexical in scope.  This means that all references to
 the named functions must appear physically within the body of the
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
new file mode 100644
index 00000000000..b84de7509da
--- /dev/null
+++ b/doc/misc/eww.texi
@@ -0,0 +1,254 @@
+\input texinfo @c -*-texinfo-*-
+@c %**start of header
+@setfilename ../../info/eww
+@settitle Emacs Web Wowser
+@documentencoding UTF-8
+@c @include emacsver.texi
+@c %**end of header
+
+@copying
+This file documents the GNU Emacs Web Wowser (EWW) package.
+
+Copyright @copyright{} 2014 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License.''
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.''
+@end quotation
+@end copying
+
+@dircategory Emacs misc features
+@direntry
+* EWW: (eww).      Emacs Web Wowser
+@end direntry
+
+@finalout
+
+@titlepage
+@title Emacs Web Wowser (EWW)
+@subtitle A web browser for GNU Emacs.
+
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@contents
+
+@ifnottex
+@node Top
+@top EWW
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Overview::
+* Basics::
+* Advanced::
+
+Appendices
+* History and Acknowledgments::
+* GNU Free Documentation License::  The license for this documentation.
+
+Indices
+* Key Index::
+* Variable Index::
+* Lisp Function Index::
+* Concept Index::
+@end menu
+
+@node Overview
+@chapter Overview
+@dfn{EWW}, the Emacs Web Wowser, is a web browser for GNU Emacs.  It
+can load, parse, and display various web pages using @dfn{shr.el}.
+However a GNU Emacs with @code{libxml2} support is required.
+
+@node Basics
+@chapter Basic Usage
+
+@findex eww
+@findex eww-open-file
+@vindex eww-search-prefix
+@cindex eww
+@cindex Web Browsing
+  You can open a URL or search the web with the command @kbd{M-x eww}.
+If the input doesn't look like a URL or domain name the web will be
+searched via @code{eww-search-prefix}.  The default search engine is
+@url{https://duckduckgo.com, DuckDuckGo}.  If you want to open a file
+either prefix the path with @code{file://} or use the command @kbd{M-x
+eww-open-file}.
+
+@findex eww-quit
+@findex eww-reload
+@findex eww-copy-page-url
+@kindex q
+@kindex w
+@kindex g
+  If loading the URL was successful the buffer @code{*eww*} is opened
+and the web page is rendered in it.  You can leave EWW by pressing
+@kbd{q} or exit the browser by calling @kbd{eww-quit}.  To reload the
+web page hit @kbd{g} (@code{eww-reload}).  Pressing @kbd{w}
+(@code{eww-copy-page-url}) will copy the current URL to the kill ring.
+
+@findex eww-download
+@vindex eww-download-path
+@kindex d
+@cindex Download
+  A URL under the point can be downloaded with @kbd{d}
+(@code{eww-download}).  The file will be written to the directory
+specified in @code{eww-download-path} (Default: @file{~/Downloads/}).
+
+@findex eww-back-url
+@findex eww-forward-url
+@findex eww-list-histories
+@kindex r
+@kindex l
+@kindex H
+@cindex History
+  EWW remembers the URLs you have visited to allow you to go back and
+forth between them.  By pressing @kbd{l} (@code{eww-back-url}) you go
+to the previous URL.  You can go forward again with @kbd{r}
+(@code{eww-forward-url}).  If you want an overview of your browsing
+history press @kbd{H} (@code{eww-list-histories}) to open the history
+buffer @code{*eww history*}.  The history is lost when EWW is quit.
+If you want to remember websites you can use bookmarks.
+
+@findex eww-add-bookmark
+@findex eww-list-bookmarks
+@kindex b
+@kindex B
+@cindex Bookmarks
+  EWW allows you to @dfn{bookmark} URLs.  Simply hit @kbd{b}
+(@code{eww-add-bookmark}) to store a bookmark for the current website.
+You can view stored bookmarks with @kbd{B}
+(@code{eww-list-bookmarks}).  This will open the bookmark buffer
+@code{*eww bookmarks*}.
+
+@findex eww-browse-with-external-browser
+@vindex shr-external-browser
+@vindex eww-use-external-browser-for-content-type
+@kindex &
+@cindex External Browser
+  Although EWW and shr.el do their best to render webpages in GNU
+Emacs some websites use features which can not be properly represented
+or are not implemented (E.g., JavaScript).  If you have trouble
+viewing a website with EWW then hit @kbd{&}
+(@code{eww-browse-with-external-browser}) inside the EWW buffer to
+open the website in the external browser specified by
+@code{shr-external-browser}.  Some content types, such as video or
+audio content, do not make sense to display in GNU Emacs at all.  You
+can tell EWW to open specific content automatically in an external
+browser by customizing
+@code{eww-use-external-browser-for-content-type}.
+
+@node Advanced
+@chapter Advanced
+
+@findex eww-view-source
+@kindex v
+@cindex Viewing Source
+  You can view the source of a website with @kbd{v}
+(@code{eww-view-source}).  This will open a new buffer
+@code{*eww-source*} and insert the source.  The buffer will be set to
+@code{html-mode} if available.
+
+@findex url-cookie-list
+@kindex C
+@cindex Cookies
+  EWW handles cookies through the @ref{Top, url package, ,url}.
+You can list existing cookies with @kbd{C} (@code{url-cookie-list}).
+For details about the Cookie handling @xref{Cookies,,,url}.
+
+@vindex eww-header-line-format
+@cindex Header
+  The header line of the EWW buffer can be changed by customizing
+@code{eww-header-line-format}.  The format replaces @code{%t} with the
+title of the website and @code{%u} with the URL.
+
+@c @vindex shr-bullet
+@c @vindex shr-hr-line
+@c @vindex eww-form-checkbox-selected-symbol
+@c @vindex eww-form-checkbox-symbol
+@c   EWW and the rendering engine shr.el use ASCII characters to
+@c represent some graphical elements, such as bullet points
+@c (@code{shr-bullet}), check boxes
+@c (@code{eww-form-checkbox-selected-symbol} and
+@c @code{eww-form-checkbox-symbol}), and horizontal rules
+@c @code{shr-hr-line}).  Depending on your fonts these characters can be
+@c replaced by Unicode glyphs to achieve better looking results.
+
+@vindex shr-max-image-proportion
+@vindex shr-blocked-images
+@cindex Image Display
+  Loading random images from the web can be problematic due to their
+size or content.  By customizing @code{shr-max-image-proportion} you
+can set the maximal image proportion in relation to the window they
+are displayed in.  E.g., 0.7 means an image is allowed to take up 70%
+of the width and height.  If Emacs supports image scaling (ImageMagick
+support required) then larger images are scaled down.  You can block
+specific images completely by customizing @code{shr-blocked-images}.
+
+@node History and Acknowledgments
+@appendix History and Acknowledgments
+
+EWW was originally written by Lars Ingebrigtsen, known for his work on
+Gnus.  He started writing an Emacs HTML rendering library,
+@code{shr.el}, to read blogs in Gnus.  He eventually added a web
+browser front end and HTML form support.  Which resulted in EWW, the
+Emacs Web Wowser.  EWW was announced on 16 June 2013:
+@url{http://lars.ingebrigtsen.no/2013/06/16/eww/}.
+
+EWW was then moved from the Gnus repository to GNU Emacs and several
+developers started contributing to it as well.  A list of contributors
+at the time of writing this manual:
+
+@itemize @bullet
+@item Daniel Hackney
+@item Eli Zaretskii
+@item Glenn Morris
+@item Ivan Kanis
+@item Juri Linkov
+@item Katsumi Yamaoka
+@item Kenjiro NAKAYAMA
+@item Lars Magne Ingebrigtsen
+@item Leo Liu
+@item Paul Eggert
+@item Rüdiger Sonderfeld
+@item Stefan Monnier
+@item Ted Zlatanov
+@end itemize
+
+@node GNU Free Documentation License
+@chapter GNU Free Documentation License
+@include doclicense.texi
+
+@node Key Index
+@unnumbered Key Index
+
+@printindex ky
+
+@node Variable Index
+@unnumbered Variable Index
+
+@printindex vr
+
+@node Lisp Function Index
+@unnumbered Function Index
+
+@printindex fn
+
+@node Concept Index
+@unnumbered Concept Index
+
+@printindex cp
+
+
+@bye
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 376d2a0ad26..6ad0c26f9ac 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -10229,8 +10229,8 @@ summary buffer, point will just move to this article.
 If given a positive numerical prefix, fetch that many articles back into
 the ancestry.  If given a negative numerical prefix, fetch just that
 ancestor.  So if you say @kbd{3 ^}, Gnus will fetch the parent, the
-grandparent and the grandgrandparent of the current article.  If you say
-@kbd{-3 ^}, Gnus will only fetch the grandgrandparent of the current
+grandparent and the great-grandparent of the current article.  If you say
+@kbd{-3 ^}, Gnus will only fetch the great-grandparent of the current
 article.
 
 @item A R (Summary)
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index a6940781ca7..c4719dcd039 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -591,7 +591,7 @@ slightly from the margin and use only 3 spaces as indentation between
 
 Restart Emacs, and re-indent the program we developed in the first part
 of this tutorial with @kbd{C-c h} and @kbd{C-M-\}.  You may want to keep
-these lines in @file{.emacs}, with values adjusted to your likings.  If
+these lines in @file{.emacs}, with values adjusted to your liking.  If
 you want to get more information about any of these variables, type,
 e.g., @kbd{C-h v idlwave-main-block-indent @key{RET}}.  To find which
 variables can be customized, look for items marked @samp{User Option:}
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index bfd765dd211..d92fb8a55e0 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-09-11.11}
+\def\texinfoversion{2014-01-06.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1138,10 +1138,12 @@ output) for that.)}
 
 \ifpdf
   %
-  % Color manipulation macros based on pdfcolor.tex,
+  % Color manipulation macros using ideas from pdfcolor.tex,
   % except using rgb instead of cmyk; the latter is said to render as a
   % very dark gray on-screen and a very dark halftone in print, instead
-  % of actual black.
+  % of actual black. The dark red here is dark enough to print on paper as
+  % nearly black, but still distinguishable for online viewing.  We use
+  % black by default, though.
   \def\rgbDarkRed{0.50 0.09 0.12}
   \def\rgbBlack{0 0 0}
   %
@@ -1251,10 +1253,9 @@ output) for that.)}
   % used to mark target names; must be expandable.
   \def\pdfmkpgn#1{#1}
   %
-  % by default, use a color that is dark enough to print on paper as
-  % nearly black, but still distinguishable for online viewing.
-  \def\urlcolor{\rgbDarkRed}
-  \def\linkcolor{\rgbDarkRed}
+  % by default, use black for everything.
+  \def\urlcolor{\rgbBlack}
+  \def\linkcolor{\rgbBlack}
   \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
   % Adding outlines to PDF; macros for calculating structure of outlines
@@ -2574,37 +2575,21 @@ end
 \let\file=\code
 \let\option=\code
 
-% @uref (abbreviation for `urlref') takes an optional (comma-separated)
-% second argument specifying the text to display and an optional third
-% arg as text to display instead of (rather than in addition to) the url
-% itself.  First (mandatory) arg is the url.
-% (This \urefnobreak definition isn't used now, leaving it for a while
-% for comparison.)
-\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
-\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
-  \unsepspaces
-  \pdfurl{#1}%
-  \setbox0 = \hbox{\ignorespaces #3}%
-  \ifdim\wd0 > 0pt
-    \unhbox0 % third arg given, show only that
-  \else
-    \setbox0 = \hbox{\ignorespaces #2}%
-    \ifdim\wd0 > 0pt
-      \ifpdf
-        \unhbox0             % PDF: 2nd arg given, show only it
-      \else
-        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
-      \fi
-    \else
-      \code{#1}% only url given, so show it
-    \fi
-  \fi
-  \endlink
-\endgroup}
+% @uref (abbreviation for `urlref') aka @url takes an optional
+% (comma-separated) second argument specifying the text to display and
+% an optional third arg as text to display instead of (rather than in
+% addition to) the url itself.  First (mandatory) arg is the url.
+
+% TeX-only option to allow changing PDF output to show only the second
+% arg (if given), and not the url (which is then just the link target).
+\newif\ifurefurlonlylink
 
-% This \urefbreak definition is the active one.
+% The main macro is \urefbreak, which allows breaking at expected
+% places within the url.  (There used to be another version, which
+% didn't support automatic breaking.)
 \def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
 \let\uref=\urefbreak
+%
 \def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
 \def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
   \unsepspaces
@@ -2613,12 +2598,19 @@ end
   \ifdim\wd0 > 0pt
     \unhbox0 % third arg given, show only that
   \else
-    \setbox0 = \hbox{\ignorespaces #2}%
+    \setbox0 = \hbox{\ignorespaces #2}% look for second arg
     \ifdim\wd0 > 0pt
       \ifpdf
-        \unhbox0             % PDF: 2nd arg given, show only it
+        \ifurefurlonlylink
+          % PDF plus option to not display url, show just arg
+          \unhbox0             
+        \else
+          % PDF, normally display both arg and url for consistency,
+          % visibility, if the pdf is eventually used to print, etc.
+          \unhbox0\ (\urefcode{#1})%
+        \fi
       \else
-        \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
+        \unhbox0\ (\urefcode{#1})% DVI, always show arg and url
       \fi
     \else
       \urefcode{#1}% only url given, so show it
@@ -3691,7 +3683,7 @@ end
   \parskip=\smallskipamount
   \ifdim\parskip=0pt \parskip=2pt \fi
   %
-  % Try typesetting the item mark that if the document erroneously says
+  % Try typesetting the item mark so that if the document erroneously says
   % something like @itemize @samp (intending @table), there's an error
   % right away at the @itemize.  It's not the best error message in the
   % world, but it's better than leaving it to the @item.  This means if
@@ -8342,8 +8334,8 @@ end
 %
 % Auto-number footnotes.  Otherwise like plain.
 \gdef\footnote{%
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
+  %\let\indent=\ptexindent
+  %\let\noindent=\ptexnoindent
   \global\advance\footnoteno by \@ne
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %