diff options
61 files changed, 483 insertions, 389 deletions
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8 index 254affe98767..4a1ebda1a625 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/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8 index 751d69300751..2304a8ca7607 100644 --- a/usr.sbin/ancontrol/ancontrol.8 +++ b/usr.sbin/ancontrol/ancontrol.8 @@ -179,8 +179,7 @@ channel selection, diversity, transmit power and transmit speed. .It Fl i Ar iface Fl t Ar 0|1|2|3|4 Select transmit speed. The available settings are as follows: -.Bd -filled -offset indent -.Bl -column "TX rate " "NIC speed " +.Bl -column "TX rate " "NIC speed " -offset indent .Em "TX rate NIC speed" 0 Auto -- NIC selects optimal speed 1 1Mbps fixed @@ -188,22 +187,19 @@ The available settings are as follows: 3 5.5Mbps fixed 4 11Mbps fixed .El -.Ed .Pp Note that the 5.5 and 11Mbps settings are only supported on the 4800 series adapters: the 4500 series adapters have a maximum speed of 2Mbps. .It Fl i Ar iface Fl s Ar 0|1|2|3 Set power save mode. Valid selections are as follows: -.Bd -filled -offset indent -.Bl -column "Selection " "Power save mode " +.Bl -column "Selection " "Power save mode " -offset indent .Em "Selection Power save mode" 0 None - power save disabled 1 Constantly awake mode (CAM) 2 Power Save Polling (PSP) 3 Fast Power Save Polling (PSP-CAM) .El -.Ed .Pp Note that for IBSS (ad-hoc) mode, only PSP mode is supported, and only if the ATIM window is non-zero. @@ -242,15 +238,13 @@ Aironet devices can be configured with up to two antennas, and transmit and receive diversity can be configured accordingly. Valid selections are as follows: -.Bd -filled -offset indent -.Bl -column "Selection " "Diversity " +.Bl -column "Selection " "Diversity " -offset indent .Em "Selection Diversity" 0 Select factory default diversity 1 Antenna 1 only 2 Antenna 2 only 3 Antenna 1 and 2 .El -.Ed .Pp The receive and transmit diversity can be set independently. The user @@ -363,8 +357,7 @@ Recognized regulatory authorities include the FCC (United States), ETSI (Europe), France and Japan. Frequencies in the table are specified in Mhz. -.Bd -filled -offset indent -.Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan " +.Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan " -offset indent .Em "Channel ID FCC ETSI France Japan" 1 2412 2412 - - 2 2417 2417 - - @@ -381,7 +374,6 @@ in the table are specified in Mhz. 13 - 2472 2472 - 14 - - - 2484 .El -.Ed .Pp If an illegal channel is specified, the NIC will revert to its default channel. diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8 index fb7f430b3a63..fc36deb43646 100644 --- a/usr.sbin/apm/apm.8 +++ b/usr.sbin/apm/apm.8 @@ -89,7 +89,7 @@ for details. .It Fl l Display the remaining battery percentage. If your laptop does not support this function, 255 is displayed. -.It Fl r +.It Fl r Ar delta Enable the resume wakeup timer, if the laptop supports it. This doesn't actually suspend the laptop, but if the laptop is suspended, and it supports resume from suspend, then it will be resume after diff --git a/usr.sbin/atm/atmarpd/atmarpd.8 b/usr.sbin/atm/atmarpd/atmarpd.8 index 78e543aa7c03..49aaebc6de50 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 64ade193be46..8643f56149c4 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 @@ -90,7 +90,7 @@ Specify the sector size. The default secotor size is 512 .El .Sh SEE ALSO .Xr boot 8 , -.Xr fdisk 8 . +.Xr fdisk 8 .Sh DIAGNOSTICS Exit status is 0 on success and >0 on error. .Sh AUTHORS diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1 index 0b1022b1632e..010e783ccdee 100644 --- a/usr.sbin/cdcontrol/cdcontrol.1 +++ b/usr.sbin/cdcontrol/cdcontrol.1 @@ -20,7 +20,6 @@ as or .Pa mcd0 . .Pp - If no command is given, then .Nm enters an interactive mode, reading commands from the standard input. @@ -56,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 @@ -145,12 +148,17 @@ Quit the program. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width CDROM +.Pp +.Bl -tag -width CD_DRIVE -compact .It Ev CDROM The cd device to use if one isn't specified with the .Fl f flag. -.It Ev CD_DRIVE Ev CDPLAY Ev DISC Ev MUSIC_CD +.Pp +.It Ev CDPLAY +.It Ev CD_DRIVE +.It Ev DISC +.It Ev MUSIC_CD These variables have been deprecated in favour of .Ev CDROM . .El diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8 index 0d9020d728a0..c1a598ea4e70 100644 --- a/usr.sbin/chown/chown.8 +++ b/usr.sbin/chown/chown.8 @@ -45,15 +45,15 @@ .Fl R .Op Fl H | Fl L | Fl P .Oc -.Ar owner Ns Op Ar :group -.Ar file ... +.Ar owner Ns Op : Ns Ar group +.Ar .Nm .Op Fl fhv .Oo .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 12f1a966a69a..ec66af480e59 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 69539cab1532..1df244030d4b 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/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5 index 03fba5a9b088..ac67d4fc347b 100644 --- a/usr.sbin/ctm/ctm/ctm.5 +++ b/usr.sbin/ctm/ctm/ctm.5 @@ -165,7 +165,7 @@ CTM_END 74ddd298d76215ae45a077a4b6a74e9c .Sh SEE ALSO .Xr ctm 1 , .Xr ctm_rmail 1 , -.Xr ed 1 . +.Xr ed 1 .Sh HISTORY Initial trials ran during the .Fx 1.1.5 , diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8 index 5b292de81c2b..d7e0fdcf2102 100644 --- a/usr.sbin/faithd/faithd.8 +++ b/usr.sbin/faithd/faithd.8 @@ -151,22 +151,20 @@ will work as TCP relaying daemon for specified .Ar service as described above. .Pp -If -.Fl d -is given, debugging information will be generated using +The following options are available: +.Bl -tag -width indent +.It Fl d +Debugging information will be generated using .Xr syslog 3 . -If -.Fl p -is given, -.Nm -will use privileged TCP port number as source port, +.It Fl p +Use privileged TCP port number as source port, for IPv4 TCP connection toward final destination. For relaying .Xr ftp 1 and .Xr rlogin 1 , -.Fl p -is not necessary as special program code is supplied. +this flag is not necessary as special program code is supplied. +.El .Pp .Nm will relay both normal and out-of-band TCP data. diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8 index 264da2df20b0..0bee4051dc6b 100644 --- a/usr.sbin/inetd/inetd.8 +++ b/usr.sbin/inetd/inetd.8 @@ -163,7 +163,7 @@ server program arguments .Ed .Pp To specify an -.No Tn "ONC RPC" Ns -based +.Tn "ONC RPC" Ns -based service, the entry would contain these fields: .Pp .Bd -unfilled -offset indent -compact @@ -209,7 +209,7 @@ should be the official name of the service (that is, the first entry in .Pa /etc/services ) . When used to specify an -.No Tn "ONC RPC" Ns -based +.Tn "ONC RPC" Ns -based service, this field is a valid RPC service name in the file .Pa /etc/rpc . diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index f43389f92936..b9466957cb04 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 655f13b7ec4a..2e76572f3678 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 a84652d00f6d..f2eaf2222acd 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/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8 index 797be1ddb94e..22c39f2fd6e5 100644 --- a/usr.sbin/kernbb/kernbb.8 +++ b/usr.sbin/kernbb/kernbb.8 @@ -49,7 +49,9 @@ with the .Fl a option. .Pp -The output format is ASCII, consisting of one line per record with the +The output format is +.Tn ASCII , +consisting of one line per record with the following fields: filename, linenumber, procedure, address, count of executions, length of the basic-block in bytes and the product of the previous two fields. diff --git a/usr.sbin/keyadmin/keyadmin.8 b/usr.sbin/keyadmin/keyadmin.8 index fdbd17afdea0..4bcc3d17a993 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 13a70f70cd1d..ff9e93381176 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 e24d4b5f471f..76782bac5564 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 2533d4543257..092f9fc9e7aa 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 @@ -199,7 +199,7 @@ v vf raster image The .Sy if filter is invoked with arguments: -.Bd -filled -offset indent +.Bd -ragged -offset indent .Cm if .Op Fl c .Fl w Ns Ar width @@ -264,7 +264,7 @@ and flags. .Pp All other filters are called as: -.Bd -filled -offset indent +.Bd -ragged -offset indent .Nm filter .Fl x Ns Ar width .Fl y Ns Ar length diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8 index 518158a23f4f..ff3e0aea1ef5 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/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8 index 3f0c5dd2618b..bd03b2c50fb0 100644 --- a/usr.sbin/mailwrapper/mailwrapper.8 +++ b/usr.sbin/mailwrapper/mailwrapper.8 @@ -133,7 +133,7 @@ was invoked. .Xr mailq 1 , .Xr newaliases 1 , .Xr mailer.conf 5 , -.Xr sendmail 8 . +.Xr sendmail 8 .Sh HISTORY .Nm first appeared in diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index bfe117a5cee0..a210e9dc2ada 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 352745c7fa4d..b4128a9983d1 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 042026615564..963f9af142f7 100644 --- a/usr.sbin/mrouted/mrouted.8 +++ b/usr.sbin/mrouted/mrouted.8 @@ -92,7 +92,7 @@ Regardless of the debug level, always writes warning and error messages to the system log demon. The .Fl debug-level -argument is a comma-seperated list of any of the following: +argument is a comma-separated list of any of the following: .Bl -tag -width indent .It "packet" Display the type, source and destination of all packets sent or received. @@ -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 94ef20bb963f..bc609b1e5ac3 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 d4fd75106ed0..e2eae631ca30 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 b47737135f3c..e8ace35a08e7 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 3bb4e1605715..af4e16246489 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 @@ -1424,7 +1418,7 @@ Specifies the name and options for the serial port device to which the PPS signal is connected. Note, this command replaces use of fudge flag3, which was used for the same purpose in NTPv3. -Note that this command should preceed the +Note that this command should precede the .Ic server and .Ic fudge diff --git a/usr.sbin/ntp/doc/ntpq.8 b/usr.sbin/ntp/doc/ntpq.8 index d9b168d6db86..d2f89988dc60 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 eebda41e8c20..c48b874a012d 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 56c8750894a1..c2a8706cbd26 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 abb6c044ef51..b72f33300907 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. @@ -108,7 +119,7 @@ reset its debug level. The .Nm program puts its logs to a separate file -.Pa Pq /var/log/pim6sd.log . +.Pq Pa /var/log/pim6sd.log . The log level can be configured by the .Fl d command line option or the configuration file. diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5 index cc7766ec2cc4..427cb9e5ecb5 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 9d1cac1ebf04..426eadb448f2 100644 --- a/usr.sbin/pkg_install/add/pkg_add.1 +++ b/usr.sbin/pkg_install/add/pkg_add.1 @@ -274,9 +274,9 @@ The .Ar PRE-INSTALL keyword will not appear if separate scripts for pre-install and post-install are given during package creation time (using the -.Cm Fl i +.Fl i and -.Cm Fl I +.Fl I flags to .Xr pkg_create 1 ) . .It @@ -331,9 +331,9 @@ The .Ar POST-INSTALL keyword will not appear if separate scripts for pre-install and post-install are given during package creation time (using the -.Cm Fl i +.Fl i and -.Cm Fl I +.Fl I flags to .Xr pkg_create 1 ) . .Pp diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index 3e695277fef8..8a89ac7a4d46 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -122,7 +122,7 @@ first argument. .Pp .Sy Note : if the -.Cm Fl I +.Fl I option is not given, this script will serve as both the pre-install and the post-install script for the package, differentiating between the functionality by passing the keywords @@ -163,7 +163,7 @@ name as the first argument. .Pp .Sy Note : if the -.Cm Fl K +.Fl K option is not given, this script will serve as both the de-install and the post-deinstall script for the package, differentiating between the functionality by passing the keywords diff --git a/usr.sbin/pkg_install/sign/pkg_sign.1 b/usr.sbin/pkg_install/sign/pkg_sign.1 index b6d4c3eada25..51d996ce8c97 100644 --- a/usr.sbin/pkg_install/sign/pkg_sign.1 +++ b/usr.sbin/pkg_install/sign/pkg_sign.1 @@ -27,7 +27,6 @@ .\" 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. - .Dd September 24, 1999 .Dt PKG_SIGN 1 .Os @@ -36,7 +35,7 @@ .Nm check_sign .Nd handle package signatures .Sh SYNOPSIS -.Nm pkg_sign +.Nm .Op Fl sc .Op Fl t Ar type .Op Fl u Ar id @@ -48,26 +47,26 @@ .Op Fl k Ar cert .Op Ar .Sh DESCRIPTION -.Nm pkg_sign +.Nm embeds a cryptographic signature within a gzip file .Ar file . .Ar type can be -.Li pgp +.Cm pgp (default), -.Li sha1 , +.Cm sha1 , or -.Li x509 . +.Cm x509 . If .Ar type is -.Li pgp , +.Cm pgp , it will always prompt you for a passphrase to unlock your private pgp key, even if you don't use a passphrase (which is a bad idea, anyway). If .Ar type is -.Li sha1 , +.Cm sha1 , you must supply an .Ar id , which will be recorded as the name of the package, and printed as the @@ -78,7 +77,9 @@ checks that cryptographic signature. It currently disregards .Ar type and checks only the topmost signature. -For sha1, it checksums the file +For +.Cm sha1 , +it checksums the file and verifies that the result matches the list of checksums recorded in .Pa /var/db/pkg/SHA1 . .Pp @@ -88,12 +89,16 @@ and .Fl c can be used to force package signing or signature checking mode. .Pp -For pgp, the +For +.Cm pgp , +the .Ar id to use to sign the package or verify the signature can be forced with .Fl u . .Pp -For X.509, the signing key or verification certificate may be +For +.Cm x509 , +the signing key or verification certificate may be specified with the .Fl k option. If not specified, packages are signed or verified with the @@ -102,7 +107,7 @@ default keys and certificates documented below. If .Ar file is a single dash -.Pq Sq \&- +.Pq Sq Fl or absent, .Nm check_sign reads from the standard input. @@ -112,24 +117,28 @@ set a flag .Dv EXTRA_FIELD in the gzip header and store extra data between the gzip header and the compressed file proper. -The OpenBSD signing scheme uses eight bytes markers such `SIGPGP' \+ length -or `CKSHA1' \+ length for its signatures (those markers are conveniently +The +.Ox +signing scheme uses eight bytes markers such +.Sq Li SIGPGP ++ length or +.Sq CKSHA1 ++ length for its signatures (those markers are conveniently eight bytes long). -.Sh RESULTS -.Nm pkg_sign +.Sh DIAGNOSTICS +.Nm and .Nm pkg_check -return with an exit code > 0 if anything went wrong for any +return with an exit code >0 if anything went wrong for any .Ar file . For .Nm pkg_check , this usually indicates that the package is not signed, or that the signature is forged. -.Sh DIAGNOSTICS .Bl -diag .It "File %s is already signed" There is a signature embedded within the gzip file already. -.Nm pkg_sign +.Nm currently does not handle multiple signatures. .It "File %s is not a signed gzip file" This is an unsigned package. @@ -162,7 +171,7 @@ the checksum file are hard-coded to avoid tampering and hinder flexibility. .Bl -tag -width "/usr/local/bin/pgp" -compact .It Pa file.sign Temporary file built by -.Nm pkg_sign +.Nm from .Ar file . .It Pa /usr/local/bin/pgp @@ -181,6 +190,14 @@ Default package verification certificate(s). .Xr pkg_add 1 , .Xr sha1 1 .Sh AUTHORS -.Nm pkg_sign -was created by Marc Espie for the OpenBSD Project. X.509 signatures -and FreeBSD support added by Wes Peters <wes@softweyr.com>. +.An -nosplit +.Nm +was created by +.An Marc Espie +for the +.Ox +Project. +X.509 signatures and +.Fx +support added by +.An Wes Peters Aq wes@softweyr.com . diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index c036665693f5..db9ee68aecf6 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -2349,11 +2349,18 @@ mode. These signals tell .Nm to exit. +.It USR1 +This signal, tells +.Nm +to re-open any existing server socket, dropping all existing diagnostic +connections. Sockets that couldn't previously be opened will be retried. .It USR2 This signal, tells .Nm to close any existing server socket, dropping all existing diagnostic connections. +.Dv SIGUSR1 +can still be used to re-open the socket. .El .Pp .Sh MULTI-LINK PPP @@ -3861,7 +3868,7 @@ Received identification packets are logged to the LCP log (see .Ic set log for details) and are never responded to. .It set Ns Xo -.No Op up +.Op up .Ar var value .Xc This option allows the setting of any of the following variables: @@ -5134,7 +5141,10 @@ The optimum value is just over twice the MTU value. If .Ar value is unspecified or zero, the default kernel controlled value is used. -.It set server|socket Ar TcpPort|LocalName|none password Op Ar mask +.It "set server|socket" Ar TcpPort Ns No \&| Ns Xo +.Ar LocalName Ns No |none|open|closed +.Op password Op Ar mask +.Xc This command tells .Nm to listen on the given socket or @@ -5142,16 +5152,26 @@ to listen on the given socket or for incoming command connections. .Pp The word -.Ar none +.Dq none +instructs +.Nm +to close any existing socket and clear the socket configuration. +The word +.Dq open instructs .Nm -to close any existing socket. +to attempt to re-open the port. +The word +.Dq closed +instructs +.Nm +to close the open port. .Pp If you wish to specify a local domain socket, .Ar LocalName must be specified as an absolute file name, otherwise it is assumed to be the name or number of a TCP port. -You must specify the octal umask to be used with a local domain socket. +You may specify the octal umask to be used with a local domain socket. Refer to .Xr umask 2 for umask details. @@ -5187,7 +5207,13 @@ Currently, .Xr telnet 1 can also be used, but link encryption may be implemented in the future, so .Xr telnet 1 -should not be relied upon. +should be avoided. +.Pp +Note; +.Dv SIGUSR1 +and +.Dv SIGUSR2 +interact with the diagnostic socket. .It set speed Ar value This sets the speed of the serial device. If speed is specified as diff --git a/usr.sbin/pppctl/pppctl.8 b/usr.sbin/pppctl/pppctl.8 index 357681581b5e..f540aac180ec 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 2a022da23d3c..a35deeade891 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/pstat/pstat.8 b/usr.sbin/pstat/pstat.8 index 6d49c72d85b2..d29e34b60173 100644 --- a/usr.sbin/pstat/pstat.8 +++ b/usr.sbin/pstat/pstat.8 @@ -233,7 +233,7 @@ PPPDISC. Print the active vnodes. Each group of vnodes corresponding to a particular filesystem is preceded by a two line header. The first line consists of the following: -.Bd -filled -offset indent +.Bd -ragged -offset indent .No *** MOUNT Em fstype from on .Em on fsflags @@ -290,7 +290,7 @@ A list of letters representing vnode flags: .Dv VDOOMED .It F .Dv VFREE -.iT b +.It b .Dv VTBFREE .It O .Dv VONWORKLST diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 440b8f57c2c3..c5743eeb9b4f 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 a4175fe87bbb..847a1283f808 100644 --- a/usr.sbin/rmt/rmt.8 +++ b/usr.sbin/rmt/rmt.8 @@ -61,7 +61,7 @@ a status indication. All responses are in and in one of two forms. Successful commands have responses of: -.Bd -filled -offset indent +.Bd -ragged -offset indent .Sm off .Sy A Ar number No \en .Sm on @@ -72,7 +72,7 @@ is an .Tn ASCII representation of a decimal number. Unsuccessful commands are responded to with: -.Bd -filled -offset indent +.Bd -ragged -offset indent .Sm off .Xo Sy E Ar error-number .No \en Ar error-message @@ -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/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 index cf684392da66..1eaf1ebfa7a8 100644 --- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 +++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 @@ -226,14 +226,14 @@ The matched entry and corresponding domain are then used for the update. .Pp Note that in order for multi-domain mode to work, there have to be -seperate template files for each domain. +separate template files for each domain. For example, if a server supports three domains, .Pa foo , .Pa bar , and .Pa baz , -there should be three seperate master.passwd template files called +there should be three separate master.passwd template files called .Pa /var/yp/foo/master.passwd , .Pa /var/yp/bar/master.passwd , and diff --git a/usr.sbin/rrenumd/rrenumd.conf.5 b/usr.sbin/rrenumd/rrenumd.conf.5 index b1186658c8b0..1fba85b87869 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/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8 index cf70545a556c..3ddc77d37eaf 100644 --- a/usr.sbin/rtadvd/rtadvd.8 +++ b/usr.sbin/rtadvd/rtadvd.8 @@ -1,3 +1,4 @@ +.\" $FreeBSD$ .\" $KAME: rtadvd.8,v 1.9 2000/05/27 13:37:01 jinmei Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -27,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd May 17, 1998 .Dt RTADVD 8 .Os diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1 index 485cd7c7a644..82a57a7ad1da 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 9bfca535b165..c11b33214520 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 747b170c2cac..0b02f928b895 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/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8 index 159c0ca400e4..fc183a593038 100644 --- a/usr.sbin/sicontrol/sicontrol.8 +++ b/usr.sbin/sicontrol/sicontrol.8 @@ -9,7 +9,7 @@ .Sh SYNOPSIS .Nm device -.Ar command Op Cm Ar param ... +.Ar command Op Ar param ... .Sh DESCRIPTION .Nm Sicontrol is used to configure and monitor the SI/XIO device driver. @@ -89,7 +89,7 @@ Generally self explanatory..... .Xr si 4 , .Xr termios 4 , .Xr tty 4 , -.Xr comcontrol 8 . +.Xr comcontrol 8 .Sh HISTORY .Nm Sicontrol is loosely based on a utility called diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8 index 78c03557f262..8731e1d671dc 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 d77e6b260054..c44142338efe 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 6e4611d822ea..2ba8821ab450 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 @@ -89,7 +95,7 @@ Accept datagrams from bits being taken into account when doing the address comparison. .Ar ipaddr can be also IPv6 address by enclosing the address with -.Ql [ +.Ql \&[ and .Ql \&] . If specified, @@ -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 4907a5f52d33..c9ed39b872f1 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 9698b5e735ae..d6c4c68dbb8f 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. @@ -133,7 +133,7 @@ more verbose. The .Nm command appeared in -.Nx 4.0 . +.Nx 1.4 . .Sh AUTHORS .An -nosplit The diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1 index a8756dd93162..c950021cf25c 100644 --- a/usr.sbin/vidcontrol/vidcontrol.1 +++ b/usr.sbin/vidcontrol/vidcontrol.1 @@ -1,4 +1,3 @@ -.\" t .\" .\" vidcontrol - a utility for manipulating the syscons video driver .\" @@ -204,18 +203,14 @@ If the required size of font has not been loaded to the kernel, .Nm will fail if the user attempts to set a new video mode. .Pp -.TS -c s -c c -l c. -Video modes and font size -Modes Font size -25 line modes 8x16 (VGA), 8x14 (EGA) -30 line modes 8x16 -43 line modes 8x8 -50 line modes 8x8 -60 line modes 8x8 -.TE +.Bl -column "25 line modes" "8x16 (VGA), 8x14 (EGA)" -compact +.Sy Modes Ta Sy Font size +.Li 25 line modes Ta 8x16 (VGA), 8x14 (EGA) +.Li 30 line modes Ta 8x16 +.Li 43 line modes Ta 8x8 +.Li 50 line modes Ta 8x8 +.Li 60 line modes Ta 8x8 +.El .Pp It is better to always load all three sizes (8x8, 8x14 and 8x16) of the same font. diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8 index 202451541429..64fe499c9bef 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 @@ -140,7 +140,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. For example, '23m' for 23 megabytes. The VN device will round the size up to a machine page boundary. @@ -176,17 +182,17 @@ option: Swapping is enabled on the special file. See .Xr swapon 2 . -.It Dv Pf mountro= Pa mount_point +.It Dv mountro Ns = Ns Pa mount_point The special file is mounted read-only on .Ar mount_point . See .Xr mount 2 . -.It Dv Pf mountrw= Pa mount_point +.It Dv mountrw Ns = Ns Pa mount_point The special file is mounted read-write on .Ar mount_point . See .Xr mount 2 . -.It Dv Pf mount= Pa mount_point +.It Dv mount Ns = Ns Pa mount_point Same as ``mountrw=''. .El .Pp diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8 index ce6cacbb4f85..8c1301d7c8c6 100644 --- a/usr.sbin/wicontrol/wicontrol.8 +++ b/usr.sbin/wicontrol/wicontrol.8 @@ -131,8 +131,7 @@ NICs support a maximum transmit rate of 2Mbps while the turbo NICs support a maximum speed of 6Mbps. The following table shows the legal transmit rate settings and the corresponding transmit speeds: -.Bd -filled -offset indent -.Bl -column "TX rate " "NIC speed " +.Bl -column "TX rate " "NIC speed " -offset indent .Em "TX rate NIC speed" 1 Fixed Low (1Mbps) 2 Fixed Standard (2Mbps) @@ -142,7 +141,6 @@ legal transmit rate settings and the corresponding transmit speeds: 6 Auto Rate Select (Standard) 7 Auto Rate Select (Medium) .El -.Ed .Pp The standard NICs support only settings 1 through 3. Turbo NICs support all the above listed speed settings. @@ -272,8 +270,7 @@ Recognized regulatory authorities include the FCC (United States), ETSI (Europe), France and Japan. Frequencies in the table are specified in Mhz. -.Bd -filled -offset indent -.Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan " +.Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan " -offset indent .Em "Channel ID FCC ETSI France Japan" 1 2412 2412 - 2412 2 2417 2417 - 2417 @@ -290,7 +287,6 @@ in the table are specified in Mhz. 13 - 2472 2472 2472 14 - - - 2484 .El -.Ed .Pp If an illegal channel is specified, the NIC will revert to its default channel. diff --git a/usr.sbin/wlconfig/wlconfig.8 b/usr.sbin/wlconfig/wlconfig.8 index e36ec5ec9a9b..42c0547398e4 100644 --- a/usr.sbin/wlconfig/wlconfig.8 +++ b/usr.sbin/wlconfig/wlconfig.8 @@ -107,7 +107,7 @@ IRQ : 10 Default MAC address : 08:00:0e:20:3d:4b Soft MAC address : 00:00:00:00:00:00 Current MAC address : Default -Adapter compatability : PC-AT 2.4GHz +Adapter compatibility : PC-AT 2.4GHz Threshold preset : 1 Call code required : NO Subband : 2425MHz diff --git a/usr.sbin/xten/xten.1 b/usr.sbin/xten/xten.1 index 75646109b6b8..4ac7ac619bbe 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 2e5637133974..29823428e13e 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 |