summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorhgutch <hgutch@NetBSD.org>2022-08-28 10:48:15 +0000
committerhgutch <hgutch@NetBSD.org>2022-08-28 10:48:15 +0000
commitc50152805215fc19f54989ef828b22f840a8b376 (patch)
treea5ded42412e49137f76ddc57b5bdbada1e74edf9 /bin
parentff6d005c7f095550ca18bf1875dc8f1a87a6a64c (diff)
Change back various occurrences of \*[Le], \*[Ge] (less/greater equal)
and \*(ua (upwards arrow) to literal "<=", ">=" and "^" whenever appropriate (e.g., in code examples).
Diffstat (limited to 'bin')
-rw-r--r--bin/csh/csh.124
-rw-r--r--bin/expr/expr.14
2 files changed, 14 insertions, 14 deletions
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 55d80f454fc..0982fe225c8 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: csh.1,v 1.56 2022/07/09 21:19:44 uwe Exp $
+.\" $NetBSD: csh.1,v 1.57 2022/08/28 10:48:15 hgutch Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -476,7 +476,7 @@ nest.)
This `!' may be preceded by a `\e' to prevent its special meaning; for
convenience, an `!' is passed unchanged when it is followed by a blank,
tab, newline, `=' or `('.
-(History substitutions also occur when an input line begins with `\*(ua'.
+(History substitutions also occur when an input line begins with `^'.
This special abbreviation will be described later.)
Any input line that contains history substitution is echoed on the terminal
before it is executed as it would have been typed without history substitution.
@@ -530,7 +530,7 @@ first (command) word
.It Ar n
.Ar n Ns 'th
argument
-.It \*(ua
+.It ^
first argument, i.e., `1'
.It $
last argument
@@ -544,7 +544,7 @@ range of words
abbreviates
.Ar `\&0\-y\'
.It *
-abbreviates `\*(ua\-$', or nothing if only 1 word in event
+abbreviates `^\-$', or nothing if only 1 word in event
.It Ar x*
abbreviates
.Ar `x\-$\'
@@ -555,7 +555,7 @@ but omitting word `$'
.El
.Pp
The `:' separating the event specification from the word designator
-can be omitted if the argument selector begins with a `\*(ua', `$', `*',
+can be omitted if the argument selector begins with a `^', `$', `*',
`\-' or `%'.
After the optional word designator can be
placed a sequence of modifiers, each preceded by a `:'.
@@ -624,14 +624,14 @@ A history reference may be given without an event specification, e.g., `!$'.
Here, the reference is to the previous command unless a previous
history reference occurred on the same line in which case this form repeats
the previous reference.
-Thus `!?foo?\*(ua !$' gives the first and last arguments
+Thus `!?foo?^ !$' gives the first and last arguments
from the command matching `?foo?'.
.Pp
A special abbreviation of a history reference occurs when the first
-non-blank character of an input line is a `\*(ua'.
-This is equivalent to `!:s\*(ua' providing a convenient
+non-blank character of an input line is a `^'.
+This is equivalent to `!:s^' providing a convenient
shorthand for substitutions on the text of the previous line.
-Thus `\*(ualb\*(ualib' fixes the spelling of
+Thus `^lb^lib' fixes the spelling of
`lib'
in the previous command.
Finally, a history substitution may be surrounded with `{' and `}'
@@ -669,7 +669,7 @@ left unchanged.
.Pp
Thus if the alias for `ls' is `ls \-l' the command `ls /usr' would map to
`ls \-l /usr', the argument list here being undisturbed.
-Similarly if the alias for `lookup' was `grep !\*(ua /etc/passwd' then
+Similarly if the alias for `lookup' was `grep !^ /etc/passwd' then
`lookup bill' would map to `grep bill /etc/passwd'.
.Pp
If an alias is found, the word transformation of the input text
@@ -987,12 +987,12 @@ and
commands.
The following operators are available:
.Bd -ragged -offset indent
-\&|\&| && \&| \*(ua & == != =~ !~ \*[Le] \*[Ge]
+\&|\&| && \&| ^ & == != =~ !~ <= >=
< > << >> + \- * / % ! ~ ( )
.Ed
.Pp
Here the precedence increases to the right,
-`==' `!=' `=~' and `!~', `\*[Le]' `\*[Ge]' `<'
+`==' `!=' `=~' and `!~', `<=' `>=' `<'
and `>', `<<' and `>>', `+' and `\-',
`*' `/' and `%' being, in groups, at the same level.
The `==' `!=' `=~' and `!~' operators compare their arguments as strings;
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 74d0469d819..bbe0798c01f 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: expr.1,v 1.37 2017/07/03 21:33:23 wiz Exp $
+.\" $NetBSD: expr.1,v 1.38 2022/08/28 10:48:16 hgutch Exp $
.\"
.\" Copyright (c) 2000,2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -62,7 +62,7 @@ Returns the evaluation of
.Ar expr1
if neither expression evaluates to an empty string or zero;
otherwise, returns zero.
-.It Ar expr1 Li "{=, >, \*[Ge], <, \*[Le], !=}" Ar expr2
+.It Ar expr1 Li "{=, >, >=, <, <=, !=}" Ar expr2
Returns the results of integer comparison if both arguments are integers;
otherwise, returns the results of string comparison using the locale-specific
collation sequence.