Merge from origin/emacs-25

[gnu-emacs] / doc / misc / eww.texi

diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 8261b27354deced50ba370400aed2acb4da68c35..14f0a8d0ea2b7a6dea0b755f8bfc5dc35ad91aea 100644 (file)
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -2,13 +2,13 @@
 @c %**start of header
 @setfilename ../../info/eww.info
 @settitle Emacs Web Wowser
-@documentencoding UTF-8
+@include docstyle.texi
 @c %**end of header
 
 @copying
 This file documents the GNU Emacs Web Wowser (EWW) package.
 
-Copyright @copyright{} 2014 Free Software Foundation, Inc.
+Copyright @copyright{} 2014--2016 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -103,6 +103,18 @@ web page hit @kbd{g} (@code{eww-reload}).  Pressing @kbd{w}
 which part of the document contains the ``readable'' text, and will
 only display this part.  This usually gets rid of menus and the like.
 
+@findex eww-toggle-fonts
+@findex shr-use-fonts
+@kindex F
+  The @kbd{F} command (@code{eww-toggle-fonts}) toggles whether to use
+variable-pitch fonts or not.  This sets the @code{shr-use-fonts} variable.
+
+@findex eww-toggle-colors
+@findex shr-use-colors
+@kindex F
+  The @kbd{C} command (@code{eww-toggle-colors}) toggles whether to use
+HTML-specified colors or not.  This sets the @code{shr-use-colors} variable.
+
 @findex eww-download
 @vindex eww-download-directory
 @kindex d
@@ -120,7 +132,7 @@ specified in @code{eww-download-directory} (Default: @file{~/Downloads/}).
 @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}
+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 @file{*eww history*}.  The history is lost when EWW is quit.
@@ -135,6 +147,12 @@ keep their number within a set limit, as specified by
 also be set to @code{nil} to allow for the history list to grow
 indefinitely.
 
+@cindex PDF
+  PDFs are viewed inline, by default, with @code{doc-view-mode}, but
+this can be customized by using the mailcap (@pxref{mailcap,,,
+emacs-mime, Emacs MIME Manual})
+mechanism, in particular @code{mailcap-mime-data}.
+
 @findex eww-add-bookmark
 @findex eww-list-bookmarks
 @kindex b
@@ -146,6 +164,13 @@ You can view stored bookmarks with @kbd{B}
 (@code{eww-list-bookmarks}).  This will open the bookmark buffer
 @file{*eww bookmarks*}.
 
+@findex eww-list-buffers
+@kindex S
+@cindex Multiple Buffers
+  To get summary of currently opened EWW buffers, press @kbd{S}
+(@code{eww-list-buffers}).  The @file{*eww buffers*} buffer allows to
+quickly kill, flip through and switch to specific EWW buffer.
+
 @findex eww-browse-with-external-browser
 @vindex shr-external-browser
 @vindex eww-use-external-browser-for-content-type
@@ -224,11 +249,11 @@ variables @code{shr-color-visible-distance-min} and
   In addition to maintaining the history at run-time, EWW will also
 save the partial state of its buffers (the URIs and the titles of the
 pages visited) in the desktop file if one is used.  @xref{Saving Emacs
-Sessions, , emacs, The GNU Emacs Manual}
+Sessions, , emacs, The GNU Emacs Manual}.
 
 @vindex eww-desktop-remove-duplicates
   EWW history may sensibly contain multiple entries for the same page
-URI.  At run-time, these entries may still have different associated
+URI@.  At run-time, these entries may still have different associated
 point positions or the actual Web page contents.
 The latter, however, tend to be overly large to preserve in the
 desktop file, so they get omitted, thus rendering the respective