Hi,
None of the synopses of the 'set' command mentions the -E and -T
options. The first patch corrects this. The second patch brings
some texts printed by 'help' more in line with the man page: among
other things it corrects a mistake in the description of 'trap' and
removes a duplicate sentence from 'wait'. The third patch puts the
options in some synopses and help texts in alphabetical order, again
following the man page, so it becomes a little easier to find them.
Benno
diff -ur bash-3.2.orig/builtins/set.def bash-3.2.new/builtins/set.def
--- bash-3.2.orig/builtins/set.def 2006-07-27 15:41:43.000000000 +0200
+++ bash-3.2.new/builtins/set.def 2006-12-11 14:25:17.000000000 +0100
@@ -60,7 +60,8 @@
$BUILTIN set
$FUNCTION set_builtin
-$SHORT_DOC set [--abefhkmnptuvxBCHP] [-o option] [arg ...]
+$SHORT_DOC set [--abefhkmnptuvxBCEHPT] [-o option] [arg ...]
+ Switches shell attributes on or off. Available switches are:
-a Mark variables which are modified or created for export.
-b Notify of job termination immediately.
-e Exit immediately if a command exits with a non-zero status.
diff -ur bash-3.2.orig/doc/bash.1 bash-3.2.new/doc/bash.1
--- bash-3.2.orig/doc/bash.1 2006-10-03 14:54:26.000000000 +0200
+++ bash-3.2.new/doc/bash.1 2006-12-11 14:25:17.000000000 +0100
@@ -7539,7 +7539,7 @@
Any command associated with the \fBRETURN\fP trap is executed
before execution resumes after the function or script.
.TP
-\fBset\fP [\fB\-\-abefhkmnptuvxBCHP\fP] [\fB\-o\fP \fIoption\fP] [\fIarg\fP ...]
+\fBset\fP [\fB\-\-abefhkmnptuvxBCEHPT\fP] [\fB\-o\fP \fIoption\fP] [\fIarg\fP ...]
Without options, the name and value of each shell variable are displayed
in a format that can be reused as input
for setting or resetting the currently-set variables.
diff -ur bash-3.2.orig/doc/bashref.texi bash-3.2.new/doc/bashref.texi
--- bash-3.2.orig/doc/bashref.texi 2006-09-28 16:25:28.000000000 +0200
+++ bash-3.2.new/doc/bashref.texi 2006-12-11 14:25:17.000000000 +0100
@@ -3935,7 +3935,7 @@
@item set
@btindex set
@example
-set [--abefhkmnptuvxBCHP] [-o @var{option}] [EMAIL PROTECTED] @dots{}]
+set [--abefhkmnptuvxBCEHPT] [-o @var{option}] [EMAIL PROTECTED] @dots{}]
@end example
If no options or arguments are supplied, @code{set} displays the names
diff -ur bash-3.2.orig/builtins/declare.def bash-3.2.new/builtins/declare.def
--- bash-3.2.orig/builtins/declare.def 2006-01-29 01:34:11.000000000 +0100
+++ bash-3.2.new/builtins/declare.def 2006-12-11 14:26:23.000000000 +0100
@@ -90,10 +90,11 @@
$BUILTIN local
$FUNCTION local_builtin
-$SHORT_DOC local name[=value] ...
+$SHORT_DOC local [option] name[=value] ...
Create a local variable called NAME, and give it VALUE. LOCAL
can only be used within a function; it makes the variable NAME
have a visible scope restricted to that function and its children.
+As option any of the options accepted by declare can be used.
$END
int
local_builtin (list)
diff -ur bash-3.2.orig/builtins/shopt.def bash-3.2.new/builtins/shopt.def
--- bash-3.2.orig/builtins/shopt.def 2005-02-19 23:25:03.000000000 +0100
+++ bash-3.2.new/builtins/shopt.def 2006-12-11 14:26:23.000000000 +0100
@@ -23,7 +23,7 @@
$BUILTIN shopt
$FUNCTION shopt_builtin
-$SHORT_DOC shopt [-pqsu] [-o long-option] optname [optname...]
+$SHORT_DOC shopt [-pqsu] [-o] [optname...]
Toggle the values of variables controlling optional behavior.
The -s flag means to enable (set) each OPTNAME; the -u flag
unsets each OPTNAME. The -q flag suppresses output; the exit
diff -ur bash-3.2.orig/builtins/trap.def bash-3.2.new/builtins/trap.def
--- bash-3.2.orig/builtins/trap.def 2006-07-27 15:42:26.000000000 +0200
+++ bash-3.2.new/builtins/trap.def 2006-12-11 14:26:23.000000000 +0100
@@ -23,14 +23,14 @@
$BUILTIN trap
$FUNCTION trap_builtin
-$SHORT_DOC trap [-lp] [arg signal_spec ...]
+$SHORT_DOC trap [-lp] [[arg] signal_spec ...]
The command ARG is to be read and executed when the shell receives
signal(s) SIGNAL_SPEC. If ARG is absent (and a single SIGNAL_SPEC
is supplied) or `-', each specified signal is reset to its original
value. If ARG is the null string each SIGNAL_SPEC is ignored by the
shell and by the commands it invokes. If a SIGNAL_SPEC is EXIT (0)
the command ARG is executed on exit from the shell. If a SIGNAL_SPEC
-is DEBUG, ARG is executed after every simple command. If the`-p' option
+is DEBUG, ARG is executed before every simple command. If the`-p' option
is supplied then the trap commands associated with each SIGNAL_SPEC are
displayed. If no arguments are supplied or if only `-p' is given, trap
prints the list of commands associated with each signal. Each SIGNAL_SPEC
diff -ur bash-3.2.orig/builtins/wait.def bash-3.2.new/builtins/wait.def
--- bash-3.2.orig/builtins/wait.def 2006-07-28 21:13:34.000000000 +0200
+++ bash-3.2.new/builtins/wait.def 2006-12-11 14:26:23.000000000 +0100
@@ -37,8 +37,7 @@
$SHORT_DOC wait [n]
Wait for the specified process and report its termination status. If
N is not given, all currently active child processes are waited for,
-and the return code is zero. N is a process ID; if it is not given,
-all child processes of the shell are waited for.
+and the return code is zero. N must be a process ID.
$END
#include <config.h>
diff -ur bash-3.2.orig/lib/readline/doc/hsuser.texi bash-3.2.new/lib/readline/doc/hsuser.texi
--- bash-3.2.orig/lib/readline/doc/hsuser.texi 2006-03-21 15:54:48.000000000 +0100
+++ bash-3.2.new/lib/readline/doc/hsuser.texi 2006-12-11 14:26:23.000000000 +0100
@@ -412,7 +412,7 @@
Remove a trailing pathname component, leaving only the head.
@item t
-Remove all leading pathname components, leaving the tail.
+Remove all leading pathname components, leaving the tail.
@item r
Remove a trailing suffix of the form @[EMAIL PROTECTED], leaving
diff -ur bash-3.2.orig/builtins/bind.def bash-3.2.new/builtins/bind.def
--- bash-3.2.orig/builtins/bind.def 2003-12-19 23:56:34.000000000 +0100
+++ bash-3.2.new/builtins/bind.def 2006-12-11 14:27:21.000000000 +0100
@@ -32,6 +32,7 @@
to that found in ~/.inputrc, but must be passed as a single argument:
bind '"\C-x\C-r": re-read-init-file'.
bind accepts the following options:
+ -f filename Read key bindings from FILENAME.
-m keymap Use `keymap' as the keymap for the duration of this
command. Acceptable keymap names are emacs,
emacs-standard, emacs-meta, emacs-ctlx, vi, vi-move,
@@ -40,18 +41,17 @@
-P List function names and bindings.
-p List functions and bindings in a form that can be
reused as input.
- -r keyseq Remove the binding for KEYSEQ.
- -x keyseq:shell-command Cause SHELL-COMMAND to be executed when
- KEYSEQ is entered.
- -f filename Read key bindings from FILENAME.
-q function-name Query about which keys invoke the named function.
+ -r keyseq Remove the binding for KEYSEQ.
-u function-name Unbind all keys which are bound to the named function.
- -V List variable names and values
- -v List variable names and values in a form that can
- be reused as input.
-S List key sequences that invoke macros and their values
-s List key sequences that invoke macros and their values
in a form that can be reused as input.
+ -V List variable names and values
+ -v List variable names and values in a form that can
+ be reused as input.
+ -x keyseq:shell-command Cause SHELL-COMMAND to be executed when
+ KEYSEQ is entered.
$END
#if defined (READLINE)
diff -ur bash-3.2.orig/builtins/complete.def bash-3.2.new/builtins/complete.def
--- bash-3.2.orig/builtins/complete.def 2003-12-19 23:57:03.000000000 +0100
+++ bash-3.2.new/builtins/complete.def 2006-12-11 14:27:21.000000000 +0100
@@ -24,7 +24,7 @@
$BUILTIN complete
$DEPENDS_ON PROGRAMMABLE_COMPLETION
$FUNCTION complete_builtin
-$SHORT_DOC complete [-abcdefgjksuv] [-pr] [-o option] [-A action] [-G globpat] [-W wordlist] [-P prefix] [-S suffix] [-X filterpat] [-F function] [-C command] [name ...]
+$SHORT_DOC complete [-abcdefgjksuv] [-pr] [-o option] [-A action] [-C command] [-F function] [-G globpat] [-P prefix] [-S suffix] [-W wordlist] [-X filterpat] [name ...]
For each NAME, specify how arguments are to be completed.
If the -p option is supplied, or if no options are supplied, existing
completion specifications are printed in a way that allows them to be
@@ -531,7 +531,7 @@
$BUILTIN compgen
$DEPENDS_ON PROGRAMMABLE_COMPLETION
$FUNCTION compgen_builtin
-$SHORT_DOC compgen [-abcdefgjksuv] [-o option] [-A action] [-G globpat] [-W wordlist] [-P prefix] [-S suffix] [-X filterpat] [-F function] [-C command] [word]
+$SHORT_DOC compgen [-abcdefgjksuv] [-o option] [-A action] [-C command] [-F function] [-G globpat] [-P prefix] [-S suffix] [-W wordlist] [-X filterpat] [word]
Display the possible completions depending on the options. Intended
to be used from within a shell function generating possible completions.
If the optional WORD argument is supplied, matches against WORD are
diff -ur bash-3.2.orig/builtins/enable.def bash-3.2.new/builtins/enable.def
--- bash-3.2.orig/builtins/enable.def 2003-12-20 00:07:07.000000000 +0100
+++ bash-3.2.new/builtins/enable.def 2006-12-11 14:27:21.000000000 +0100
@@ -23,7 +23,7 @@
$BUILTIN enable
$FUNCTION enable_builtin
-$SHORT_DOC enable [-pnds] [-a] [-f filename] [name ...]
+$SHORT_DOC enable [-adnps] [-f filename] [name ...]
Enable and disable builtin shell commands. This allows
you to use a disk command which has the same name as a shell
builtin without specifying a full pathname. If -n is used, the
diff -ur bash-3.2.orig/builtins/fc.def bash-3.2.new/builtins/fc.def
--- bash-3.2.orig/builtins/fc.def 2006-07-28 03:44:09.000000000 +0200
+++ bash-3.2.new/builtins/fc.def 2006-12-11 14:27:21.000000000 +0100
@@ -24,7 +24,7 @@
$BUILTIN fc
$FUNCTION fc_builtin
$DEPENDS_ON HISTORY
-$SHORT_DOC fc [-e ename] [-nlr] [first] [last] or fc -s [pat=rep] [cmd]
+$SHORT_DOC fc [-e ename] [-lnr] [first] [last] or fc -s [pat=rep] [cmd]
fc is used to list or edit and re-execute commands from the history list.
FIRST and LAST can be numbers specifying the range, or FIRST can be a
string, which means the most recent command beginning with that
diff -ur bash-3.2.orig/builtins/history.def bash-3.2.new/builtins/history.def
--- bash-3.2.orig/builtins/history.def 2005-09-24 23:42:21.000000000 +0200
+++ bash-3.2.new/builtins/history.def 2006-12-11 14:27:21.000000000 +0100
@@ -24,7 +24,7 @@
$BUILTIN history
$FUNCTION history_builtin
$DEPENDS_ON HISTORY
-$SHORT_DOC history [-c] [-d offset] [n] or history -awrn [filename] or history -ps arg [arg...]
+$SHORT_DOC history [-c] [-d offset] [n] or history -anrw [filename] or history -ps arg [arg...]
Display the history list with line numbers. Lines listed with
with a `*' have been modified. Argument of N says to list only
the last N lines. The `-c' option causes the history list to be
diff -ur bash-3.2.orig/builtins/read.def bash-3.2.new/builtins/read.def
--- bash-3.2.orig/builtins/read.def 2006-09-19 14:45:48.000000000 +0200
+++ bash-3.2.new/builtins/read.def 2006-12-11 14:27:21.000000000 +0100
@@ -23,7 +23,7 @@
$BUILTIN read
$FUNCTION read_builtin
-$SHORT_DOC read [-ers] [-u fd] [-t timeout] [-p prompt] [-a array] [-n nchars] [-d delim] [name ...]
+$SHORT_DOC read [-ers] [-a array] [-d delim] [-n nchars] [-p prompt] [-t timeout] [-u fd] [name ...]
One line is read from the standard input, or from file descriptor FD if the
-u option is supplied, and the first word is assigned to the first NAME,
the second word to the second NAME, and so on, with leftover words assigned
diff -ur bash-3.2.orig/builtins/setattr.def bash-3.2.new/builtins/setattr.def
--- bash-3.2.orig/builtins/setattr.def 2005-08-09 17:32:19.000000000 +0200
+++ bash-3.2.new/builtins/setattr.def 2006-12-11 14:27:21.000000000 +0100
@@ -52,7 +52,7 @@
$BUILTIN export
$FUNCTION export_builtin
-$SHORT_DOC export [-nf] [name[=value] ...] or export -p
+$SHORT_DOC export [-fn] [name[=value] ...] or export -p
NAMEs are marked for automatic export to the environment of
subsequently executed commands. If the -f option is given,
the NAMEs refer to functions. If no NAMEs are given, or if `-p'
_______________________________________________
Bug-bash mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-bash
