From c24eb7cf3707341de89aba6be7490dc99f30d789 Mon Sep 17 00:00:00 2001 From: tg Date: Tue, 27 Jan 2004 17:41:30 +0000 Subject: [PATCH] first part of mergeing OpenBSD and fixing whitespace and RCS IDs --- ksh.1tbl | 42 +++++++++++++++++++++--------------------- sh.1tbl | 36 ++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ksh.1tbl b/ksh.1tbl index c69d725..aac207f 100644 --- a/ksh.1tbl +++ b/ksh.1tbl @@ -1,5 +1,5 @@ -.\" $MirBSD: ksh.1tbl,v 1.13 2004/01/04 19:53:29 tg Exp $ -.\" $OpenBSD: ksh.1tbl,v 1.63 2003/12/27 20:35:12 jmc Exp $ +.\" $MirBSD: ksh.1tbl,v 1.14 2004/01/27 17:41:29 tg Exp $ +.\" $OpenBSD: ksh.1tbl,v 1.65 2004/01/23 23:08:45 jmc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -562,7 +562,7 @@ if no .Ar list is executed, the exit status is zero. .It Xo Ic for Ar name No [ -.Ic in Ar word Ar ... term Ns No ] +.Ic in Ar word Ar ... term Ns ] .Ic do Ar list Ic done .Xc For each @@ -623,7 +623,7 @@ that is executed; if no non-conditional .Ar list is executed, the exit status is zero. .It Xo Ic select Ar name No [ -.Ic in Ar word Ar ... term Ns No ] +.Ic in Ar word Ar ... term Ns ] .Ic do Ar list Ic done .Xc The @@ -1104,7 +1104,7 @@ Lastly, parameters can be assigned values using assignment operators inside arithmetic expressions (see .Sx Arithmetic expressions below) or using the -.Xo Ic ${ Ns Ar name Ns No = +.Xo Ic ${ Ns Ar name Ns = .Ns Ar value Ns Ic \&} .Xc form of the parameter substitution (see below). @@ -1117,7 +1117,7 @@ commands, or by parameter assignments followed by simple commands) are put in the environment (see .Xr environ 7 ) of commands run by the shell as -.Ar name Ns No = Ns Ar value +.Ar name Ns = Ns Ar value pairs. The order in which parameters appear in the environment of a command is unspecified. @@ -1170,7 +1170,7 @@ is set and not it is substituted; otherwise, .Ar word is printed on standard error (preceded by -.Ar name Ns No \&: ) +.Ar name Ns \&: ) and an error occurs (normally causing termination of a shell script, function or .-script). If word is omitted the string @@ -1695,7 +1695,7 @@ The pattern elements have the following meaning: Matches any single character. .It Ic \&* Matches any sequence of characters. -.It Ic \&[ Ns No .. Ns Ic \&] +.It Ic \&[ Ns .. Ns Ic \&] Matches any of the characters inside the brackets. Ranges of characters can be specified by separating two characters by a @@ -1716,9 +1716,9 @@ Also, a .Ql \&! appearing at the start of the list has special meaning (see below), so to represent itself it must be quoted or appear later in the list. -.It Ic \&[\&! Ns No .. Ns Ic \&] +.It Ic \&[\&! Ns .. Ns Ic \&] Like -.Ic \&[ Ns No .. Ns Ic \&] , +.Ic \&[ Ns .. Ns Ic \&] , except it matches any character not inside the brackets. .Sm off .It Xo Ic \&*( Ar pattern Ic \&| No \ ...\ @@ -1813,7 +1813,7 @@ Note that none of the above pattern elements match either a period at the start of a file name or a slash .Pq Sq / , even if they are explicitly used in a -.Ic \&[ Ns No .. Ns Ic \&] +.Ic \&[ Ns .. Ns Ic \&] sequence; also, the names .Dq \&. and @@ -1832,7 +1832,7 @@ The character classes (i.e., .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&] inside a -.Ic \&[ Ns No .. Ns Ic \&] +.Ic \&[ Ns .. Ns Ic \&] expression) are not yet implemented. .Ss Input/output redirection When a command is executed, its standard input, standard output, and standard @@ -1963,7 +1963,7 @@ will print an error with a line number prepended to it. Integer arithmetic expressions can be used with the .Ic let command, inside -.Ic $(( Ns No .. Ns Ic )) +.Ic $(( Ns .. Ns Ic )) expressions, inside array references (e.g., .Sm off .Ar name Ic \&[ Ar expr Ic \&] ) , @@ -2625,7 +2625,7 @@ above). .Pp When listing aliases, one of two formats is used. Normally, aliases are listed as -.Ar name Ns No = Ns Ar value , +.Ar name Ns = Ns Ar value , where .Ar value is quoted. @@ -2914,7 +2914,7 @@ is used), and then executed by the shell. .It Xo Ic fc .Oo Fl e No \&- \&| Fl s Oc .Op Fl g -.Op Ar old Ns No = Ns Ar new +.Op Ar old Ns = Ns Ar new .Op Ar prefix .Xc Re-execute the selected command (the previous command by default) after @@ -3212,14 +3212,14 @@ commands defining all read-only parameters, including their values, are printed. .It Ic return Op Ar status Returns from a function or -.Ic \&. +.Ic .\& script, with exit status .Ar status . If no .Ar status is given, the exit status of the last executed command is used. If used outside of a function or -.Ic \&. +.Ic .\& script, it has the same effect as .Ic exit . Note that @@ -3227,9 +3227,9 @@ Note that treats both profile and .Ev ENV files as -.Ic \&. -scripts, while the original Korn shell only treats profiles as -.Ic \&. +.Ic .\& +cripts, while the original Korn shell only treats profiles as +.Ic .\& scripts. .It Xo Ic set Op Ic +-abCefhkmnpsuvxX .Op Ic +-o Ar option @@ -4616,7 +4616,7 @@ commands continue searching backward to the next previous occurrence of the pattern. The history buffer retains only a finite number of lines; the oldest are discarded as necessary. -.It Ic set-mark-command ^[ Ns No +.It Ic set-mark-command ^[ Ns Set the mark at the cursor position. .It Ic stuff On systems supporting it, pushes the bound character back onto the terminal diff --git a/sh.1tbl b/sh.1tbl index ce1e5ae..70d1db3 100644 --- a/sh.1tbl +++ b/sh.1tbl @@ -1,4 +1,4 @@ -.\" $OpenBSD: sh.1tbl,v 1.42 2003/12/27 20:52:22 jmc Exp $ +.\" $OpenBSD: sh.1tbl,v 1.44 2004/01/23 23:08:45 jmc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -540,7 +540,7 @@ if no .Ar list is executed, the exit status is zero. .It Xo Ic for Ar name No [ -.Ic in Ar word Ar ... term Ns No ] +.Ic in Ar word Ar ... term Ns ] .Ic do Ar list Ic done .Xc For each @@ -931,7 +931,7 @@ Lastly, parameters can be assigned values using assignment operators inside arithmetic expressions (see .Sx Arithmetic expressions below) or using the -.Xo Ic ${ Ns Ar name Ns No = +.Xo Ic ${ Ns Ar name Ns = .Ns Ar value Ns Ic \&} .Xc form of the parameter substitution (see below). @@ -944,7 +944,7 @@ commands, or by parameter assignments followed by simple commands) are put in the environment (see .Xr environ 7 ) of commands run by the shell as -.Ar name Ns No = Ns Ar value +.Ar name Ns = Ns Ar value pairs. The order in which parameters appear in the environment of a command is unspecified. @@ -997,7 +997,7 @@ is set and not it is substituted; otherwise, .Ar word is printed on standard error (preceded by -.Ar name Ns No \&: ) +.Ar name Ns \&: ) and an error occurs (normally causing termination of a shell script, function or .-script). If word is omitted the string @@ -1352,7 +1352,7 @@ The pattern elements have the following meaning: Matches any single character. .It Ic \&* Matches any sequence of characters. -.It Ic \&[ Ns No .. Ns Ic \&] +.It Ic \&[ Ns .. Ns Ic \&] Matches any of the characters inside the brackets. Ranges of characters can be specified by separating two characters by a @@ -1373,9 +1373,9 @@ Also, a .Ql \&! appearing at the start of the list has special meaning (see below), so to represent itself it must be quoted or appear later in the list. -.It Ic \&[\&! Ns No .. Ns Ic \&] +.It Ic \&[\&! Ns .. Ns Ic \&] Like -.Ic \&[ Ns No .. Ns Ic \&] , +.Ic \&[ Ns .. Ns Ic \&] , except it matches any character not inside the brackets. .Sm on Matches any string of characters that matches zero or more occurrences of the @@ -1466,7 +1466,7 @@ Note that none of the above pattern elements match either a period at the start of a file name or a slash .Pq Sq / , even if they are explicitly used in a -.Ic \&[ Ns No .. Ns Ic \&] +.Ic \&[ Ns .. Ns Ic \&] sequence; also, the names .Dq \&. and @@ -1485,7 +1485,7 @@ The character classes (i.e., .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&] inside a -.Ic \&[ Ns No .. Ns Ic \&] +.Ic \&[ Ns .. Ns Ic \&] expression) are not yet implemented. .Ss Input/output redirection When a command is executed, its standard input, standard output, and standard @@ -1616,7 +1616,7 @@ will print an error with a line number prepended to it. Integer arithmetic expressions can be used with the .Ic let command, inside -.Ic $(( Ns No .. Ns Ic )) +.Ic $(( Ns .. Ns Ic )) expressions, inside array references (e.g., .Sm off .Ar name Ic \&[ Ar expr Ic \&] ) , @@ -2217,7 +2217,7 @@ above). .Pp When listing aliases, one of two formats is used. Normally, aliases are listed as -.Ar name Ns No = Ns Ar value , +.Ar name Ns = Ns Ar value , where .Ar value is quoted. @@ -2416,7 +2416,7 @@ If no command is given except for I/O redirection, the I/O redirection is permanent and the shell is not replaced. Any file descriptors which are opened or -.Xr dup 2 Ns No 'd +.Xr dup 2 Ns 'd in this way are made available to other executed commands (note that the Korn shell differs here: it does not pass on file descriptors greater than 2). .It Ic exit Op Ar status @@ -2444,7 +2444,7 @@ A command that exits with a non-zero status. .It Xo Ic fc .Oo Fl e No \&- \&| Fl s Oc .Op Fl g -.Op Ar old Ns No = Ns Ar new +.Op Ar old Ns = Ns Ar new .Op Ar prefix .Xc Re-execute the selected command (the previous command by default) after @@ -2730,14 +2730,14 @@ commands defining all read-only parameters, including their values, are printed. .It Ic return Op Ar status Returns from a function or -.Ic \&. +.Ic .\& script, with exit status .Ar status . If no .Ar status is given, the exit status of the last executed command is used. If used outside of a function or -.Ic \&. +.Ic .\& script, it has the same effect as .Ic exit . Note that @@ -2745,9 +2745,9 @@ Note that treats both profile and .Ev ENV files as -.Ic \&. +.Ic .\& scripts, while the original Korn shell only treats profiles as -.Ic \&. +.Ic .\& scripts. .It Xo Ic set Op Ic +-abCefhkmnpsuvxX .Op Ic +-o Ar option