diff options
| author | Michael Albinus | 2018-03-01 09:25:55 +0100 |
|---|---|---|
| committer | Michael Albinus | 2018-03-01 09:25:55 +0100 |
| commit | 304278c040bf0d98ae614da83e08fb2b4df55218 (patch) | |
| tree | 97b23aa95fa9ec21c24a590920d3fa9002b4dd8e /doc/misc | |
| parent | ca8afa7672b830d6ed570c21599f3eadb0958d79 (diff) | |
| download | emacs-304278c040bf0d98ae614da83e08fb2b4df55218.tar.gz emacs-304278c040bf0d98ae614da83e08fb2b4df55218.zip | |
Further improvements on manuals
* doc/emacs/xresources.texi:
* doc/lispref/display.texi:
* doc/lispref/keymaps.texi:
* doc/misc/dbus.texi:
* doc/misc/efaq-w32.texi: Use "GTK+" where applicable.
* doc/emacs/xresources.texi (Resources): Mention several use
of "-xrm".
(Table of Resources) [verticalScrollBars]: Add reference to Scroll Bars.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/dbus.texi | 6 | ||||
| -rw-r--r-- | doc/misc/efaq-w32.texi | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index b425bb0c00d..5b14382d8b8 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi | |||
| @@ -1815,7 +1815,7 @@ The function returns a number, which counts the connections this Emacs | |||
| 1815 | session has established to the @var{bus} under the same unique name | 1815 | session has established to the @var{bus} under the same unique name |
| 1816 | (see @code{dbus-get-unique-name}). It depends on the libraries Emacs | 1816 | (see @code{dbus-get-unique-name}). It depends on the libraries Emacs |
| 1817 | is linked with, and on the environment Emacs is running. For example, | 1817 | is linked with, and on the environment Emacs is running. For example, |
| 1818 | if Emacs is linked with the gtk toolkit, and it runs in a GTK-aware | 1818 | if Emacs is linked with the GTK+ toolkit, and it runs in a GTK+-aware |
| 1819 | environment like Gnome, another connection might already be | 1819 | environment like Gnome, another connection might already be |
| 1820 | established. | 1820 | established. |
| 1821 | 1821 | ||
| @@ -1837,9 +1837,9 @@ Example: You initialize a connection to the AT-SPI bus on your host: | |||
| 1837 | 1837 | ||
| 1838 | @result{} "unix:abstract=/tmp/dbus-2yzWHOCdSD,guid=a490dd26625870ca1298b6e10000fd7f" | 1838 | @result{} "unix:abstract=/tmp/dbus-2yzWHOCdSD,guid=a490dd26625870ca1298b6e10000fd7f" |
| 1839 | 1839 | ||
| 1840 | ;; If Emacs is built with gtk support, and you run in a GTK enabled | 1840 | ;; If Emacs is built with GTK+ support, and you run in a GTK+-enabled |
| 1841 | ;; environment (like a GNOME session), the initialization reuses the | 1841 | ;; environment (like a GNOME session), the initialization reuses the |
| 1842 | ;; connection established by GTK's atk bindings. | 1842 | ;; connection established by GTK+'s atk bindings. |
| 1843 | (dbus-init-bus my-bus) | 1843 | (dbus-init-bus my-bus) |
| 1844 | 1844 | ||
| 1845 | @result{} 2 | 1845 | @result{} 2 |
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index dd5bfd93615..af002d7a28f 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi | |||
| @@ -316,7 +316,7 @@ file for build instructions. | |||
| 316 | 316 | ||
| 317 | You can run Emacs without any extra steps, but if you want icons in your | 317 | You can run Emacs without any extra steps, but if you want icons in your |
| 318 | Start Menu, or for Emacs to detect the image libraries that are already | 318 | Start Menu, or for Emacs to detect the image libraries that are already |
| 319 | installed on your system as part of GTK, then you should run the program | 319 | installed on your system as part of GTK+, then you should run the program |
| 320 | @file{addpm.exe}, which is usually installed into the same @file{bin} | 320 | @file{addpm.exe}, which is usually installed into the same @file{bin} |
| 321 | directory with @file{emacs.exe}. | 321 | directory with @file{emacs.exe}. |
| 322 | 322 | ||
| @@ -2206,10 +2206,10 @@ outdated. Tools available here that are useful for Emacs include: | |||
| 2206 | @item GifLib - library to support GIF images. | 2206 | @item GifLib - library to support GIF images. |
| 2207 | @item Grep - for searching through files with @code{grep}. | 2207 | @item Grep - for searching through files with @code{grep}. |
| 2208 | @item Gzip - used by Emacs to automatically decompress .gz files. | 2208 | @item Gzip - used by Emacs to automatically decompress .gz files. |
| 2209 | @item Jpeg - library to support JPEG images (also in GTK). | 2209 | @item Jpeg - library to support JPEG images (also in GTK+). |
| 2210 | @item Lha - used by @code{archive-mode} to edit .lzh files. | 2210 | @item Lha - used by @code{archive-mode} to edit .lzh files. |
| 2211 | @item LibPng - library to support PNG images (also in GTK). | 2211 | @item LibPng - library to support PNG images (also in GTK+). |
| 2212 | @item LibTiff - library to support TIFF images (also in GTK). | 2212 | @item LibTiff - library to support TIFF images (also in GTK+). |
| 2213 | @item Make - used by @code{compile} for building projects (also in MinGW) | 2213 | @item Make - used by @code{compile} for building projects (also in MinGW) |
| 2214 | @item OpenSSL - used by @code{gnus} to talk to servers over SSL. | 2214 | @item OpenSSL - used by @code{gnus} to talk to servers over SSL. |
| 2215 | @item Patch - used by @code{ediff-patch-file} and others to apply patches. | 2215 | @item Patch - used by @code{ediff-patch-file} and others to apply patches. |
| @@ -2218,21 +2218,21 @@ outdated. Tools available here that are useful for Emacs include: | |||
| 2218 | @item Unzip - used by @code{archive-mode} for extracting zip files. | 2218 | @item Unzip - used by @code{archive-mode} for extracting zip files. |
| 2219 | @item Xpm - library to support XPM images (bundled with Emacs binaries) | 2219 | @item Xpm - library to support XPM images (bundled with Emacs binaries) |
| 2220 | @item Zip - used by @code{archive-mode} for editing zip files. | 2220 | @item Zip - used by @code{archive-mode} for editing zip files. |
| 2221 | @item Zlib - required by LibPng (also in GTK). | 2221 | @item Zlib - required by LibPng (also in GTK+). |
| 2222 | @end itemize | 2222 | @end itemize |
| 2223 | 2223 | ||
| 2224 | @node GTK | 2224 | @node GTK |
| 2225 | @section GTK | 2225 | @section GTK+ |
| 2226 | @cindex GTK image libraries | 2226 | @cindex GTK+ image libraries |
| 2227 | @cindex image libraries, GTK | 2227 | @cindex image libraries, GTK+ |
| 2228 | @cindex addpm, using GTK image libraries | 2228 | @cindex addpm, using GTK+ image libraries |
| 2229 | 2229 | ||
| 2230 | GTK is a potential source for some of the image libraries that Emacs | 2230 | GTK+ is a potential source for some of the image libraries that Emacs |
| 2231 | requires. GTK is installed along with other ports of GUI software, | 2231 | requires. GTK+ is installed along with other ports of GUI software, |
| 2232 | such as the GIMP image editor, and Pidgin instant messenger client. | 2232 | such as the GIMP image editor, and Pidgin instant messenger client. |
| 2233 | If GTK is installed when you run @command{addpm}, Emacs will use the | 2233 | If GTK+ is installed when you run @command{addpm}, Emacs will use the |
| 2234 | image libraries that it provides, even if they are not on the | 2234 | image libraries that it provides, even if they are not on the |
| 2235 | @env{PATH}. GTK ships with JPEG, PNG and TIFF support. | 2235 | @env{PATH}. GTK+ ships with JPEG, PNG and TIFF support. |
| 2236 | 2236 | ||
| 2237 | @node Read man pages | 2237 | @node Read man pages |
| 2238 | @section How do I read man pages? | 2238 | @section How do I read man pages? |