rpms/bash/devel bash-aq.patch,NONE,1.1 bash.spec,1.97,1.98

Fri Jan 6 16:47:49 UTC 2006

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1160

Modified Files:
	bash.spec 
Added Files:
	bash-aq.patch 
Log Message:
* Fri Jan  6 2006 Tim Waugh <twaugh at redhat.com>
- Use literal single-quote in bash man page where appropriate (bug #177051).


bash-aq.patch:
 bash.1 |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE bash-aq.patch ---
--- bash-3.1/doc/bash.1.aq	2006-01-06 16:40:40.000000000 +0000
+++ bash-3.1/doc/bash.1	2006-01-06 16:46:36.000000000 +0000
@@ -977,7 +977,7 @@
 .B PARAMETERS
 below).
 .PP
-Words of the form \fB$\fP'\fIstring\fP' are treated specially.  The
+Words of the form \fB$\fP\(aq\fIstring\fP\(aq are treated specially.  The
 word expands to \fIstring\fP, with backslash-escaped characters replaced
 as specified by the ANSI C standard.  Backslash escape sequences, if
 present, are decoded as follows:
@@ -1011,7 +1011,7 @@
 .B \e\e
 backslash
 .TP
-.B \e'
+.B \e\(aq
 single quote
 .TP   
 .B \e\fInnn\fP
@@ -1845,7 +1845,7 @@
 Example:
 .RS
 .PP
-\fBMAILPATH\fP='/var/mail/bfox?"You have mail":~/shell\-mail?"$_ has mail!"'
+\fBMAILPATH\fP=\(aq/var/mail/bfox?"You have mail":~/shell\-mail?"$_ has mail!"\(aq
 .PP
 .B Bash
 supplies a default value for this variable, but the location of the user
@@ -1979,7 +1979,7 @@
 included.
 .IP
 If this variable is not set, \fBbash\fP acts as if it had the
-value \fB$'\enreal\et%3lR\enuser\et%3lU\ensys\t%3lS'\fP.
+value \fB$\(aq\enreal\et%3lR\enuser\et%3lU\ensys\t%3lS\(aq\fP.
 If the value is null, no timing information is displayed.
 A trailing newline is added when the format string is displayed.
 .TP
@@ -2708,7 +2708,7 @@
 .B IFS
 is null, no word splitting occurs.
 .PP
-Explicit null arguments (\^\f3"\^"\fP or \^\f3'\^'\fP\^) are retained.
+Explicit null arguments (\^\f3"\^"\fP or \^\f3\(aq\^\(aq\fP\^) are retained.
 Unquoted implicit null arguments, resulting from the expansion of
 parameters that have no values, are removed.
 If a parameter with no value is expanded within double quotes, a
@@ -2930,7 +2930,7 @@
 After the preceding expansions, all unquoted occurrences of the
 characters
 .BR \e ,
-.BR ' ,
+.BR \(aq ,
 and \^\f3"\fP\^ that did not result from one of the above
 expansions are removed.
 .SH REDIRECTION
@@ -4495,8 +4495,8 @@
 .B \e"
 literal "
 .TP
-.B \e'
-literal '
+.B \e\(aq
+literal \(aq
 .RE
 .PD
 .PP
@@ -4544,7 +4544,7 @@
 Unquoted text is assumed to be a function name.
 In the macro body, the backslash escapes described above are expanded.
 Backslash will quote any other character in the macro text,
-including " and '.
+including " and \(aq.
 .PP
 .B Bash
 allows the current readline key bindings to be displayed or modified
@@ -7320,7 +7320,7 @@
 In addition to the standard \fIprintf\fP(1) formats, \fB%b\fP causes
 \fBprintf\fP to expand backslash escape sequences in the corresponding
 \fIargument\fP (except that \fB\ec\fP terminates output, backslashes in
-\fB\e'\fP, \fB\e"\fP, and \fB\e?\fP are not removed, and octal escapes
+\fB\e\(aq\fP, \fB\e"\fP, and \fB\e?\fP are not removed, and octal escapes
 beginning with \fB\e0\fP may contain up to four digits),
 and \fB%q\fP causes \fBprintf\fP to output the corresponding
 \fIargument\fP in a format that can be reused as shell input.
@@ -8037,7 +8037,7 @@
 \fBPathname Expansion\fP are enabled.
 .TP 8
 .B extquote
-If set, \fB$\fP'\fIstring\fP' and \fB$\fP"\fIstring\fP" quoting is
+If set, \fB$\fP\(aq\fIstring\fP\(aq and \fB$\fP"\fIstring\fP" quoting is
 performed within \fB${\fP\fIparameter\fP\fB}\fP expansions
 enclosed in double quotes.  This option is enabled by default.
 .TP 8


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- bash.spec	2 Jan 2006 11:02:47 -0000	1.97
+++ bash.spec	6 Jan 2006 16:47:46 -0000	1.98
@@ -19,6 +19,7 @@
 Patch102: bash-2.03-profile.patch
 Patch103: bash-2.05a-requires.patch
 Patch104: bash-2.05a-shellfunc.patch
+Patch105: bash-aq.patch
 Patch106: bash-2.05a-loadables.patch
 Patch107: bash-2.05a-interpreter.patch
 Patch108: bash-2.05b-readline-oom.patch
@@ -64,6 +65,7 @@
 %patch102 -p1 -b .profile
 %patch103 -p1 -b .requires
 %patch104 -p1 -b .shellfunc
+%patch105 -p1 -b .aq
 %patch106 -p1 -b .loadables
 %patch107 -p1 -b .interpreter
 %patch108 -p1 -b .readline-oom
@@ -209,6 +211,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Jan  6 2006 Tim Waugh <twaugh at redhat.com>
+- Use literal single-quote in bash man page where appropriate (bug #177051).
+
 * Mon Jan  2 2006 Tim Waugh <twaugh at redhat.com> 3.1-1
 - 3.1.
 - No longer need ia64, utf8, multibyteifs, jobs, sigpipe,


