summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2018-01-13 11:45:04 +0200
committerEli Zaretskii <eliz@gnu.org>2018-01-13 11:45:04 +0200
commit106bf8adc31367465864d3991250109dfa4f4f5c (patch)
tree94c3d7415fc62d5575c122f3d08e1ec9ea726a13
parent47aa85c7ec3b03c579171b6e6ce62e538f3a5b10 (diff)
downloademacs-106bf8adc31367465864d3991250109dfa4f4f5c.tar.gz
Improve the Emacs manual's "Misc" node
* doc/emacs/misc.texi (Gnus): A more descriptive section name. (Invoking emacsclient): Mention how to avoid errors when there's no Emacs server. (EWW, Embedded WebKit Widgets): Now subsections under "Hyperlinking and Web Navigation Features". (Amusements): Add "games" to the section name. Suggested by Alex Branham <alex.branham@gmail.com> in emacs-manual-bugs@gnu.org. * doc/emacs/emacs.texi (Top): Adjust the top-level menus to the above changes. * doc/lispref/os.texi (Security Considerations): Fix typos.
-rw-r--r--doc/emacs/emacs.texi4
-rw-r--r--doc/emacs/misc.texi78
-rw-r--r--doc/lispref/os.texi4
3 files changed, 45 insertions, 41 deletions
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index cda94631b9b..09817080c58 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -191,8 +191,6 @@ Advanced Features
* Host Security:: Security issues on a single computer.
* Network Security:: Managing the network security.
* Document View:: Viewing PDF, PS and DVI files.
-* EWW:: A web browser in Emacs.
-* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
* Shell:: Executing shell commands from Emacs.
* Emacs Server:: Using Emacs as an editing server.
* Printing:: Printing hardcopies of buffers or regions.
@@ -1095,6 +1093,8 @@ Printing Hard Copies
Hyperlinking and Navigation Features
+* EWW:: A web browser in Emacs.
+* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
* Browse-URL:: Following URLs.
* Goto Address mode:: Activating URLs.
* FFAP:: Finding files etc. at point.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 633e1e881d8..172a2223ad9 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -21,7 +21,7 @@ hyperlinks, and various diversions and amusements.
@end ifnottex
@node Gnus
-@section Gnus
+@section Email and Usenet News with Gnus
@cindex Gnus
@cindex Usenet news
@cindex newsreader
@@ -587,40 +587,6 @@ associated with the current buffer, type @kbd{K}
(@code{doc-view-kill-proc-and-buffer}) kills the converter process and
the DocView buffer.
-@node EWW
-@section Web Browsing with EWW
-
-@findex eww
-@findex eww-open-file
- @dfn{EWW}, the Emacs Web Wowser, is a web browser package for Emacs.
-It allows browsing URLs within an Emacs buffer. The command @kbd{M-x
-eww} will open a URL or search the web. You can open a file
-using the command @kbd{M-x eww-open-file}. You can use EWW as the
-web browser for @code{browse-url}, @pxref{Browse-URL}. For full
-details, @pxref{Top, EWW,, eww, The Emacs Web Wowser Manual}.
-
-@node Embedded WebKit Widgets
-@section Embedded WebKit Widgets
-@cindex xwidget
-@cindex webkit widgets
-@cindex embedded widgets
-
-@findex xwidget-webkit-browse-url
-@findex xwidget-webkit-mode
-@cindex Xwidget-WebKit mode
- If Emacs was compiled with the appropriate support packages, it is
-able to show browser widgets in its buffers. The command @kbd{M-x
-xwidget-webkit-browse-url} asks for a URL to display in the browser
-widget. The URL normally defaults to the URL at or before point, but
-if there is an active region (@pxref{Mark}), the default URL comes
-from the region instead, after removing any whitespace from it. The
-command then creates a new buffer with the embedded browser showing
-the specified URL. The buffer is put in the Xwidget-WebKit mode
-(similar to Image mode, @pxref{File Conveniences}), which provides
-one-key commands for scrolling the widget, changing its size, and
-reloading it. Type @w{@kbd{C-h b}} in that buffer to see the key
-bindings.
-
@node Shell
@section Running Shell Commands from Emacs
@cindex subshell
@@ -1745,7 +1711,9 @@ graphical frame, or one in a text terminal (@pxref{Frames}). You
can then select that frame to begin editing.
If there is no Emacs server, the @command{emacsclient} program halts
-with an error message. If the Emacs process has no existing
+with an error message (you can prevent this from happening by using
+the @samp{--alternate-editor=""} option to @command{emacsclient},
+@pxref{emacsclient Options}). If the Emacs process has no existing
frame---which can happen if it was started as a daemon (@pxref{Emacs
Server})---then Emacs opens a frame on the terminal in which you
called @command{emacsclient}.
@@ -2702,17 +2670,53 @@ key bindings.
@node Hyperlinking
-@section Hyperlinking and Navigation Features
+@section Hyperlinking and Web Navigation Features
The following subsections describe convenience features for handling
URLs and other types of links occurring in Emacs buffer text.
@menu
+* EWW:: A web browser in Emacs.
+* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
* Browse-URL:: Following URLs.
* Goto Address mode:: Activating URLs.
* FFAP:: Finding files etc. at point.
@end menu
+@node EWW
+@subsection Web Browsing with EWW
+
+@findex eww
+@findex eww-open-file
+ @dfn{EWW}, the Emacs Web Wowser, is a web browser package for Emacs.
+It allows browsing URLs within an Emacs buffer. The command @kbd{M-x
+eww} will open a URL or search the web. You can open a file
+using the command @kbd{M-x eww-open-file}. You can use EWW as the
+web browser for @code{browse-url}, @pxref{Browse-URL}. For full
+details, @pxref{Top, EWW,, eww, The Emacs Web Wowser Manual}.
+
+@node Embedded WebKit Widgets
+@subsection Embedded WebKit Widgets
+@cindex xwidget
+@cindex webkit widgets
+@cindex embedded widgets
+
+@findex xwidget-webkit-browse-url
+@findex xwidget-webkit-mode
+@cindex Xwidget-WebKit mode
+ If Emacs was compiled with the appropriate support packages, it is
+able to show browser widgets in its buffers. The command @kbd{M-x
+xwidget-webkit-browse-url} asks for a URL to display in the browser
+widget. The URL normally defaults to the URL at or before point, but
+if there is an active region (@pxref{Mark}), the default URL comes
+from the region instead, after removing any whitespace from it. The
+command then creates a new buffer with the embedded browser showing
+the specified URL. The buffer is put in the Xwidget-WebKit mode
+(similar to Image mode, @pxref{File Conveniences}), which provides
+one-key commands for scrolling the widget, changing its size, and
+reloading it. Type @w{@kbd{C-h b}} in that buffer to see the key
+bindings.
+
@node Browse-URL
@subsection Following URLs
@cindex World Wide Web
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 6315574923f..08544688350 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -3001,10 +3001,10 @@ issues involved, rather than to be a security checklist.
@table @asis
@item File local variables
@cindex file local variables
-A file that Emacs visits can contain variable settings that affects
+A file that Emacs visits can contain variable settings that affect
the buffer visiting that file; @xref{File Local Variables}.
Similarly, a directory can specify local variable values common to all
-files in that directory; @xref{Directory Local Variables}. Although
+files in that directory; see @ref{Directory Local Variables}. Although
Emacs takes some effort to protect against misuse of these variables,
a security hole can be created merely by a package setting
@code{safe-local-variable} too optimistically, a problem that is all