[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5325] doc updates
|
From: |
karl |
|
Subject: |
[5325] doc updates |
|
Date: |
Sun, 18 Aug 2013 18:32:00 +0000 |
Revision: 5325
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5325
Author: karl
Date: 2013-08-18 18:31:58 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
doc updates
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/doc/info-stnd.texi
trunk/doc/texinfo.texi
trunk/info/info.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2013-08-18 14:29:05 UTC (rev 5324)
+++ trunk/ChangeLog 2013-08-18 18:31:58 UTC (rev 5325)
@@ -1,3 +1,13 @@
+2013-08-18 Karl Berry <address@hidden>
+
+ * doc/texinfo.texi (Image Syntax): a bit more about Docbook.
+
+ * doc/info-stnd.texi (Invoking Info),
+ (Variables): editing throughout.
+ * info/info.c (info_short_help): use MANUAL instead of FILENAME
+ for -f. Report from Arne Babenhauserheide,
+ 11 Apr 2013 11:05:37.
+
2013-08-18 Sergey Poznyakoff <address@hidden>
Improve info -a: process manpages, filter out duplicate names.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2013-08-18 14:29:05 UTC (rev 5324)
+++ trunk/NEWS 2013-08-18 18:31:58 UTC (rev 5325)
@@ -23,10 +23,10 @@
-------------------------------------------------------------------------------
* info:
- . new option -x (--debug) enables additional debugging output.
- . new option -v (--variable) assigns a value to an Info variable.
- The syntax is the same as for many other GNU utilities: -v VARIABLE=VALUE
- . new option -a (--all) instructs info to display all documents
+ . new option -x (--debug) for debugging output; -x -1 to get everything.
+ . new option -v (--variable) assigns a value to an Info variable,
+ with the usual syntax, -v VARIABLE=VALUE.
+ . new option -a (--all) instructs Info to display all documents
matching the command line arguments, not just the first. In
conjunction with the -w option, it shows full names of the info
files matching the command line arguments.
@@ -36,7 +36,7 @@
forward searches (}) start at the beginning of the next page, and
backward searches ({) start at the end of the previous page.
-* Distribution: automake-1.14, gettext-0.18.3.
+* Distribution: automake-1.14, gettext-0.18.3.1.
5.1 (12 March 2013)
Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi 2013-08-18 14:29:05 UTC (rev 5324)
+++ trunk/doc/info-stnd.texi 2013-08-18 18:31:58 UTC (rev 5325)
@@ -145,6 +145,7 @@
@anchor{--all}
@item --all
@itemx -a
address@hidden @code{--all} (@code{-a}) command line option
Find all files matching the given @var{menu-item} (a file or node
name). Three usage patterns are supported, as follows.
@@ -167,6 +168,7 @@
@anchor{--apropos}
@item address@hidden
@itemx -k @var{string}
address@hidden @code{--apropos} (@code{-k}) command line option
@cindex Searching all indices
@cindex Info address@hidden, searching all indices}
@cindex address@hidden, in Info files}
@@ -180,30 +182,31 @@
You can invoke the apropos command from inside Info; see
@ref{Searching Commands}.
address@hidden debugging
@item address@hidden
@itemx -x @var{number}
address@hidden @code{--debug} (@code{-x}) command line option
address@hidden debugging
Print additional debugging information. The argument specifies the
-requested verbosity level. To request maximum level, use
address@hidden -1}.
+verbosity level. For all available debugging output, use @option{-x
+-1}. Version @value{VERSION} has two specific verbosity levels:
-The version @value{VERSION} of GNU info defines two verbosity levels:
-
@table @asis
@item 1
Print information about file lookups.
@item 2
-Print operations over the @env{INFOPATH}.
+Print operations relating to @env{INFOPATH}.
@end table
address@hidden @file{infodebug} output file
Unless the window system is initialized, debugging output goes to the
standard error. When it is initialized, it is diverted to the file
@file{infodebug} in the current working directory.
address@hidden directory path
@item --directory @var{directory-path}
@itemx -d @var{directory-path}
address@hidden @code{--directory} (@code{-d}) command line option
address@hidden directory path
Prepend @var{directory-path} to the list of directory paths searched
when Info needs to find a file. You may issue @code{--directory}
multiple times; once for each directory which contains Info files,
@@ -225,32 +228,39 @@
@var{dir/base} is replaced by @address@hidden/share/info} or
@address@hidden/info}, provided that directory exists.
address@hidden address@hidden
address@hidden @code{--dribble} command line option
@cindex keystrokes, recording
@cindex remembering user keystrokes
address@hidden address@hidden
Specify a file where all user keystrokes will be recorded. This file
can be used later to replay the same sequence of commands, see the
@samp{--restore} option below.
address@hidden --file @var{filename}
address@hidden -f @var{filename}
address@hidden Info file, selecting
-Specify a particular Info file to visit. By default, Info visits
-the file @code{dir}; if you use this option, Info will start with
address@hidden(@var{filename})Top} as the first file and node.
address@hidden --file @var{manual}
address@hidden -f @var{manual}
address@hidden @code{--file} (@code{-f}) command line option
address@hidden Info manual, specifying initial
address@hidden initial node, specifying
address@hidden startup node, specifying
+Specify a particular manual to visit. By default, Info starts at a
+top-level ``directory'' (constructed by combining the @file{dir} files
+that it finds). With this option, it starts by trying to visit
address@hidden(@var{manual})Top}, i.e., the @code{Top} node in (typically)
address@hidden@var{manual}.info}. If no such file (or node) can be found,
+Info just exits immediately.
@cindex relative Info file names
@cindex file names, relative
@cindex Info files, relative
-If @var{filename} is an absolute file name, or begins with @file{./} or
address@hidden/}, Info looks for @var{filename} only in the directory of the
-specified @var{filename}, and adds the directory of @var{filename} to
-the value of @code{INFOPATH}. In contrast, if @var{filename} is in the
-form of a relative file name, but without the @file{./} or @file{../}
-prefix, Info will only look for it in the directories specified in
address@hidden In other words, Info does @emph{not} treat file names
-which lack @file{./} and @file{../} prefix as relative to the current
-directory.
+If @var{manual} is an absolute file name, or begins with @file{./} or
address@hidden/}, or contains an intermediate directory, Info looks for
address@hidden only in that explicitly specified directory, and adds
+that directory to the value of @code{INFOPATH}. For example,
address@hidden -f /usr/local/share/info/emacs} and @code{info -f ./emacs}
+visit the Emacs manual in the given directory, or quits. Otherwise,
address@hidden is a simple name (@code{info -f emacs)}, and Info will
+only look for it in the directories specified in @code{INFOPATH}---not
+relative to the current directory.
@cindex compressed Info files
@cindex files, compressed
@@ -261,10 +271,10 @@
known extension, Info looks for a compressed file, if a regular file
isn't found. Info supports files compressed with @code{gzip},
@code{xz}, @code{bzip2}, @code{lzip}, @code{lzma}, @code{compress} and
address@hidden programs, assumed to have @file{.z}, @file{.gz},
address@hidden, @file{.bz2}, @file{.lz}, @file{.lzma}, @file{.Z}, or
address@hidden extensions, possibly after one of the known Info files
-extensions.
address@hidden programs, assumed to have extensions @file{.z},
address@hidden, @file{.xz}, @file{.bz2}, @file{.lz}, @file{.lzma},
address@hidden, and @file{.Y} respectively, possibly after one of the known
+Info files extensions.
On MS-DOS, Info allows for the Info extension, such as @code{.inf},
and the short compressed file extensions, such as @file{.z} and
@@ -276,26 +286,29 @@
@item --help
@itemx -h
-Produces a relatively brief description of the available Info options.
address@hidden @code{--help} (@code{-h}) command line option
+Output a brief description of the available Info command-line options.
@item --index-search @var{string}
address@hidden @code{--index-search} command line option
@cindex index search, selecting from the command line
@cindex online help, using Info as
-After processing all command-line arguments, go to the index in the Info
-file and search for index entries which match @var{string}. If such an
-entry is found, the Info session begins with displaying the node pointed
-to by the first matching index entry; press @kbd{,} to step through the
-rest of the matching entries. If no such entry exists, print @samp{no
-entries found} and exit with nonzero status. This can be used from
-another program as a way to provide online help, or as a quick way of
-starting to read an Info file at a certain node when you don't know the
-exact name of that node.
+After processing all command-line arguments, go to the index in the
+selected Info file and search for index entries which match
address@hidden If such an entry is found, the Info session begins with
+displaying the node pointed to by the first matching index entry;
+press @kbd{,} to step through the rest of the matching entries. If no
+such entry exists, print @samp{no entries found} and exit with nonzero
+status. This can be used from another program as a way to provide
+online help, or as a quick way of starting to read an Info file at a
+certain node when you don't know the exact name of that node.
-This command can also be invoked from inside Info; see @ref{Searching
+This command can also be invoked from inside Info; @pxref{Searching
Commands}.
@item --node @var{nodename}
@itemx -n @var{nodename}
address@hidden @code{--node} (@code{-n}) command line option
@cindex node, selecting from the command line
Specify a particular node to visit in the initial file that Info
loads. This is especially useful in conjunction with @code{--file}.
@@ -309,29 +322,31 @@
close parentheses and whitespace from the shell; for example:@*
@t{info --node "(emacs)Buffers"}
address@hidden --output @var{filename}
address@hidden -o @var{filename}
address@hidden --output @var{file}
address@hidden -o @var{file}
address@hidden @code{--output} (@code{-o}) command line option
@cindex file, outputting to
@cindex outputting to a file
-Specify @var{filename} as the name of a file to which to direct output.
-Each node that Info visits will be output to @var{filename} instead of
-interactively viewed. A value of @code{-} for @var{filename} specifies
-the standard output.
+Direct output to @var{file}. Each node that Info visits will be
+output to @var{file} instead of interactively viewed. A value of
address@hidden for @var{file} means standard output.
address@hidden colors in documents
address@hidden ANSI escape sequences in documents
@item --raw-escapes
@itemx --no-raw-escapes
@itemx -R
address@hidden @code{--raw-escapes} (@code{-R}) command line option
address@hidden colors in documents
address@hidden ANSI escape sequences in documents
Do not remove ANSI escape sequences from documents. Some versions of
-Groff, the GNU document formatter, produce man pages with ANSI escape
+Groff (@pxref{Top,,,groff,Groff}) produce man pages with ANSI escape
sequences for bold, italics, and underlined characters, and for
colorized text. By default, Info lets those escape sequences pass
through directly to the terminal. If your terminal does not support
these escapes, use @code{--no-raw-escapes} to make Info remove them.
address@hidden address@hidden
address@hidden @code{--restore} command line option
@cindex replaying recorded keystrokes
address@hidden address@hidden
Read keystrokes from @var{dribble-file}, presumably recorded during
previous Info session (see the description of the @samp{--dribble}
option above). When the keystrokes in the files are all read, Info
@@ -339,40 +354,44 @@
@item --show-malformed-multibytes
@itemx --no-show-malformed-multibytes
address@hidden @code{--show-malformed-multibytes} command line option
address@hidden malformed multibyte sequences, showing
Show malformed multibyte sequences in the output. By default, such
sequences are dropped.
@anchor{--show-options}
address@hidden command-line options, how to find
address@hidden invocation description, how to find
@item --show-options
@itemx --usage
@itemx -O
-This option causes Info to look for the node that describes how to
-invoke the program and its command-line options, and begin the session
-by displaying that node. It is provided to make it easier to find the
-most important usage information in a manual without the need to wade
-through complex menu hierarchies. The effect is similar to the
address@hidden goto-invocation} command (@pxref{goto-invocation}) from inside
-Info.
address@hidden @code{--show-options} (@code{--usage}, @code{-O}) command line
option
address@hidden command-line options, how to find
address@hidden invocation description, how to find
+Tell Info to look for the node that describes how to invoke the
+program and its command-line options, and begin the session by
+displaying that node. It is provided to make it easier to find the
+most important usage information in a manual without navigating
+through menu hierarchies. The effect is similar to the @code{M-x
+goto-invocation} command (@pxref{goto-invocation}) from inside Info.
address@hidden speech synthesizers
@item --speech-friendly
@itemx -b
-On MS-DOS/MS-Windows only, this option causes Info to use standard file
-I/O functions for screen writes. (By default, Info uses direct writes
-to the video memory on these systems, for faster operation and colored
-display support.) This allows the speech synthesizers used by blind
-persons to catch the output and convert it to audible speech.
address@hidden @code{--speech-friendly} (@code{-b}) command line option
address@hidden speech synthesizers
+On MS-DOS/MS-Windows only, this option causes Info to use standard
+file I/O functions for screen writes. (By default, Info uses direct
+writes to the video memory on these systems, for faster operation and
+colored display support.) This allows the speech synthesizers used by
+blind persons to catch the output and convert it to audible speech.
@item --strict-node-location
-This option causes Info not to search ``nearby'' to locate nodes, and
-instead strictly use the information provided in the Info
-file. The practical use for this option is in debugging programs
-that write Info files, to check that they are outputting the correct
-locations. Due to various bugs and malfeasances in various Info
-writing programs over the years and versions, it is not advisable to
-ever use this option when just trying to read documentation.
address@hidden @code{--strict-node-location} command line option
+This option causes Info not to search ``nearby'' to locate nodes, and
+instead strictly use the information provided in the Info file. The
+practical use for this option is for debugging programs that write
+Info files, to check that they are outputting the correct locations.
+Due to bugs and malfeasances in the various Info writing programs over
+the years and versions, it is not advisable to ever use this option
+when just trying to read documentation.
@item --subnodes
@cindex @code{--subnodes}, command line option
@@ -383,37 +402,41 @@
members of an index. Each node is only output once.
@anchor{variable-assignment}
address@hidden variable assignment
@item -v @address@hidden
@itemx address@hidden@var{value}
-Assign @var{value} to the @command{info} variable @var{name}.
address@hidden, for a detailed description of this feature.
address@hidden @code{--variable} (@code{-v}) command line option
address@hidden variable assignment
+Set the @command{info} variable @var{name} to @var{value}.
address@hidden
@item --version
address@hidden @code{--version} command line option
@cindex version information
Prints the version information of Info and exits.
@anchor{--vi-keys}
address@hidden --vi-keys
address@hidden @code{--vi-keys} command line option
@cindex vi-like key bindings
@cindex Less-like key bindings
address@hidden --vi-keys
This option binds functions to keys differently, to emulate the key
bindings of @code{vi} and Less. The default key bindings are generally
modeled after Emacs.
(@xref{Custom Key Bindings},
for a more general way of altering GNU Info's key bindings.)
address@hidden Info manual location
address@hidden Where is an Info manual?
@item --where
@itemx --location
@itemx -w
address@hidden @code{--where} (@code{--location}, @code{-w}) command line option
address@hidden Info manual location
address@hidden Where is an Info manual?
Show the filename that would be read and exit, instead of actually
reading it and starting Info.
address@hidden menu items}
@item @var{menu-item}
@cindex menu, following
address@hidden menu items}
Info treats its remaining arguments as the names of menu items. The
first argument is a menu item in the initial node visited (generally
@code{dir}), the second argument is a menu item in the first argument's
@@ -1934,22 +1957,22 @@
@node Variables
@chapter Manipulating Variables
-GNU Info contains several @dfn{variables} whose values are looked at by
-various Info commands. You can change the values of these variables,
-and thus change the behavior of Info to more closely match your
-environment and Info file reading manner.
+GNU Info uses several internal @dfn{variables} whose values are looked
+at by various Info commands. You can change the values of these
+variables, and thus change the behavior of Info, if desired.
-There are three ways to set the value of a variable:
+There are three ways to set the value of a variable, listed here in
+order of precedence:
address@hidden 1
address@hidden
@item
-in the command line, using the @option{-v} (@option{--variable})
+interactively, using the @code{set-variable} command described below;
address@hidden
+on the command line, using the @option{-v} (@option{--variable})
command line option (@pxref{variable-assignment});
@item
-interactively, using the @code{set-variable} command described below;
address@hidden
-in the @code{#var} section of the @code{.infokey} file. @xref{Custom
-Key Bindings}.
+in the @code{#var} section of the @code{.infokey} file (@pxref{Custom
+Key Bindings}).
@end enumerate
@table @asis
@@ -1958,16 +1981,14 @@
@findex set-variable
Read the name of a variable, and the value for it, in the echo area
and then set the variable to that value. Completion is available when
-reading the variable name (@pxref{The Echo Area}); often, completion
-is available when reading the value to give to the variable, but that
-depends on the variable itself. If a variable does @emph{not} supply
-multiple choices to complete over, it expects a numeric value.
+reading the variable name (@pxref{The Echo Area}); completion is also
+available when reading the value when that makes sense.
@item @kbd{M-x describe-variable}
@cindex variables, describing
@findex describe-variable
-Read the name of a variable in the echo area and then display a brief
-description of what the variable affects.
+Read the name of a variable in the echo area and display its value and
+a brief description.
@end table
Here is a list of the variables that you can set in Info.
@@ -1975,14 +1996,16 @@
@table @code
@item automatic-footnotes
@vindex automatic-footnotes
address@hidden @code{*Footnotes*} window
address@hidden footnotes window
When set to @code{On}, footnotes appear and disappear automatically;
else, they appear at the bottom of the node text. This variable is
@code{Off} by default. When a node is selected, a window containing
the footnotes which appear in that node is created, and the footnotes
are displayed within the new window. The window that Info creates to
-contain the footnotes is called @samp{*Footnotes*}. If a node is
-selected which contains no footnotes, and a @samp{*Footnotes*} window
-is on the screen, the @samp{*Footnotes*} window is deleted. Footnote
+contain the footnotes is called @code{*Footnotes*}. If a node is
+selected which contains no footnotes, and a @code{*Footnotes*} window
+is on the screen, the @code{*Footnotes*} window is deleted. Footnote
windows created in this fashion are not automatically tiled so that
they can use as little of the display as is possible.
@@ -1992,52 +2015,52 @@
windows. This variable is @code{Off} by default. Normally, typing
@samp{C-x 2} divides the current window into two equal parts. When
@code{automatic-tiling} is set to @code{On}, all of the windows are
-resized automatically, keeping an equal number of lines visible in each
-window. There are exceptions to the automatic tiling; specifically, the
-windows @samp{*Completions*} and @samp{*Footnotes*} are @emph{not}
-resized through automatic tiling; they remain their original size.
+resized automatically, keeping an equal number of lines visible in
+each window. Any @code{*Completions*} and @code{*Footnotes*} windows
+are exceptions to the automatic tiling; they retain their original
+size.
@anchor{cursor-movement-scrolls}
@item cursor-movement-scrolls
-Normally, cursor movement commands (@pxref{Cursor Commands}) stop when
-top or bottom of a node is reached. When this variable is set to
address@hidden, cursor movement commands act as scrolling ones and their
-behavior is controlled by the @code{scroll-behavior} variable (see below).
+By default, cursor movement commands stop when top or bottom of a node
+is reached (@pxref{Cursor Commands}). When this variable is set to
address@hidden, cursor movement commands become scrolling and their
+behavior is controlled by the @code{scroll-behavior} variable (see
+below).
@item errors-ring-bell
@vindex errors-ring-bell
-When set to @code{On}, errors cause the bell to ring. The default
-setting of this variable is @code{On}.
+When set to @code{On} (the default), errors cause the bell to ring.
@item gc-compressed-files
@vindex gc-compressed-files
When set to @code{On}, Info garbage collects files which had to be
uncompressed. The default value of this variable is @code{Off}.
Whenever a node is visited in Info, the Info file containing that node
-is read into core, and Info reads information about the tags and nodes
-contained in that file. Once the tags information is read by Info, it
-is never forgotten. However, the actual text of the nodes does not need
-to remain in core unless a particular Info window needs it. For
-non-compressed files, the text of the nodes does not remain in core when
-it is no longer in use. But de-compressing a file can be a time
-consuming operation, and so Info tries hard not to do it twice.
address@hidden tells Info it is okay to garbage collect the
-text of the nodes of a file which was compressed on disk.
+is read into memory, and Info reads information about the tags and
+nodes contained in that file. Once the tags information is read by
+Info, it is never forgotten. However, the actual text of the nodes
+does not need to be retained unless a particular Info window needs it.
+For non-compressed files, node text is not remembered when it is no
+longer in use. But de-compressing a file can be a time-consuming
+operation, and so Info tries hard not to do it twice. This variable
+tells Info it is okay to garbage collect the text of the nodes of a
+file which was compressed on disk.
@item ISO-Latin
@cindex ISO Latin characters
@vindex ISO-Latin
-When set to @code{On}, Info accepts and displays ISO Latin characters.
-By default, Info assumes an ASCII character set. @code{ISO-Latin} tells
-Info that it is running in an environment where the European standard
-character set is in use, and allows you to input such characters to
-Info, as well as display them.
+When set to @code{On}, Info accepts and displays ISO Latin characters;
+the default is @code{Off}, i.e., an ASCII character set.
address@hidden tells Info that it is running in an environment where
+the European standard character set is in use, and allows you to input
+such characters to Info, as well as display them.
@anchor{min-search-length}
@item min-search-length
-Minimal length of a search string. Attempts to initiate a
+Minimum length of a search string (default 1). Attempts to initiate a
search for a string (or regular expression) shorter than this value,
-result in error. The default is 1 character.
+result in an error.
@anchor{scroll-behavior}
@item scroll-behavior
@@ -2046,17 +2069,29 @@
@vindex scroll-behaviour
Control what happens when forward scrolling is requested at the end of
a node, or when backward scrolling is requested at the beginning of a
-node. The default value for this variable is @code{Continuous}.
-There are three possible values for this variable:
+node. The two variable names are synonyms. The default value for
+this variable is @code{Continuous}. Possible values:
@table @code
@item Continuous
Try to get the first item in this node's menu, or failing that, the
address@hidden node, or failing that, the @samp{Next} of the @samp{Up}.
-This behavior is identical to using the @samp{]}
address@hidden node, or failing that, the @samp{Next} of the @samp{Up}
+node. This behavior is identical to using the @samp{]}
(@code{global-next-node}) and @samp{[} (@code{global-prev-node})
commands.
address@hidden Next Only
+Only try to get the @samp{Next} node.
+
address@hidden Page Only
+Just stop, changing nothing. With this value, no scrolling command
+can change the node that is being viewed.
address@hidden table
+
+This variable normally affects only scrolling commands.
address@hidden, for information on how to widen its
+scope to cursor movement commands.
+
@item scroll-last-node
@vindex scroll-last-node
Control what happens when a scrolling command is issued at the end of
@@ -2083,22 +2118,6 @@
behavior was counter-intuitive, therefore since version 4.12 the
default is to stop at the last node.
address@hidden Next Only
-Only try to get the @samp{Next} node.
-
address@hidden Page Only
-Simply give up, changing nothing. If @code{scroll-behavior} is
address@hidden Only}, no scrolling command can change the node that is being
-viewed.
address@hidden table
-
-This variable normally affects only scrolling commands.
address@hidden, for information on how to widen its
-scope.
-
-The two names, @code{scroll-behavior} and @code{scroll-behaviour}, are
-a historical accident. They are merely synonyms.
-
@item scroll-step
@vindex scroll-step
The number of lines to scroll when the cursor moves out of the window.
@@ -2115,34 +2134,30 @@
@item search-skip-screen
@vindex search-skip-screen
-Change the starting point of the repeated searches
-(@pxref{repeated-search}). When set to @code{Off} (the default),
-repeated searches start at the position immediately following (when
-searching in forward direction), or immediately preceding (when
-searching backwards) the cursor. When set to @code{On}, repeated
-searches omit lines visibly displayed on the screen. In other words,
-forward searches (@address@hidden) start at the beginning of the next page,
-and backward searches (@address@hidden) start at the end of the previous
-page.
+Set the starting point of repeated searches (@pxref{repeated-search}).
+When set to @code{Off} (the default), repeated searches start at the
+position immediately following (when searching in forward direction),
+or immediately preceding (when searching backwards) the cursor. When
+set to @code{On}, repeated searches omit lines visibly displayed on
+the screen. In other words, forward searches (@address@hidden) start at the
+beginning of the next page, and backward searches (@address@hidden) start at
+the end of the previous page.
@item show-index-match
@vindex show-index-match
-When set to @code{On}, the portion of the matched search string is
-highlighted in the message which explains where the matched search
-string was found. The default value of this variable is @code{On}.
-When Info displays the location where an index match was found,
-(@pxref{Searching Commands, , @code{next-index-match}}), the portion of the
-string that you had typed is highlighted by displaying it in the inverse
-case from its surrounding characters.
+When set to @code{On} (the default), the portion of the matched search
+string that you typed is indicated (by displaying it in the
+``opposite'' case) in the result message (@pxref{Searching Commands,,
address@hidden).
@item visible-bell
@vindex visible-bell
-When set to @code{On}, GNU Info attempts to flash the screen instead of
-ringing the bell. This variable is @code{Off} by default. Of course,
-Info can only flash the screen if the terminal allows it; in the case
-that the terminal does not allow it, the setting of this variable has no
-effect. However, you can make Info perform quietly by setting the
address@hidden variable to @code{Off}.
+When set to @code{On}, Info attempts to flash the screen instead of
+ringing the bell. This variable is @code{Off} by default. If the
+terminal does not allow flashing, this variable has no effect. (But
+you can still make Info perform quietly by setting the
address@hidden variable to @code{Off}; or using an external
+command to mute the bell, e.g., @code{xset b 0 0 0}.)
@end table
Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi 2013-08-18 14:29:05 UTC (rev 5324)
+++ trunk/doc/texinfo.texi 2013-08-18 18:31:58 UTC (rev 5325)
@@ -9865,10 +9865,11 @@
@cindex SVG images, used in Docbook
For Docbook, @code{makeinfo} outputs references to
@address@hidden, @address@hidden
address@hidden@var{filename}.jpg}, @address@hidden,
address@hidden@var{filename}.png} and @address@hidden, for every
-file found. Also, @address@hidden is included verbatim, if
-present.
address@hidden@var{filename}.jpeg}, @address@hidden,
address@hidden@var{filename}.pdf}, @address@hidden and
address@hidden@var{filename}.svg}, for every file found. Also,
address@hidden@var{filename}.txt} is included verbatim, if present. (The
+subsequent Docbook processor is supposed to choose the appropriate one.)
@item
For Info and HTML output, @code{makeinfo} uses the optional fifth
Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c 2013-08-18 14:29:05 UTC (rev 5324)
+++ trunk/info/info.c 2013-08-18 18:31:58 UTC (rev 5325)
@@ -910,22 +910,22 @@
puts (_("\
Options:\n\
- -a, --all visit all matching documents.\n\
+ -a, --all use all matching manuals.\n\
-k, --apropos=STRING look up STRING in all indices of all manuals.\n\
-d, --directory=DIR add DIR to INFOPATH.\n\
- --dribble=FILENAME remember user keystrokes in FILENAME.\n\
- -f, --file=FILENAME specify Info file to visit."));
+ --dribble=FILE remember user keystrokes in FILENAME.\n\
+ -f, --file=MANUAL specify Info manual to visit."));
puts (_("\
-h, --help display this help and exit.\n\
--index-search=STRING go to node pointed by index entry STRING.\n\
-n, --node=NODENAME specify nodes in first visited Info file.\n\
- -o, --output=FILENAME output selected nodes to FILENAME."));
+ -o, --output=FILE output selected nodes to FILE."));
puts (_("\
-R, --raw-escapes output \"raw\" ANSI escapes (default).\n\
--no-raw-escapes output escapes as literal text.\n\
- --restore=FILENAME read initial keystrokes from FILENAME.\n\
+ --restore=FILE read initial keystrokes from FILE.\n\
-O, --show-options, --usage go to command-line options node."));
#if defined(__MSDOS__) || defined(__MINGW32__)
@@ -936,7 +936,7 @@
puts (_("\
--strict-node-location (for debugging) use Info file pointers as-is.\n\
--subnodes recursively output menu items.\n\
- -v, --variable VAR=VALUE assign VALUE to the info variable VAR.\n\
+ -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n\
--vi-keys use vi-like and less-like key bindings.\n\
--version display version information and exit.\n\
-w, --where, --location print physical location of Info file.\n\
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5325] doc updates,
karl <=