diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 1999-06-04 02:45:26 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 1999-06-04 02:45:26 +0000 |
| commit | 8b44fe6976bc998d4f0e2aad3f16532a857e5794 (patch) | |
| tree | 196a1ce3b84d92c654f45f5c001905bd1b00101d | |
| parent | 67797a0990e5f662d6d5a45d57b8df9621d9b446 (diff) | |
start to remove non-escaped trailing whitespace, it can confuse troff; pjanzen@
63 files changed, 629 insertions, 527 deletions
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index 5721ad578bc..57b33874616 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cp.1,v 1.10 1999/05/30 17:44:54 aaron Exp $ +.\" $OpenBSD: cp.1,v 1.11 1999/06/04 02:45:11 aaron Exp $ .\" $NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $ .\" .\" Copyright (c) 1989, 1990, 1993, 1994 @@ -135,12 +135,12 @@ For each destination file that already exists, its contents are overwritten if permissions allow, but its mode, user ID, and group ID are unchanged. .Pp -In the second synopsis form, -.Ar target_directory +In the second synopsis form, +.Ar target_directory must exist unless there is only one named .Ar source_file -which is a directory and the -.Fl R +which is a directory and the +.Fl R flag is specified. .Pp If the destination file does not exist, the mode of the source file is @@ -159,12 +159,12 @@ conditions must be fulfilled or both bits are removed. .Pp Appropriate permissions are required for file creation or overwriting. .Pp -Symbolic links are always followed unless the -.Fl R +Symbolic links are always followed unless the +.Fl R flag is set, in which case symbolic links are not followed, by default. The .Fl H -or +or .Fl L flags (in conjunction with the .Fl R @@ -196,7 +196,7 @@ or .Sh SEE ALSO .Xr mv 1 , .Xr rcp 1 , -.Xr umask 2 , +.Xr umask 2 , .Xr fts 3 , .Xr symlink 7 .Sh STANDARDS diff --git a/bin/csh/csh.1 b/bin/csh/csh.1 index 0d74cb99714..89630684200 100644 --- a/bin/csh/csh.1 +++ b/bin/csh/csh.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: csh.1,v 1.28 1999/06/03 09:50:31 aaron Exp $ +.\" $OpenBSD: csh.1,v 1.29 1999/06/04 02:45:12 aaron Exp $ .\" $NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -62,7 +62,7 @@ login shell and a shell script command processor. If the first argument (argument 0) to the shell is a dash .Pq Sq \- , then this is a login shell. -A login shell also can be specified by invoking the shell with the +A login shell also can be specified by invoking the shell with the .Fl l flag as the only argument. .Pp @@ -1756,7 +1756,7 @@ option lists process IDs in addition to the normal information. .Pp .It Ic kill % Ns Ar job .It Ic kill -.Op Fl s Ar signal_name +.Op Fl s Ar signal_name .Ar pid .It Ic kill Fl sig Ar pid ... .It Ic kill Fl l Op exit_status @@ -1939,7 +1939,7 @@ being ignored, all forms of have no meaning and interrupts continue to be ignored by the shell and all invoked commands. Finally, -.Ic onintr +.Ic onintr statements are ignored in the system startup files where interrupts are disabled .Pq Pa /etc/csh.cshrc , /etc/csh.login . @@ -1955,13 +1955,13 @@ entry in the stack. The members of the directory stack are numbered from the top starting at 0. .Pp .It Ic printf Ar format-string values -Invokes a built-in version of -.Ic printf -after evaluating the -.Ar format-string -and -.Ar values . -See the +Invokes a built-in version of +.Ic printf +after evaluating the +.Ar format-string +and +.Ar values . +See the .Xr printf 1 manpage for details. .Pp @@ -2484,7 +2484,7 @@ is given. Default is .Dq %\ , or -.Dq #\ +.Dq #\ for the super-user. .It Ic savehist Is given a numeric value to control the number of entries of the diff --git a/bin/date/date.1 b/bin/date/date.1 index 853bbc4ed0f..87c17b13f1c 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: date.1,v 1.18 1999/02/01 07:50:46 d Exp $ +.\" $OpenBSD: date.1,v 1.19 1999/06/04 02:45:12 aaron Exp $ .\" $NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -92,7 +92,7 @@ Set the kernel's value for minutes west of .Tn GMT . .Ar minutes_west specifies the number of minutes returned in -.Ql tz_minuteswest +.Ql tz_minuteswest by future calls to .Xr gettimeofday 2 . .It Fl u @@ -106,7 +106,7 @@ An operand with a leading plus sign signals a user-defined format string which specifies the format in which to display the date and time. The format string may contain any of the conversion specifications described -in the +in the .Xr strftime 3 manual page, as well as any arbitrary text. A <newline> character is always output after the characters specified by diff --git a/bin/df/df.1 b/bin/df/df.1 index d9752e68206..87fd1360232 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: df.1,v 1.15 1999/05/23 14:10:47 aaron Exp $ +.\" $OpenBSD: df.1,v 1.16 1999/06/04 02:45:13 aaron Exp $ .\" $NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 @@ -79,7 +79,7 @@ option causes the numbers to be reported in kilobyte counts. .It Fl l Display statistics only about mounted file systems with the MNT_LOCAL flag set. If a non-local file system is given as an argument, a -warning is issued and no information is given on that file system. +warning is issued and no information is given on that file system. .It Fl n Print out the previously obtained statistics from the file systems. This option should be used if it is possible that one or more diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index 859de2d43ac..c7f33c4c912 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ed.1,v 1.18 1999/05/23 14:10:47 aaron Exp $ +.\" $OpenBSD: ed.1,v 1.19 1999/06/04 02:45:13 aaron Exp $ .\" .Dd May 2, 1993 .Dt ED 1 @@ -536,7 +536,7 @@ and .Em V Ns No . A newline alone in .Em command-list -is equivalent to a +is equivalent to a .Em p command. .It (1,$) Ns Em G/re/ @@ -545,7 +545,7 @@ Interactively edits the addressed lines matching a regular expression For each matching line, the line is printed, the current address is set, -and the user is prompted to enter a +and the user is prompted to enter a .Em command-list Ns No . At the end of the .Em g @@ -593,10 +593,10 @@ Prints the addressed lines unambiguously. If a single line fills more than one screen (as might be the case when viewing a binary file, for instance), a .Dq --More-- -prompt is printed on the last line. +prompt is printed on the last line. .Nm waits until the RETURN key is pressed -before displaying the next screen. +before displaying the next screen. The current address is set to the last line printed. .It (.,.) Ns Em m Ns No (.) @@ -894,7 +894,7 @@ printed with the .Em h (help) command. .Pp -Since the +Since the .Em g (global) command masks any errors from failed searches and substitutions, it can be used to perform conditional operations in scripts; e.g., diff --git a/bin/expr/expr.1 b/bin/expr/expr.1 index a7556453b8b..be6bf24b455 100644 --- a/bin/expr/expr.1 +++ b/bin/expr/expr.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: expr.1,v 1.6 1998/12/15 01:20:21 aaron Exp $ +.\" $OpenBSD: expr.1,v 1.7 1999/06/04 02:45:13 aaron Exp $ .\" $NetBSD: expr.1,v 1.9 1995/04/28 23:27:13 jtc Exp $ .\" .\" Written by J.T. Conklin <jtc@netbsd.org>. @@ -16,7 +16,7 @@ .Sh DESCRIPTION The .Nm -utility evaluates +utility evaluates .Ar expression and writes the result on standard output. .Pp @@ -29,8 +29,8 @@ Operators are listed below in order of increasing precedence. Operators with equal precedence are grouped within { } symbols. .Bl -tag -width indent .It Ar expr1 Li | Ar expr2 -Returns the evaluation of -.Ar expr1 +Returns the evaluation of +.Ar expr1 if it is neither an empty string nor zero; otherwise, returns the evaluation of .Ar expr2 . @@ -40,7 +40,7 @@ Returns the evaluation of if neither expression evaluates to an empty string or zero; otherwise, returns zero. .It Ar expr1 Li "{=, >, >=, <, <=, !=}" Ar expr2 -Returns the results of integer comparison if both arguments are integers; +Returns the results of integer comparison if both arguments are integers; otherwise, returns the results of string comparison using the locale-specific collation sequence. The result of each comparison is 1 if the specified relation is true, @@ -50,23 +50,23 @@ Returns the results of addition or subtraction of integer-valued arguments. .It Ar expr1 Li "{*, /, %}" Ar expr2 Returns the results of multiplication, integer division, or remainder of integer-valued arguments. .It Ar expr1 Li : Ar expr2 -The +The .Dq \: -operator matches -.Ar expr1 -against +operator matches +.Ar expr1 +against .Ar expr2 , which must be a regular expression. The regular expression is anchored -to the beginning of the string with an implicit +to the beginning of the string with an implicit .Dq ^ . .Pp If the match succeeds and the pattern contains at least one regular -expression subexpression -.Dq "\e(...\e)" , -the string corresponding to +expression subexpression +.Dq "\e(...\e)" , +the string corresponding to .Dq "\e1" is returned; -otherwise the matching operator returns the number of characters matched. +otherwise the matching operator returns the number of characters matched. If the match fails and the pattern contains a regular expression subexpression the null string is returned; otherwise 0. @@ -75,7 +75,7 @@ otherwise 0. Parentheses are used for grouping in the usual manner. .Sh EXAMPLES .Bl -enum -.It +.It The following example adds one to the variable a. .Dl a=`expr $a + 1` .It diff --git a/bin/kill/kill.1 b/bin/kill/kill.1 index 6e2b5aa2eea..6747a537290 100644 --- a/bin/kill/kill.1 +++ b/bin/kill/kill.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kill.1,v 1.7 1998/12/15 01:20:22 aaron Exp $ +.\" $OpenBSD: kill.1,v 1.8 1999/06/04 02:45:13 aaron Exp $ .\" $NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -46,7 +46,7 @@ .Sh SYNOPSIS .Nm kill .Op Fl s Ar signal_name -.Ar PID +.Ar PID .Ar \&... .Nm kill .Fl l diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index f17165f87a9..0803fcccdb4 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ls.1,v 1.18 1999/05/30 02:42:05 pjanzen Exp $ +.\" $OpenBSD: ls.1,v 1.19 1999/06/04 02:45:13 aaron Exp $ .\" $NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -98,8 +98,7 @@ an equal sign after each socket, and a vertical bar .Pq Sq \&| -after each that is a -.Tn FIFO . +after each that is a FIFO. .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. @@ -368,7 +367,7 @@ or .Pp In addition, if the .Fl o -option is specified, the file flags (see +option is specified, the file flags (see .Xr chflags 1 ) are displayed as comma-separated strings in front of the file size, abbreviated as follows: @@ -377,7 +376,7 @@ abbreviated as follows: .It \&- no flags .It uappnd -user append-only +user append-only .It uchg user immutable .It nodump @@ -387,7 +386,7 @@ opaque file .It sappnd system append-only .It arch -archived +archived .It schg system immutable .El diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1 index 138d60730d3..df9acbe4b21 100644 --- a/bin/pax/cpio.1 +++ b/bin/pax/cpio.1 @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: cpio.1,v 1.7 1998/12/15 01:20:24 aaron Exp $ +.\" $OpenBSD: cpio.1,v 1.8 1999/06/04 02:45:14 aaron Exp $ .\" .Dd February 16, 1997 .Dt CPIO 1 @@ -261,7 +261,7 @@ specific archive format specification. .Xr pax 1 , .Xr tar 1 .Sh BUGS -The +The .Fl s and .Fl S diff --git a/bin/pax/pax.1 b/bin/pax/pax.1 index fb5b8480f20..469cd03fa1f 100644 --- a/bin/pax/pax.1 +++ b/bin/pax/pax.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pax.1,v 1.13 1999/06/03 09:50:33 aaron Exp $ +.\" $OpenBSD: pax.1,v 1.14 1999/06/04 02:45:14 aaron Exp $ .\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $ .\" .\" Copyright (c) 1992 Keith Muller. @@ -205,20 +205,17 @@ and .It <none> .Em List . .Nm -will write to -.Dv standard output +will write to standard output a table of contents of the members of the archive file read from -.Dv standard input , -whose pathnames match the specified +standard input, whose pathnames match the specified .Ar patterns . The table of contents contains one filename per line and is written using single line buffering. .It Fl r .Em Read . .Nm -extracts the members of the archive file read from the -.Dv standard input , -with pathnames matching the specified +extracts the members of the archive file read from the standard input, +with pathnames matching the specified .Ar patterns . The archive format and blocking is automatically determined on input. When an extracted file is a directory, the entire file hierarchy @@ -231,16 +228,15 @@ option. .It Fl w .Em Write . .Nm -writes an archive containing the +writes an archive containing the .Ar file -operands to -.Dv standard output +operands to standard output using the specified archive format. -When no +When no .Ar file -operands are specified, a list of files to copy with one per line is read from -.Dv standard input . -When a +operands are specified, a list of files to copy with one per line is read from +standard input. +When a .Ar file operand is also a directory, the entire file hierarchy rooted at that directory will be included. @@ -251,11 +247,10 @@ copies the .Ar file operands to the destination .Ar directory . -When no +When no .Ar file operands are specified, a list of files to copy with one per line is read from -the -.Dv standard input . +the standard input. When a .Ar file operand is also a directory the entire file @@ -308,10 +303,10 @@ operand is used to select one or more pathnames of archive members. Archive members are selected using the pattern matching notation described by .Xr fnmatch 3 . -When the +When the .Ar pattern operand is not supplied, all members of the archive will be selected. -When a +When a .Ar pattern matches a directory, the entire file hierarchy rooted at that directory will be selected. @@ -321,8 +316,7 @@ operand does not select at least one archive member, .Nm will write these .Ar pattern -operands in a diagnostic message to -.Dv standard error +operands in a diagnostic message to standard error. and then exit with a non-zero exit status. .Pp The @@ -334,41 +328,36 @@ operand does not select at least one archive member, .Nm will write these .Ar file -operand pathnames in a diagnostic message to -.Dv standard error +operand pathnames in a diagnostic message to standard error and then exit with a non-zero exit status. .Sh OPTIONS The following options are supported: .Bl -tag -width 4n .It Fl r -Read an archive file from -.Dv standard input +Read an archive file from standard input and extract the specified .Ar files . If any intermediate directories are needed in order to extract an archive member, these directories will be created as if .Xr mkdir 2 was called with the bitwise inclusive -.Dv OR +.Tn OR of .Dv S_IRWXU , S_IRWXG , and -.Dv S_IRWXO +.Dv S_IRWXO as the mode argument. When the selected archive format supports the specification of linked files and these files cannot be linked while the archive is being extracted, .Nm -will write a diagnostic message to -.Dv standard error +will write a diagnostic message to standard error and exit with a non-zero exit status at the completion of operation. .It Fl w -Write files to the -.Dv standard output +Write files to the standard input in the specified archive format. When no .Ar file -operands are specified, -.Dv standard input +operands are specified, standard input is read for a list of pathnames with one per line without any leading or trailing .Aq blanks . @@ -380,7 +369,7 @@ If an archive format is not specified with a .Fl x option, the format currently being used in the archive will be selected. Any attempt to append to an archive in a format different from the -format already used in the archive will cause +format already used in the archive will cause .Nm to exit immediately with a non-zero exit status. @@ -421,7 +410,7 @@ can be separated by to indicate a product. A specific archive device may impose additional restrictions on the size of blocking it will support. -When blocking is not specified, the default +When blocking is not specified, the default .Ar blocksize is dependent on the specific archive format being used (see the .Fl x @@ -442,13 +431,11 @@ member and not the file hierarchy rooted at the directory. Specify .Ar archive as the pathname of the input or output archive, overriding the default -.Dv standard input -(for +standard input (for .Em list and .Em read ) -or -.Dv standard output +or standard output (for .Em write ) . A single archive may span multiple files and different archive devices. @@ -475,8 +462,8 @@ If this line consists of a single period, the file or archive member is processed with no modification to its name. Otherwise, its name is replaced with the contents of the line. .Nm -will immediately exit with a non-zero exit status if -.Dv <EOF> +will immediately exit with a non-zero exit status if +.Dv EOF is encountered when reading a response or if .Pa /dev/tty cannot be opened for reading and writing. @@ -500,7 +487,7 @@ No more than one archive member is matched for each .Ar pattern . When members of type directory are matched, the file hierarchy rooted at that directory is also matched (unless -.Fl d +.Fl d is also specified). .It Fl o Ar options Information to modify the algorithm for extracting or writing archive files @@ -522,7 +509,7 @@ and .Cm p . Multiple characteristics can be concatenated within the same string and multiple -.Fl p +.Fl p options can be specified. The meaning of the specification characters are as follows: .Bl -tag -width 2n @@ -537,10 +524,10 @@ This is intended to be used by .Em root , someone with all the appropriate privileges, in order to preserve all aspects of the files as they are recorded in the archive. -The +The .Cm e flag is the sum of the -.Cm o +.Cm o and .Cm p flags. @@ -553,7 +540,7 @@ Preserve the user ID and group ID. .Sq Preserve the file mode bits. This intended to be used by a -.Em user +.Em user with regular privileges who wants to preserve all aspects of the file other than the ownership. The file times are preserved by default, but two other flags are offered to @@ -567,7 +554,7 @@ extracted file, subject to the permissions of the invoking process. Otherwise the attribute of the extracted file is determined as part of the normal file creation action. -If neither the +If neither the .Cm e nor the .Cm o @@ -575,7 +562,7 @@ specification character is specified, or the user ID and group ID are not preserved for any reason, .Nm will not set the -.Dv S_ISUID +.Dv S_ISUID .Em ( setuid ) and .Dv S_ISGID @@ -583,8 +570,7 @@ and bits of the file mode. If the preservation of any of these items fails for any reason, .Nm -will write a diagnostic message to -.Dv standard error . +will write a diagnostic message to standard error. Failure to preserve these items will affect the final exit status, but will not cause the extracted file to be deleted. If the file characteristic letters in any of the string option-arguments are @@ -610,14 +596,21 @@ As in .Cm old is a basic regular expression and .Cm new -can contain an ampersand (&), \\n (where n is a digit) back-references, +can contain an ampersand +.Pq Ql & , +.Ql \en +(where +.Ar n +is a digit) back-references, or subexpression matching. The .Cm old -string may also contain -.Dv <newline> -characters. -Any non-null character can be used as a delimiter (/ is shown here). +string may also contain newline characters. +Any non-null character can be used as a delimiter +.Po +.Ql / +is shown here +.Pc . Multiple .Fl s expressions can be specified. @@ -633,8 +626,7 @@ option. The optional trailing .Cm p will cause the final result of a successful substitution to be written to -.Dv standard error -in the following format: +standard error in the following format: .Dl <original pathname> >> <new pathname> File or archive member names that substitute to the empty string are not selected and will be skipped. @@ -672,7 +664,7 @@ the output has the format: .Dl <ls -l listing> == <link name> For pathnames representing a symbolic link, the output has the format: .Dl <ls -l listing> => <link name> -Where <ls -l listing> is the output format specified by the +Where <ls -l listing> is the output format specified by the .Xr ls 1 utility when used with the .Fl l @@ -680,15 +672,12 @@ option. Otherwise for all the other operational modes .Po Em read , write , Li and Em copy .Pc , -pathnames are written and flushed to -.Dv standard error -without a trailing -.Dv <newline> +pathnames are written and flushed to standard error +without a trailing newline as soon as processing begins on that file or archive member. -The trailing -.Dv <newline> , -is not buffered, and is written only after the file has been read or written. +The trailing newline +is not buffered and is written only after the file has been read or written. .It Fl x Ar format Specify the output archive format, with the default format being .Ar ustar . @@ -761,7 +750,7 @@ file. .It Fl z Use .Xr gzip 1 -to compress (decompress) the archive while writing (reading). +to compress (decompress) the archive while writing (reading). Incompatible with .Fl a . .It Fl B Ar bytes @@ -784,7 +773,7 @@ to indicate a product. .Em Warning : Only use this option when writing an archive to a device which supports an end of file read condition based on last (or largest) write offset -(such as a regular file or a tape drive). +(such as a regular file or a tape drive). The use of this option with a floppy or hard disk is not recommended. .It Fl D This option is the same as the @@ -815,11 +804,11 @@ of will cause .Nm to attempt to recover from read errors forever. -The default +The default .Ar limit is a small positive number of retries. .Pp -.Em Warning: +.Em Warning: Using this option with .Li NONE should be used with extreme caution as @@ -831,9 +820,11 @@ Select a file based on its name, or when starting with a .Cm # , a numeric gid. -A '\\' can be used to escape the +A +.Ql \e +can be used to escape the .Cm # . -Multiple +Multiple .Fl G options may be supplied and checking stops with the first match. .It Fl H @@ -846,12 +837,12 @@ Do not follow symbolic links, perform a physical file system traversal. This is the default mode. .It Fl T Ar [from_date][,to_date][/[c][m]] Allow files to be selected based on a file modification or inode change -time falling within a specified time range of +time falling within a specified time range of .Ar from_date to .Ar to_date (the dates are inclusive). -If only a +If only a .Ar from_date is supplied, all files with a modification or inode change time equal to or younger are selected. @@ -859,7 +850,7 @@ If only a .Ar to_date is supplied, all files with a modification or inode change time equal to or older will be selected. -When the +When the .Ar from_date is equal to the .Ar to_date , @@ -868,7 +859,7 @@ time will be selected. .Pp When .Nm -is in the +is in the .Em write or .Em copy @@ -885,7 +876,7 @@ The .Ar c specifies the comparison of inode change time (the time when the file inode was last changed; e.g. a change of owner, group, mode, etc). -When +When .Ar c and .Ar m @@ -926,14 +917,14 @@ The minute field is required, while the other fields are optional and must be added in the following order: .Dl Cm hh , dd , mm , yy . -The +The .Cm ss field may be added independently of the other fields. Time ranges are relative to the current time, so .Dl Fl T Ar 1234/cm would select all files with a modification or inode change time of 12:34 PM today or later. -Multiple +Multiple .Fl T time range can be supplied and checking stops with the first match. .It Fl U Ar user @@ -942,16 +933,18 @@ Select a file based on its name, or when starting with a .Cm # , a numeric UID. -A '\\' can be used to escape the +A +.Ql \e +can be used to escape the .Cm # . -Multiple +Multiple .Fl U options may be supplied and checking stops with the first match. .It Fl X When traversing the file hierarchy specified by a pathname, do not descend into directories that have a different device ID. See the -.Li st_dev +.Li st_dev field as described in .Xr stat 2 for more information about device IDs. @@ -1007,7 +1000,7 @@ Then the and .Fl Z options will be applied based on the final pathname. -Finally, the +Finally, the .Fl v option will write the names resulting from these modifications. .Pp @@ -1023,13 +1016,13 @@ based only on the user specified pathnames as modified by the .Fl D , .Fl G , .Fl T , -and +and .Fl U options (the .Fl D option only applies during a copy operation). Then any -.Fl s +.Fl s and .Fl i options will modify in that order, the names of these selected files. @@ -1074,7 +1067,7 @@ directory hierarchy to .Pp The command: .Dl pax -r -s ',^//*usr//*,,' -f a.pax -reads the archive +reads the archive .Pa a.pax , with all files rooted in .Pa /usr @@ -1145,7 +1138,7 @@ will exit with one of the following values: .Bl -tag -width 2n .It 0 All files were processed successfully. -.It 1 +.It 1 An error occurred. .El .Pp @@ -1155,8 +1148,7 @@ cannot create a file or a link when reading an archive or cannot find a file when writing an archive, or cannot preserve the user ID, group ID, or file mode when the .Fl p -option is specified, a diagnostic message is written to -.Dv standard error +option is specified, a diagnostic message is written to standard error and a non-zero exit status will be returned, but processing will continue. In the case where .Nm @@ -1181,8 +1173,7 @@ If while doing a .Em copy , .Nm detects a file is about to overwrite itself, the file is not copied, -a diagnostic message is written to -.Dv standard error +a diagnostic message is written to standard error and when .Nm completes it will exit with a non-zero exit status. diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 1fec0b19316..c5683647be1 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rm.1,v 1.6 1998/12/15 01:20:26 aaron Exp $ +.\" $OpenBSD: rm.1,v 1.7 1999/06/04 02:45:14 aaron Exp $ .\" $NetBSD: rm.1,v 1.8 1995/07/25 19:37:30 jtc Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 @@ -69,7 +69,7 @@ the exit status to reflect an error. The .Fl f option overrides any previous -.Fl i +.Fl i options. .It Fl i Request confirmation before attempting to remove each file, regardless of @@ -78,7 +78,7 @@ terminal. The .Fl i option overrides any previous -.Fl f +.Fl f options. .It Fl P Overwrite regular files before deleting them. @@ -86,14 +86,14 @@ Files are overwritten three times, first with the byte pattern 0xff, then 0x00, and then 0xff again, before they are deleted. .It Fl R Attempt to remove the file hierarchy rooted in each file argument. -The +The .Fl R option implies the .Fl d option. If the .Fl i -option is specified, the user is prompted for confirmation before +option is specified, the user is prompted for confirmation before each directory's contents are processed (as well as before the attempt is made to remove the directory). If the user does not respond affirmatively, the file hierarchy rooted in diff --git a/bin/test/test.1 b/bin/test/test.1 index f517759b025..b45bb69a011 100644 --- a/bin/test/test.1 +++ b/bin/test/test.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: test.1,v 1.9 1998/11/28 03:20:36 aaron Exp $ +.\" $OpenBSD: test.1,v 1.10 1999/06/04 02:45:14 aaron Exp $ .\" $NetBSD: test.1,v 1.6 1995/03/21 07:04:03 cgd Exp $ .\" .\" Copyright (c) 1991, 1993 @@ -121,7 +121,7 @@ is a named pipe .Po Tn FIFO Pc . .It Fl r Ar file True if -.Ar file +.Ar file exists and is readable. .It Fl s Ar file True if @@ -162,7 +162,7 @@ True if the length of .Ar string is zero. .It Fl L Ar file -True if +True if .Ar file exists and is a symbolic link. .It Fl O Ar file @@ -227,7 +227,7 @@ True if .Ar \&s\&1 is not the null string. -.It Ar \&n\&1 Fl \&eq Ar \&n\&2 +.It Ar \&n\&1 Fl \&eq Ar \&n\&2 True if the integers .Ar \&n\&1 and @@ -297,10 +297,10 @@ operator has higher precedence than the .Fl o operator. .Sh GRAMMAR AMBIGUITY -The +The .Nm grammar is inherently ambiguous. In order to assure a degree of consistency, -the cases described in +the cases described in .St -p1003.2 section D11.2/4.62.4 are evaluated consistently according to the rules specified in the diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8 index 67a8fd4ed7c..1c85688763f 100644 --- a/sbin/badsect/badsect.8 +++ b/sbin/badsect/badsect.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: badsect.8,v 1.7 1999/05/23 14:11:18 aaron Exp $ +.\" $OpenBSD: badsect.8,v 1.8 1999/06/04 02:45:14 aaron Exp $ .\" $NetBSD: badsect.8,v 1.8 1995/03/18 14:54:27 cgd Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 @@ -67,7 +67,7 @@ currently requires the running of the standard formatter. Thus to deal with a newly bad block or on disks where the drivers -do not support the bad-blocking standard +do not support the bad-blocking standard .Nm may be used to good effect. .Pp @@ -91,7 +91,7 @@ and run on the file system. The bad sectors should show up in two files or in the bad sector files and the free list. Have .Xr fsck -remove files containing the offending bad sectors, but +remove files containing the offending bad sectors, but .Em do not have it remove the .Pa BAD/ Ns Em nnnnn @@ -106,11 +106,11 @@ works by giving the specified sector numbers in a system call, creating an illegal file whose first block address is the block containing bad sector and whose name is the bad sector number. -When it is discovered by +When it is discovered by .Xr fsck it will ask .Dq Li "HOLD BAD BLOCK ?" -A positive response will cause +A positive response will cause .Xr fsck to convert the inode to a regular file containing the bad block. .Sh SEE ALSO diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5 index d66eb11c45f..38700e69d56 100644 --- a/sbin/disklabel/disklabel.5 +++ b/sbin/disklabel/disklabel.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: disklabel.5,v 1.7 1998/11/11 22:19:56 aaron Exp $ +.\" $OpenBSD: disklabel.5,v 1.8 1999/06/04 02:45:14 aaron Exp $ .\" $NetBSD: disklabel.5,v 1.3 1995/03/18 14:54:36 cgd Exp $ .\" .\" Copyright (c) 1987, 1991, 1993 @@ -87,7 +87,7 @@ A copy of the in-core label for a disk can be obtained with the this works with a file descriptor for a block or character .Pq Dq raw device for any partition of the disk. -The in-core copy of the label is set by the +The in-core copy of the label is set by the .Dv DIOCSDINFO .Xr ioctl . The offset of a partition cannot generally be changed while it is open, @@ -95,7 +95,7 @@ nor can it be made smaller while it is open. One exception is that any change is allowed if no label was found on the disk, and the driver was able to construct only a skeletal label without partition information. -Finally, the +Finally, the .Dv DIOCWDINFO .Xr ioctl operation sets the in-core label and then updates the on-disk label; @@ -137,7 +137,7 @@ struct disklabel { short d_type; /* drive type */ short d_subtype; /* controller/d_type specific */ char d_typename[16]; /* type name, e.g. "eagle" */ - /* + /* * d_packname contains the pack identifier and is returned when * the disklabel is read off the disk or in-core copy. * d_boot0 and d_boot1 are the (optional) names of the @@ -147,12 +147,12 @@ struct disklabel { to retrieve the values from /etc/disktab. */ union { - char un_d_packname[16]; /* pack identifier */ + char un_d_packname[16]; /* pack identifier */ struct { char *un_d_boot0; /* primary bootstrap name */ char *un_d_boot1; /* secondary bootstrap name */ - } un_b; - } d_un; + } un_b; + } d_un; #define d_packname d_un.un_d_packname #define d_boot0 d_un.un_b.un_d_boot0 #define d_boot1 d_un.un_b.un_d_boot1 diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8 index 9c3d21421a9..b81eeebe769 100644 --- a/sbin/dump/dump.8 +++ b/sbin/dump/dump.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dump.8,v 1.18 1999/05/26 03:21:03 aaron Exp $ +.\" $OpenBSD: dump.8,v 1.19 1999/06/04 02:45:15 aaron Exp $ .\" $NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -224,7 +224,7 @@ filesystem name, increment level and .Xr ctime 3 -format dump date. +format dump date. There may be only one entry per filesystem at each level. The file .Pa /etc/dumpdates diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8 index 3baebe8e05f..d13fac28b52 100644 --- a/sbin/dumpfs/dumpfs.8 +++ b/sbin/dumpfs/dumpfs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dumpfs.8,v 1.5 1999/05/23 14:11:14 aaron Exp $ +.\" $OpenBSD: dumpfs.8,v 1.6 1999/06/04 02:45:15 aaron Exp $ .\" $NetBSD: dumpfs.8,v 1.8 1997/05/07 23:19:03 lukem Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -55,7 +55,7 @@ information such as the file system block size, minimum free space percentage, and the file system level that can be upgraded with the .Fl c -option of +option of .Xr fsck_ffs 8 . All of this information can be found within the first twenty lines of the output. diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index da308e3bd5c..b666b902355 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fdisk.8,v 1.22 1999/05/23 14:11:15 aaron Exp $ +.\" $OpenBSD: fdisk.8,v 1.23 1999/06/04 02:45:15 aaron Exp $ .\" .\" Copyright (c) 1997 Tobias Weingartner .\" All rights reserved. @@ -75,7 +75,7 @@ The DOS .Nm program can be used to divide space on the disk into partitions and set one active. -This +This .Nm program serves a similar purpose to the DOS program. When called with no special flags, it prints the MBR partition @@ -99,7 +99,7 @@ has been selected using the .Fl h , and .Fl s -options. +options. .Pp This disk is divided into two partitions that happen to fill the disk. The first partition overlaps the third partition. (Used for debugging diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8 index bbe4ab045e0..84a36b7ad76 100644 --- a/sbin/fsck/fsck.8 +++ b/sbin/fsck/fsck.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fsck.8,v 1.14 1999/05/28 22:59:58 aaron Exp $ +.\" $OpenBSD: fsck.8,v 1.15 1999/06/04 02:45:15 aaron Exp $ .\" $NetBSD: fsck.8,v 1.14 1996/10/03 20:08:29 christos Exp $ .\" .\" Copyright (c) 1996 Christos Zoulas. All rights reserved. @@ -38,14 +38,14 @@ .Nm fsck .Op Fl dvplfyn .Op Fl l Ar maxparallel -.Op Fl t Ar fstype -.Op Fl T Ar fstype:fsoptions +.Op Fl t Ar fstype +.Op Fl T Ar fstype:fsoptions .Ar special | node ... .Sh DESCRIPTION The .Nm -command invokes filesystem-specific programs to check the -special devices listed in the +command invokes filesystem-specific programs to check the +special devices listed in the .Xr fstab 5 file or in the command line for consistency. The options are as follows: @@ -77,7 +77,7 @@ mounted writeable. Enter preen mode. .It Fl t Ar fstype Invoke fsck only in the comma separated list of filesystem types. If the -list starts with +list starts with .Dq no , invoke fsck only in the filesystem types that are .Em not diff --git a/sbin/fsck_ext2fs/fsck_ext2fs.8 b/sbin/fsck_ext2fs/fsck_ext2fs.8 index fd03232c437..2a254bd0031 100644 --- a/sbin/fsck_ext2fs/fsck_ext2fs.8 +++ b/sbin/fsck_ext2fs/fsck_ext2fs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fsck_ext2fs.8,v 1.8 1998/12/15 01:20:30 aaron Exp $ +.\" $OpenBSD: fsck_ext2fs.8,v 1.9 1999/06/04 02:45:16 aaron Exp $ .\" $NetBSD: fsck_ext2fs.8,v 1.1 1997/06/11 11:21:48 bouyer Exp $ .\" .\" Copyright (c) 1997 Manuel Bouyer. @@ -101,7 +101,7 @@ Without the .Fl p option, .Nm -audits and interactively repairs inconsistent conditions for filesystems. +audits and interactively repairs inconsistent conditions for filesystems. If the filesystem is inconsistent the operator is prompted for concurrence before each correction is attempted. It should be noted that some of the corrective actions which are not @@ -117,7 +117,7 @@ or .Dq no . If the operator does not have write permission on the filesystem, .Nm -will default to a +will default to a .Fl n action. .Pp @@ -150,7 +150,7 @@ set of permissions such as 700. .It Fl n Assume a .Dq no -response to all questions asked by +response to all questions asked by .Nm except for .Dq CONTINUE? , @@ -163,7 +163,7 @@ mode, described above. .It Fl y Assume a .Dq yes -response to all questions asked by +response to all questions asked by .Nm fsck_ext2fs ; this should be used with great caution as this is a free license to continue after essentially unlimited trouble has been encountered. @@ -181,7 +181,7 @@ Incorrect link counts. .It Size checks: .Bl -item -indent indent -compact -.It +.It Directory size not a multiple of filesystem block size. .It Partially truncated file. @@ -193,7 +193,7 @@ Blocks not accounted for anywhere. .It Directory checks: .Bl -item -indent indent -compact -.It +.It File pointing to unallocated inode. .It Inode number out of range. @@ -204,7 +204,7 @@ or having the wrong inode number. .It Super Block checks: .Bl -item -indent indent -compact -.It +.It More blocks for inodes than there are in the filesystem. .It Bad free block map format. @@ -215,7 +215,7 @@ Total free block and/or free inode count incorrect. .Pp Orphaned files and directories (allocated but unreferenced) are, with the operator's concurrence, reconnected by -placing them in the +placing them in the .Pa lost+found directory. The name assigned is the inode number. @@ -227,7 +227,7 @@ If there is insufficient space its size is increased. Because of inconsistencies between the block device and the buffer cache, the raw device should always be used. .Sh DIAGNOSTICS -The diagnostics produced by +The diagnostics produced by .Nm are fully enumerated and explained in Appendix A of .Rs diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8 index 2add53c3b44..ab4a1dc8f9d 100644 --- a/sbin/fsck_ffs/fsck_ffs.8 +++ b/sbin/fsck_ffs/fsck_ffs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fsck_ffs.8,v 1.8 1999/05/23 14:11:15 aaron Exp $ +.\" $OpenBSD: fsck_ffs.8,v 1.9 1999/06/04 02:45:16 aaron Exp $ .\" $NetBSD: fsck_ffs.8,v 1.12 1996/09/23 16:18:34 christos Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 @@ -125,7 +125,7 @@ Without the .Fl p option, .Nm -audits and interactively repairs inconsistent conditions for filesystems. +audits and interactively repairs inconsistent conditions for filesystems. If the filesystem is inconsistent the operator is prompted for concurrence before each correction is attempted. It should be noted that some of the corrective actions which are not @@ -141,7 +141,7 @@ or .Dq no . If the operator does not have write permission on the filesystem, .Nm -will default to a +will default to a .Fl n action. .Pp @@ -180,14 +180,14 @@ set of permissions such as 755. .It Fl y Assume a .Dq yes -response to all questions asked by +response to all questions asked by .Nm fsck_ffs ; this should be used with great caution as this is a free license to continue after essentially unlimited trouble has been encountered. .It Fl n Assume a .Dq no -response to all questions asked by +response to all questions asked by .Nm except for .Dq CONTINUE? , @@ -204,7 +204,7 @@ The filesystem is in the old (static table) format. The filesystem is in the new (dynamic table) format. .It 2 The filesystem supports 32-bit UIDs and GIDs, -short symbolic links are stored in the inode, +short symbolic links are stored in the inode, and directories have an added field showing the file type. .It 3 If @@ -228,11 +228,11 @@ possible without user interaction. Conversion in preen mode is best used when all the filesystems are being converted at once. The format of a filesystem can be determined from the -first line of output from +first line of output from .Xr dumpfs 8 . .El .Pp -If no filesystems are given to +If no filesystems are given to .Nm then a default list of filesystems is read from the file @@ -250,7 +250,7 @@ Incorrect link counts. .It Size checks: .Bl -item -indent indent -compact -.It +.It Directory size not a multiple of DIRBLKSIZ. .It Partially truncated file. @@ -262,7 +262,7 @@ Blocks not accounted for anywhere. .It Directory checks: .Bl -item -indent indent -compact -.It +.It File pointing to unallocated inode. .It Inode number out of range. @@ -273,7 +273,7 @@ or having the wrong inode number. .It Super Block checks: .Bl -item -indent indent -compact -.It +.It More blocks for inodes than there are in the filesystem. .It Bad free block map format. @@ -284,7 +284,7 @@ Total free block and/or free inode count incorrect. .Pp Orphaned files and directories (allocated but unreferenced) are, with the operator's concurrence, reconnected by -placing them in the +placing them in the .Pa lost+found directory. The name assigned is the inode number. @@ -301,7 +301,7 @@ the raw device should always be used. contains default list of filesystems to check .El .Sh DIAGNOSTICS -The diagnostics produced by +The diagnostics produced by .Nm are fully enumerated and explained in Appendix A of .Rs diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8 index b27cf9e9934..c861ec5d8d5 100644 --- a/sbin/fsdb/fsdb.8 +++ b/sbin/fsdb/fsdb.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fsdb.8,v 1.10 1998/12/15 01:20:31 aaron Exp $ +.\" $OpenBSD: fsdb.8,v 1.11 1999/06/04 02:45:16 aaron Exp $ .\" $NetBSD: fsdb.8,v 1.5 1997/01/11 05:51:40 lukem Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ .Fl f Ar fsname .Sh DESCRIPTION .Nm -opens +opens .Ar fsname (usually a raw disk partition) and runs a command loop allowing manipulation of the file system's inode data. You are prompted @@ -69,7 +69,7 @@ option enables additional debugging output (which comes primarily from .Xr fsck 8 -derived code). .Sh COMMANDS -Besides the built-in +Besides the built-in .Xr editline 3 commands, .Nm @@ -119,7 +119,7 @@ Set the active inode's link count to .Pp .It Cm ls List the current inode's directory entries. This command is valid only -if the current inode is a directory. +if the current inode is a directory. .Pp .It Cm rm Ar name .It Cm del Ar name @@ -176,7 +176,7 @@ Change the file flags of the current inode to Change the owner of the current inode to .Ar uid . .Pp -.It Cm chlen Ar length +.It Cm chlen Ar length Change the length of the current inode to .Ar length . .Pp @@ -192,7 +192,7 @@ Change the generation number of the current inode to .It Cm ctime Ar time .It Cm atime Ar time Change the modification, change, or access time (respectively) on the -current inode to +current inode to .Ar time . .Ar Time should be in the format @@ -203,7 +203,7 @@ is an optional nanosecond specification. If no nanoseconds are specified, the .Va mtimensec , .Va ctimensec , or -.Va atimensec +.Va atimensec field will be set to zero. .Pp .It Cm quit, Cm q, Cm exit, Em <EOF> @@ -231,10 +231,10 @@ uses the source code for .Xr fsck 8 to implement most of the file system manipulation code. The remainder of .Nm -first appeared in +first appeared in .Nx 1.1 . .Sh WARNING Use this tool with extreme caution--you can damage an FFS file system beyond what .Xr fsck 8 -can repair. +can repair. diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 21d77c7f37c..edb369cdfae 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.23 1999/05/23 14:11:15 aaron Exp $ +.\" $OpenBSD: ifconfig.8,v 1.24 1999/06/04 02:45:17 aaron Exp $ .\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $ .\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $ .\" @@ -85,14 +85,14 @@ For the .Tn DARPA-Internet family, the address is either a host name present in the host name data -base, +base, .Xr hosts 5 , or a .Tn DARPA Internet address expressed in the Internet standard .Dq dot notation . For the Xerox Network Systems(tm) and Internetwork Packet Exchange families, -addresses are +addresses are .Ar net:a.b.c.d.e.f , where .Ar net @@ -111,7 +111,7 @@ family, addresses are specified as a long hexadecimal string, as in the Xerox family. However, two consecutive dots imply a zero byte, and the dots are optional, if the user wishes to (carefully) count out long strings of digits in network byte order. -.Tn AppleTalk +.Tn AppleTalk (LLAP) addresses are specified as nn.na (Network Number.Node Address). Node addresses are divided into 2 classes: User Node IDs and Server Node IDs. 1-127($01-$7F) are for User Node IDs while 128-254($80-$FE) @@ -141,7 +141,7 @@ for example, .Dq en0 . .El .Pp -The following parameters may be set with +The following parameters may be set with .Nm ifconfig : .Bl -tag -width dest_addressxx .It Cm alias @@ -184,7 +184,7 @@ Mark an interface When an interface is marked .Dq down , the system will not attempt to -transmit messages through that interface. +transmit messages through that interface. If possible, the interface will be reset to disable reception as well. This action does not automatically disable routes using the interface. .It Cm ipdst @@ -254,7 +254,7 @@ and 0's for the host part. The mask should contain at least the standard network portion, and the subnet field should be contiguous with the network portion. -.\" see +.\" see .\" Xr eon 5 . .It Cm nsellength Ar n .Pf ( Tn ISO @@ -323,7 +323,7 @@ for more information. Disable special processing at the link level with the specified interface. .It Cm up Mark an interface -.Dq up . +.Dq up . This may be used to enable an interface after an .Dq ifconfig down . It happens automatically when setting the first address on an interface. @@ -372,8 +372,8 @@ Assign the inet(4) address of 192.168.1.10 with a network mask of Assign the ipx(3) address of 12625920 specified in decimal to interface fxp0. .Pp .It Cm ifconfig fxp0 atalk 39108.128 range 39107-39109 phase 2 -Assign the AppleTalk network 39108 and server node 128 with a network -range of 39107-39109 to interface fxp0 on a phase 2 AppleTalk network. +Assign the AppleTalk network 39108 and server node 128 with a network +range of 39107-39109 to interface fxp0 on a phase 2 AppleTalk network. .Pp .It Cm ifconfig xl0 media 10baseT Configure the xl0 interface to use 10baseT. diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 385cd9569b6..21ea2b88991 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: init.8,v 1.17 1999/05/31 17:43:22 millert Exp $ +.\" $OpenBSD: init.8,v 1.18 1999/06/04 02:45:17 aaron Exp $ .\" $NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -83,13 +83,13 @@ flag, then .Nm will require that the super-user password be entered before the system will start a single-user shell. -The password check is skipped if the +The password check is skipped if the .Ar console is marked as .Dq secure . .Pp The kernel runs with four different levels of security. -Any super-user process can raise the security level, but only +Any super-user process can raise the security level, but only .Nm can lower it. Security levels are defined as follows: @@ -130,7 +130,7 @@ the administrator must build a kernel with .Dq option INSECURE in the config file. .Pp -In multi-user operation, +In multi-user operation, .Nm maintains processes for the terminal ports found in the file @@ -197,7 +197,7 @@ executes a new to enable a new login. If the getty or window field for a line is changed, the change takes effect at the end of the current -login session (e.g., the next time +login session (e.g., the next time .Nm starts a process on the line). If a line is commented out or deleted from diff --git a/sbin/ipf/ipf.5 b/sbin/ipf/ipf.5 index 4c3c47f65eb..ef6c9fc7ac5 100644 --- a/sbin/ipf/ipf.5 +++ b/sbin/ipf/ipf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipf.5,v 1.12 1999/02/05 05:58:41 deraadt Exp $ +.\" $OpenBSD: ipf.5,v 1.13 1999/06/04 02:45:17 aaron Exp $ .TH IPF 5 .SH NAME ipf \- IP packet filter rule syntax @@ -126,7 +126,7 @@ reset may only be used with a rule which is being applied to TCP packets. .TP .B pass -will flag the packet to be let through the filter. +will flag the packet to be let through the filter. .TP .B log causes the packet to be logged (as described in the LOGGING section @@ -207,7 +207,7 @@ construct a firewall that behaves transparently, like a filtering hub or switch, rather than a router. The \fBfastroute\fP keyword is a synonym for this option. .SH MATCHING PARAMETERS -.PP +.PP The keywords described in this section are used to describe attributes of the packet to be used when determining whether rules match or don't match. The following general-purpose attributes are provided for @@ -239,7 +239,7 @@ duplication of otherwise-identical rules. The \fBfrom\fP and \fBto\fP keywords are used to match against IP addresses (and optionally port numbers). Rules must specify BOTH source and destination parameters. -.PP +.PP IP addresses may be specified in one of two ways: as a numerical address\fB/\fPmask, or as a hostname \fBmask\fP netmask. The hostname may either be a valid hostname, from either the hosts file or DNS @@ -392,7 +392,7 @@ following qualifiers may be used (in order): .TP .B body indicates that the first 128 bytes of the packet contents will be -logged after the headers. +logged after the headers. .TP .B first ?? diff --git a/sbin/ipf/ipf.8 b/sbin/ipf/ipf.8 index 405706651f5..bc39354edf6 100644 --- a/sbin/ipf/ipf.8 +++ b/sbin/ipf/ipf.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipf.8,v 1.9 1999/05/28 22:59:59 aaron Exp $ +.\" $OpenBSD: ipf.8,v 1.10 1999/06/04 02:45:17 aaron Exp $ .Dd February 6, 1999 .Dt IPF 8 .Os @@ -102,15 +102,15 @@ affect fragment or state statistics). .It Pa /usr/share/ipf location of sample configuration files .It Pa /dev/ipauth -name of the +name of the .Nm auth socket .It Pa /dev/ipl -name of the +name of the .Nm logging socket .It Pa /dev/ipstate -name of the +name of the .Nm state socket .El diff --git a/sbin/ipnat/ipnat.8 b/sbin/ipnat/ipnat.8 index 0ecf1e62018..4923cbf9fc8 100644 --- a/sbin/ipnat/ipnat.8 +++ b/sbin/ipnat/ipnat.8 @@ -21,17 +21,17 @@ Options are as follows: .It Fl C Delete all entries in the NAT list. .It Fl F -Flush all active mappings from the NAT table. +Flush all active mappings from the NAT table. .It Fl l Display the current entries and mappings. .It Fl n Do not alter the NAT table. .It Fl r -Remove, rather than add, entries specified in the rule list. +Remove, rather than add, entries specified in the rule list. .It Fl s Display statistics. .It Fl v -Verbosity. Displays detailed information pertaining to rule processing. +Verbosity. Displays detailed information pertaining to rule processing. .El .Pp Certain configuration requirements must be met before @@ -40,12 +40,12 @@ will work. These are listed in .Pa /usr/share/ipf/nat.2 . .Pp .Nm -operates on a list of rules, specified by +operates on a list of rules, specified by .Ar filename . -This file is typically +This file is typically .Pa /etc/ipnat.rules ; stdin is represented by "\-". Each rule is parsed, then sequentially added to -the kernel's internal NAT list. Like +the kernel's internal NAT list. Like .Xr ipf 8 , if an entry contradicts another previously added, the newer will take precedence. @@ -58,9 +58,9 @@ parses the file. Entries may be separated by spaces or tabs. Each rule must begin with either .Em map or -.Em rdr . +.Em rdr . .Pp -.Em map +.Em map tells the NAT how a range of addresses should be translated. The entries use the following format: .Pp @@ -69,7 +69,7 @@ map ifname internal/mask -> external/mask options .Ed .Pp The -.Em ifname +.Em ifname field is the interface to which packets are sent. A gateway with a PPP link would probably use .Dq ppp0 @@ -105,8 +105,8 @@ four 8-bit numbers. The number of bits set in the mask is placed following the IP address. .Pp Both -.Em internal -and +.Em internal +and .Em external may be an actual IP address, the name of an interface, or a hostname. If it is a network number, however, a problem may arise. For example: @@ -117,22 +117,22 @@ map ppp0 10.0.0.0/8 -> 209.1.2.0/24 .Pp 16,000,000 IP addresses are being squeezed into an address space of only 254. This is solved by the -.Em portmap +.Em portmap option, which remaps ports instead of IP addresses. The protocol is specified by following the option with either -.Em tcp , +.Em tcp , .Em udp , .Em tcp/udp , -or +or .Em tcpudp (the last two have the same effect). The syntax to assign a range of ports is .Dq portnumber:portnumber . This looks like: .Pp -.Bd -unfilled -offset indent -compact +.Bd -unfilled -offset indent -compact map ppp0 10.0.0.0/8 -> 209.1.2.0/24 portmap tcp/udp 1025:65000 map ppp0 10.0.0.0/8 -> 209.1.2.0/24 -.Ed +.Ed .Pp That will cut the number down from ~16,000,000 addresses short to only 527,566. .Pp @@ -146,24 +146,24 @@ rdr ifname external/mask port service -> internal port service protocol This setup is best described by an example of an actual entry: .Pp .Bd -unfilled -offset indent -compact -rdr xl0 0.0.0.0/0 port 25 -> 204.213.176.10 port smtp +rdr xl0 0.0.0.0/0 port 25 -> 204.213.176.10 port smtp .Ed .Pp This redirects all smtp packets received on xl0 to 204.213.176.10, port 25. A netmask is not needed on the .Em internal -address; it is always 32. The +address; it is always 32. The .Em external -and +and .Em internal fields, similar to the .Em map -directive, may be actual addresses, hostnames, or interfaces. Likewise, the +directive, may be actual addresses, hostnames, or interfaces. Likewise, the .Em service -field may be the name of a service, or a port number. The +field may be the name of a service, or a port number. The .Em protocol -of the service may be selected by appending -.Em tcp , +of the service may be selected by appending +.Em tcp , .Em udp , .Em tcp/udp , or diff --git a/sbin/ipsecadm/ipsecadm.8 b/sbin/ipsecadm/ipsecadm.8 index b330abeb90b..ed0461ef4bc 100644 --- a/sbin/ipsecadm/ipsecadm.8 +++ b/sbin/ipsecadm/ipsecadm.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipsecadm.8,v 1.6 1999/05/16 19:56:14 alex Exp $ +.\" $OpenBSD: ipsecadm.8,v 1.7 1999/06/04 02:45:24 aaron Exp $ .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> .\" All rights reserved. .\" @@ -77,7 +77,7 @@ encryption algorithms can be applied. Allowed modifiers are: .Fl spi , .Fl enc , .Fl halfiv , -.Fl forcetunnel , +.Fl forcetunnel , and .Fl key . .It new ah @@ -223,7 +223,7 @@ at your own risk. We suggest using 3DES instead. DES support is kept for interoperability (with old implementations) purposes only. See .Xr des_cipher 3 . -.It Nm 3des +.It Nm 3des This is available for both old and new esp. It is considered more secure than straight DES, since it uses larger keys. .It Nm blf @@ -290,7 +290,7 @@ may only be used with old ESP. .It proto The security protocol needed by .Nm delspi , -.Nm flow , +.Nm flow , .Nm group or .Nm bind diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8 index 06ab5b90357..90d6d33c755 100644 --- a/sbin/isakmpd/isakmpd.8 +++ b/sbin/isakmpd/isakmpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: isakmpd.8,v 1.7 1999/05/28 23:00:02 aaron Exp $ +.\" $OpenBSD: isakmpd.8,v 1.8 1999/06/04 02:45:22 aaron Exp $ .\" $EOM: isakmpd.8,v 1.13 1998/12/21 00:09:36 niklas Exp $ .\" .\" Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -53,9 +53,9 @@ The .Nm daemon establishes security associations for encrypted -and/or authenticated network traffic. +and/or authenticated network traffic. .Pp -The daemon listens to a named pipe +The daemon listens to a named pipe .Pa isakmpd.fifo for user requests and on a .Dv PF_ENCAP diff --git a/sbin/mknod/mkfifo.1 b/sbin/mknod/mkfifo.1 index 804967b2563..4f0c8b932b5 100644 --- a/sbin/mknod/mkfifo.1 +++ b/sbin/mknod/mkfifo.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mkfifo.1,v 1.2 1999/05/12 13:26:49 aaron Exp $ +.\" $OpenBSD: mkfifo.1,v 1.3 1999/06/04 02:45:17 aaron Exp $ .\" $NetBSD: mkfifo.1,v 1.4 1994/12/23 07:16:54 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -51,7 +51,7 @@ .Nm mkfifo creates the FIFOs requested, in the order specified, using mode -.Li \&0666 +.Li \&0666 modified by the current .Xr umask 2 . .Pp @@ -60,13 +60,13 @@ The options are as follows: .It Fl m Ar mode Set the file permission bits of newly created directories to .Ar mode . -The mode is specified as in +The mode is specified as in .Xr chmod 1 . -In symbolic mode strings, the -.Dq + -and +In symbolic mode strings, the +.Dq + +and .Dq - -operators are interpreted relative to an assumed initial mode of +operators are interpreted relative to an assumed initial mode of .Dq a=rw . .El .Pp diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8 index c7be3634abd..353640647cd 100644 --- a/sbin/modload/modload.8 +++ b/sbin/modload/modload.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: modload.8,v 1.10 1999/05/28 23:00:00 aaron Exp $ +.\" $OpenBSD: modload.8,v 1.11 1999/06/04 02:45:18 aaron Exp $ .\" $NetBSD: modload.8,v 1.5 1995/03/18 14:56:43 cgd Exp $ .\" .\" Copyright (c) 1993 Christopher G. Demetriou @@ -65,7 +65,7 @@ temporary file to be kept rather than deleted. Print comments about the loading process. .It Fl A Ar kernel Specify the file that is passed to the linker -to resolve module references to external symbols. +to resolve module references to external symbols. The symbol file must be for the currently running kernel or the module is likely to crash the system. .It Fl e Ar entry diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3 index eec4fa725a1..28b792055e8 100644 --- a/sbin/mount/getmntopts.3 +++ b/sbin/mount/getmntopts.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getmntopts.3,v 1.3 1998/09/17 04:14:54 aaron Exp $ +.\" $OpenBSD: getmntopts.3,v 1.4 1999/06/04 02:45:18 aaron Exp $ .\" $NetBSD: getmntopts.3,v 1.2 1995/03/18 14:56:56 cgd Exp $ .\" .\" Copyright (c) 1994 @@ -162,5 +162,5 @@ unrecognized option is encountered. .Sh HISTORY The .Fn getmntopts -function appeared in +function appeared in .Bx 4.4 . diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 4f627818a29..570d092d5a3 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount.8,v 1.16 1999/05/23 14:11:16 aaron Exp $ +.\" $OpenBSD: mount.8,v 1.17 1999/06/04 02:45:18 aaron Exp $ .\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .Nm mount .Op Fl Aadfruvw -.Op Fl t Ar type +.Op Fl t Ar type .Nm mount .Op Fl dfruvw .Ar special | node diff --git a/sbin/mount_fdesc/mount_fdesc.8 b/sbin/mount_fdesc/mount_fdesc.8 index 10d007bb90c..badaf2c0ba0 100644 --- a/sbin/mount_fdesc/mount_fdesc.8 +++ b/sbin/mount_fdesc/mount_fdesc.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount_fdesc.8,v 1.7 1999/05/23 14:11:16 aaron Exp $ +.\" $OpenBSD: mount_fdesc.8,v 1.8 1999/06/04 02:45:18 aaron Exp $ .\" $NetBSD: mount_fdesc.8,v 1.6 1995/12/17 18:50:19 ghudson Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 @@ -77,7 +77,7 @@ The contents of the mount point are .Pa fd , .Pa stderr , .Pa stdin , -.Pa stdout +.Pa stdout and .Pa tty . .Pp @@ -123,7 +123,7 @@ fd = fcntl(STDERR_FILENO, F_DUPFD, 0); Flags to the .Xr open 2 call other than -.Dv O_RDONLY , +.Dv O_RDONLY , .Dv O_WRONLY and .Dv O_RDWR diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8 index 2f2807bdca8..63f31d15f7c 100644 --- a/sbin/mount_null/mount_null.8 +++ b/sbin/mount_null/mount_null.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount_null.8,v 1.8 1999/05/23 14:11:18 aaron Exp $ +.\" $OpenBSD: mount_null.8,v 1.9 1999/06/04 02:45:18 aaron Exp $ .\" $NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 @@ -85,7 +85,7 @@ for constructing new layers. .\" .\" .Sh INSTANTIATING NEW NULL LAYERS -New null layers are created with +New null layers are created with .Nm mount_null . .Nm takes two arguments: the pathname @@ -110,8 +110,8 @@ on the lower layer. Finally, it replaces the null-nodes in the arguments and, if a vnode is returned by the operation, stacks a null-node on top of the returned vnode. .Pp -Although bypass handles most operations, -.Em vop_getattr , +Although bypass handles most operations, +.Em vop_getattr , .Em vop_inactive , .Em vop_reclaim , and @@ -140,7 +140,7 @@ are created as a result of vnode operations on this or other null vnode stacks. .Pp New vnode stacks come into existence as a result of -an operation which returns a vnode. +an operation which returns a vnode. The bypass routine stacks a null-node above the new vnode before returning it to the caller. .Pp @@ -149,26 +149,26 @@ For example, imagine mounting a null layer with mount_null /usr/include /dev/layer/null .Ed .Pp -Changing directory to +Changing directory to .Pa /dev/layer/null will assign the root null-node (which was created when the null layer was mounted). -Now consider opening +Now consider opening .Pa sys . A .Em vop_lookup would be done on the root null-node. This operation would bypass through -to the lower layer which would return a vnode representing -the UFS +to the lower layer which would return a vnode representing +the UFS .Pa sys . Null_bypass then builds a null-node -aliasing the UFS +aliasing the UFS .Pa sys and returns this to the caller. -Later operations on the null-node +Later operations on the null-node .Pa sys -will repeat this +will repeat this process when constructing other vnode stacks. .\" .\" @@ -176,16 +176,16 @@ process when constructing other vnode stacks. One of the easiest ways to construct new file system layers is to make a copy of the null layer, rename all files and variables, and then begin modifyng the copy. -.Xr sed 1 +.Xr sed 1 can be used to easily rename all variables. .Pp -The umap layer is an example of a layer descended from the +The umap layer is an example of a layer descended from the null layer. .\" .\" .Sh INVOKING OPERATIONS ON LOWER LAYERS -There are two techniques to invoke operations on a lower layer +There are two techniques to invoke operations on a lower layer when the operation cannot be completely bypassed. Each method is appropriate in different situations. In both cases, it is the responsibility of the aliasing layer to make @@ -196,7 +196,7 @@ The first approach is to call the aliasing layer's bypass routine. This method is most suitable when you wish to invoke the operation currently being handled on the lower layer. It has the advantage the bypass routine already must do argument mapping. -An example of this is +An example of this is .Em null_getattrs in the null layer. .Pp diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8 index 1e5c1541c33..5dfeef65e40 100644 --- a/sbin/mount_umap/mount_umap.8 +++ b/sbin/mount_umap/mount_umap.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount_umap.8,v 1.9 1999/05/23 14:11:22 aaron Exp $ +.\" $OpenBSD: mount_umap.8,v 1.10 1999/06/04 02:45:18 aaron Exp $ .\" $NetBSD: mount_umap.8,v 1.4 1996/03/05 02:36:42 thorpej Exp $ .\" .\" Copyright (c) 1992, 1993, 1994 @@ -83,39 +83,39 @@ UID 2000 in the local environment. The .Nm command allows the subtree from smith's original environment to be mapped in such a way that all files with owner UID 1000 look like -they are actually owned by UID 2000. +they are actually owned by UID 2000. .Pp -.Em target +.Em target should be the current location of the subtree in the -local system's name space. -.Ar mount_point +local system's name space. +.Ar mount_point should be a directory -where the mapped subtree is to be placed. -.Em uid-mapfile +where the mapped subtree is to be placed. +.Em uid-mapfile and -.Em gid-mapfile +.Em gid-mapfile describe the mappings to be made between identifiers. Briefly, the format of these files is a count of the number of mappings on the first line, with each subsequent line containing a single mapping. Each of these mappings consists of an ID from the original environment and the corresponding ID in the local environment, -separated by white space. -.Em uid-mapfile +separated by white space. +.Em uid-mapfile should contain all UID -mappings, and -.Em gid-mapfile +mappings, and +.Em gid-mapfile should contain all GID mappings. -Any UIDs not mapped in -.Em uid-mapfile +Any UIDs not mapped in +.Em uid-mapfile will be treated as user NOBODY, -and any GIDs not mapped in -.Em gid-mapfile +and any GIDs not mapped in +.Em gid-mapfile will be treated as group NULLGROUP. At most 64 UIDs can be mapped for a given subtree, and at most 16 groups can be mapped by a given subtree. .Pp The mapfiles can be located anywhere in the file hierarchy, but they -must be owned by root, and they must be writable only by root. +must be owned by root, and they must be writable only by root. .Nm will refuse to map the subtree if the ownership or permissions on these files are improper. It will also balk if the count of mappings diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8 index 64866cb9c26..3008ad5bbcc 100644 --- a/sbin/mount_union/mount_union.8 +++ b/sbin/mount_union/mount_union.8 @@ -1,9 +1,9 @@ -.\" $OpenBSD: mount_union.8,v 1.7 1999/05/23 14:11:18 aaron Exp $ +.\" $OpenBSD: mount_union.8,v 1.8 1999/06/04 02:45:19 aaron Exp $ .\" $NetBSD: mount_union.8,v 1.4 1995/09/29 06:44:02 jtc Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. -.\" +.\" .\" This code is derived from software donated to Berkeley by .\" Jan-Simon Pendry. .\" diff --git a/sbin/mount_xfs/mount_xfs.8 b/sbin/mount_xfs/mount_xfs.8 index 8819cb91d8b..89827e73aea 100644 --- a/sbin/mount_xfs/mount_xfs.8 +++ b/sbin/mount_xfs/mount_xfs.8 @@ -1,30 +1,30 @@ -.\" $OpenBSD: mount_xfs.8,v 1.11 1999/05/23 14:11:19 aaron Exp $ +.\" $OpenBSD: mount_xfs.8,v 1.12 1999/06/04 02:45:25 aaron Exp $ .\" $NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $ .\" .\" Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: -.\" +.\" .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. -.\" +.\" .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the Kungliga Tekniska .\" Högskolan and its contributors. -.\" +.\" .\" 4. Neither the name of the Institute nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index 0ed05102366..f53ffbd95a7 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: newfs.8,v 1.16 1999/05/23 14:11:19 aaron Exp $ +.\" $OpenBSD: newfs.8,v 1.17 1999/06/04 02:45:19 aaron Exp $ .\" $NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $ .\" .\" Copyright (c) 1983, 1987, 1991, 1993, 1994 @@ -84,11 +84,11 @@ replaces the more obtuse .Xr mkfs 8 program. -Before running +Before running .Nm or .Nm mount_mfs , -the disk must be labeled using +the disk must be labeled using .Xr disklabel 8 . .Nm builds a file system on the specified @@ -163,7 +163,7 @@ See .Xr tunefs 8 for more details on how to set this option. .It Fl b Ar block-size -The block size of the file system, in bytes. +The block size of the file system, in bytes. .It Fl c Ar #cylinders/group The number of cylinders per cylinder group in a file system. The default value is 16. @@ -215,7 +215,7 @@ for more details on how to set this option. The size of the file system in sectors. .El .Pp -The following options override the standard sizes for the disk geometry. +The following options override the standard sizes for the disk geometry. Their default values are taken from the disk label. Changing these defaults is useful only when using .Nm @@ -223,7 +223,7 @@ to build a file system whose raw image will eventually be used on a different type of disk than the one on which it is initially created (for example on a write-once disk). Note that changing any of these values from their defaults will make -it impossible for +it impossible for .Xr fsck 8 to find the alternate superblocks if the standard superblock is lost. .Bl -tag -width Fl diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8 index 98312c7cb60..e8645b680a8 100644 --- a/sbin/newfs_msdos/newfs_msdos.8 +++ b/sbin/newfs_msdos/newfs_msdos.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: newfs_msdos.8,v 1.9 1999/05/28 23:00:01 aaron Exp $ +.\" $OpenBSD: newfs_msdos.8,v 1.10 1999/06/04 02:45:19 aaron Exp $ .\" .\" Copyright (c) 1995, 1996 Joerg Wunsch .\" @@ -35,7 +35,7 @@ .Nd create an MS-DOS (FAT) file system .Sh SYNOPSIS .Nm newfs_msdos -.Bq Fl s Ar kilobytes +.Bq Fl s Ar kilobytes .Bq Fl L Ar vollabel .Ar device .Sh DESCRIPTION diff --git a/sbin/newlfs/newlfs.8 b/sbin/newlfs/newlfs.8 index 671fe6a476d..63966433779 100644 --- a/sbin/newlfs/newlfs.8 +++ b/sbin/newlfs/newlfs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: newlfs.8,v 1.7 1999/05/23 14:11:19 aaron Exp $ +.\" $OpenBSD: newlfs.8,v 1.8 1999/06/04 02:45:19 aaron Exp $ .\" $NetBSD: newlfs.8,v 1.2 1995/03/18 14:58:54 cgd Exp $ .\" .\" Copyright (c) 1993 @@ -53,10 +53,10 @@ builds a log-structured file system on the specified .Ar special device, basing its defaults on the information in the disk label. -(Before running +(Before running .Nm -the disk must be labeled using -.Xr disklabel 8 .) +the disk must be labeled using +.Xr disklabel 8 . ) .Pp The following options define the general layout policies: .Bl -tag -width Fl diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8 index aaf2563de98..8e0c6a39ba3 100644 --- a/sbin/nfsd/nfsd.8 +++ b/sbin/nfsd/nfsd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nfsd.8,v 1.8 1999/02/26 16:19:51 millert Exp $ +.\" $OpenBSD: nfsd.8,v 1.9 1999/06/04 02:45:19 aaron Exp $ .\" $NetBSD: nfsd.8,v 1.7 1996/02/18 11:58:24 fvdl Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 @@ -84,7 +84,7 @@ Serve clients. .El .Pp -For example, +For example, .Dq Li "nfsd -u -t -n 6" serves .Tn UDP diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8 index ab78c51d315..5cb16013dd2 100644 --- a/sbin/nologin/nologin.8 +++ b/sbin/nologin/nologin.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nologin.8,v 1.7 1998/12/15 01:20:41 aaron Exp $ +.\" $OpenBSD: nologin.8,v 1.8 1999/06/04 02:45:19 aaron Exp $ .\" $NetBSD: nologin.8,v 1.3 1995/03/18 14:59:09 cgd Exp $ .\" .\" Copyright (c) 1993 @@ -39,7 +39,7 @@ .Os .Sh NAME .Nm nologin -.Nd politely refuse a login +.Nd politely refuse a login .Sh SYNOPSIS .Nm nologin .Sh DESCRIPTION diff --git a/sbin/pcmcia_cntrl/pcmcia_cntrl.8 b/sbin/pcmcia_cntrl/pcmcia_cntrl.8 index 0dccb453b9f..1ff629ee31d 100644 --- a/sbin/pcmcia_cntrl/pcmcia_cntrl.8 +++ b/sbin/pcmcia_cntrl/pcmcia_cntrl.8 @@ -1,5 +1,5 @@ -.\" $OpenBSD: pcmcia_cntrl.8,v 1.5 1998/12/15 01:20:42 aaron Exp $ -.\" Copyright (c) 1994 Stefan Grefen +.\" $OpenBSD: pcmcia_cntrl.8,v 1.6 1999/06/04 02:45:20 aaron Exp $ +.\" Copyright (c) 1994 Stefan Grefen .\" All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by diff --git a/sbin/photurisd/photurisd.8 b/sbin/photurisd/photurisd.8 index 32d28c52bf9..bae2a499525 100644 --- a/sbin/photurisd/photurisd.8 +++ b/sbin/photurisd/photurisd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: photurisd.8,v 1.3 1998/12/15 01:20:46 aaron Exp $ +.\" $OpenBSD: photurisd.8,v 1.4 1999/06/04 02:45:25 aaron Exp $ .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> .\" All rights reserved. .\" @@ -44,9 +44,9 @@ The .Nm daemon establishes security associations for encrypted -and/or authenticated network traffic. +and/or authenticated network traffic. .Pp -The daemon listens to a named pipe +The daemon listens to a named pipe .Pa photuris.pipe for user requests and on a .Dv PF_ENCAP @@ -59,7 +59,7 @@ The .Fl c option is used to force a primality check of the bootstrapped moduli. .It Fl v -The +The .Fl v options is used to start .Xr photurisd 8 @@ -68,7 +68,7 @@ in VPN (Virtual Private Network) mode, see .It Fl i The .Fl i -option can be used to ignore the +option can be used to ignore the .Pa photuris.startup file. Otherwise the exchanges in that file will be initiated on startup. @@ -92,20 +92,20 @@ the daemon shall bind to. The file .Pa photuris.conf contains the moduli for the DH exchange and the actual exchange -schemes used to establish a shared secret. The following keywords are +schemes used to establish a shared secret. The following keywords are understood: .Bl -tag -width exchange -offset indent .It Ic modulus This keyword is followed by the numeric generator and modulus. Those two -values describe the group in which exchange values for the +values describe the group in which exchange values for the .Dq Diffie-Hellmann -key exchange are generated. The modulus needs to be a +key exchange are generated. The modulus needs to be a .Dq safe prime . .It Ic exchange -This keyword is used to specify the supported exchange schemes. The scheme is +This keyword is used to specify the supported exchange schemes. The scheme is followed by either zero or the number of bits of the modulus to be used with this scheme. -If zero is specified the given scheme acts as modifier to the base +If zero is specified the given scheme acts as modifier to the base scheme. The base scheme is .Dq DH_G_2_MD5 (generator of two and MD5 identification). Extended schemes are @@ -120,7 +120,7 @@ values are: .Ic exchange_max_retries , .Ic exchange_retransmit_timeout , .Ic exchange_timeout , -.Ic exchange_lifetime +.Ic exchange_lifetime and .Ic spi_lifetime . They are followed by an integer. @@ -133,7 +133,7 @@ and authenication, offered to the other peer. If a line starts with an ip address and a space separated netmask the following attributes are only offered to hosts lying in that net range. Only one attribute per line is allowed. An attribute can either be an already defined tag or -a new definition of an attribute. In that case the line is followed by a +a new definition of an attribute. In that case the line is followed by a comma separated list: .Ar attribute name , .Ar Photuris ID , @@ -162,12 +162,12 @@ Starts the list of encryption attributes. The file .Pa secrets.conf contains the party preconfigured symmetric secrets for the -identity exchange. +identity exchange. .Bl -tag -width identity_pair_local -offset indent .It Ic identity local Defines the identity the local daemon will assume and the according password. Both name and secret are braced by quotation marks and follow -the +the .Ic identity local directive. .It Ic identity remote @@ -193,7 +193,7 @@ Finally the file contains parameters for exchanges which are created during startup. .Pp -The keywords +The keywords .Ic dst , .Ic port , .Ic options , @@ -203,7 +203,7 @@ The keywords .Ic spi_lifetime and .Ic user -are understood in the +are understood in the .Pa photuris.startup file. The values are as follows: .Bl -tag -width exchange_lifetime -offset indent @@ -276,8 +276,8 @@ tdst=134.100.106.0/255.255.255.255 .Xr vpn 8 .Sh HISTORY The photuris keymanagement protocol is described in the internet draft -.%T draft-simpson-photuris +.%T draft-simpson-photuris by the authors Phil Karn and William Allen Simpson. -This implementation was done 1997 by Niels Provos and appeared in +This implementation was done 1997 by Niels Provos and appeared in .Ox 2.1 . diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 01b8fd4022c..b2b82670151 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ping.8,v 1.17 1999/05/23 14:11:19 aaron Exp $ +.\" $OpenBSD: ping.8,v 1.18 1999/06/04 02:45:22 aaron Exp $ .\" $NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 @@ -163,13 +163,13 @@ This option can be used to ping a local host through an interface that has no route through it (e.g., after the interface was dropped by .Xr routed 8 ) . .It Fl s Ar packetsize -Specifies the number of data bytes to be sent. +Specifies the number of data bytes to be sent. The default is 56, which translates into 64 .Tn ICMP data bytes when combined with the 8 bytes of .Tn ICMP -header data. If the +header data. If the .Fl D or .Fl T diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8 index 7bf468d6d7e..26d847e5503 100644 --- a/sbin/quotacheck/quotacheck.8 +++ b/sbin/quotacheck/quotacheck.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: quotacheck.8,v 1.7 1999/05/23 14:11:20 aaron Exp $ +.\" $OpenBSD: quotacheck.8,v 1.8 1999/06/04 02:45:22 aaron Exp $ .\" $NetBSD: quotacheck.8,v 1.4 1995/03/18 14:59:20 cgd Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 @@ -127,7 +127,7 @@ and located at the root of the associated file system. These defaults may be overridden in .Pa /etc/fstab . -If a file is not present, +If a file is not present, .Nm will create it. .Pp diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8 index 6f7a8cffd30..01fc1c80363 100644 --- a/sbin/raidctl/raidctl.8 +++ b/sbin/raidctl/raidctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: raidctl.8,v 1.3 1999/04/02 15:12:18 aaron Exp $ +.\" $OpenBSD: raidctl.8,v 1.4 1999/06/04 02:45:25 aaron Exp $ .\" .\" $NetBSD: raidctl.8,v 1.3 1999/02/04 14:50:31 oster Exp $ .\" @@ -39,29 +39,29 @@ .\" .\" Copyright (c) 1995 Carnegie-Mellon University. .\" All rights reserved. -.\" +.\" .\" Author: Mark Holland -.\" +.\" .\" Permission to use, copy, modify and distribute this software and .\" its documentation is hereby granted, provided that both the copyright .\" notice and this permission notice appear in all copies of the .\" software, derivative works or modified versions, and any portions .\" thereof, and that both notices appear in supporting documentation. -.\" +.\" .\" CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" .\" CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND .\" FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. -.\" +.\" .\" Carnegie Mellon requests users of this software to return to -.\" +.\" .\" Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU .\" School of Computer Science .\" Carnegie Mellon University .\" Pittsburgh PA 15213-3890 -.\" +.\" .\" any improvements or extensions that they make and grant Carnegie the .\" rights to redistribute these changes. -.\" +.\" .Dd November 6, 1998 .Dt RAIDCTL 8 .Os @@ -82,15 +82,15 @@ .Nm raidctl .Fl R Ar dev .Nm raidctl -.Fl s Ar dev +.Fl s Ar dev .Nm raidctl .Fl u Ar dev .Sh DESCRIPTION .Nm is the user-land control program for .Xr raid 4 , -the RAIDframe disk device. -.Nm +the RAIDframe disk device. +.Nm is primarily used to dynamically configure and unconfigure RAIDframe disk devices. For more information about the RAIDframe disk device, see .Xr raid 4 . @@ -98,55 +98,55 @@ devices. For more information about the RAIDframe disk device, see This document assumes the reader has at least rudimentary knowledge of RAID and RAID concepts. .Pp -The command-line options for +The command-line options for .Nm are as follows: .Bl -tag -width indent .It Fl c Ar config_file Ar dev -Configure the RAIDframe device +Configure the RAIDframe device .Ar dev according to the configuration given in .Ar config_file . -A description of the contents of +A description of the contents of .Ar config_file is given later. .It Fl C Ar dev -Initiate a copyback of reconstructed data from a spare disk to -its original disk. This is performed after a component has failed, +Initiate a copyback of reconstructed data from a spare disk to +its original disk. This is performed after a component has failed, and the failed drive has been reconstructed onto a spare drive. .It Fl f Ar component Ar dev -This marks the specified +This marks the specified .Ar component as having failed, but does not initiate a reconstruction of that -component. +component. .It Fl F Ar component Ar dev -Fails the specified +Fails the specified .Ar component of the device, and immediately beginis a reconstruction of the failed disk onto an available hot spare. This is the mechanism used to start the reconstruction process if a component does have a hardware failure. .It Fl r Ar dev -Re-write the parity on the device. This +Re-write the parity on the device. This .Em must be done before the RAID device is labeled and before filesystems are created on the RAID device, and is normally used after -a system crash (and before a +a system crash (and before a .Xr fsck 8 ) Ns to ensure the integrity of the parity. .It Fl R Ar dev -Check the status of component reconstruction. The output indicates +Check the status of component reconstruction. The output indicates the amount of progress achieved in reconstructing a failed component. .It Fl s Ar dev Display the status of the RAIDframe device for each of the components -and spares. +and spares. .It Fl u Ar dev Unconfigure the RAIDframe device. .El .Pp -The device used by +The device used by .Nm -is specified by -.Ar dev . +is specified by +.Ar dev . .Ar dev may be either the full name of the device (e.g., .Pa /dev/rraid0d @@ -158,31 +158,31 @@ or just simply raid0 (for .Pp The format of the configuration file is complex, and only an abbreviated treatment is given here. In the configuration -files, a +files, a .Sq # indicates the beginning of a comment. .Pp There are 4 required sections of a configuration file, and 2 -optional components. Each section begins with a -.Dq START , +optional components. Each section begins with a +.Dq START , followed by the section name, and the confuration parameters associated with that -section. The first section is the +section. The first section is the .Dq array section, and it specifies the number of rows, columns, and spare disks in the RAID array. For -example: +example: .Bd -unfilled -offset indent START array 1 3 0 .Ed .Pp indicates an array with 1 row, 3 columns, and 0 spare disks. Note -that although multi-dimensional arrays may be specified, they are +that although multi-dimensional arrays may be specified, they are .Em not supported in the driver. .Pp -The second section, the +The second section, the .Dq disks section, specifies the actual components of the device. For example: @@ -195,15 +195,15 @@ START disks .Pp specifies the three component disks to be used in the RAID device. If any of the specified drives cannot be found when the RAID device is -configured, then they will be marked as -.Dq failed , +configured, then they will be marked as +.Dq failed , and the system will operate in degraded mode. Note that it is .Em imperative that the order of the components in the configuration file does not change between configurations of a RAID device. Changing the order of the components (at least at the time of this writing) will result in -data loss. +data loss. .Pp The next section, .Dq spare , @@ -211,20 +211,20 @@ is optional, and if present specifies the devices to be used as .Dq hot spares -- devices which are on-line, but are not actively used by the RAID driver unless -one of the main components fail. A simple +one of the main components fail. A simple .Dq spare section might be: .Bd -unfilled -offset indent -START spare +START spare /dev/sd3e .Ed .Pp for a configuration with a single spare component. If no spare drives -are to be used in the configuration, then the +are to be used in the configuration, then the .Dq spare -section may be omitted. +section may be omitted. .Pp -The next section is the +The next section is the .Dq layout section. This section describes the general layout parameters for the RAID device, and provides such @@ -247,9 +247,9 @@ While certain values above 1 are permitted, a discussion of valid values and the consequences of using anything other than 1 are outside the scope of this document. The last value in this section (5 in this example) indicates the parity configuration desired. Valid entries -include: +include: .Bl -tag -width inde -.It 0 +.It 0 RAID level 0. No parity, only simple striping. .It 1 RAID level 1. Mirroring. @@ -262,12 +262,12 @@ all components. .El .Pp There are other valid entries here, including those for Even-Odd -parity, RAID level 5 with rotated sparing, Chained declustering, +parity, RAID level 5 with rotated sparing, Chained declustering, and Interleaved declustering, but as of this writing the code for -those parity operations has not been tested with +those parity operations has not been tested with .Ox . .Pp -The next required section is the +The next required section is the .Dq queue section. This is most often specified as: @@ -279,15 +279,15 @@ fifo 1 where the queuing method is specified as FIFO (first-in, first-out), and the size of the per-component queue is limited to 1 request. A value of 1 is quite conservative here, and values of 100 or more may -been used to increase the driver performance. +been used to increase the driver performance. Other queuing methods may also be specified, but a discussion of them is beyond the scope of this document. .Pp -The final section, the +The final section, the .Dq debug section, is optional. For more details on this the reader is referred to the RAIDframe documentation -dissussed in the +dissussed in the .Sx HISTORY section. See @@ -297,19 +297,19 @@ for a more complete configuration file example. The examples in this section will focus on a RAID 5 configuration. Other RAID configurations will behave similarly. It is highly recommended that before using the RAID driver for real filesystems -that the system administrator(s) have used +that the system administrator(s) have used .Em all -of the options for +of the options for .Nm , and that they understand how the component reconstruction process works. While this example is not created as a tutorial, the steps shown here can be easily dupilicated using four equal-sized partitions -from any number of disks (including all four from a single disk). +from any number of disks (including all four from a single disk). .Pp -The primary use of +The primary use of .Nm is to configure and unconfigure -.Xr raid 4 +.Xr raid 4 devices. To configure a device, a configuration file which looks something like: .Bd -unfilled -offset indent @@ -341,13 +341,13 @@ and .Pa /dev/sd3e , with .Pa /dev/sd4e -available as a +available as a .Dq hot spare in case one of the three main drives should fail. If the above configuration is in a -file called -.Pa rfconfig , -raid device 0 can be configured with: +file called +.Pa rfconfig , +raid device 0 can be configured with: .Bd -unfilled -offset indent raidctl -c rfconfig raid0 .Ed @@ -411,16 +411,16 @@ Spares: /dev/sd4e [0][0]: spare .Ed .Pp -Note that with the use of +Note that with the use of .Fl f a reconstruction has not been started. To both fail the disk and -start a reconstruction, the +start a reconstruction, the .Fl F -option must be used. (The +option must be used. (The .Fl f option may be used first, and then the .Fl F -option used later, on the same disk, if desired.) +option used later, on the same disk, if desired.) Immediately after the reconstruction is started, the status will report: .Bd -unfilled -offset indent Components: @@ -432,7 +432,7 @@ Spares: .Ed .Pp This indicates that a reconstruction is in progress. To find out how -the reconstruction is progressing the +the reconstruction is progressing the .Fl R option may be used. This will indicate the progress in terms of the percentage of the reconstruction that is completed. When the @@ -450,12 +450,12 @@ Spares: .Pp At this point there are at least two options. First, if .Pa /dev/sd2e -is known to be good (i.e., the failure was either caused by +is known to be good (i.e., the failure was either caused by .Fl f -or +or .Fl F , -or the failed disk was replaced), then a copyback of the data can -be initiated with the +or the failed disk was replaced), then a copyback of the data can +be initiated with the .Fl C option. In this example, this would copy the entire contents of .Pa /dev/sd4e @@ -493,17 +493,17 @@ This can be done as .Pa /dev/sd4e is completely interchangeable with .Pa /dev/sd2e -at this point. Note that extreme care must be taken when +at this point. Note that extreme care must be taken when changing the order of the drives in a configuration. This is one of the few instances where the devices and/or their orderings can be changed without loss of data! In general, the ordering of components -in a configuration file should -.Em never +in a configuration file should +.Em never be changed. .Pp -The final operation performed by +The final operation performed by .Nm -is to unconfigure a +is to unconfigure a .Xr raid 4 device. This is accomplished via a simple: .Bd -unfilled -offset indent @@ -516,11 +516,11 @@ Certain RAID levels (1, 4, 5, 6, and others) can protect against some data loss due to component failure. However the loss of two components of a RAID 4 or 5 system, or the loss of a single component of a RAID 0 system will result in the entire filesystem being lost. -RAID is +RAID is .Em not a substitute for good backup practices. .Pp -Recomputation of parity +Recomputation of parity .Em must be performed whenever there is a chance that it may have been compromised. This includes after system crashes, or before a RAID @@ -544,7 +544,7 @@ device special files .Sh HISTORY RAIDframe is a framework for rapid prototyping of RAID structures developed by the folks at the Parallel Data Laboratory at Carnegie -Mellon University (CMU). +Mellon University (CMU). A more complete description of the internals and functionality of RAIDframe is found in the paper "RAIDframe: A Rapid Prototyping Tool for RAID Systems", by William V. Courtright II, Garth Gibson, Mark diff --git a/sbin/reboot/boot_atari.8 b/sbin/reboot/boot_atari.8 index c6a724f0fd4..dbc941b2d25 100644 --- a/sbin/reboot/boot_atari.8 +++ b/sbin/reboot/boot_atari.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_atari.8,v 1.6 1998/11/28 19:56:32 aaron Exp $ +.\" $OpenBSD: boot_atari.8,v 1.7 1999/06/04 02:45:22 aaron Exp $ .\" $NetBSD: boot_atari.8,v 1.1 1996/06/27 11:07:56 leo Exp $ .\" .\" Copyright (c) 1990, 1991 The Regents of the University of California. @@ -49,7 +49,7 @@ system bootstrapping procedures .Sh DESCRIPTION .Ss Power fail and crash recovery When the -.Tn OpenBSD +.Ox kernel is booted normally (using one of the two methods discussed below), it initializes itself and proceeds to boot the system. An automatic consistency check of the file systems takes place, and unless this @@ -69,10 +69,12 @@ or not), the system will attempt a reboot. .Pp .Ss Booting OpenBSD using the bootloader When a bootable -.Tn OpenBSD +.Ox partition is created by means of .Xr installboot 8 , -the Atari BIOS will automatically start the OpenBSD bootloader. By default, +the Atari BIOS will automatically start the +.Ox +bootloader. By default, it will load the kernel image .Pa /bsd and attempt to boot it into multi-user mode. This behaviour can be changed by @@ -132,14 +134,16 @@ Enter the kernel debugger. .El .Pp .Ss Booting using the loadbsd program -When you want (or have to) start OpenBSD from GEM, you have to use the +When you want (or have to) start +.Ox +from GEM, you have to use the .Xr loadbsd program that is supplied on the kernel-floppy. The .Xr loadbsd command line specification is: .Bd -ragged -offset indent -.Nm loadbsd +.Nm loadbsd .Op Fl abdhstwDV .Op Fl S Ar amount .Op Fl T Ar amount @@ -161,9 +165,12 @@ here. Write all output to the file .Ar outputfile . .It Fl s -Tell OpenBSD only to use ST compatible RAM. +Tell +.Ox +only to use ST compatible RAM. .It Fl t -Test loading of the kernel but don't start OpenBSD. +Test loading of the kernel but don't start +.Ox . .It Fl w Wait for a keypress before exiting loadbsd. This is useful when starting this program under GEM. diff --git a/sbin/reboot/boot_hp300.8 b/sbin/reboot/boot_hp300.8 index 1afaca88af3..0e1af743ec2 100644 --- a/sbin/reboot/boot_hp300.8 +++ b/sbin/reboot/boot_hp300.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_hp300.8,v 1.5 1998/11/11 22:19:59 aaron Exp $ +.\" $OpenBSD: boot_hp300.8,v 1.6 1999/06/04 02:45:22 aaron Exp $ .\" $NetBSD: boot_hp300.8,v 1.3 1995/04/23 10:33:34 cgd Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 @@ -66,7 +66,7 @@ when the partition file system on the pack is created. .Pp This boot program -finds the corresponding file on the given device +finds the corresponding file on the given device .Pf ( Ar bsd by default), loads that file into memory, diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 index ff34c7344af..83e799fcd88 100644 --- a/sbin/reboot/boot_i386.8 +++ b/sbin/reboot/boot_i386.8 @@ -1,9 +1,9 @@ -.\" $OpenBSD: boot_i386.8,v 1.9 1998/11/11 22:19:59 aaron Exp $ +.\" $OpenBSD: boot_i386.8,v 1.10 1999/06/04 02:45:23 aaron Exp $ .\" .\" Copyright (c) 1997 Tobias Weingartner .\" .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -17,9 +17,9 @@ .\" This product includes software developed by Michael Shalayeff. .\" 4. The name of the author may not be used to endorse or promote products .\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL @@ -29,7 +29,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" +.\" .Dd September 4, 1997 .Dt BOOT_I386 8 i386 diff --git a/sbin/reboot/boot_mac68k.8 b/sbin/reboot/boot_mac68k.8 index 4df0bb54eef..a4e3ea2a9dc 100644 --- a/sbin/reboot/boot_mac68k.8 +++ b/sbin/reboot/boot_mac68k.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_mac68k.8,v 1.8 1998/11/11 22:19:59 aaron Exp $ +.\" $OpenBSD: boot_mac68k.8,v 1.9 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: boot_mac68k.8,v 1.1 1995/07/02 02:09:52 briggs Exp $ .\" .\" Copyright (c) 1990, 1991 The Regents of the University of California. @@ -76,8 +76,9 @@ switch can be physically rotated and locked in the position. The native OS can be configured to automatically start the .Ox -boot program. Additionally, the OpenBSD boot program can be configured -to boot +boot program. Additionally, the +.Ox +boot program can be configured to boot .Ox without intervention. When a system is so configured, it can crash or lose power and reboot back to a fully multi-user state without @@ -114,8 +115,8 @@ in native OS rather than from the usual location in the file system. A radio button is supplied for this purpose. Note that some programs will not run properly if the kernel is not found as .Pa /bsd -within the -.Tn OpenBSD +within the +.Ox file system. .Sh FILES .Bl -tag -width /bsd -compact diff --git a/sbin/reboot/boot_pmax.8 b/sbin/reboot/boot_pmax.8 index cb78adbc0f6..c201646bed1 100644 --- a/sbin/reboot/boot_pmax.8 +++ b/sbin/reboot/boot_pmax.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_pmax.8,v 1.11 1999/05/16 19:56:17 alex Exp $ +.\" $OpenBSD: boot_pmax.8,v 1.12 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: boot_pmax.8,v 1.1 1995/04/25 23:55:11 mellon Exp $ .\" .\" Copyright (c) 1990, 1991 The Regents of the University of California. @@ -45,7 +45,7 @@ system bootstrapping procedures .Sh DESCRIPTION The -.Tn OpenBSD +.Ox kernel is started by placing it at the beginning of physical memory and transferring to the entry point. Since the system is not reenterable, @@ -73,7 +73,7 @@ the ROM attempts to autoboot. On the DECstation 2100 and 3100, the path used for automatic booting is stored in the .Nm bootpath -environment variable. The path is made up of a +environment variable. The path is made up of a device type specifier (e.g., rz, tz, mop or tftp), followed by a triplet in the form (x,y,z), followed by a filename to load. .Pp @@ -109,10 +109,10 @@ For automatic boots, the ROM automatically passes a .Fl a argument to the bootloader, requesting that -.Tn OpenBSD +.Ox attempt to come up to multi-user mode. At the boot ROM prompt, the user may boot -.Tn OpenBSD +.Ox with either the .Nm auto or the @@ -125,7 +125,7 @@ argument is passed to the kernel, requesting a multi-user boot; otherwise the .Fl s argument is passed, requesting that -.Tn OpenBSD +.Ox boot to single user mode. .Pp When either the @@ -181,7 +181,7 @@ devices, the option-specific protocol identifier is either mop or tftp. Filename requirements are as for the DECstation 2100 and 3100. .Pp To start -.Tn OpenBSD +.Ox from the boot prompt, the .Nm boot command must be used. With no arguments, this simply boots the default diff --git a/sbin/reboot/boot_sparc.8 b/sbin/reboot/boot_sparc.8 index 506c2f01774..0e1654373e3 100644 --- a/sbin/reboot/boot_sparc.8 +++ b/sbin/reboot/boot_sparc.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_sparc.8,v 1.7 1998/11/11 22:20:00 aaron Exp $ +.\" $OpenBSD: boot_sparc.8,v 1.8 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: boot_sparc.8,v 1.4 1995/04/25 11:37:25 pk Exp $ .\" .\" Copyright (c) 1992, 1993 @@ -111,7 +111,9 @@ setenv sunmon-compat? false The ROM will normally load the kernel from .Dq sd(0,0,0)bsd . To change the -default so that OpenBSD will be loaded, type the following: +default so that +.Ox +will be loaded, type the following: .Pp .Em \ ok setenv boot-from sd(0,0,0)bsd diff --git a/sbin/reboot/boot_vax.8 b/sbin/reboot/boot_vax.8 index 2745fcf258b..3a96e2e301c 100644 --- a/sbin/reboot/boot_vax.8 +++ b/sbin/reboot/boot_vax.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_vax.8,v 1.7 1998/11/11 22:20:00 aaron Exp $ +.\" $OpenBSD: boot_vax.8,v 1.8 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: boot_vax.8,v 1.3 1995/04/23 10:33:39 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -206,10 +206,10 @@ contains the correct parameters for an disk such as the RD53. .Pp -On any processor, the +On any processor, the .Nm boot program -finds the corresponding file on the given device +finds the corresponding file on the given device .Pf ( Pa bsd by default), loads that file into memory location zero, and starts the program at the entry address diff --git a/sbin/reboot/boot_x68k.8 b/sbin/reboot/boot_x68k.8 index 1a7a69a2a6c..d0eefbfccf3 100644 --- a/sbin/reboot/boot_x68k.8 +++ b/sbin/reboot/boot_x68k.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_x68k.8,v 1.6 1998/11/11 22:20:00 aaron Exp $ +.\" $OpenBSD: boot_x68k.8,v 1.7 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: boot_x68k.8,v 1.1 1996/06/15 18:54:22 oki Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -56,7 +56,7 @@ floppy disk drive (from 0 to 3) first, and then from a hard disk (SASI or SCSI). On the OpenBSD/X68k, booting from partition .Dq a -of SCSI disks (sd?a) +of SCSI disks (sd?a) and 2HD floppy disks (fd?a, fd?c) is currently supported. .Pp First, the initial program loader of IOCS ROM or SCSI disk @@ -65,7 +65,9 @@ First, the initial program loader of IOCS ROM or SCSI disk program at the top of the disk, and then the .Nm boot -program loads the OpenBSD kernel +program loads the +.Ox +kernel .Pa /bsd which is in the same partition of the disk. If you press the @@ -86,15 +88,20 @@ flag and tries to boot the system in debug mode; see for details. .Pp Note for X68030+MC68030 systems: -Nothing special to be attended to; you can boot OpenBSD just like as +Nothing special to be attended to; you can boot +.Ox +just like as other operating systems such as Human68k and OS-9. .Pp Note for X68030/040turbo(68040 accelerator by BEEPs) systems: -OpenBSD can boot under 040 mode. +.Ox +can boot under 040 mode. It can also boot under 030 mode if you have an MC68030 on the board. .Pp Note for X68000/Xellent30(68030 accelerator by TSR) + MC68030 systems: -In order to boot OpenBSD, you must choose 030 mode by using +In order to boot +.Ox , +you must choose 030 mode by using .Pa CH30.SYS , which must reside in the battery-backuped SRAM. .Pp diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8 index 0775d0973ee..59db570da51 100644 --- a/sbin/restore/restore.8 +++ b/sbin/restore/restore.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: restore.8,v 1.14 1999/05/23 14:11:20 aaron Exp $ +.\" $OpenBSD: restore.8,v 1.15 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: restore.8,v 1.15 1997/07/01 05:37:53 lukem Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 @@ -124,7 +124,7 @@ added to the extraction list flag is specified on the command line). Files that are on the extraction list are prepended with a .Dq \&* -when they are listed by +when they are listed by .Ic ls . .It Ic \&cd Ar arg Change the current working directory to the specified argument. @@ -136,7 +136,7 @@ deleted from the extraction list (unless the .Fl h flag is specified on the command line). -The most expedient way to extract most of the files from a directory +The most expedient way to extract most of the files from a directory is to add the directory to the extraction list and then delete those files that are not needed. .It Ic extract @@ -167,10 +167,10 @@ have their owner, modes, and times set; nothing is extracted from the dump. This is useful for cleaning up after a restore has been prematurely aborted. .It Ic verbose -The sense of the +The sense of the .Fl v flag is toggled. -When set, the verbose flag causes the +When set, the verbose flag causes the .Ic ls command to list the inode numbers of all entries. It also causes @@ -210,9 +210,9 @@ cd /mnt restore rf /dev/rst8 .Ed .Pp -Note that +Note that .Nm -leaves a file +leaves a file .Pa restoresymtable in the root directory to pass information between incremental restore passes. @@ -244,7 +244,7 @@ program. .ne 1i .It Fl x The named files are read from the given media. -If a named file matches a directory whose contents +If a named file matches a directory whose contents are on the backup and the .Fl h @@ -301,7 +301,7 @@ reads from the named file on the remote host using .Xr rmt 8 . .Pp .It Fl h -Extract the actual directory, +Extract the actual directory, rather than the files that it references. This prevents hierarchical restoration of complete subtrees from the dump. @@ -330,7 +330,7 @@ Always try to skip over the bad block(s) and continue. .El .Sh DIAGNOSTICS Complains if it gets a read error. -If +If .Fl y has been specified, or the user responds .Dq y , @@ -378,7 +378,7 @@ or that has too low an incremental level has been loaded. .Pp .It Incremental dump too high When doing an incremental restore, -a dump that does not begin its coverage where the previous incremental +a dump that does not begin its coverage where the previous incremental dump left off, or that has too high an incremental level has been loaded. .Pp @@ -393,7 +393,7 @@ no extracted files have been corrupted, though files may not be found on the tape. .Pp .It resync restore, skipped <num> blocks -After a dump read error, +After a dump read error, .Nm may have to resynchronize itself. This message lists the number of blocks that were skipped over. @@ -454,7 +454,7 @@ and are generated with a unique name based on the date of the dump and the process ID (see .Xr mktemp 3 ), -except when +except when .Fl r or .Fl R diff --git a/sbin/route/route.8 b/sbin/route/route.8 index 00075ee4a97..bc61e3ccdf5 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: route.8,v 1.16 1999/05/23 14:11:20 aaron Exp $ +.\" $OpenBSD: route.8,v 1.17 1999/06/04 02:45:23 aaron Exp $ .\" $NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -61,7 +61,7 @@ The utility supports a limited number of general options, but a rich command language enables the user to specify any arbitrary request that could be delivered via the -programmatic interface discussed in +programmatic interface discussed in .Xr route 4 . .Bl -tag -width Ds .It Fl d @@ -116,9 +116,9 @@ The flush command has the syntax .Op Ar family .Ed .Pp -If the +If the .Cm flush -command is specified, +command is specified, .Nm will .Dq flush @@ -155,7 +155,7 @@ The optional modifiers and .Fl host force the destination to be interpreted as a network or a host, respectively. -Otherwise, if the +Otherwise, if the .Ar destination has a .Dq local address part @@ -177,7 +177,7 @@ is interpreted as .Fl net Li 128.32 is interpreted as .Li 128.32.0.0; -and +and .Fl net Li 128.32.130 is interpreted as .Li 128.32.130.0 . @@ -188,7 +188,7 @@ is interpreted to specify that the high 20 bits of the address .Pp If the destination is directly reachable via an interface requiring -no intermediary system to act as a gateway, the +no intermediary system to act as a gateway, the .Fl interface modifier should be specified; the gateway given is the address of this host on the common network, @@ -198,7 +198,7 @@ The optional modifiers .Fl xns , .Fl osi , and -.Fl link +.Fl link specify that all subsequent addresses are in the .Tn XNS .Tn OSI @@ -257,7 +257,7 @@ These may be individually locked by preceding each such modifier to be locked by the .Fl lock -meta-modifier, or one can +meta-modifier, or one can specify that all ensuing metrics may be locked by the .Fl lockrest meta-modifier. @@ -278,7 +278,7 @@ modifiers may be used to determine the interface or interface address. .Pp All symbolic names specified for a .Ar destination -or +or .Ar gateway are looked up first as a host name using .Xr gethostbyname 3 . @@ -300,17 +300,17 @@ the routing tables. .It Sy "add [host \&| network ] %s: gateway %s flags %x" The specified route is being added to the tables. The values printed are from the routing table entry supplied -in the +in the .Xr ioctl 2 call. If the gateway address used was not the primary address of the gateway (the first one returned by .Xr gethostbyname 3 ) , the gateway address is printed numerically as well as symbolically. -.It Sy "delete [ host &| network ] %s: gateway %s flags %x" +.It Sy "delete [ host &| network ] %s: gateway %s flags %x" As above, but when deleting an entry. .It Sy "%s %s done" -When the +When the .Cm flush command is specified, each routing table entry deleted is indicated with a message of this form. diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8 index ea87be1f5de..2c0eaedbb41 100644 --- a/sbin/routed/routed.8 +++ b/sbin/routed/routed.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: routed.8,v 1.23 1999/05/23 14:11:20 aaron Exp $ +.\" $OpenBSD: routed.8,v 1.24 1999/06/04 02:45:24 aaron Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -452,7 +452,7 @@ specified in "dot" notation (see or .Pa /etc/hosts , or -.Xr named 8 +.Xr named 8 must have been started before .Nm routed Ns .) .Pp diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8 index 691ff389479..88e383567d0 100644 --- a/sbin/scsi/scsi.8 +++ b/sbin/scsi/scsi.8 @@ -1,21 +1,21 @@ -.\" $OpenBSD: scsi.8,v 1.9 1999/05/28 23:00:03 aaron Exp $ +.\" $OpenBSD: scsi.8,v 1.10 1999/06/04 02:45:24 aaron Exp $ .\" $FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $ .\" .\" Written By Julian ELischer .\" Copyright julian Elischer 1993. .\" Permission is granted to use or redistribute this file in any way as long -.\" as this notice remains. Julian Elischer does not guarantee that this file -.\" is totally correct for any given task and users of this file must +.\" as this notice remains. Julian Elischer does not guarantee that this file +.\" is totally correct for any given task and users of this file must .\" accept responsibility for any damage that occurs from the application of .\" this file. -.\" +.\" .\" (julian@tfs.com julian@dialix.oz.au) .\" User SCSI hooks added by Peter Dufault: -.\" +.\" .\" Copyright (c) 1994 HD Associates .\" (contact: dufault@hda.com) .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -27,7 +27,7 @@ .\" 3. The name of HD Associates .\" may not be used to endorse or promote products derived from this software .\" without specific prior written permission. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -139,7 +139,7 @@ fields are Permits you to edit the fields. It will use the editor specified by your .Ev EDITOR -environment variable. To store changes permanently, +environment variable. To store changes permanently, edit page control 3 using the .Fl P flag. diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8 index f7581e582fc..c08861fcb5f 100644 --- a/sbin/shutdown/shutdown.8 +++ b/sbin/shutdown/shutdown.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: shutdown.8,v 1.13 1999/05/23 14:11:21 aaron Exp $ +.\" $OpenBSD: shutdown.8,v 1.14 1999/06/04 02:45:24 aaron Exp $ .\" $NetBSD: shutdown.8,v 1.6 1995/03/18 15:01:07 cgd Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 @@ -42,7 +42,7 @@ .Nd "close down the system at a given time" .Sh SYNOPSIS .Nm shutdown -.Op Fl +.Op Fl .Op Fl dfhkrnp .Ar time .Op Ar warning-message ... @@ -83,7 +83,7 @@ system multi-user with logins disabled (for all but super-user). Prevent the normal .Xr sync 2 before stopping. -.It Fl r +.It Fl r .Nm execs .Xr reboot 8 diff --git a/sbin/startkey/startkey.1 b/sbin/startkey/startkey.1 index 204f37971f1..d3b72ddf1f4 100644 --- a/sbin/startkey/startkey.1 +++ b/sbin/startkey/startkey.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: startkey.1,v 1.3 1998/12/16 02:47:52 aaron Exp $ +.\" $OpenBSD: startkey.1,v 1.4 1999/06/04 02:45:25 aaron Exp $ .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> .\" All rights reserved. .\" @@ -44,7 +44,7 @@ The .Nm utility attemps to contact the .Xr photurisd 8 -daemon and initalize a key exchange. The flags are: +daemon and initalize a key exchange. The flags are: .Bl -tag -width Ds .It Fl d The @@ -55,7 +55,7 @@ looks for its startup files. The default is .Pa /etc/photuris/ . .El .Pp -The options +The options .Ic dst , .Ic port , .Ic options , diff --git a/sbin/swapctl/swapctl.8 b/sbin/swapctl/swapctl.8 index af8e7561789..871e7e7826e 100644 --- a/sbin/swapctl/swapctl.8 +++ b/sbin/swapctl/swapctl.8 @@ -73,7 +73,7 @@ itself is called with .Fl a in which case, .Nm swapon -acts as +acts as .Nm with the .Fl A @@ -172,7 +172,7 @@ This option is useful for swapping to NFS files. It specifies the local mount point to mount an NFS filesystem. Typically, once this mount has succeeded, the file to be used for swapping on will be available under this point mount. For example: -.Bd -literal +.Bd -literal server:/export/swap/client none swap sw,nfsmntpt=/swap .Ed .El diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8 new file mode 100644 index 00000000000..b141e408fb4 --- /dev/null +++ b/sbin/swapon/swapon.8 @@ -0,0 +1,95 @@ +.\" $OpenBSD: swapon.8,v 1.10 1999/06/04 02:45:24 aaron Exp $ +.\" $NetBSD: swapon.8,v 1.8 1995/08/18 14:51:35 pk Exp $ +.\" +.\" Copyright (c) 1980, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS `AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)swapon.8 8.1 (Berkeley) 6/5/93 +.\" +.Dd June 5, 1993 +.Dt SWAPON 8 +.Os +.Sh NAME +.Nm swapon +.Nd "specify additional device for paging and swapping" +.Sh SYNOPSIS +.Nm swapon +.Fl a +.Nm swapon +.Ar special_file ... +.Sh DESCRIPTION +.Nm +is used to specify additional devices on which paging and swapping +are to take place. +The system begins by swapping and paging on only a single device +so that only one disk is required at bootstrap time. +Calls to +.Nm +normally occur in the system multi-user initialization file +.Pa /etc/rc +making all swap devices available, so that the paging and swapping +activity is interleaved across several devices. +.Pp +Normally, the first form is used: +.Bl -tag -width Ds +.It Fl a +All devices marked as +.Dq sw +swap devices in +.Pa /etc/fstab +are made available. +.El +.Pp +The second form gives individual block devices as given +in the system swap configuration table. The call makes only this space +available to the system for swap allocation. +.Sh FILES +.Bl -tag -width /dev/[ru][pk]?b -compact +.It Pa /dev/[ru][pk]?b +standard paging devices +.It Pa /etc/fstab +ASCII filesystem description table +.El +.Sh SEE ALSO +.Xr swapon 2 , +.Xr fstab 5 , +.Xr init 8 , +.Xr rc 8 , +.Xr vnconfig 8 +.Sh BUGS +There is no way to stop paging and swapping on a device. +It is therefore not possible to make use of devices which may be +dismounted during system operation. +.Sh HISTORY +The +.Nm +command appeared in +.Bx 4.0 . |