aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2018-01-13 11:45:04 +0200
committerEli Zaretskii2018-01-13 11:45:04 +0200
commit106bf8adc31367465864d3991250109dfa4f4f5c (patch)
tree94c3d7415fc62d5575c122f3d08e1ec9ea726a13 /doc
parent47aa85c7ec3b03c579171b6e6ce62e538f3a5b10 (diff)
downloademacs-106bf8adc31367465864d3991250109dfa4f4f5c.tar.gz
emacs-106bf8adc31367465864d3991250109dfa4f4f5c.zip
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.
Diffstat (limited to 'doc')
-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
191* Host Security:: Security issues on a single computer. 191* Host Security:: Security issues on a single computer.
192* Network Security:: Managing the network security. 192* Network Security:: Managing the network security.
193* Document View:: Viewing PDF, PS and DVI files. 193* Document View:: Viewing PDF, PS and DVI files.
194* EWW:: A web browser in Emacs.
195* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
196* Shell:: Executing shell commands from Emacs. 194* Shell:: Executing shell commands from Emacs.
197* Emacs Server:: Using Emacs as an editing server. 195* Emacs Server:: Using Emacs as an editing server.
198* Printing:: Printing hardcopies of buffers or regions. 196* Printing:: Printing hardcopies of buffers or regions.
@@ -1095,6 +1093,8 @@ Printing Hard Copies
1095 1093
1096Hyperlinking and Navigation Features 1094Hyperlinking and Navigation Features
1097 1095
1096* EWW:: A web browser in Emacs.
1097* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
1098* Browse-URL:: Following URLs. 1098* Browse-URL:: Following URLs.
1099* Goto Address mode:: Activating URLs. 1099* Goto Address mode:: Activating URLs.
1100* FFAP:: Finding files etc. at point. 1100* 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.
21@end ifnottex 21@end ifnottex
22 22
23@node Gnus 23@node Gnus
24@section Gnus 24@section Email and Usenet News with Gnus
25@cindex Gnus 25@cindex Gnus
26@cindex Usenet news 26@cindex Usenet news
27@cindex newsreader 27@cindex newsreader
@@ -587,40 +587,6 @@ associated with the current buffer, type @kbd{K}
587(@code{doc-view-kill-proc-and-buffer}) kills the converter process and 587(@code{doc-view-kill-proc-and-buffer}) kills the converter process and
588the DocView buffer. 588the DocView buffer.
589 589
590@node EWW
591@section Web Browsing with EWW
592
593@findex eww
594@findex eww-open-file
595 @dfn{EWW}, the Emacs Web Wowser, is a web browser package for Emacs.
596It allows browsing URLs within an Emacs buffer. The command @kbd{M-x
597eww} will open a URL or search the web. You can open a file
598using the command @kbd{M-x eww-open-file}. You can use EWW as the
599web browser for @code{browse-url}, @pxref{Browse-URL}. For full
600details, @pxref{Top, EWW,, eww, The Emacs Web Wowser Manual}.
601
602@node Embedded WebKit Widgets
603@section Embedded WebKit Widgets
604@cindex xwidget
605@cindex webkit widgets
606@cindex embedded widgets
607
608@findex xwidget-webkit-browse-url
609@findex xwidget-webkit-mode
610@cindex Xwidget-WebKit mode
611 If Emacs was compiled with the appropriate support packages, it is
612able to show browser widgets in its buffers. The command @kbd{M-x
613xwidget-webkit-browse-url} asks for a URL to display in the browser
614widget. The URL normally defaults to the URL at or before point, but
615if there is an active region (@pxref{Mark}), the default URL comes
616from the region instead, after removing any whitespace from it. The
617command then creates a new buffer with the embedded browser showing
618the specified URL. The buffer is put in the Xwidget-WebKit mode
619(similar to Image mode, @pxref{File Conveniences}), which provides
620one-key commands for scrolling the widget, changing its size, and
621reloading it. Type @w{@kbd{C-h b}} in that buffer to see the key
622bindings.
623
624@node Shell 590@node Shell
625@section Running Shell Commands from Emacs 591@section Running Shell Commands from Emacs
626@cindex subshell 592@cindex subshell
@@ -1745,7 +1711,9 @@ graphical frame, or one in a text terminal (@pxref{Frames}). You
1745can then select that frame to begin editing. 1711can then select that frame to begin editing.
1746 1712
1747 If there is no Emacs server, the @command{emacsclient} program halts 1713 If there is no Emacs server, the @command{emacsclient} program halts
1748with an error message. If the Emacs process has no existing 1714with an error message (you can prevent this from happening by using
1715the @samp{--alternate-editor=""} option to @command{emacsclient},
1716@pxref{emacsclient Options}). If the Emacs process has no existing
1749frame---which can happen if it was started as a daemon (@pxref{Emacs 1717frame---which can happen if it was started as a daemon (@pxref{Emacs
1750Server})---then Emacs opens a frame on the terminal in which you 1718Server})---then Emacs opens a frame on the terminal in which you
1751called @command{emacsclient}. 1719called @command{emacsclient}.
@@ -2702,17 +2670,53 @@ key bindings.
2702 2670
2703 2671
2704@node Hyperlinking 2672@node Hyperlinking
2705@section Hyperlinking and Navigation Features 2673@section Hyperlinking and Web Navigation Features
2706 2674
2707 The following subsections describe convenience features for handling 2675 The following subsections describe convenience features for handling
2708URLs and other types of links occurring in Emacs buffer text. 2676URLs and other types of links occurring in Emacs buffer text.
2709 2677
2710@menu 2678@menu
2679* EWW:: A web browser in Emacs.
2680* Embedded WebKit Widgets:: Embedding browser widgets in Emacs buffers.
2711* Browse-URL:: Following URLs. 2681* Browse-URL:: Following URLs.
2712* Goto Address mode:: Activating URLs. 2682* Goto Address mode:: Activating URLs.
2713* FFAP:: Finding files etc. at point. 2683* FFAP:: Finding files etc. at point.
2714@end menu 2684@end menu
2715 2685
2686@node EWW
2687@subsection Web Browsing with EWW
2688
2689@findex eww
2690@findex eww-open-file
2691 @dfn{EWW}, the Emacs Web Wowser, is a web browser package for Emacs.
2692It allows browsing URLs within an Emacs buffer. The command @kbd{M-x
2693eww} will open a URL or search the web. You can open a file
2694using the command @kbd{M-x eww-open-file}. You can use EWW as the
2695web browser for @code{browse-url}, @pxref{Browse-URL}. For full
2696details, @pxref{Top, EWW,, eww, The Emacs Web Wowser Manual}.
2697
2698@node Embedded WebKit Widgets
2699@subsection Embedded WebKit Widgets
2700@cindex xwidget
2701@cindex webkit widgets
2702@cindex embedded widgets
2703
2704@findex xwidget-webkit-browse-url
2705@findex xwidget-webkit-mode
2706@cindex Xwidget-WebKit mode
2707 If Emacs was compiled with the appropriate support packages, it is
2708able to show browser widgets in its buffers. The command @kbd{M-x
2709xwidget-webkit-browse-url} asks for a URL to display in the browser
2710widget. The URL normally defaults to the URL at or before point, but
2711if there is an active region (@pxref{Mark}), the default URL comes
2712from the region instead, after removing any whitespace from it. The
2713command then creates a new buffer with the embedded browser showing
2714the specified URL. The buffer is put in the Xwidget-WebKit mode
2715(similar to Image mode, @pxref{File Conveniences}), which provides
2716one-key commands for scrolling the widget, changing its size, and
2717reloading it. Type @w{@kbd{C-h b}} in that buffer to see the key
2718bindings.
2719
2716@node Browse-URL 2720@node Browse-URL
2717@subsection Following URLs 2721@subsection Following URLs
2718@cindex World Wide Web 2722@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.
3001@table @asis 3001@table @asis
3002@item File local variables 3002@item File local variables
3003@cindex file local variables 3003@cindex file local variables
3004A file that Emacs visits can contain variable settings that affects 3004A file that Emacs visits can contain variable settings that affect
3005the buffer visiting that file; @xref{File Local Variables}. 3005the buffer visiting that file; @xref{File Local Variables}.
3006Similarly, a directory can specify local variable values common to all 3006Similarly, a directory can specify local variable values common to all
3007files in that directory; @xref{Directory Local Variables}. Although 3007files in that directory; see @ref{Directory Local Variables}. Although
3008Emacs takes some effort to protect against misuse of these variables, 3008Emacs takes some effort to protect against misuse of these variables,
3009a security hole can be created merely by a package setting 3009a security hole can be created merely by a package setting
3010@code{safe-local-variable} too optimistically, a problem that is all 3010@code{safe-local-variable} too optimistically, a problem that is all