diff options
57 files changed, 469 insertions, 414 deletions
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 9bfca53..c11b332 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -385,24 +385,22 @@ as it requires extra reassembly at forwarding node .It Ar policy .Ar policy is the one of following: -.Bd -literal -offset -.Xo +.Pp +.Bl -item -compact +.It .Fl P .Ar direction .Li discard -.Xc -.Xo +.It .Fl P .Ar direction .Li none -.Xc -.Xo +.It .Fl P .Ar direction .Li ipsec .Ar protocol/mode/src-dst/level -.Xc -.Ed +.El .Pp You must specify the direction of its policy as .Ar direction . diff --git a/usr.sbin/acpi/amldb/amldb.8 b/usr.sbin/acpi/amldb/amldb.8 index b480001..8be073a 100644 --- a/usr.sbin/acpi/amldb/amldb.8 +++ b/usr.sbin/acpi/amldb/amldb.8 @@ -122,22 +122,22 @@ value region type Interactive commands are described below: .Bl -tag -width indent .It Cm s -.Em Single step: +.Em Single step : Performs single-step execution of the current Control Method. If the next instruction is an invocation of another Control Method, the step execution will continue in the following Control Method. .It Cm n -.Em Step program: +.Em Step program : Performs single-step execution of the current Control Method. Even if the next instruction is an invocation of another Control Method, the step execution will not continue. .It Cm c -.Em Continue program being debugged: +.Em Continue program being debugged : Resumes execution of the AML interpreter. Because the current .Nm has no way of breakpoint, this command might not so much useful. .It Cm q -.Em Quit method execution: +.Em Quit method execution : Terminates execution of the current Control Method. If .Nm is not in execution, this command causes to input the next @@ -146,27 +146,27 @@ terminates .Nm itself. .It Cm t -.Em Show local name space tree and variables: +.Em Show local name space tree and variables : Displays the structure of the ACPI namespace tree. If .Nm is in execution, this command displays the structure that relates to the objects, arguments, and local variables below the scope of the current Control Method. .It Cm i -.Em Toggle region input prompt: +.Em Toggle region input prompt : Switches whether the prompt for modifying the value read from the .Em region contents be showed or not. Default is On. .It Cm o -.Em Toggle region output prompt: +.Em Toggle region output prompt : Switches whether the prompt for modifying the value to be written to the region contents will be shown or not. The default is Off. .It Cm m -.Em Show memory management statistics: +.Em Show memory management statistics : Displays the current statistics of the memory management system on the AML interpreter. .It Cm r Ar method -.Em Run specified method: +.Em Run specified method : Executes the specified Control Method. If it requires one or more arguments, a prompt such as the following appears; .Bd -literal @@ -192,7 +192,7 @@ is identified. For example, we can enter as follows: .Ed .Pp .It Cm f Ar string -.Em Find named objects from namespace: +.Em Find named objects from namespace : Lists the named objects that includes the specified string as the terminate elements searching from the ACPI namespace. For the namespace is expressed as the sequence of four-character elements, @@ -202,7 +202,7 @@ characters are necessary for specifying objects which have less than four character string. Unless additional underscores specified, matching occurs as the beginning of word with the specified number of characters. .It Cm h -.Em Show help messsage: +.Em Show help messsage : Displays the command summary of .Nm . .El @@ -313,7 +313,6 @@ yet implemented because nobody has ever needed it. .Sh FILES .Bl -tag -width region.ini -compact .It Pa region.ini -.br .It Pa region.dmp .El .Sh SEE ALSO diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8 index 254affe..4a1ebda 100644 --- a/usr.sbin/adduser/adduser.8 +++ b/usr.sbin/adduser/adduser.8 @@ -124,13 +124,13 @@ Parse command line options. .El .Sh OPTIONS .Bl -tag -width Ds -.It Sy -check_only +.It Fl check_only Check /etc/passwd, /etc/group, /etc/shells and exit. -.It Sy -class Ar login_class +.It Fl class Ar login_class Set default login class. -.It Sy -config_create +.It Fl config_create Create new configuration and message file and exit. -.It Sy -dotdir Ar directory +.It Fl dotdir Ar directory Copy files from .Ar directory into the @@ -154,15 +154,15 @@ to read/execute/write .Pa prv , .Pa iscreen , .Pa term . -.It Sy -group Ar login_group +.It Fl group Ar login_group Login group. .Ar USER means that the username is to be used as login group. -.It Sy -help,-h,-? +.It Fl help , h , \&? Print a summary of options and exit. -.It Sy -home Ar partition +.It Fl home Ar partition Default home partition where all users located. -.It Sy -message Ar file +.It Fl message Ar file Send new users a welcome message from .Ar file . Specifying a value of @@ -170,17 +170,17 @@ Specifying a value of for .Ar file causes no message to be sent to new users. -.It Sy -noconfig +.It Fl noconfig Do not read the default configuration file. -.It Sy -shell Ar shell +.It Fl shell Ar shell Default shell for new users. -.It Sy -silent,-s,-quiet,-q +.It Fl silent , s , quiet , q Few warnings, questions, bug reports. -.It Sy -uid Ar uid +.It Fl uid Ar uid Use uid's from .Ar uid on up. -.It Sy -verbose,-v +.It Fl verbose , v Many warnings, questions. Recommended for novice users. .El diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8 index 78e543a..49aaebc 100644 --- a/usr.sbin/atm/atmarpd/atmarpd.8 +++ b/usr.sbin/atm/atmarpd/atmarpd.8 @@ -25,7 +25,7 @@ .\" @(#) $FreeBSD$ .\" .\" -.Dd August 04, 1998 +.Dd August 4, 1998 .Dt ATMARPD 8 .Os .Sh NAME diff --git a/usr.sbin/boot98cfg/boot98cfg.8 b/usr.sbin/boot98cfg/boot98cfg.8 index 9d5d2b7..8643f56 100644 --- a/usr.sbin/boot98cfg/boot98cfg.8 +++ b/usr.sbin/boot98cfg/boot98cfg.8 @@ -50,7 +50,7 @@ On NEC PC-98s, consists of the .Sq IPL and -.Sq HDD boot menu. +.Sq HDD boot menu . The IPL occupies sector 0 of a disk and is followed by the partition table. The IPL loads the HDD boot menu that starts from 0x400. .Pp diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1 index 38b6350..010e783 100644 --- a/usr.sbin/cdcontrol/cdcontrol.1 +++ b/usr.sbin/cdcontrol/cdcontrol.1 @@ -55,7 +55,11 @@ to track .Ar last_track . The first track has number 1. Can be omitted in all cases. -.It Cm play Ar start_m:start_s.start_f Op Ar end_m:end_s.end_f +.It Cm play Xo +.Ar start_m : Ns Ar start_s . Ns Ar start_f +.Oo Ar end_m : Ns Ar end_s . Ns +.Ar end_f Oc +.Xc Play from the absolute address (MSF) defined by .Ar start_m diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8 index 0d9020d..b0fa668 100644 --- a/usr.sbin/chown/chown.8 +++ b/usr.sbin/chown/chown.8 @@ -45,7 +45,7 @@ .Fl R .Op Fl H | Fl L | Fl P .Oc -.Ar owner Ns Op Ar :group +.Ar owner Ns Op : Ns Ar group .Ar file ... .Nm .Op Fl fhv @@ -53,7 +53,7 @@ .Fl R .Op Fl H | Fl L | Fl P .Oc -.Ar :group +.No : Ns Ar group .Ar .Sh DESCRIPTION .Nm Chown diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8 index 12f1a96..ec66af4 100644 --- a/usr.sbin/cron/cron/cron.8 +++ b/usr.sbin/cron/cron/cron.8 @@ -25,7 +25,10 @@ .Nd daemon to execute scheduled commands (Vixie Cron) .Sh SYNOPSIS .Nm -.Op Fl x Ar debugflag Ns Op ,... +.Oo +.Fl x +.Ar debugflag Ns Op , Ns Ar ... +.Oc .Sh DESCRIPTION .Nm Cron should be started from diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1 index 69539ca..1df2440 100644 --- a/usr.sbin/ctm/ctm/ctm.1 +++ b/usr.sbin/ctm/ctm/ctm.1 @@ -139,7 +139,7 @@ any number of these options. Use of this option disables the sequence number checks. For example, the expression .Ic ^usr.sbin/ctm for example, will select the -.Nm usr.sbin/ctm +.Pa usr.sbin/ctm source directory and all pathnames under it. .Pp Pathnames can be disabled from being considered by CTM using the @@ -234,7 +234,7 @@ Therefore it is recommended that you make use of GPG or PGP5 to verify the signatures if you receive your CTM deltas via email. .Sh ENVIRONMENT -.Ev TMPDIR, +.Ev TMPDIR , if set to a pathname, will cause ctm to use that pathname as the location of temporary file. See diff --git a/usr.sbin/extattrctl/extattrctl.8 b/usr.sbin/extattrctl/extattrctl.8 index bc1bacf..187b3dc 100644 --- a/usr.sbin/extattrctl/extattrctl.8 +++ b/usr.sbin/extattrctl/extattrctl.8 @@ -101,7 +101,7 @@ for attributes when they are written, preventing low disk space conditions from denying attribute service. .Pp This file should not exist before running -.Cm initattr. +.Cm initattr . .It Cm enable Ar path Ar attrname Ar attrfile Enable an attribute named .Ar attrname diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5 index 2428725..2be90a4 100644 --- a/usr.sbin/i4b/isdnd/isdnd.rc.5 +++ b/usr.sbin/i4b/isdnd/isdnd.rc.5 @@ -344,7 +344,7 @@ of the time left in the time period. (optional) .It Li budget-calloutncalls The number of outgoing calls allowed within the time period specified by -.Em budget-calloutperiod. +.Em budget-calloutperiod . (optional) .It Li budget-calloutsfile A path/filename to which the number of successfull callouts are written. @@ -365,9 +365,10 @@ and the new day's (!) day of month number is appended. .It Li budget-callbacksfile .It Li budget-calloutsfile-rotate See -.Em budget-calloutperiod, -.Em budget-calloutncalls and -.Em budget-calloutsfile +.Em budget-calloutperiod , +.Em budget-calloutncalls , +.Em budget-calloutsfile , +and .Em budget-calloutsfile-rotate above. These are used to specify the budgets for calling back a remote site. @@ -517,7 +518,7 @@ than the requested channel! (mandatory) .It Li isdntxdel-incoming A delay value suitable for the -.Em timeout() +.Xr timeout 9 kernel subroutine to delay the transmission of the first packet after a successful connection is made by this value for .Em incoming @@ -532,7 +533,7 @@ IP over raw HDLC ISDN driver. (optional) .It Li isdntxdel-outgoing A delay value suitable for the -.Em timeout() +.Xr timeout 9 kernel subroutine to delay the transmission of the first packet after a successful connection is made by this value for .Em outgoing @@ -802,7 +803,7 @@ This parameter is optional and is set to .Em off by default. .It Li valid -.Em Note: +.Em Note : this feature is considered experimental! The parameter to this keyword is a string specifying a time range within which this entry is valid. @@ -893,7 +894,8 @@ and the selected and .Em idletime-outgoing must be greater than 0 (zero); -.Em earlyhangup must be >= 0 (zero). +.Em earlyhangup +must be >= 0 (zero). .Bd -literal |<unchecked-window>|<checkwindow>|<safetywindow>| | | | | diff --git a/usr.sbin/i4b/isdntrace/isdntrace.8 b/usr.sbin/i4b/isdntrace/isdntrace.8 index 5453b26..8ca87f1 100644 --- a/usr.sbin/i4b/isdntrace/isdntrace.8 +++ b/usr.sbin/i4b/isdntrace/isdntrace.8 @@ -69,14 +69,14 @@ The utility is only available for passive supported cards. .Pp .Em Note -.br +.Pp All filenames, user specified or default, get a date and time stamp string added in the form -yyyymmdd-hhmmss: a hyphen, four digits year, two digits month and day, a hyphen and two digits hour, minutes and seconds. Tracefiles no longer get overwritten. In case a new filename is needed within a second, the filename-generating mechanism sleeps one second. -.br +.Pp In case the program is sent a USR1 signal, a new user specified or default filename with a new date and timestamp is generated and opened. .Pp diff --git a/usr.sbin/i4b/ispppcontrol/ispppcontrol.8 b/usr.sbin/i4b/ispppcontrol/ispppcontrol.8 index 0978444..f3cdc36 100644 --- a/usr.sbin/i4b/ispppcontrol/ispppcontrol.8 +++ b/usr.sbin/i4b/ispppcontrol/ispppcontrol.8 @@ -240,6 +240,5 @@ utility which appeared in .Fx 3.0 . .Sh AUTHORS The program was written by -.ie t J\(:org Wunsch, -.el Joerg Wunsch, +.An J\(:org Wunsch , Dresden. diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8 index 7b7d5d9..264da2df 100644 --- a/usr.sbin/inetd/inetd.8 +++ b/usr.sbin/inetd/inetd.8 @@ -47,7 +47,7 @@ .Op Fl W .Op Fl c Ar maximum .Op Fl C Ar rate -.Op Fl a Ar address|hostname +.Op Fl a Ar address | hostname .Op Fl p Ar filename .Op Fl R Ar rate .Op Ar configuration file @@ -455,7 +455,9 @@ If the real service is disabled, return this username for every request. This is primarily useful when running this service on a NAT machine. -.It Fl t Ar sec[.usec] +.It Fl t Xo +.Ar sec Ns Op . Ns Ar usec +.Xc Specify a timeout for the service. The default timeout is 10.0 seconds. .It Fl r diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index f43389f..b946695 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -75,7 +75,12 @@ statistics .Op Fl M Ar core .Op Fl n Ar devs .Op Fl N Ar system -.Op Fl t Ar type,if,pass +.Oo +.Fl t +.Sm off +.Ar type , if , pass +.Sm on +.Oc .Op Fl w Ar wait .Op Ar drives .Sh DESCRIPTION diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 655f13b..2e76572 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -82,11 +82,11 @@ named for the jailed IP address. Substitute below as needed with your own directory, IP address, and hostname. .Pp First, you will want to set up your real system's environment to be -.Dq jail-friendly. +.Dq jail-friendly . For consistency, we will refer to the parent box as the -.Dq host environment, +.Dq host environment , and to the jailed virtual machine as the -.Dq jail environment. +.Dq jail environment . Because jail is implemented using IP aliases, one of the first things to do is to disable IP services on the host system that listen on all local IP addresses for a service. This means changing diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1 index a84652d..f2eaf22 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.1 +++ b/usr.sbin/kbdcontrol/kbdcontrol.1 @@ -22,8 +22,14 @@ .Sh SYNOPSIS .Nm .Op Fl dFKix -.Op Fl b Ar duration.pitch | Ar belltype -.Op Fl r Ar delay.repeat | Ar speed +.Oo +.Fl b +.Ar duration . Ns Ar pitch | Ar belltype +.Oc +.Oo +.Fl r +.Ar delay . Ns Ar repeat | Ar speed +.Oc .Op Fl l Ar keymap_file .Op Fl f Ar # Ar string .Op Fl h Ar size @@ -47,7 +53,9 @@ below. .Pp The following command line options are supported: .Bl -tag -width indent -.It Fl b Ar duration.pitch | Ar belltype +.It Fl b Xo +.Ar duration . Ns Ar pitch | Ar belltype +.Xc Set the bell duration in milliseconds and pitch in hertz. If a .Ar belltype @@ -63,7 +71,9 @@ If is preceded by the word .Cm quiet. , the bell will not be rung when the ringing process is in the background vty. -.It Fl r Ar delay.repeat | Ar speed +.It Fl r Xo +.Ar delay . Ns Ar repeat | Ar speed +.Xc Set keyboard .Ar delay (250, 500, 750, 1000) diff --git a/usr.sbin/keyadmin/keyadmin.8 b/usr.sbin/keyadmin/keyadmin.8 index fdbd17a..4bcc3d1 100644 --- a/usr.sbin/keyadmin/keyadmin.8 +++ b/usr.sbin/keyadmin/keyadmin.8 @@ -132,7 +132,8 @@ of data. .It Ic load Ar filename .Pp Load security association information from a file formatted as documented in -.Xr keys 5 . If +.Xr keys 5 . +If .Dq - is specified for the .Ar filename , @@ -140,7 +141,8 @@ load keys from the standard input. .It Ic save Ar filename .Pp Save security association information to a file formatted as documented in -.Xr keys 5 . If +.Xr keys 5 . +If .Dq - is specified for the .Ar filename , diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8 index 13a70f7..ff9e933 100644 --- a/usr.sbin/keyserv/keyserv.8 +++ b/usr.sbin/keyserv/keyserv.8 @@ -70,7 +70,7 @@ Display status of DES support (enabled/disabled). .Sh FILES .Bl -tag -width /usr/lib/libdes.so.3. -compact .It Pa /etc/.rootkey -.It Pa /usr/lib/libdes.so.3. +.It Pa /usr/lib/libdes.so.3 .El .Sh "SEE ALSO" .Xr keylogin 1 , diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8 index e24d4b5..76782ba 100644 --- a/usr.sbin/lpr/lpc/lpc.8 +++ b/usr.sbin/lpr/lpc/lpc.8 @@ -40,10 +40,7 @@ .Nd line printer control program .Sh SYNOPSIS .Nm -.Oo -.Ar command -.Op Ar argument ... -.Oc +.Op Ar command Op Ar argument ... .Sh DESCRIPTION .Nm Lpc is used by the system administrator to control the @@ -77,31 +74,44 @@ to read commands from file. Commands may be abbreviated; the following is the list of recognized commands. .Pp -.Bl -tag -width Ds -compact -.It Ic \&? No [ command ... ] -.It Ic help No [ command ... ] +.Bl -tag -width indent -compact +.It Ic \&? Op Ar command ... +.It Ic help Op Ar command ... Print a short description of each command specified in the argument list, or, if no argument is given, a list of the recognized commands. .Pp -.It Ic abort No {\ all\ |\ printer\ } +.It Ic abort Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Terminate an active spooling daemon on the local host immediately and then disable printing (preventing new daemons from being started by .Xr lpr 1 ) for the specified printers. .Pp -.It Ic clean No {\ all\ |\ printer\ } +.It Ic clean Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Remove any temporary files, data files, and control files that cannot be printed (i.e., do not form a complete printer job) from the specified printer queue(s) on the local machine. .Pp -.It Ic disable No {\ all\ |\ printer\ } +.It Ic disable Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Turn the specified printer queues off. This prevents new printer jobs from being entered into the queue by .Xr lpr 1 . .Pp -.It Ic down No {\ all\ |\ printer\ } message ... +.It Ic down Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Ar message ... +.Xc Turn the specified printer queue off, disable printing and put -.Em message +.Ar message in the printer status file. The message doesn't need to be quoted, the remaining arguments are treated like @@ -110,7 +120,10 @@ This is normally used to take a printer down and let others know why .Xr lpq 1 will indicate the printer is down and print the status message). .Pp -.It Ic enable No {\ all\ |\ printer\ } +.It Ic enable Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Enable spooling on the local queue for the listed printers. This will allow .Xr lpr 1 @@ -118,32 +131,50 @@ to put new jobs in the spool queue. .Pp .It Ic exit .It Ic quit -Exit from lpc. -.\" ne 1i +Exit from +.Nm . .Pp -.It Ic restart No {\ all\ |\ printer\ } +.It Ic restart Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Attempt to start a new printer daemon. This is useful when some abnormal condition causes the daemon to die unexpectedly, leaving jobs in the queue. -.Xr Lpq 1 +.Xr lpq 1 will report that there is no daemon present when this condition occurs. If the user is the super-user, try to abort the current daemon first (i.e., kill and restart a stuck daemon). .Pp -.It Ic start No {\ all\ |\ printer\ } +.It Ic start Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Enable printing and start a spooling daemon for the listed printers. .Pp -.It Ic status No {\ all\ |\ printer\ } +.It Ic status Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Display the status of daemons and queues on the local machine. .Pp -.It Ic stop No {\ all\ |\ printer\ } +.It Ic stop Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Stop a spooling daemon after the current job completes and disable printing. .Pp -.It Ic topq No printer\ [\ jobnum\ ...\ ]\ [\ user\ ...\ ] +.It Ic topq Ar printer Xo +.Op Ar jobnum ... +.Op Ar user ... +.Xc Place the jobs in the order listed at the top of the printer queue. .Pp -.It Ic up No {\ all\ |\ printer\ } +.It Ic up Xo +.Es \&{ \&} +.En Cm all | Ar printer +.Xc Enable everything and start a new printer daemon. Undoes the effects of .Ic down . @@ -164,7 +195,7 @@ lock file for queue control .Xr printcap 5 , .Xr lpd 8 .Sh DIAGNOSTICS -.Bl -tag -width Ds +.Bl -tag -width indent .It Sy "?Ambiguous command" abbreviation matches more than one command .It Sy "?Invalid command" diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5 index 2533d45..5022ed1 100644 --- a/usr.sbin/lpr/lpr/printcap.5 +++ b/usr.sbin/lpr/lpr/printcap.5 @@ -93,9 +93,9 @@ format .It "lf str" Ta Pa /dev/console Ta No "error logging file name" .It "lo str" Ta Pa lock Ta No "name of lock file" .It "lp str" Ta Pa /dev/lp Ta No "device name to open for output" -.It "ms str" Ta Dv NULL Ta No "if lp is a tty, a comma-separated, " -.Xr stty 1 --like list describing the tty modes +.It "ms str" Ta Dv NULL Ta No "if lp is a tty, a comma-separated," +.Xr stty 1 Ns -like +list describing the tty modes .It "mx num 1000 maximum file size (in" .Dv BUFSIZ blocks), zero = unlimited diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8 index 518158a..ff3e0ae 100644 --- a/usr.sbin/lptcontrol/lptcontrol.8 +++ b/usr.sbin/lptcontrol/lptcontrol.8 @@ -15,17 +15,11 @@ .Dt LPTCONTROL 8 .Os FreeBSD .Sh NAME -.Nm \&lptcontrol +.Nm lptcontrol .Nd a utility for manipulating the lpt printer driver .Sh SYNOPSIS .Nm -.Cm -i -| -.Cm -p -| -.Cm -e -| -.Cm -s +.Fl i | p | e | s .Op Fl d Ar device .Sh DESCRIPTION The @@ -33,7 +27,8 @@ The command is used to set either the interrupt-driven, extended or polling mode of individual .Xr lpt 4 -devices. When a printer is switched from +devices. +When a printer is switched from a mode to another, this change will only take effect the next time the device is opened. .Pp @@ -51,23 +46,20 @@ Turn on polled mode. Turn on extended mode. .It Fl s Turn on standard mode, i.e. turn off extended mode. -.It Fl d Ar dev +.It Fl d Ar device Set the mode of the printer device specified by -.Ar dev . +.Ar device . The default value for -.Ar dev +.Ar device is .Pa /dev/lpt0 . .El .Pp One of -.Fl i -, -.Fl p +.Fl i , p or .Fl e must be specified. -.Pp .Sh FILES .Bl -tag -width /sys/i386/conf/GENERIC -compact .It Pa /dev/lpt? @@ -79,11 +71,13 @@ kernel configuration file .El .Sh BUGS Sure to be some. -.Sh "SEE ALSO" +.Sh SEE ALSO .Xr lpt 4 .Sh AUTHORS .An Geoffrey M. Rehmet .Sh HISTORY -.Nm Lptcontrol +The +.Nm +command first appeared in .Fx 1.1.5 diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index bfe117a..a210e9d 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -38,12 +38,17 @@ .Op Fl f Ar device .Op Fl s .Oo -.Oo Ns -.Ar dev Op Ar lvol Ns Op Ar :rvol -.Li | recsrc | -.Ar {^|+|-|=}rec rdev +.Oo Ar dev +.Op Ar lvol Ns Op : Ns Ar rvol +.Cm | recsrc | +.Sm off +.Eo \&{ +.Cm ^ | + | - | = +.Sm on +.Ec \&} Ns Cm rec +.Ar rdev .Oc -.Ar ... \& +.Ar ... .Oc .Sh DESCRIPTION The @@ -73,7 +78,7 @@ device will be displayed. To modify the mixer value .Ar dev , the optional left and right channel settings of -.Ar lvol Ns Op Ar :rvol +.Ar lvol Ns Op : Ns Ar rvol may be specified. The .Ar lvol and @@ -89,19 +94,19 @@ for use as the command-line arguments to a future invocation of .Pp To change the recording device you use one of: .Bl -tag -width =rec -offset indent -.It ^rec +.It Cm ^rec toggles .Ar rdev of possible recording devices -.It +rec +.It Cm +rec adds .Ar rdev to possible recording devices -.It -rec +.It Cm -rec removes .Ar rdev from possible recording devices -.It =rec +.It Cm =rec sets the recording device to .Ar rdev .El diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8 index 352745c..b4128a9 100644 --- a/usr.sbin/moused/moused.8 +++ b/usr.sbin/moused/moused.8 @@ -201,7 +201,7 @@ or ``generic''. Assign the physical button .Ar M to the logical button -.Ar N. +.Ar N . You may specify as many instances of this option as you like. More than one physical button may be assigned to a logical button at the same time. @@ -413,7 +413,7 @@ serial port to the mouse. You can attach multiple USB mice to your system or to your USB hub. They are accessible as -.Pa /dev/ums0, /dev/ums1, +.Pa /dev/ums0 , /dev/ums1 , and so on. .Pa You may want to create a symbolic link @@ -458,25 +458,25 @@ option. You have to make a guess and try. There is rule of thumb: .Pp -.Bl -tag -compact -width 1.X -.It 1. +.Bl -enum -compact -width 1.X +.It The bus and InPort mice always use .Ar busmouse protocol regardless of the brand of the mouse. -.It 2. +.It The .Ar ps/2 protocol should always be specified for the PS/2 mouse regardless of the brand of the mouse. -.It 3. +.It You must specify the .Ar auto protocol for the USB mouse. -.It 4. +.It Most 2-button serial mice support the .Ar microsoft protocol. -.It 5. +.It 3-button serial mice may work with the .Ar mousesystems protocol. @@ -487,7 +487,7 @@ the third (middle) button will not function. 3-button serial mice may also work with the .Ar mouseman protocol under which the third button may function as expected. -.It 6. +.It 3-button serial mice may have a small switch to choose between ``MS'' and ``PC'', or ``2'' and ``3''. ``MS'' or ``2'' usually mean the @@ -496,7 +496,7 @@ protocol. ``PC'' or ``3'' will choose the .Ar mousesystems protocol. -.It 7. +.It If the mouse has a roller or a wheel, it may be compatible with the .Ar intellimouse protocol. diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8 index 0420266..15bd75c 100644 --- a/usr.sbin/mrouted/mrouted.8 +++ b/usr.sbin/mrouted/mrouted.8 @@ -250,7 +250,7 @@ or and a remote host (identified by .Ar remote-addr or -.Ar remote-hostname ). +.Ar remote-hostname ) . A remote hostname may only be used if it maps to a single IP address. A tunnel must be configured on both routers before it can be used. diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8 index 94ef20b..bc609b1 100644 --- a/usr.sbin/mrouted/mtrace.8 +++ b/usr.sbin/mrouted/mtrace.8 @@ -118,7 +118,7 @@ This must be the last-hop router on the path from the intended to the .Ar receiver . .Pp -.Em CAUTION!! +.Em CAUTION ! ! Versions 3.3 and 3.5 of .Nm mrouted will crash if a trace query is received via a @@ -141,7 +141,7 @@ and the response destination. .It Fl l Loop indefinitely printing packet rate and loss statistics for the multicast path every 10 seconds (see -.Fl S Ar stat_int ). +.Fl S Ar stat_int ) . .It Fl M Always request the response using multicast rather than attempting unicast for the last half of the tries. diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8 index d4fd751..e2eae63 100644 --- a/usr.sbin/ndp/ndp.8 +++ b/usr.sbin/ndp/ndp.8 @@ -58,7 +58,7 @@ .Fl H .Nm .Fl I -.Op delete \(ba Ar interface +.Op Cm delete | Ar interface .Nm .Fl i .Ar interface @@ -104,7 +104,7 @@ Parse the file specified by .It Fl H Harmonize consistency between the routing table and the default router list; install the top entry of the list into the kernel routing table. -.It Fl I Op delete \(ba Ar interface +.It Fl I Op Cm delete | Ar interface Shows or specifies the default interface used as the default route when there is no default router. If no argument is given to the option, the current default interface will be shown. diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8 index b477371..e8ace35 100644 --- a/usr.sbin/newsyslog/newsyslog.8 +++ b/usr.sbin/newsyslog/newsyslog.8 @@ -84,7 +84,7 @@ follows: .Bl -tag -width indent .It Ar logfile_name Name of the system log file to be archived. -.It Ar owner:group +.It Ar owner : Ns Ar group This optional field specifies the owner and group for the archive file. The ":" is essential, even if the .Ar owner @@ -145,7 +145,7 @@ little point in specifying an explicit minutes or seconds component in the current implementation, since the only comparison is `within the hour'. .Pp -.Em ISO 8601 restricted time format +.Sy ISO 8601 restricted time format .Pp The lead-in character for a restricted .Tn ISO 8601 @@ -211,29 +211,15 @@ equivalent: .Sq Li \& .El .Pp -.Em Day, week and month time format +.Sy Day, week and month time format .Pp The lead-in character for day, week and month specification is a .So Li \&$ Sc Ns No -sign . The particular format of day, week and month specification is: -.Sm off -.Oo -.Va D\&hh -.Oc , -.Oo -.Va W\&w -.Oo -.Va D\&hh -.Oc -.Oc +.Op Va D\&hh , +.Op Va W\&w Ns Op Va D\&hh and -.Oo -.Va M\&dd -.Oo -.Va D\&hh -.Oc -.Oc -.Sm on +.Op Va M\&dd Ns Op Va D\&hh respectively. Optional time fields default to midnight. The ranges for day and hour secifications are: diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5 index 3bb4e16..610775a 100644 --- a/usr.sbin/ntp/doc/ntp.conf.5 +++ b/usr.sbin/ntp/doc/ntp.conf.5 @@ -1290,16 +1290,13 @@ Except where noted, these options apply to all clock drivers. .Ss Reference Clock Options .Bl -tag -width indent -.It Xo Ic server No 127.127. Ns Xo -.Ar t Ns No . Ns Xo -.Ar u +.It Xo Ic server No 127.127. Ns +.Ar t . Ns Ar u .Op prefer .Op mode Ar int .Op minpoll Ar int .Op maxpoll Ar int .Xc -.Xc -.Xc This command can be used to configure reference clocks in special ways. The options are interpreted as follows: @@ -1331,9 +1328,8 @@ minpoll defaults to 10 (17.1 m) and maxpoll defaults to 14 (4.5 h). The allowable range is 4 (16 s) to 17 (36.4 h) inclusive. .El -.It Xo Ic fudge No 127.127. Ns Xo -.Ar t Ns No . Ns Xo -.Ar u +.It Xo Ic fudge No 127.127. Ns +.Ar t . Ns Ar u .Op time1 Ar sec .Op time2 Ar sec .Op stratum Ar int @@ -1344,8 +1340,6 @@ The allowable range is 4 (16 s) to 17 (36.4 h) inclusive. .Op flag3 Ar 0 Ns | Ns Ar 1 .Op flag4 Ar 0 Ns | Ns Ar 1 .Xc -.Xc -.Xc This command can be used to configure reference clocks in special ways. It must immediately follow the diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8 index d9b168d..d2f8998 100644 --- a/usr.sbin/ntp/doc/ntpq.8 +++ b/usr.sbin/ntp/doc/ntpq.8 @@ -139,9 +139,9 @@ than this manual page. .It Ic clearvars The data carried by NTP mode 6 messages consists of a list of items of the form -.Xo Aq variable_name Ns -.Pf = Aq value -.Xc +.Sm off +.Ao variable_name Ac = Aq value +.Sm on where the .Qq = Ns Aq value is ignored, and can be omitted, in requests @@ -376,16 +376,16 @@ cached by the most recent .Ic associations command. .It Xo Ic mreadvar -.Ar assocID assocID [ +.Ar assocID assocID Oo .Aq variable_name Ns .Op = Ns Aq value Ns -.Op ,...] +.Op ,... Oc .Xc .It Xo Ic mrv -.Ar assocID assocID [ +.Ar assocID assocID Oo .Aq variable_name Ns .Op = Ns Aq value Ns -.Op ,...] +.Op ,... Oc .Xc Like the .Ic readvar diff --git a/usr.sbin/pim6dd/pim6dd.8 b/usr.sbin/pim6dd/pim6dd.8 index eebda41..c48b874 100644 --- a/usr.sbin/pim6dd/pim6dd.8 +++ b/usr.sbin/pim6dd/pim6dd.8 @@ -38,7 +38,12 @@ .Sh SYNOPSIS .Nm .Op Fl c Ar configfile -.Op Fl d Op debug_level Op ,debug_level +.Oo +.Fl d +.Sm off +.Op Ar debug_level Op , Ar ... +.Sm on +.Oc .Sh DESCRIPTION .Nm Pim6dd is an IPv6 multicast routing daemon, which supports @@ -61,11 +66,14 @@ all debug messages will be printed out. A subset of the messages to be printed out can be specified as arguments of the option. Valid debug levels are -.Ic timeout, packets, interfaces, kernel, mfc, pim_detail, pim_hello, -.Ic kernel, mfc, pim_detail, pim_hello, pim_jp, pim_graft, pim_asserts, -.Ic pim_routes, pim_timers, rpf, pim, routes, routers, timers, +.Ic timeout , packets , interfaces , kernel , +.Ic mfc , pim_detail , pim_hello , kernel , +.Ic mfc , pim_detail , pim_hello , pim_jp , +.Ic pim_graft , pim_asserts , pim_routes , pim_timers , +.Ic rpf , pim , routes , routers , +.Ic timers , and -.Ic asserts. +.Ic asserts . .El .Pp .Nm Pim6dd diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5 index 56c8750..c2a8706 100644 --- a/usr.sbin/pim6dd/pim6dd.conf.5 +++ b/usr.sbin/pim6dd/pim6dd.conf.5 @@ -79,7 +79,7 @@ to ignore the interface even if the interface is multicast-capable. Interfaces are specified in the form of "name unit", such as .Ar gif0 and -.Ar ep1. +.Ar ep1 . .\" .It Xo .Ic phyint Ar interface @@ -97,7 +97,7 @@ If an incoming multicast packet's destination matches the specified .Ar groupaddrs , the packet is not sent on the -.Ar interfaces. +.Ar interfaces . Moreover, if there is no other interface than the specified interfaces, .Xr pim6dd 8 @@ -124,7 +124,7 @@ out. If .Ar prefixlen is omitted, it means the exact match for -.Ar multicastaddr. +.Ar multicastaddr . .El .Ar interfaces are specified as a blank separated list of interfaces. Each interface is diff --git a/usr.sbin/pim6sd/pim6sd.8 b/usr.sbin/pim6sd/pim6sd.8 index abb6c04..52f1d7c 100644 --- a/usr.sbin/pim6sd/pim6sd.8 +++ b/usr.sbin/pim6sd/pim6sd.8 @@ -37,7 +37,12 @@ .Sh SYNOPSIS .Nm .Op Fl c Ar configfile -.Op Fl d Op debug_level Op ,debug_level +.Oo +.Fl d +.Sm off +.Op Ar debug_level Op , Ar ... +.Sm on +.Oc .Op Fl f .Sh DESCRIPTION .Nm Pim6sd @@ -61,15 +66,21 @@ all debug messages will be printed out. A subset of the messages to be printed out can be specified as arguments of the option. Valid debug levels are -.Ic mld_proto, mld_timer, mld_member, mld, switch, trace, mtrace, traceroute, -.Ic timeout, callout, pkt, packets, interfaces, vif, kernel, cache, mfc, -.Ic k_cache, k_mfc, rsrr, pim_detail, pim_hello, pim_neighbors, pim_register, -.Ic registers, pim_join_prune, pim_j_p, pim_jp, pim_bootstrap, pim_bsr, bsr, -.Ic bootstrap, pim_asserts, pim_cand_rp, pim_c_rp, pim_rp, rp, pim_routes, -.Ic pim_routing, pim_mrt, pim_timers, pim_rpf, rpf, pim, routes, routing, -.Ic mrt, routers, mrouters, neighbors, timers, +.Ic mld_proto , mld_timer , mld_member , mld , +.Ic switch , trace , mtrace , traceroute , +.Ic timeout , callout , pkt , packets , +.Ic interfaces , vif , kernel , cache , +.Ic mfc , k_cache , k_mfc , rsrr , +.Ic pim_detail , pim_hello , pim_neighbors , pim_register , +.Ic registers , pim_join_prune , pim_j_p , pim_jp , +.Ic pim_bootstrap , pim_bsr , bsr , bootstrap , +.Ic pim_asserts , pim_cand_rp , pim_c_rp , pim_rp , +.Ic rp , pim_routes , pim_routing , pim_mrt , +.Ic pim_timers , pim_rpf , rpf , pim , +.Ic routes , routing , mrt , routers , +.Ic mrouters , neighbors , timers , and -.Ic asserts. +.Ic asserts . .It Fl f Do not become daemon, run in foreground. This option is for debugging use. diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5 index cc7766e..427cb9e 100644 --- a/usr.sbin/pim6sd/pim6sd.conf.5 +++ b/usr.sbin/pim6sd/pim6sd.conf.5 @@ -39,7 +39,9 @@ The .Nm configuration file consists of a sequence of statements terminated -by a semi-colon (`;'), each of which specifies how the daemon treats +by a semi-colon +.Pq Ql \&; , +each of which specifies how the daemon treats each interface on the system, specifies some parameters of the PIM protocol, and requires some special behavior defined by the protocol. .Pp @@ -60,11 +62,7 @@ are comments. The following statements can be specified in the configuration file. .Pp .Bl -tag -width Ds -.It Xo -.Ic log -.Ar option... -.Ic ; -.Xc +.It Ic log Ar option... ; Specify debug messages to be printed out. Each .Ar option usually specifies a subset of the messages to be printed. @@ -77,19 +75,23 @@ will not be printed. For example, .Ic `all nomld' means that all the messages except MLD related ones will be printed. Valid options are -.Ic mld_proto, mld_timer, mld_member, mld, switch, trace, mtrace, traceroute, -.Ic timeout, callout, pkt, packets, interfaces, vif, kernel, cache, mfc, -.Ic k_cache, k_mfc, rsrr, pim_detail, pim_hello, pim_neighbors, pim_register, -.Ic registers, pim_join_prune, pim_j_p, pim_jp, pim_bootstrap, pim_bsr, bsr, -.Ic bootstrap, pim_asserts, pim_cand_rp, pim_c_rp, pim_rp, rp, pim_routes, -.Ic pim_routing, pim_mrt, pim_timers, pim_rpf, rpf, pim, routes, routing, -.Ic mrt, routers, mrouters, neighbors, timers, asserts, +.Ic mld_proto , mld_timer , mld_member , mld , +.Ic switch , trace , mtrace , traceroute , +.Ic timeout , callout , pkt , packets , +.Ic interfaces , vif , kernel , cache , +.Ic mfc , k_cache , k_mfc , rsrr , +.Ic pim_detail , pim_hello , pim_neighbors , pim_register , +.Ic registers , pim_join_prune , pim_j_p , pim_jp , +.Ic pim_bootstrap , pim_bsr , bsr , bootstrap , +.Ic pim_asserts , pim_cand_rp , pim_c_rp , pim_rp , +.Ic rp , pim_routes , pim_routing , pim_mrt , +.Ic pim_timers , pim_rpf , rpf , pim , +.Ic routes , routing , mrt , routers , +.Ic mrouters , neighbors , timers , asserts , and .Ic all . .\" -.It Xo -.Ic reverselookup (yes \(ba no); -.Xc +.It Ic reverselookup Pq Cm yes | no ; Specifies if a hostname for an IPv6 address should be resolved on logging. .Ic yes @@ -98,11 +100,7 @@ means a hostname should be resolved, and means should not. By default, a hostname is not resolved. .\" -.It Xo -.Ic phyint Ar interface -.Op disable -.Ic ; -.Xc +.It Ic phyint Ar interface Op Cm disable ; Specifies .Xr pim6sd 8 to ignore the interface even if the interface is multicast-capable. @@ -111,14 +109,13 @@ the case where there is no configuration file). Interfaces are specified in the form of "name unit", such as .Ar gif0 and -.Ar ep1. +.Ar ep1 . .\" .It Xo .Ic phyint Ar interface -.Op preference Ar preference -.Op metric Ar metric -.Op nolistener -.Ic ; +.Op Cm preference Ar preference +.Op Cm metric Ar metric +.Op Cm nolistener ; .Xc Specifies the preference and/or metric values when sending a PIM assert message on the interface. @@ -131,9 +128,7 @@ This option is usually meaningless but will be useful when MLD messages are noisy (e.g. when debugging) and there is surely no listner on the interface. .\" -.It Xo -.Ic default_source_preference Ar preference; -.Xc +.It Ic default_source_preference Ar preference ; Specifies a default preference value when sending a PIM assert message. Preferences are used by assert elections to determine upstream routers. Currently @@ -142,21 +137,17 @@ cannot reliably obtain preferences and metrics from the unicast routing protocols, so a default value may be configured. The default preference is 1024. .\" -.It Ic default_source_metric Ar metric; +.It Ic default_source_metric Ar metric ; Specifies a default metric value when sending a PIM assert message. It is recommended that preferences be set such that metrics are never consulted. However, default metrics may also be set and will default to 1024. .\" -.It Xo -.Ic granularity Ar second; -.Xc +.It Ic granularity Ar second ; Specifies timer granularity in seconds. The default value is 5. .\" -.It Xo -.Ic hello_period Ar period Ar coef; -.Xc +.It Ic hello_period Ar period coef ; .Ar Period specifies the period in second between 2 hello messages. .Ar Coef @@ -168,9 +159,7 @@ the holdtime will be The default values of the period and the coefficient are 30 and 3.5, respectively. The default holdtime is 105 seconds as a result. .\" -.It Xo -.Ic join_prune_period Ar period Ar coef; -.Xc +.It Ic join_prune_period Ar period coef ; .Ar Period specifies the period in second between 2 join/prune messages. .Ar Coef @@ -182,33 +171,25 @@ the holdtime will be The default values of the period and the coefficient are 60 and 3.5, respectively. Consequently, the default holdtime is 210 seconds. .\" -.It Xo -.Ic data_timeout Ar timer; -.Xc +.It Ic data_timeout Ar timer ; Specifies the time after which (S,G) state for a silent source will be deleted. The default value is 210. .\" -.It Xo -.Ic register_suppression_timeout Ar interval; -.Xc +.It Ic register_suppression_timeout Ar interval ; .Ar Interval specifies the interval between receiving a Register-Stop and allowing PIM Register to be send again. The default value is 60. .\" -.It Xo -.Ic probe_time Ar timer; -.Xc +.It Ic probe_time Ar timer ; .Ar Timer specifies the time between sending a null Register and the Register-Suppression-Timer expiring unless it is restarted by receiving a Register-Stop. The default value is 5. .\" -.It Xo -.Ic assert_timeout Ar interval; -.Xc +.It Ic assert_timeout Ar interval ; .Ar Interval specifies the interval between the last time an Assert is received and the time at which the assert is timeout. @@ -217,9 +198,8 @@ The default value is 180. .It Xo .Ic cand_rp .Op Ar interface -.Op Ic time Ar time -.Op Ic priority Ar priority -.Ic ; +.Op Cm time Ar time +.Op Cm priority Ar priority ; .Xc Specifies to act as a candidate Rendezvous Point(RP). It is recommended to specify @@ -244,9 +224,7 @@ Another optional parameter specifies the priority of the RP. The default value is 0, which means the highest priority. .\" -.It Xo -.Ic group_prefix Ar prefix; -.Xc +.It Ic group_prefix Ar prefix ; When acting as a Rendezvous Point(RP), .Ar prefix specifies a group prefix that the RP will handle. @@ -254,10 +232,9 @@ specifies a group prefix that the RP will handle. .It Xo .Ic cand_bootstrap_router .Op Ar interface -.Op Ic time Ar time -.Op Ic priority Ar priority -.Op Ic masklen Ar masklen -.Ic ; +.Op Cm time Ar time +.Op Cm priority Ar priority +.Op Cm masklen Ar masklen ; .Xc Specifies to act as a candidate bootstrap router(BSR). It is recommended to specify @@ -285,7 +262,8 @@ parametr. Its value, must be no less than 0 and no greater than 128. .\" .It Xo -.Ic switch_register_threshold Ic rate Ar rate Ic interval Ar interval; +.Ic switch_register_threshold +.Cm rate Ar rate Cm interval Ar interval ; .Xc Specifies the threshold that a Rendezvous Point(RP) switches to a shortest path tree, which is valid only when acting as an RP. @@ -296,7 +274,8 @@ specifies the interval of checking the rate in seconds. The default values are 50000 and 20, respectively. .\" .It Xo -.Ic switch_data_threshold Ic rate Ar rate Ic interval Ar interval; +.Ic switch_data_threshold +.Cm rate Ar rate Cm interval Ar interval ; .Xc Specifies the threshold that a last hop router switches to a shortest path tree. diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1 index a30ed35..f7c47ae 100644 --- a/usr.sbin/pkg_install/add/pkg_add.1 +++ b/usr.sbin/pkg_install/add/pkg_add.1 @@ -28,7 +28,7 @@ .Op Fl vInfrRMS .Op Fl t Ar template .Op Fl p Ar prefix -.Ar pkg-name [pkg-name ...] +.Ar pkg-name Op Ar pkg-name ... .Sh DESCRIPTION The .Nm @@ -67,7 +67,7 @@ command to examine the package file. .Sh OPTIONS The following command line arguments are supported: .Bl -tag -width indent -.It Ar pkg-name [... pkg-name] +.It Ar pkg-name Op Ar pkg-name ... The named packages are installed. A package name of - will cause .Nm to read from stdin. @@ -269,7 +269,7 @@ is the name of the package in question and .Ar PRE-INSTALL is a keyword denoting this as the preinstallation phase. .Pp -.Cm Note: +.Sy Note : The .Ar PRE-INSTALL keyword will not appear if separate scripts for pre-install and post-install @@ -326,7 +326,7 @@ is the name of the package in question and .Ar POST-INSTALL is a keyword denoting this as the post-installation phase. .Pp -.Cm Note: +.Sy Note : The .Ar POST-INSTALL keyword will not appear if separate scripts for pre-install and post-install diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index e46b497..aaf8fb2 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -75,7 +75,9 @@ if is a .Cm - (dash). -.It Fl c Ar [-]desc +.It Fl c Xo +.Oo Fl Oc Ns Ar desc +.Xc Fetch package .Dq one line description from file @@ -85,7 +87,9 @@ or, if preceded by the argument itself. This string should also give some idea of which version of the product (if any) the package represents. -.It Fl d Ar [-]desc +.It Fl d Xo +.Oo Fl Oc Ns Ar desc +.Xc Fetch long description for package from file .Ar desc or, if preceded by @@ -116,7 +120,7 @@ package is later installed. It will be passed the package's name as the first argument. .Pp -.Cm Note: +.Sy Note : if the .Cm Fl I option is not given, this script will serve as both the pre-install and the @@ -157,7 +161,7 @@ package is later (if ever) de-installed. It will be passed the package's name as the first argument. .Pp -.Cm Note: +.Sy Note : if the .Cm Fl K option is not given, this script will serve as both the de-install and the diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1 index 080c403..d178864 100644 --- a/usr.sbin/pkg_install/delete/pkg_delete.1 +++ b/usr.sbin/pkg_install/delete/pkg_delete.1 @@ -154,7 +154,7 @@ is the name of the package in question and .Ar DEINSTALL is a keyword denoting this as the pre-deinstallation phase. .Pp -.Cm Note: +.Sy Note : The .Ar DEINSTALL keyword will not appear if separate scripts for deinstall and post-deinstall @@ -188,7 +188,7 @@ is the name of the package in question and .Ar POST-DEINSTALL is a keyword denoting this as the post-deinstallation phase. .Pp -.Cm Note: +.Sy Note : The .Ar POST-DEINSTALL keyword will not appear if separate scripts for deinstall and post-deinstall diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1 index b14081f..646810d 100644 --- a/usr.sbin/pkg_install/info/pkg_info.1 +++ b/usr.sbin/pkg_install/info/pkg_info.1 @@ -29,7 +29,7 @@ .Op Fl e Ar package .Op Fl l Ar prefix .Op Fl t Ar template -.Ar pkg-name [pkg-name ...] +.Op Ar pkg-name ... .Nm .Fl a .Op Ar flags diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1 index f2dc15b..e3a787f 100644 --- a/usr.sbin/pkg_install/version/pkg_version.1 +++ b/usr.sbin/pkg_install/version/pkg_version.1 @@ -61,7 +61,7 @@ cannot be located, .Nm will search for the package in the ports collection index file (typically -.Pa /usr/ports/INDEX ). +.Pa /usr/ports/INDEX ) . Any matching version number(s) there will be used to determine whether the installed package is up-to-date or requires updating. .Pp @@ -78,13 +78,13 @@ Each package name is printed, along with a one-character status flag: .Bl -tag -width indent .It Li = The installed version of the package is current. -.It Li < +.It Li \&< The installed version of the package is older than the current version. -.It Li > +.It Li \&> The installed version of the package is newer than the current version. This situation can arise with an out-of-date index file, or when testing new ports. -.It Li ? +.It Li \&? The installed package does not appear in the index. This could be due to an out of date index or a package taken from a PR that has not yet been committed. @@ -96,7 +96,7 @@ Examples from the ports collection are the Tcl toolkit or the .Tn EMACS editor. -.It Li ! +.It Li \&! The installed package exists in the index but for some reason, .Nm was unable to compare the version number of the installed package diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index 34045f3..70f8f58 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -11,8 +11,7 @@ .Op Fl nat .Op Fl quiet .Op Fl unit Ns Ar N -.Op Ar system Ns -.No ... +.Op Ar system ... .Sh DESCRIPTION This is a user process .Em PPP @@ -968,7 +967,7 @@ command: .No set redial Ar secs Ns Xo .Oo + Ns Ar inc Ns .Op - Ns Ar max Ns -.Oc Op . Ns Ar next +.Oc Ns Op . Ns Ar next .Op Ar attempts .Xc .Pp @@ -1615,13 +1614,12 @@ set filter .Ar src_addr Ns Op / Ns Ar width .Op Ar dst_addr Ns Op / Ns Ar width .Oc -.Oo Ar proto Op src Ar cmp port +.Ar [ proto Op src Ar cmp port .Op dst Ar cmp port .Op estab .Op syn .Op finrst -.Op timeout Ar secs -.Oc +.Op timeout Ar secs ] .Bl -enum .It .Ar Name @@ -1663,7 +1661,7 @@ the new rule number (rather than the next rule number). The .Ar action may optionally be followed with an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , telling .Nm to reverse the sense of the following match. @@ -1849,7 +1847,7 @@ is established. To control this IPCP behaviour, this implementation has the .Dq set ifaddr command for defining the local and remote IP address: -.Bd -literal -offset indent +.Bd -ragged -offset indent .No set ifaddr Oo Ar src_addr Ns .Op / Ns Ar \&nn .Oo Ar dst_addr Ns Op / Ns Ar \&nn @@ -1957,7 +1955,7 @@ dialing and redialing separated by either a pipe .Pq Dq \&| or a colon .Pq Dq \&: : -.Bd -literal -offset indent +.Bd -ragged -offset indent .No set phone Ar telno Ns Xo .Oo \&| Ns Ar backupnumber .Oc Ns ... Ns Oo : Ns Ar nextnumber @@ -2084,7 +2082,7 @@ When or .Ar chat logging is enabled, the actual password is not logged; -.Sq ******** Ns +.Sq ******** is logged instead. .Pp Login scripts vary greatly between ISPs. @@ -3077,7 +3075,7 @@ will also disable .El .Pp .It add Ns Xo -.Op \&! +.Op !\& .Ar dest Ns Op / Ns Ar nn .Op Ar mask .Op Ar gateway @@ -3120,7 +3118,7 @@ is replaced with the interface destination (peer) address. If the .Ar add!\& command is used -.Pq note the trailing Dq \&! , +.Pq note the trailing Dq !\& , then if the route already exists, it will be updated as with the .Sq route change command (see @@ -3362,7 +3360,7 @@ These commands are also discussed in the file .Pa README.alias which comes with the source distribution. .Pp -.It Op \&! Ns Xo +.It Op !\& Ns Xo .No bg Ar command .Xc The given @@ -3457,7 +3455,7 @@ command below. .Pp The default link name is .Dq deflink . -.It close Op lcp|ccp Ns Op \&! +.It close Op lcp|ccp Ns Op !\& If no arguments are given, the relevant protocol layers will be brought down and the link will be closed. If @@ -3487,7 +3485,7 @@ See the .Dq quit command below. .It delete Ns Xo -.Op \&! +.Op !\& .Ar dest .Xc This command deletes the route with the given @@ -3510,7 +3508,7 @@ the default route is deleted. If the .Ar delete!\& command is used -.Pq note the trailing Dq \&! , +.Pq note the trailing Dq !\& , .Nm will not complain if the route does not already exist. .It dial|call Op Ar label Ns Xo @@ -3564,12 +3562,12 @@ This command is used to control the interface used by may be one of the following: .Bl -tag -width 2n .It iface add Ns Xo -.Op \&! +.Op !\& .Ar addr Ns Op / Ns Ar bits .Op Ar peer .Xc .It iface add Ns Xo -.Op \&! +.Op !\& .Ar addr .Ar mask .Ar peer @@ -3906,7 +3904,7 @@ for security reasons. If the first character of .Ar value is an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , .Nm treats the remainder of the string as a program that must be executed to determine the @@ -3918,11 +3916,11 @@ values. If the .Dq !\& is doubled up -.Pq to Dq \&!! , +.Pq to Dq !! , it is treated as a single literal -.Dq \&! , +.Dq !\& , otherwise, ignoring the -.Dq \&! , +.Dq !\& , .Ar value is parsed as a program to execute in the same was as the .Dq !bg @@ -4033,7 +4031,7 @@ until no options remain at which point will terminate negotiations (unless .Dq none is one of the specified -.Ar option Ns No ). +.Ar option ) . In server mode, .Nm will accept any of the given protocols - but the client @@ -4102,15 +4100,11 @@ This is required (in addition to one or more other callback options) if you wish callback to be optional. .El .Pp -.It set cbcp Oo Xo -.No *| Ns Ar number Ns No -.Oo -.No , Ns Ar number Ns -.Oc -.No ... +.It set cbcp Oo +.No *| Ns Ar number Ns Oo +.No , Ns Ar number Ns ...\& Oc .Op Ar delay Op Ar retry .Oc -.Xc If no arguments are given, CBCP (Microsoft's CallBack Control Protocol) is disabled - ie, configuring CBCP in the .Dq set callback @@ -4211,7 +4205,7 @@ values. If .Ar seconds is followed immediately by an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , .Nm will .Em require @@ -4301,7 +4295,7 @@ If does not begin with .Pa /dev/ , it must either begin with an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , be of the format .No PPPoE: Ns Ar iface Ns Xo .Op \&: Ns Ar provider Ns @@ -4438,11 +4432,11 @@ set dial "... ATDT\\\\T CONNECT" It is also possible to execute external commands from the chat script. To do this, the first character of the expect or send string is an exclamation mark -.Pq Dq \&! . +.Pq Dq !\& . If a literal exclamation mark is required, double it up to .Dq !!\& and it will be treated as a single literal -.Dq \&! . +.Dq !\& . When the command is executed, standard input and standard output are directed to the open device (see the .Dq set device @@ -4585,13 +4579,12 @@ as they travel across the link. .Oo Op host .Ar src_addr Ns Op / Ns Ar width .Op Ar dst_addr Ns Op / Ns Ar width -.Oc Oo tcp|udp|ospf|igmp|icmp Op src lt|eq|gt Ar port +.Oc [ tcp|udp|ospf|igmp|icmp Op src lt|eq|gt Ar port .Op dst lt|eq|gt Ar port .Op estab .Op syn .Op finrst -.Op timeout Ar secs -.Oc +.Op timeout Ar secs ] .Xc .Nm supports four filter sets. @@ -4681,11 +4674,11 @@ unless the IP address is 0.0.0.0 in which case it defaults to If you wish to assign a dynamic IP number to the peer, .Ar hisaddr may also be specified as a range of IP numbers in the format -.Bd -literal -offset indent +.Bd -ragged -offset indent .Ar \&IP Ns Oo \&- Ns Ar \&IP Ns Xo -.Oc Oo , Ns Ar \&IP Ns +.Oc Ns Oo , Ns Ar \&IP Ns .Op \&- Ns Ar \&IP Ns -.Oc No ... +.Oc Ns ... .Xc .Ed .Pp @@ -5091,7 +5084,7 @@ is unspecified or zero, the default kernel controlled value is used. .It set redial Ar secs Ns Xo .Oo + Ns Ar inc Ns .Op - Ns Ar max Ns -.Oc Op . Ns Ar next +.Oc Ns Op . Ns Ar next .Op Ar attempts .Xc .Nm diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4 index 34045f3..70f8f58 100644 --- a/usr.sbin/ppp/ppp.8.m4 +++ b/usr.sbin/ppp/ppp.8.m4 @@ -11,8 +11,7 @@ .Op Fl nat .Op Fl quiet .Op Fl unit Ns Ar N -.Op Ar system Ns -.No ... +.Op Ar system ... .Sh DESCRIPTION This is a user process .Em PPP @@ -968,7 +967,7 @@ command: .No set redial Ar secs Ns Xo .Oo + Ns Ar inc Ns .Op - Ns Ar max Ns -.Oc Op . Ns Ar next +.Oc Ns Op . Ns Ar next .Op Ar attempts .Xc .Pp @@ -1615,13 +1614,12 @@ set filter .Ar src_addr Ns Op / Ns Ar width .Op Ar dst_addr Ns Op / Ns Ar width .Oc -.Oo Ar proto Op src Ar cmp port +.Ar [ proto Op src Ar cmp port .Op dst Ar cmp port .Op estab .Op syn .Op finrst -.Op timeout Ar secs -.Oc +.Op timeout Ar secs ] .Bl -enum .It .Ar Name @@ -1663,7 +1661,7 @@ the new rule number (rather than the next rule number). The .Ar action may optionally be followed with an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , telling .Nm to reverse the sense of the following match. @@ -1849,7 +1847,7 @@ is established. To control this IPCP behaviour, this implementation has the .Dq set ifaddr command for defining the local and remote IP address: -.Bd -literal -offset indent +.Bd -ragged -offset indent .No set ifaddr Oo Ar src_addr Ns .Op / Ns Ar \&nn .Oo Ar dst_addr Ns Op / Ns Ar \&nn @@ -1957,7 +1955,7 @@ dialing and redialing separated by either a pipe .Pq Dq \&| or a colon .Pq Dq \&: : -.Bd -literal -offset indent +.Bd -ragged -offset indent .No set phone Ar telno Ns Xo .Oo \&| Ns Ar backupnumber .Oc Ns ... Ns Oo : Ns Ar nextnumber @@ -2084,7 +2082,7 @@ When or .Ar chat logging is enabled, the actual password is not logged; -.Sq ******** Ns +.Sq ******** is logged instead. .Pp Login scripts vary greatly between ISPs. @@ -3077,7 +3075,7 @@ will also disable .El .Pp .It add Ns Xo -.Op \&! +.Op !\& .Ar dest Ns Op / Ns Ar nn .Op Ar mask .Op Ar gateway @@ -3120,7 +3118,7 @@ is replaced with the interface destination (peer) address. If the .Ar add!\& command is used -.Pq note the trailing Dq \&! , +.Pq note the trailing Dq !\& , then if the route already exists, it will be updated as with the .Sq route change command (see @@ -3362,7 +3360,7 @@ These commands are also discussed in the file .Pa README.alias which comes with the source distribution. .Pp -.It Op \&! Ns Xo +.It Op !\& Ns Xo .No bg Ar command .Xc The given @@ -3457,7 +3455,7 @@ command below. .Pp The default link name is .Dq deflink . -.It close Op lcp|ccp Ns Op \&! +.It close Op lcp|ccp Ns Op !\& If no arguments are given, the relevant protocol layers will be brought down and the link will be closed. If @@ -3487,7 +3485,7 @@ See the .Dq quit command below. .It delete Ns Xo -.Op \&! +.Op !\& .Ar dest .Xc This command deletes the route with the given @@ -3510,7 +3508,7 @@ the default route is deleted. If the .Ar delete!\& command is used -.Pq note the trailing Dq \&! , +.Pq note the trailing Dq !\& , .Nm will not complain if the route does not already exist. .It dial|call Op Ar label Ns Xo @@ -3564,12 +3562,12 @@ This command is used to control the interface used by may be one of the following: .Bl -tag -width 2n .It iface add Ns Xo -.Op \&! +.Op !\& .Ar addr Ns Op / Ns Ar bits .Op Ar peer .Xc .It iface add Ns Xo -.Op \&! +.Op !\& .Ar addr .Ar mask .Ar peer @@ -3906,7 +3904,7 @@ for security reasons. If the first character of .Ar value is an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , .Nm treats the remainder of the string as a program that must be executed to determine the @@ -3918,11 +3916,11 @@ values. If the .Dq !\& is doubled up -.Pq to Dq \&!! , +.Pq to Dq !! , it is treated as a single literal -.Dq \&! , +.Dq !\& , otherwise, ignoring the -.Dq \&! , +.Dq !\& , .Ar value is parsed as a program to execute in the same was as the .Dq !bg @@ -4033,7 +4031,7 @@ until no options remain at which point will terminate negotiations (unless .Dq none is one of the specified -.Ar option Ns No ). +.Ar option ) . In server mode, .Nm will accept any of the given protocols - but the client @@ -4102,15 +4100,11 @@ This is required (in addition to one or more other callback options) if you wish callback to be optional. .El .Pp -.It set cbcp Oo Xo -.No *| Ns Ar number Ns No -.Oo -.No , Ns Ar number Ns -.Oc -.No ... +.It set cbcp Oo +.No *| Ns Ar number Ns Oo +.No , Ns Ar number Ns ...\& Oc .Op Ar delay Op Ar retry .Oc -.Xc If no arguments are given, CBCP (Microsoft's CallBack Control Protocol) is disabled - ie, configuring CBCP in the .Dq set callback @@ -4211,7 +4205,7 @@ values. If .Ar seconds is followed immediately by an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , .Nm will .Em require @@ -4301,7 +4295,7 @@ If does not begin with .Pa /dev/ , it must either begin with an exclamation mark -.Pq Dq \&! , +.Pq Dq !\& , be of the format .No PPPoE: Ns Ar iface Ns Xo .Op \&: Ns Ar provider Ns @@ -4438,11 +4432,11 @@ set dial "... ATDT\\\\T CONNECT" It is also possible to execute external commands from the chat script. To do this, the first character of the expect or send string is an exclamation mark -.Pq Dq \&! . +.Pq Dq !\& . If a literal exclamation mark is required, double it up to .Dq !!\& and it will be treated as a single literal -.Dq \&! . +.Dq !\& . When the command is executed, standard input and standard output are directed to the open device (see the .Dq set device @@ -4585,13 +4579,12 @@ as they travel across the link. .Oo Op host .Ar src_addr Ns Op / Ns Ar width .Op Ar dst_addr Ns Op / Ns Ar width -.Oc Oo tcp|udp|ospf|igmp|icmp Op src lt|eq|gt Ar port +.Oc [ tcp|udp|ospf|igmp|icmp Op src lt|eq|gt Ar port .Op dst lt|eq|gt Ar port .Op estab .Op syn .Op finrst -.Op timeout Ar secs -.Oc +.Op timeout Ar secs ] .Xc .Nm supports four filter sets. @@ -4681,11 +4674,11 @@ unless the IP address is 0.0.0.0 in which case it defaults to If you wish to assign a dynamic IP number to the peer, .Ar hisaddr may also be specified as a range of IP numbers in the format -.Bd -literal -offset indent +.Bd -ragged -offset indent .Ar \&IP Ns Oo \&- Ns Ar \&IP Ns Xo -.Oc Oo , Ns Ar \&IP Ns +.Oc Ns Oo , Ns Ar \&IP Ns .Op \&- Ns Ar \&IP Ns -.Oc No ... +.Oc Ns ... .Xc .Ed .Pp @@ -5091,7 +5084,7 @@ is unspecified or zero, the default kernel controlled value is used. .It set redial Ar secs Ns Xo .Oo + Ns Ar inc Ns .Op - Ns Ar max Ns -.Oc Op . Ns Ar next +.Oc Ns Op . Ns Ar next .Op Ar attempts .Xc .Nm diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8 index 3576815..f540aac 100644 --- a/usr.sbin/pppctl/pppctl.8 +++ b/usr.sbin/pppctl/pppctl.8 @@ -11,8 +11,14 @@ PPP control program .Op Fl v .Op Fl t Ar n .Op Fl p Ar passwd -.Ar [host:]Port | LocalSocket -.Op command[;command]... +.Xo Oo Ar host : Oc Ns +.Ar Port | LocalSocket +.Xc +.Oo +.Sm off +.Ar command Oo ; Ar command Oc Ar ... +.Sm on +.Oc .Sh DESCRIPTION This program provides command line control of the .Xr ppp 8 @@ -30,7 +36,7 @@ for details. If the socket contains a leading '/', it is taken as an .Dv AF_LOCAL socket. If it contains a colon, it is treated as a -.Ar host:port +.Ar host : Ns Ar port pair, otherwise it is treated as a TCP port specification on the local machine (127.0.0.1). Both the .Ar host @@ -41,7 +47,7 @@ or don't have an entry for the given port in .Pa /etc/services . .Pp All remaining arguments are concatenated to form the -.Ar command(s) +.Ar command Ns (s) that will be sent to the .Nm ppp daemon. If any semi-colon characters are found, they are treated as diff --git a/usr.sbin/prefix/prefix.8 b/usr.sbin/prefix/prefix.8 index 2a022da..a35deea 100644 --- a/usr.sbin/prefix/prefix.8 +++ b/usr.sbin/prefix/prefix.8 @@ -98,7 +98,7 @@ to a network interface. Specify that .Ar len bits are reserved as identifier for IPv6 sub-networks in -.Ar prefix. +.Ar prefix . The .Ar len must be integer, and for syntactical reason it must be between 0 to 128. @@ -167,7 +167,7 @@ as prefix valid life time for a prefix to be added. Valid value for .Ar time is same as for -.Cm pltime. +.Cm pltime . .It Cm raf_auto Enable the autonomous address auto configuration for the prefix to be added. diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 440b8f5..c5743ee 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -67,8 +67,8 @@ .Op Fl g Ar group .Op Fl G Ar grouplist .Op Fl k Ar dir -.Op Fl u Ar min,max -.Op Fl i Ar min,max +.Op Fl u Ar min , Ns Ar max +.Op Fl i Ar min , Ns Ar max .Op Fl w Ar method .Op Fl s Ar shell .Op Fl y Ar path @@ -207,7 +207,8 @@ in any order. (For example, .Ar showuser , .Ar usershow , -.Ar show user , and +.Ar show user , +and .Ar user show all mean the same thing.) This flexibility is useful for interactive scripts calling @@ -575,7 +576,10 @@ Set the default directory, from which prototype shell and other initialization files are copied when .Nm creates a user's home directory. -.It Fl u Ar min,max , Fl i Ar min,max +.It Xo +.Fl u Ar min , Ns Ar max , +.Fl i Ar min , Ns Ar max +.Xc These options set the minimum and maximum user and group ids allocated for new accounts and groups created by .Nm . diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8 index a4175fe..b47a26f 100644 --- a/usr.sbin/rmt/rmt.8 +++ b/usr.sbin/rmt/rmt.8 @@ -100,6 +100,7 @@ indicates that a newline should be supplied: .It Xo Sy \&O Ar device .No \en Ar mode No \en .Xc +.Sm on Open the specified .Ar device using the indicated @@ -114,11 +115,14 @@ number suitable for passing to .Xr open 2 . If a device had already been opened, it is closed before a new open is performed. +.Sm off .It Xo Sy C Ar device No \en .Xc +.Sm on Close the currently open device. The .Ar device specified is ignored. +.Sm off .It Xo Sy L .Ar whence No \en .Ar offset No \en @@ -195,7 +199,6 @@ an ``ack'' is sent with the size of the status buffer, then the status buffer is sent (in binary). .El -.Sm on .Pp Any other command causes .Nm diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5 index b118665..1fba85b 100644 --- a/usr.sbin/rrenumd/rrenumd.conf.5 +++ b/usr.sbin/rrenumd/rrenumd.conf.5 @@ -70,7 +70,7 @@ There are some statements that may or have to specify interface. Interfaces are specified in the form of "name unit", such as .Ar lo0 and -.Ar ep1. +.Ar ep1 . .\" .Sh Configuration Statements .Bl -tag -width Ds diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1 index 485cd7c..82a57a7 100644 --- a/usr.sbin/rtprio/rtprio.1 +++ b/usr.sbin/rtprio/rtprio.1 @@ -41,21 +41,21 @@ or idletime scheduling priority .Sh SYNOPSIS .Nm [id|rt]prio .Nm [id|rt]prio -.Ar [-]pid +.Oo Fl Oc Ns Ar pid .Nm [id|rt]prio .Ar priority .Ar command .Op args .Nm [id|rt]prio .Ar priority -.Ar -pid +.Fl Ar pid .Nm [id|rt]prio .Fl t .Ar command .Op args .Nm [id|rt]prio .Fl t -.Ar -pid +.Fl Ar pid .Sh DESCRIPTION .Nm Rtprio is used for controlling realtime process scheduling. diff --git a/usr.sbin/setkey/setkey.8 b/usr.sbin/setkey/setkey.8 index 9bfca53..c11b332 100644 --- a/usr.sbin/setkey/setkey.8 +++ b/usr.sbin/setkey/setkey.8 @@ -385,24 +385,22 @@ as it requires extra reassembly at forwarding node .It Ar policy .Ar policy is the one of following: -.Bd -literal -offset -.Xo +.Pp +.Bl -item -compact +.It .Fl P .Ar direction .Li discard -.Xc -.Xo +.It .Fl P .Ar direction .Li none -.Xc -.Xo +.It .Fl P .Ar direction .Li ipsec .Ar protocol/mode/src-dst/level -.Xc -.Ed +.El .Pp You must specify the direction of its policy as .Ar direction . diff --git a/usr.sbin/sgsc/sgsc.1 b/usr.sbin/sgsc/sgsc.1 index 747b170..0b02f92 100644 --- a/usr.sbin/sgsc/sgsc.1 +++ b/usr.sbin/sgsc/sgsc.1 @@ -60,7 +60,7 @@ is called with no option only the current settings are reported. .Pp The following options are available: .Bl -tag -width indent -.It Fl s Ar [GSC_SRESSW] +.It Fl s Bq Dv GSC_SRESSW Set the scanner with the values of the resolution selector switch. .It Fl q Operate in quiet mode, i.e. do not report any of the current settings. @@ -74,17 +74,17 @@ several of them will refer the same device unit. The modifications are performed od the unit regardless of the device node by which it is accessed. -.It Fl r Ar resolution [GSC_SRES] +.It Fl r Ar resolution Bq Dv GSC_SRES Set the resolution in dpi. -.It Fl w Ar width [GSC_SWIDHT] +.It Fl w Ar width Bq Dv GSC_SWIDHT Set the width of the bitmap in pixels. -.It Fl h Ar height [GSC_SHEIGHT] +.It Fl h Ar height Bq Dv GSC_SHEIGHT Set the height of the bitmap in lines of pixels. -.It Fl b Ar len [GSC_SBLEN] +.It Fl b Ar len Bq Dv GSC_SBLEN Set the internal dma buffer to be .Ar len lines in size. -.It Fl t Ar timeout [GSC_SBTIME] +.It Fl t Ar timeout Bq Dv GSC_SBTIME Set the timeout time for reading one dma buffer. .El .Sh FILES diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8 index 78c0355..8731e1d 100644 --- a/usr.sbin/sliplogin/sliplogin.8 +++ b/usr.sbin/sliplogin/sliplogin.8 @@ -274,38 +274,31 @@ unit was successfully attached. .El .Sh FILES -.Ar /etc/sliphome/slip.hosts +.Bl -tag -width indent +.It Pa /etc/sliphome/slip.hosts list of host login names and parameters. -.Pp -.Ar /etc/sliphome/slip.login +.It Pa /etc/sliphome/slip.login script executed when a connection is made. -.Pp -.Ar /etc/sliphome/slip.login.loginname +.It Pa /etc/sliphome/slip.login. Ns Ar loginname script executed when a connection is made by .Ar loginname . -.Pp -.Ar /etc/sliphome/slip.logout +.It Pa /etc/sliphome/slip.logout script executed when a connection is lost. -.Pp -.Ar /etc/sliphome/slip.logout.loginname +.It Pa /etc/sliphome/slip.logout. Ns Ar loginname script executed when a connection is lost by .Ar loginname . -.Pp -.Ar /etc/sliphome/slip.slparms +.It Pa /etc/sliphome/slip.slparms extra parameters file. -.Pp -.Ar /etc/sliphome/slip.slparms.loginname +.It Pa /etc/sliphome/slip.slparms. Ns Ar loginname extra parameters file for .Ar loginname . -.Pp -.Ar /var/run/ttyXn.if +.It Pa /var/run/ Ns Ar ttyXn Ns Pa .if contains the name of the network interface used by the sliplogin process on .Ar ttyXn . -.Pp -.Ar /var/run/slX.pid +.It Pa /var/run/ Ns Ar slX Ns Pa .pid contains the PID of the sliplogin process which is using interface .Ar slX . -.Pp +.El .Sh SEE ALSO .Xr slattach 8 , .Xr syslogd 8 , diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5 index d77e6b2..c441423 100644 --- a/usr.sbin/syslogd/syslog.conf.5 +++ b/usr.sbin/syslogd/syslog.conf.5 @@ -117,8 +117,7 @@ may be used to specify exactly what is logged. The default set of comparison flags are .Dq => (or, if you prefer, -.Do >= -.Dc ), +.Dq >= ) , which means that messages from the specified .Em facility list of a priority diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8 index 6e4611d..83cf993 100644 --- a/usr.sbin/syslogd/syslogd.8 +++ b/usr.sbin/syslogd/syslogd.8 @@ -81,7 +81,13 @@ options may be specified. .Ar Allowed_peer can be any of the following: .Bl -tag -width "ipaddr/masklen[:service]XX" -.It Ar ipaddr/masklen Ns Op Ar :service +.It Xo +.Sm off +.Ar ipaddr +.No / Ar masklen +.Op : Ar service +.Sm on +.Xc Accept datagrams from .Ar ipaddr (in the usual dotted quad notation) with @@ -116,13 +122,21 @@ by 24 otherwise. If is IPv6 address, a missing .Ar masklen will be substituted by 128. -.It Ar domainname Ns Op Ar :service +.It Xo +.Sm off +.Ar domainname Op : Ar service +.Sm on +.Xc Accept datagrams where the reverse address lookup yields .Ar domainname for the sender address. The meaning of .Ar service is as explained above. -.It Ar *domainname Ns Op Ar :service +.It Xo +.Sm off +.No * Ar domainname Op : Ar service +.Sm on +.Xc Same as before, except that any source host whose name .Em ends in @@ -218,7 +232,7 @@ The message sent to should consist of a single line. The message can contain a priority code, which should be a preceding decimal number in angle braces, for example, -.Sq Aq 5. +.Sq Aq 5 . This priority code should map into the priorities defined in the include file .Aq Pa sys/syslog.h . diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1 index 4907a5f..c9ed39b 100644 --- a/usr.sbin/tcpdump/tcpslice/tcpslice.1 +++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1 @@ -200,7 +200,7 @@ is used. .It Fl R Dump the timestamps of the first and last packets in each input file as raw timestamps (i.e., in the form -.Em sssssssss.uuuuuu Ns ). +.Em sssssssss.uuuuuu ) . .It Fl r Same as .Fl R diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8 index 9698b5e..b015cff 100644 --- a/usr.sbin/usbd/usbd.8 +++ b/usr.sbin/usbd/usbd.8 @@ -89,7 +89,7 @@ The command line options are as follows: .It Fl c Ar filename Name of configuration file. The default is -.Pa /etc/usbd.conf. +.Pa /etc/usbd.conf . .It Fl d Enable debugging to the standard output, and do not disassociate from the controlling terminal. diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8 index 2c5be57..bb46fed 100644 --- a/usr.sbin/vnconfig/vnconfig.8 +++ b/usr.sbin/vnconfig/vnconfig.8 @@ -47,11 +47,11 @@ .Nm .Op Fl cdeguv .Oo Fl s Ar option Ns -.Op , Ns Ar option Ns Ar ...\& Oc +.Op , Ns Ar option Ns Ar ... Oc .Oo Fl r Ar option Ns -.Op , Ns Ar option Ns Ar ...\& Oc +.Op , Ns Ar option Ns Ar ... Oc .Op Fl S Ar value -.Ar special_file Ar [regular_file] +.Ar special_file Op Ar regular_file .Op Ar feature .Nm .Fl a @@ -144,7 +144,13 @@ Set The list of allowed flags and their meanings are the same as for the .Fl r option. -.It Fl S Ar value{k,m,g,t} +.It Fl S Xo +.Sm off +.Ar value +.Es \&{ \&} +.En Cm k , m , g , t +.Sm on +.Xc If no regular file is specified, VN will use swap for backing store. This option specifies the size of the device and implies the .Fl c diff --git a/usr.sbin/xten/xten.1 b/usr.sbin/xten/xten.1 index 7564610..4ac7ac6 100644 --- a/usr.sbin/xten/xten.1 +++ b/usr.sbin/xten/xten.1 @@ -38,10 +38,11 @@ .Sh SYNOPSIS .Nm .Op Fl "" -.Ar house Ar key Ns Op Ar :cnt +.Ar house +.Ar key Ns Op : Ns Ar cnt .Oo .Op Ar house -.Ar key Ns Op Ar :cnt +.Ar key Ns Op : Ns Ar cnt .Ar ... .Oc .Sh DESCRIPTION diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8 index 2e56371..2982342 100644 --- a/usr.sbin/ypbind/ypbind.8 +++ b/usr.sbin/ypbind/ypbind.8 @@ -43,7 +43,12 @@ .Op Fl ypsetme .Op Fl s .Op Fl m -.Op Fl S Ar domainname,server1,server2,... +.Oo +.Fl S +.Sm off +.Ar domainname , server1 , server2 , ... +.Sm on +.Oc .Sh DESCRIPTION .Nm Ypbind is the process that maintains NIS binding information. @@ -108,7 +113,11 @@ Cause to run in secure mode: it will refuse to bind to any NIS server that is not running as root (i.e. that is not using privileged TCP ports). -.It Fl S Ar domainname,server1,server2,server3,... +.It Fl S Xo +.Sm off +.Ar domainname , server1 , server2 , server3 , ... +.Sm on +.Xc Allow the system administrator to lock .Nm to a particular |
