summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2012-12-10 14:28:11 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2012-12-10 14:28:11 +0000
commit33b3adb4cccf80561b80b2ce77b62d8574f4d4cf (patch)
tree62b0b0449a83b325bef6151ceeda39796ba85107
parent10f05a4ef9efc53f89e03c33aba1576ca320d13c (diff)
downloadillumos-joyent-33b3adb4cccf80561b80b2ce77b62d8574f4d4cf.tar.gz
OS-1749 oawk must die
-rw-r--r--manifest5
-rw-r--r--usr/src/man/man1/nawk.19
2 files changed, 10 insertions, 4 deletions
diff --git a/manifest b/manifest
index d6c717c30a..3ca022817c 100644
--- a/manifest
+++ b/manifest
@@ -1932,7 +1932,7 @@ f usr/bin/at 4755 root sys
f usr/bin/atq 4755 root sys
f usr/bin/atrm 4755 root sys
f usr/bin/auths 0555 root bin
-f usr/bin/awk 0555 root bin
+h usr/bin/awk=usr/bin/nawk
f usr/bin/banner 0555 root bin
f usr/bin/bart 0555 root bin
f usr/bin/basename 0555 root bin
@@ -2202,7 +2202,6 @@ f usr/bin/nl 0555 root bin
f usr/bin/nm 0555 root bin
h usr/bin/nohup=usr/lib/isaexec
f usr/bin/nroff 0555 root bin
-h usr/bin/oawk=usr/bin/awk
f usr/bin/od 0555 root bin
f usr/bin/on 0555 root bin
f usr/bin/optisa 0555 root bin
@@ -11383,7 +11382,7 @@ f usr/share/man/man1/at.1 0444 root bin
f usr/share/man/man1/atq.1 0444 root bin
f usr/share/man/man1/atrm.1 0444 root bin
f usr/share/man/man1/auths.1 0444 root bin
-f usr/share/man/man1/awk.1 0444 root bin
+s usr/share/man/man1/awk.1=nawk.1
f usr/share/man/man1/banner.1 0444 root bin
f usr/share/man/man1/basename.1 0444 root bin
f usr/share/man/man1/batch.1 0444 root bin
diff --git a/usr/src/man/man1/nawk.1 b/usr/src/man/man1/nawk.1
index 425db5d299..2c27e1baa0 100644
--- a/usr/src/man/man1/nawk.1
+++ b/usr/src/man/man1/nawk.1
@@ -15,6 +15,12 @@ nawk \- pattern scanning and processing language
.SH SYNOPSIS
.LP
.nf
+\fB/usr/bin/awk\fR [\fB-F\fR \fIERE\fR] [\fB-v\fR \fIassignment\fR] \fI\&'program'\fR | \fB-f\fR \fIprogfile\fR...
+ [\fIargument\fR]...
+.fi
+
+.LP
+.nf
\fB/usr/bin/nawk\fR [\fB-F\fR \fIERE\fR] [\fB-v\fR \fIassignment\fR] \fI\&'program'\fR | \fB-f\fR \fIprogfile\fR...
[\fIargument\fR]...
.fi
@@ -28,7 +34,8 @@ nawk \- pattern scanning and processing language
.SH DESCRIPTION
.sp
.LP
-The \fB/usr/bin/nawk\fR and \fB/usr/xpg4/bin/awk\fR utilities execute
+The \fB/usr/bin/awk\fR, \fB/usr/bin/nawk\fR and \fB/usr/xpg4/bin/awk\fR
+utilities execute
\fIprogram\fRs written in the \fBnawk\fR programming language, which is
specialized for textual data manipulation. A \fBnawk\fR \fIprogram\fR is a
sequence of patterns and corresponding actions. The string specifying