1 *** doc/bash.1.orig Wed Oct 12 06:45:05 2011 |
1 --- doc/bash.1 2011-01-16 12:31:39.000000000 -0800 |
2 --- doc/bash.1 Wed Oct 12 06:45:46 2011 |
2 +++ doc/bash.1 2011-11-29 09:57:25.406978670 -0800 |
3 *************** |
3 @@ -3937,7 +3937,7 @@ |
4 *** 3843,3849 **** |
4 .B \fIexpr\fP?\fIexpr\fP:\fIexpr\fP |
5 .B \fIexpr\fP?\fIexpr\fP:\fIexpr\fP |
5 conditional operator |
6 conditional operator |
6 .TP |
7 .TP |
7 -.B = *= /= %= += \-= <<= >>= &= ^= |= |
8 ! .B = *= /= %= += \-= <<= >>= &= ^= |= |
8 +.B "= *= /= %= += \-= <<= >>= &= ^= |=" |
9 assignment |
9 assignment |
10 .TP |
10 .TP |
11 .B \fIexpr1\fP , \fIexpr2\fP |
11 .B \fIexpr1\fP , \fIexpr2\fP |
12 --- 3843,3849 ---- |
12 @@ -5340,11 +5340,11 @@ |
13 .B \fIexpr\fP?\fIexpr\fP:\fIexpr\fP |
13 .IP \fB$include\fP |
14 conditional operator |
14 This directive takes a single filename as an argument and reads commands |
15 .TP |
15 and bindings from that file. For example, the following directive |
16 ! .B "= *= /= %= += \-= <<= >>= &= ^= |=" |
16 -would read \fI/etc/inputrc\fP: |
17 assignment |
17 +would read \fI/etc/bash/inputrc\fP: |
18 .TP |
18 .sp 1 |
19 .B \fIexpr1\fP , \fIexpr2\fP |
19 .RS |
20 *************** |
20 .nf |
21 *** 5235,5245 **** |
21 -\fB$include\fP \^ \fI/etc/inputrc\fP |
22 .IP \fB$include\fP |
22 +\fB$include\fP \^ \fI/etc/bash/inputrc\fP |
23 This directive takes a single filename as an argument and reads commands |
23 .fi |
24 and bindings from that file. For example, the following directive |
24 .RE |
25 ! would read \fI/etc/inputrc\fP: |
25 .SS Searching |
26 .sp 1 |
|
27 .RS |
|
28 .nf |
|
29 ! \fB$include\fP \^ \fI/etc/inputrc\fP |
|
30 .fi |
|
31 .RE |
|
32 .SS Searching |
|
33 --- 5235,5245 ---- |
|
34 .IP \fB$include\fP |
|
35 This directive takes a single filename as an argument and reads commands |
|
36 and bindings from that file. For example, the following directive |
|
37 ! would read \fI/etc/bash/inputrc\fP: |
|
38 .sp 1 |
|
39 .RS |
|
40 .nf |
|
41 ! \fB$include\fP \^ \fI/etc/bash/inputrc\fP |
|
42 .fi |
|
43 .RE |
|
44 .SS Searching |
|