summaryrefslogtreecommitdiff
path: root/bin/csh
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2004-03-18 09:37:26 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2004-03-18 09:37:26 +0000
commit6bf53b69ee4604609fc2d3da05cb624fa9d3bb1b (patch)
tree456ca8ebc5e82bafd300c3121549aaefeda0a32c /bin/csh
parentd272ea8f06cb6a9b5c5f15167496785a0c52a4cf (diff)
wording/grammar improvements from Jared Yanovich;
Diffstat (limited to 'bin/csh')
-rw-r--r--bin/csh/USD.doc/csh.18
-rw-r--r--bin/csh/USD.doc/csh.210
-rw-r--r--bin/csh/csh.124
3 files changed, 21 insertions, 21 deletions
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index f41c3d11861..974475543a3 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.7 2003/06/02 23:32:07 millert Exp $
+.\" $OpenBSD: csh.1,v 1.8 2004/03/18 09:37:25 jmc Exp $
.\" $NetBSD: csh.1,v 1.3 1995/03/21 09:03:33 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -674,7 +674,7 @@ and does not execute the command.
.PP
Another very important point is that files with the character `.' at the
beginning are treated specially.
-Neither `*' or `?' or the `[' `]' mechanism will match it.
+Neither `*' nor `?' nor the `[' `]' mechanism will match it.
This prevents accidental matching of the filenames `.' and `..'
in the working directory which have special meaning to the system,
as well as other files such as
@@ -737,14 +737,14 @@ Thus the command
echo *
.DE
will not echo the character `*'.
-It will either echo an sorted list of filenames in the
+It will either echo a sorted list of filenames in the
current
.I "working directory,"
or print the message `No match' if there are
no files in the working directory.
.PP
The recommended mechanism for placing characters which are neither numbers,
-digits, `/', `.' or `\-' in an argument word to a command is to enclose
+digits, `/', `.', nor `\-' in an argument word to a command, is to enclose
it with single quotation characters `\'', i.e.
.DS
echo \'*\'
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 5420d8a6bda..ceae444557c 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.2,v 1.7 2003/06/02 23:32:07 millert Exp $
+.\" $OpenBSD: csh.2,v 1.8 2004/03/18 09:37:25 jmc Exp $
.\" $NetBSD: csh.2,v 1.3 1995/03/21 09:03:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -450,7 +450,7 @@ mail bill
.DE
into a call on `newmail'.
More generally, suppose we wish the command `ls' to always show
-sizes of files, that is to always do `\-s'.
+sizes of files, that is, to always do `\-s'.
We can do
.DS
alias ls ls \-s
@@ -682,8 +682,8 @@ before prompting you for another command. For example,
[2] 2034 2035
%
.DE
-runs the `ls' program with the `\-s' options, pipes this output into
-the `sort' program with the `\-n' option which puts its output into the
+runs the `ls' program with the `\-s' option, pipes this output into
+the `sort' program with the `\-n' option, which puts its output into the
file `usage'.
Since the `&' was at the end of the line, these two programs were started
together as a background job. After starting the job, the shell prints
@@ -1060,7 +1060,7 @@ stack (forgetting it).
Typing
.I popd
several times in a series takes you backward through the directories
-you had been in (changed to) by
+you had been in (changed to) by the
.I pushd
command.
There are other options to
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index edbc06330d4..aa4470c9dba 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.49 2003/09/02 18:09:43 jmc Exp $
+.\" $OpenBSD: csh.1,v 1.50 2004/03/18 09:37:25 jmc Exp $
.\" $NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -310,7 +310,7 @@ showing that the job which was started asynchronously was job number
.Pp
If you are running a job and wish to do something else you may hit
.Ic ^Z
-(control-Z) which sends a
+(control-Z), which sends a
.Dv SIGSTOP
signal to the current job.
The shell will then normally show that the job has been
@@ -373,7 +373,7 @@ job, if there were only one suspended job whose name began with
the string
.Qq ex .
It is also possible to say
-.Ic %?string
+.Ic %?string ,
which specifies a job whose text contains
.Ar string ,
if there is only one such job.
@@ -912,7 +912,7 @@ zero, and the second and additional words of multiword values are ignored.
.Pp
After the input line is aliased and parsed, and before each command
is executed, variable substitution
-is performed keyed by
+is performed, keyed by
.Ql $
characters.
This expansion can be prevented by preceding the
@@ -951,8 +951,8 @@ modifier, the results of variable
substitution may eventually be command and filename substituted.
Within
.Ql \&" ,
-a variable whose value consists of multiple words expands to a
-(portion of) a single word, with the words of the variable's value
+a variable whose value consists of multiple words expands to
+(a portion of) a single word, with the words of the variable's value
separated by blanks.
When the
.Ql :q
@@ -1399,7 +1399,7 @@ Strings that begin with
are considered octal numbers.
Null or missing arguments are considered
.Ql 0 .
-The result of all expressions are strings,
+The results of all expressions are strings,
which represent decimal numbers.
It is important to note that no two components of an expression can appear
in the same word; except when adjacent to components of expressions that
@@ -1956,7 +1956,7 @@ is set.
.It Ic onintr Fl
.It Ic onintr Ar label
Control the action of the shell on interrupts.
-The first form restores the default action of the shell on interrupts
+The first form restores the default action of the shell on interrupts,
which is to terminate shell scripts or to return to the terminal command
input level.
The second form
@@ -2157,7 +2157,7 @@ This is most often used to stop shells started by
.It Ic \ \ \ \ breaksw
.It Ic endsw
Each case label is successively matched against the specified
-.Ar string
+.Ar string ,
which is first command and filename expanded.
The file metacharacters
.Ql * ,
@@ -2239,7 +2239,7 @@ It is not an error for nothing to be
.Ic unset .
.Pp
.It Ic unsetenv Ar pattern
-Removes all variables whose name match the specified pattern from the
+Removes all variables whose names match the specified pattern from the
environment.
See also the
.Ic setenv
@@ -2320,7 +2320,7 @@ The operators
etc. are available as in C.
The space separating the name from the assignment operator is optional.
Spaces are, however, mandatory in separating components of
-.Ar expr
+.Ar expr ,
which would otherwise be single words.
.Pp
Special postfix
@@ -2558,7 +2558,7 @@ Controls automatic timing of commands.
If set, then any command that takes more than this many
.Tn CPU
seconds
-will cause a line giving user, system, and real times and a utilization
+will cause a line giving user, system, and real times, and a utilization
percentage which is the ratio of user plus system times to real time
to be printed when it terminates.
.It Ic verbose