Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/solaris-014.bash.man.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Mon, 29 Feb 2016 10:09:14 -0800
changeset 5518 c47fe0edc204
parent 1082 6d49548fa9da
child 7485 89b2d849f322
permissions -rw-r--r--
20612604 upgrade bash to 4.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5518
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     1
 
# Solaris-specific configuration defaults.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     2
 
# Our bash system configuration files are in /etc/bash.
c47fe0edc204 20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1082
diff changeset 
     3
 
# Not for upstream.
1082
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
     4
 
--- 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 
     5
 
+++ 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 
     6
 
@@ -3937,7 +3937,7 @@
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
     7
 
 .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 
     8
 
 conditional operator
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
     9
 
 .TP
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    10
 
-.B = *= /= %= += \-= <<= >>= &= ^= |=
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    11
 
+.B "= *= /= %= += \-= <<= >>= &= ^= |="
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    12
 
 assignment
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    13
 
 .TP
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    14
 
 .B \fIexpr1\fP , \fIexpr2\fP
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    15
 
@@ -5340,11 +5340,11 @@
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    16
 
 .IP \fB$include\fP
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    17
 
 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 
    18
 
 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 
    19
 
-would read \fI/etc/inputrc\fP:
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    20
 
+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 
    21
 
 .sp 1
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    22
 
 .RS
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    23
 
 .nf
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    24
 
-\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 
    25
 
+\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 
    26
 
 .fi
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    27
 
 .RE
6d49548fa9da 15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents: 540
diff changeset 
    28
 
 .SS Searching
upstream/oracle/userland-gate