author | Stefan Teleman <stefan.teleman@oracle.com> |
Thu, 13 Dec 2012 15:52:21 -0800 | |
changeset 1082 | 6d49548fa9da |
parent 540 | 4e3006696e5f |
child 5518 | c47fe0edc204 |
permissions | -rw-r--r-- |
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
1 |
--- doc/bash.1 2011-01-16 12:31:39.000000000 -0800 |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
2 |
+++ doc/bash.1 2011-11-29 09:57:25.406978670 -0800 |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
3 |
@@ -3937,7 +3937,7 @@ |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
4 |
.B \fIexpr\fP?\fIexpr\fP:\fIexpr\fP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
5 |
conditional operator |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
6 |
.TP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
7 |
-.B = *= /= %= += \-= <<= >>= &= ^= |= |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
8 |
+.B "= *= /= %= += \-= <<= >>= &= ^= |=" |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
9 |
assignment |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
10 |
.TP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
11 |
.B \fIexpr1\fP , \fIexpr2\fP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
12 |
@@ -5340,11 +5340,11 @@ |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
13 |
.IP \fB$include\fP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
14 |
This directive takes a single filename as an argument and reads commands |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
15 |
and bindings from that file. For example, the following directive |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
16 |
-would read \fI/etc/inputrc\fP: |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
17 |
+would read \fI/etc/bash/inputrc\fP: |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
18 |
.sp 1 |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
19 |
.RS |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
20 |
.nf |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
21 |
-\fB$include\fP \^ \fI/etc/inputrc\fP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
22 |
+\fB$include\fP \^ \fI/etc/bash/inputrc\fP |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
23 |
.fi |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
24 |
.RE |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
540
diff
changeset
|
25 |
.SS Searching |