From 5325ced31a7c9a8f277b22d0c3b56a197bbcbd41 Mon Sep 17 00:00:00 2001 From: "Cynthia A. E. Livingston" Date: Wed, 25 Jul 1990 05:52:26 -0800 Subject: [PATCH] .Xr botch fix SCCS-vsn: old/adb/common_source/adb.1 5.9 SCCS-vsn: old/refer/addbib/addbib.1 6.3 SCCS-vsn: usr.bin/apply/apply.1 6.3 SCCS-vsn: usr.bin/apropos/apropos.1 6.9 SCCS-vsn: usr.bin/ar/ar.1 6.4 SCCS-vsn: old/pcc/lint/lpass1/lint.1 6.4 SCCS-vsn: old/as.vax/as.1 6.5 SCCS-vsn: usr.bin/what/what.1 6.2 SCCS-vsn: usr.bin/systat/systat.1 6.8 SCCS-vsn: usr.bin/at/at/at.1 6.4 SCCS-vsn: bin/cat/cat.1 6.11 SCCS-vsn: usr.bin/at/atq/atq.1 6.4 SCCS-vsn: usr.bin/at/atrm/atrm.1 6.4 SCCS-vsn: old/awk/awk.1 6.4 SCCS-vsn: usr.bin/basename/basename.1 6.4 SCCS-vsn: usr.bin/bc/bc.1 6.6 SCCS-vsn: usr.bin/biff/biff.1 6.4 SCCS-vsn: usr.bin/cal/cal.1 6.7 SCCS-vsn: usr.bin/calendar/calendar.1 6.9 SCCS-vsn: bin/cat/cat.1 6.12 SCCS-vsn: usr.bin/pascal/eyacc/eyacc.1 6.3 SCCS-vsn: old/pcc/cc/cc.1 6.6 SCCS-vsn: share/man/man1/cd.1 6.3 SCCS-vsn: usr.bin/checknr/checknr.1 6.5 SCCS-vsn: usr.sbin/chown/chgrp.1 6.5 SCCS-vsn: bin/chmod/chmod.1 6.10 SCCS-vsn: usr.bin/chpass/chpass.1 5.9 SCCS-vsn: usr.bin/cmp/cmp.1 6.4 SCCS-vsn: usr.bin/col/col.1 6.6 SCCS-vsn: usr.bin/colcrt/colcrt.1 6.6 SCCS-vsn: usr.bin/colrm/colrm.1 6.5 SCCS-vsn: usr.bin/column/column.1 5.6 SCCS-vsn: usr.bin/comm/comm.1 6.4 SCCS-vsn: usr.bin/compress/compress.1 6.8 SCCS-vsn: bin/cp/cp.1 6.11 SCCS-vsn: old/cpio/cpio.1 5.5 SCCS-vsn: bin/csh/csh.1 6.14 SCCS-vsn: usr.bin/ctags/ctags.1 6.7 SCCS-vsn: usr.bin/cut/cut.1 5.3 SCCS-vsn: bin/date/date.1 6.8 SCCS-vsn: old/dbx/dbx.1 6.5 SCCS-vsn: usr.bin/dc/dc.1 6.4 SCCS-vsn: bin/dd/dd.1 6.3 SCCS-vsn: usr.bin/deroff/deroff.1 6.4 SCCS-vsn: bin/df/df.1 6.7 SCCS-vsn: usr.bin/diction/diction/diction.1 4.5 SCCS-vsn: usr.bin/diff/diff/diff.1 6.6 SCCS-vsn: usr.bin/diff/diff3/diff3.1 6.4 SCCS-vsn: usr.bin/du/du.1 6.7 SCCS-vsn: bin/echo/echo.1 6.4 SCCS-vsn: bin/ed/ed.1 6.5 SCCS-vsn: usr.bin/error/error.1 6.5 SCCS-vsn: usr.bin/ex/ex.1 6.6 SCCS-vsn: usr.bin/expand/expand.1 6.5 SCCS-vsn: usr.bin/pascal/eyacc/eyacc.1 6.4 SCCS-vsn: usr.bin/f77/f77.vax/f77.1 6.7 SCCS-vsn: usr.bin/false/false.1 6.3 SCCS-vsn: usr.bin/file/file.1 6.3 SCCS-vsn: usr.bin/find/find.1 6.15 SCCS-vsn: usr.bin/finger/finger.1 6.11 SCCS-vsn: usr.bin/fmt/fmt.1 6.6 SCCS-vsn: usr.bin/fpr/fpr.1 6.7 SCCS-vsn: usr.bin/from/from.1 6.5 SCCS-vsn: usr.bin/fsplit/fsplit.1 6.5 SCCS-vsn: usr.bin/ftp/ftp.1 6.15 SCCS-vsn: usr.bin/gcore/gcore.1 6.3 SCCS-vsn: usr.bin/gprof/gprof.1 6.6 SCCS-vsn: usr.bin/graph/graph.1 6.3 SCCS-vsn: usr.bin/grep/egrep/grep.1 6.5 SCCS-vsn: old/groups/groups.1 6.3 SCCS-vsn: usr.bin/head/head.1 6.4 SCCS-vsn: usr.bin/hexdump/hexdump.1 5.10 SCCS-vsn: bin/hostname/hostname.1 6.6 SCCS-vsn: usr.bin/indent/indent.1 6.8 SCCS-vsn: usr.bin/xinstall/install.1 6.9 SCCS-vsn: usr.bin/join/join.1 6.3 SCCS-vsn: usr.bin/kdump/kdump.1 1.3 SCCS-vsn: bin/kill/kill.1 6.4 SCCS-vsn: usr.bin/ktrace/ktrace.1 1.3 SCCS-vsn: usr.bin/last/last.1 6.6 SCCS-vsn: usr.bin/lastcomm/lastcomm.1 6.6 SCCS-vsn: old/ld/ld.1 6.4 SCCS-vsn: usr.bin/learn/learn/learn.1 6.5 SCCS-vsn: usr.bin/leave/leave.1 6.4 SCCS-vsn: old/pcc/lint/lpass1/lint.1 6.5 SCCS-vsn: bin/ln/ln.1 6.5 SCCS-vsn: usr.bin/locate/locate/locate.1 5.3 SCCS-vsn: usr.bin/lock/lock.1 6.7 SCCS-vsn: usr.bin/logger/logger.1 6.6 SCCS-vsn: usr.bin/login/login.1 6.8 SCCS-vsn: usr.bin/look/look.1 6.4 SCCS-vsn: old/refer/lookbib/lookbib.1 6.3 SCCS-vsn: usr.bin/lorder/lorder.1 6.5 SCCS-vsn: usr.sbin/lpr/lpq/lpq.1 6.8 SCCS-vsn: usr.sbin/lpr/lpr/lpr.1 6.7 SCCS-vsn: usr.sbin/lpr/lprm/lprm.1 6.5 SCCS-vsn: usr.sbin/lpr/lptest/lptest.1 6.5 SCCS-vsn: usr.bin/m4/m4.1 6.6 SCCS-vsn: old/machine/machine.1 5.3 SCCS-vsn: usr.bin/mail/mail.1 6.16 SCCS-vsn: usr.bin/make/make.1 5.3 SCCS-vsn: usr.bin/mesg/mesg.1 6.5 SCCS-vsn: usr.bin/mkdep/mkdep.1 5.10 SCCS-vsn: bin/mkdir/mkdir.1 6.6 SCCS-vsn: usr.bin/mkfifo/mkfifo.1 5.3 SCCS-vsn: usr.bin/mkstr/mkstr.1 6.4 SCCS-vsn: usr.bin/more/more.1 5.13 SCCS-vsn: usr.bin/msgs/msgs.1 6.6 SCCS-vsn: usr.bin/mt/mt.1 6.5 SCCS-vsn: usr.sbin/mtree/mtree.8 5.7 SCCS-vsn: bin/mv/mv.1 6.5 SCCS-vsn: usr.bin/netstat/netstat.1 6.11 SCCS-vsn: usr.sbin/sendmail/src/newaliases.1 6.4 SCCS-vsn: usr.bin/nfsstat/nfsstat.1 5.3 SCCS-vsn: usr.bin/nice/nice.1 6.5 SCCS-vsn: usr.bin/nm/nm.1 6.4 SCCS-vsn: usr.bin/nohup/nohup.1 6.5 SCCS-vsn: old/roff/nroff/nroff.1 6.5 SCCS-vsn: usr.bin/hexdump/od.1 5.3 SCCS-vsn: usr.bin/pagesize/pagesize.1 6.4 SCCS-vsn: usr.bin/passwd/passwd.1 6.8 SCCS-vsn: usr.bin/paste/paste.1 5.3 SCCS-vsn: usr.bin/plot/plot.1 6.6 SCCS-vsn: old/pr/pr.1 6.3 SCCS-vsn: usr.bin/printenv/printenv.1 6.4 SCCS-vsn: usr.bin/printf/printf.1 5.8 SCCS-vsn: usr.bin/ptx/ptx.1 6.4 SCCS-vsn: bin/pwd/pwd.1 6.3 SCCS-vsn: usr.bin/quota/quota.1 6.6 SCCS-vsn: usr.bin/ranlib/ranlib.1 6.4 SCCS-vsn: old/ratfor/ratfor.1 6.4 SCCS-vsn: bin/rcp/rcp.1 6.11 SCCS-vsn: usr.bin/rdist/rdist.1 6.9 SCCS-vsn: old/refer/refer/refer.1 6.4 SCCS-vsn: usr.bin/rlogin/rlogin.1 6.16 SCCS-vsn: bin/rm/rm.1 6.4 SCCS-vsn: bin/rmail/rmail.8 6.6 SCCS-vsn: bin/rmdir/rmdir.1 6.3 SCCS-vsn: old/refer/OTHERS/roffbib.1 6.3 SCCS-vsn: usr.bin/rsh/rsh.1 6.8 SCCS-vsn: usr.bin/ruptime/ruptime.1 6.7 SCCS-vsn: usr.bin/rwho/rwho.1 6.5 SCCS-vsn: usr.bin/sccs/sccs.1 2.8 SCCS-vsn: usr.bin/script/script.1 6.3 SCCS-vsn: libexec/bugfiler/sendbug.1 6.6 SCCS-vsn: old/sh/sh.1 6.6 SCCS-vsn: usr.bin/size/size.1 6.3 SCCS-vsn: bin/sleep/sleep.1 6.3 SCCS-vsn: bin/stty/stty.1 6.7 SCCS-vsn: usr.bin/systat/systat.1 6.9 SCCS-vsn: usr.bin/telnet/telnet.1 6.11 SCCS-vsn: usr.bin/tip/tip.1 6.6 SCCS-vsn: usr.bin/tset/tset.1 6.5 SCCS-vsn: usr.bin/window/window.1 6.13 --- usr/src/bin/cat/cat.1 | 12 +- usr/src/bin/chmod/chmod.1 | 17 +- usr/src/bin/cp/cp.1 | 105 +++---- usr/src/bin/csh/csh.1 | 201 ++++++++++---- usr/src/bin/date/date.1 | 48 ++-- usr/src/bin/dd/dd.1 | 32 ++- usr/src/bin/df/df.1 | 4 +- usr/src/bin/echo/echo.1 | 8 +- usr/src/bin/ed/ed.1 | 13 +- usr/src/bin/hostname/hostname.1 | 5 +- usr/src/bin/kill/kill.1 | 7 +- usr/src/bin/ln/ln.1 | 37 +-- usr/src/bin/mkdir/mkdir.1 | 50 ++-- usr/src/bin/mv/mv.1 | 3 +- usr/src/bin/pwd/pwd.1 | 2 +- usr/src/bin/rcp/rcp.1 | 4 +- usr/src/bin/rm/rm.1 | 11 +- usr/src/bin/rmail/rmail.8 | 2 +- usr/src/bin/rmdir/rmdir.1 | 122 ++++---- usr/src/bin/sleep/sleep.1 | 114 +++++--- usr/src/bin/stty/stty.1 | 6 +- usr/src/libexec/bugfiler/sendbug.1 | 68 +++-- usr/src/old/adb/common_source/adb.1 | 53 ++-- usr/src/old/as.vax/as.1 | 13 +- usr/src/old/awk/awk.1 | 40 +-- usr/src/old/cpio/cpio.1 | 33 ++- usr/src/old/dbx/dbx.1 | 40 +-- usr/src/old/groups/groups.1 | 2 +- usr/src/old/ld/ld.1 | 11 +- usr/src/old/machine/machine.1 | 2 +- usr/src/old/pcc/cc/cc.1 | 27 +- usr/src/old/pcc/lint/lpass1/lint.1 | 9 +- usr/src/old/pr/pr.1 | 49 +++- usr/src/old/ratfor/ratfor.1 | 2 +- usr/src/old/refer/OTHERS/roffbib.1 | 198 +++++++------ usr/src/old/refer/addbib/addbib.1 | 27 +- usr/src/old/refer/lookbib/lookbib.1 | 192 ++++++++----- usr/src/old/refer/refer/refer.1 | 309 +++++++++++---------- usr/src/old/roff/nroff/nroff.1 | 2 +- usr/src/old/sh/sh.1 | 4 +- usr/src/share/man/man1/cd.1 | 6 +- usr/src/usr.bin/apply/apply.1 | 6 +- usr/src/usr.bin/apropos/apropos.1 | 11 +- usr/src/usr.bin/ar/ar.1 | 9 +- usr/src/usr.bin/at/at/at.1 | 72 ++--- usr/src/usr.bin/at/atq/atq.1 | 23 +- usr/src/usr.bin/at/atrm/atrm.1 | 14 +- usr/src/usr.bin/basename/basename.1 | 44 ++- usr/src/usr.bin/bc/bc.1 | 53 ++-- usr/src/usr.bin/biff/biff.1 | 12 +- usr/src/usr.bin/cal/cal.1 | 12 +- usr/src/usr.bin/calendar/calendar.1 | 8 +- usr/src/usr.bin/checknr/checknr.1 | 21 +- usr/src/usr.bin/chpass/chpass.1 | 24 +- usr/src/usr.bin/cmp/cmp.1 | 74 ++--- usr/src/usr.bin/col/col.1 | 4 +- usr/src/usr.bin/colcrt/colcrt.1 | 9 +- usr/src/usr.bin/colrm/colrm.1 | 7 +- usr/src/usr.bin/column/column.1 | 16 +- usr/src/usr.bin/comm/comm.1 | 7 +- usr/src/usr.bin/compress/compress.1 | 10 +- usr/src/usr.bin/ctags/ctags.1 | 29 +- usr/src/usr.bin/cut/cut.1 | 8 +- usr/src/usr.bin/dc/dc.1 | 5 +- usr/src/usr.bin/deroff/deroff.1 | 2 +- usr/src/usr.bin/diction/diction/diction.1 | 10 +- usr/src/usr.bin/diff/diff/diff.1 | 165 ++++++----- usr/src/usr.bin/diff/diff3/diff3.1 | 94 +++---- usr/src/usr.bin/du/du.1 | 3 +- usr/src/usr.bin/error/error.1 | 15 +- usr/src/usr.bin/ex/ex.1 | 4 +- usr/src/usr.bin/expand/expand.1 | 9 +- usr/src/usr.bin/f77/f77.vax/f77.1 | 37 +-- usr/src/usr.bin/false/false.1 | 2 +- usr/src/usr.bin/file/file.1 | 2 +- usr/src/usr.bin/find/find.1 | 14 +- usr/src/usr.bin/finger/finger.1 | 3 +- usr/src/usr.bin/fmt/fmt.1 | 2 +- usr/src/usr.bin/fpr/fpr.1 | 2 +- usr/src/usr.bin/from/from.1 | 2 +- usr/src/usr.bin/fsplit/fsplit.1 | 2 +- usr/src/usr.bin/ftp/ftp.1 | 253 +++++++++-------- usr/src/usr.bin/gcore/gcore.1 | 2 +- usr/src/usr.bin/gprof/gprof.1 | 2 +- usr/src/usr.bin/graph/graph.1 | 2 +- usr/src/usr.bin/grep/egrep/grep.1 | 17 +- usr/src/usr.bin/head/head.1 | 2 +- usr/src/usr.bin/hexdump/hexdump.1 | 115 +++++--- usr/src/usr.bin/hexdump/od.1 | 10 +- usr/src/usr.bin/indent/indent.1 | 6 +- usr/src/usr.bin/join/join.1 | 83 ++++-- usr/src/usr.bin/kdump/kdump.1 | 114 +++++--- usr/src/usr.bin/ktrace/ktrace.1 | 238 ++++++++-------- usr/src/usr.bin/last/last.1 | 15 +- usr/src/usr.bin/lastcomm/lastcomm.1 | 41 +-- usr/src/usr.bin/learn/learn/learn.1 | 2 +- usr/src/usr.bin/leave/leave.1 | 21 +- usr/src/usr.bin/locate/locate/locate.1 | 2 +- usr/src/usr.bin/lock/lock.1 | 2 +- usr/src/usr.bin/logger/logger.1 | 2 +- usr/src/usr.bin/login/login.1 | 10 +- usr/src/usr.bin/look/look.1 | 7 +- usr/src/usr.bin/lorder/lorder.1 | 53 ++-- usr/src/usr.bin/m4/m4.1 | 45 +-- usr/src/usr.bin/mail/mail.1 | 30 +- usr/src/usr.bin/make/make.1 | 35 +-- usr/src/usr.bin/mesg/mesg.1 | 92 ++++-- usr/src/usr.bin/mkdep/mkdep.1 | 81 ++++-- usr/src/usr.bin/mkfifo/mkfifo.1 | 52 ++-- usr/src/usr.bin/mkstr/mkstr.1 | 153 +++++----- usr/src/usr.bin/more/more.1 | 40 ++- usr/src/usr.bin/msgs/msgs.1 | 11 +- usr/src/usr.bin/mt/mt.1 | 7 +- usr/src/usr.bin/netstat/netstat.1 | 10 +- usr/src/usr.bin/nfsstat/nfsstat.1 | 2 +- usr/src/usr.bin/nice/nice.1 | 4 +- usr/src/usr.bin/nm/nm.1 | 2 +- usr/src/usr.bin/nohup/nohup.1 | 4 +- usr/src/usr.bin/pagesize/pagesize.1 | 2 +- usr/src/usr.bin/pascal/eyacc/eyacc.1 | 7 +- usr/src/usr.bin/passwd/passwd.1 | 2 +- usr/src/usr.bin/paste/paste.1 | 5 +- usr/src/usr.bin/plot/plot.1 | 2 +- usr/src/usr.bin/printenv/printenv.1 | 10 +- usr/src/usr.bin/printf/printf.1 | 20 +- usr/src/usr.bin/ptx/ptx.1 | 4 +- usr/src/usr.bin/quota/quota.1 | 53 ++-- usr/src/usr.bin/ranlib/ranlib.1 | 58 ++-- usr/src/usr.bin/rdist/rdist.1 | 10 +- usr/src/usr.bin/rlogin/rlogin.1 | 160 ++++++----- usr/src/usr.bin/rsh/rsh.1 | 179 ++++++------ usr/src/usr.bin/ruptime/ruptime.1 | 91 +++--- usr/src/usr.bin/rwho/rwho.1 | 2 +- usr/src/usr.bin/sccs/sccs.1 | 2 +- usr/src/usr.bin/script/script.1 | 129 ++++++--- usr/src/usr.bin/size/size.1 | 50 ++-- usr/src/usr.bin/systat/systat.1 | 4 +- usr/src/usr.bin/telnet/telnet.1 | 152 +--------- usr/src/usr.bin/tip/tip.1 | 27 +- usr/src/usr.bin/tset/tset.1 | 8 +- usr/src/usr.bin/what/what.1 | 2 +- usr/src/usr.bin/window/window.1 | 2 +- usr/src/usr.bin/xinstall/install.1 | 13 +- usr/src/usr.sbin/chown/chgrp.1 | 15 +- usr/src/usr.sbin/lpr/lpq/lpq.1 | 9 +- usr/src/usr.sbin/lpr/lpr/lpr.1 | 162 ++++++----- usr/src/usr.sbin/lpr/lprm/lprm.1 | 173 +++++++----- usr/src/usr.sbin/lpr/lptest/lptest.1 | 51 ++-- usr/src/usr.sbin/mtree/mtree.8 | 8 +- usr/src/usr.sbin/sendmail/src/newaliases.1 | 46 ++- 150 files changed, 3178 insertions(+), 2583 deletions(-) diff --git a/usr/src/bin/cat/cat.1 b/usr/src/bin/cat/cat.1 index 489cd8ef18..2bd3af3da0 100644 --- a/usr/src/bin/cat/cat.1 +++ b/usr/src/bin/cat/cat.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cat.1 6.10 (Berkeley) %G% +.\" @(#)cat.1 6.12 (Berkeley) %G% .\" .Dd .Dt CAT 1 @@ -26,6 +26,7 @@ operands are processed in command line order. A single dash represents standard input. .Pp The options are as follows: +.Tw Ds .Tp Fl b Implies the .Fl n @@ -48,7 +49,8 @@ Implies the option, and displays tab characters as ``^I'' as well. .Tp Fl u The -.Fl u option guarantees that the output is unbuffered. +.Fl u +option guarantees that the output is unbuffered. .Tp Fl v Displays non-printing characters so they are visible. Control characters print line ``^X'' for control-X; the delete @@ -57,7 +59,7 @@ Non-ascii characters (with the high bit set) are printed as `.`M-'' (for meta) followed by the character for the low 7 bits. .Tp .Pp -.Nm cat +.Nm Cat is useful for getting files into a pipe, for instance, to sort two files together, the command @@ -70,10 +72,10 @@ newly sorted data in file3. .Pp Because of the shell language mechanism used to perform output redirection, the command ``cat file1 file 2 > file1'' will cause -the original data in file1 to be destroyed! +.P original data in file1 to be destroyed! .Pp .Nm Cat -utility exits 0 on success, and >0 if an error +The cat utility exits 0 on success, and >0 if an error occurs. .Sh SEE ALSO .Xr head 1 , diff --git a/usr/src/bin/chmod/chmod.1 b/usr/src/bin/chmod/chmod.1 index 516d889934..1905247a50 100644 --- a/usr/src/bin/chmod/chmod.1 +++ b/usr/src/bin/chmod/chmod.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)chmod.1 6.9 (Berkeley) %G% +.\" @(#)chmod.1 6.10 (Berkeley) %G% .\" .Dd .Dt CHMOD 1 @@ -25,6 +25,7 @@ as specified by the operand. .Pp The options are as follows: +.Tw Ds .Tp Fl f .Nm chmod will still exit 0 and not complain if it fails to change the mode @@ -52,6 +53,8 @@ An absolute mode is an octal number constructed by .Cx 'ing .Cx the following values: +.Df I +.Dw Fl .Dp Li 4000 set-user-ID-on-execution .Dp Li 2000 @@ -69,6 +72,7 @@ read, write, execute/search by group .Dp Li 0007 read, write, execute/search by others .Dp +.De .Pp The read, write, and execute/search values for group and others are encoded as described for owner. @@ -107,7 +111,7 @@ symbol ``a'' is equivalent to ``ugo''. The .Ar perm symbols represent the portions of the mode bits as follows: -.Dw Fl +.Dw Ds .Dp r The read bits. .Dp s @@ -131,7 +135,7 @@ symbol ``+'', and it is ignored in all other cases. The .Ar op symbols represent the operation performed, as follows: -.Tw Fl +.Tw Ds .Tp \&+ If no value is supplied for .Ar perm , @@ -190,7 +194,7 @@ Operations upon the other permissions only (specified by the symbol .Ar perm symbols ``s'' or ``t'', are ignored. .Sh EXAMPLES -.Tw Fl +.Tw Ar .Tp ``644'' make a file readable by anyone and writable by the owner only. .Tp ``go-w'' @@ -210,11 +214,10 @@ clear all mode bits for group and others. There's no .Ar perm option for the naughty bits. -.Sh ENVIRONMENT .Sh SEE ALSO .Xr install 1 , .Xr chmod 2 , -.Xr fts 3 , +.Xr fts 2 , .Xr stat 2 , .Xr umask 2 , .Xr setmode 3 , @@ -222,7 +225,7 @@ option for the naughty bits. .Sh STANDARDS The .Nm chmod -function is expected to be POSIX 1003.2 compatible with the exception +utility is expected to be POSIX 1003.2 compatible with the exception of the .Ar perm symbols ``t'' and ``X'' which are not included in that standard. diff --git a/usr/src/bin/cp/cp.1 b/usr/src/bin/cp/cp.1 index afb838b2cf..8220fdadf2 100644 --- a/usr/src/bin/cp/cp.1 +++ b/usr/src/bin/cp/cp.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cp.1 6.10 (Berkeley) %G% +.\" @(#)cp.1 6.11 (Berkeley) %G% .\" .Dd .Dt CP 1 @@ -13,29 +13,39 @@ .Nd copy files .Sh SYNOPSIS .Nm cp -.Op Fl fhip +.Op Fl Rfhip .Ar source_file target_file -.br .Nm cp .Op Fl Rfhip .Ar source_file ... target_directory .Sh DESCRIPTION -In the first synopsis form, +In the first synopsis form, the .Nm cp utility copies the contents of the .Ar source_file to the -.Ar target_file -or, in the second synopsis form, +.Ar target_file . +In the second synopsis form, the contents of each named -.Ar source_file(s) +.Ar source_file is copied to the destination .Ar target_directory . The names of the files themselves are not changed. If .Nm cp detects an attempt to copy a file to itself, the copy will fail. +.Pp The following options are available: +.Tw Ds +.Tp Fl f +For each existing destination pathname, remove it and +create a new file, without prompting for confirmation +regardless of its permissions. +(The +.Fl i +option is ignored if the +.Fl f +option is specified.) .Tp Fl h Forces .Nm cp @@ -43,83 +53,78 @@ to follow symbolic links. Provided for the .Fl R option which does not follow symbolic links by default. -.Tp Fl f -Turns off the -.Fl i -option. -(The last -.Fl f -or -.Fl i -option overrides any previous specification of either option.) .Tp Fl i Causes .Nm cp to write a prompt to standard error before copying a file that would overwrite an existing file. -If the response from the standard input begins with the character ``y'', -the file is copied if permissions allow. -(The last -.Fl f -or -.Fl i -option overrides any previous specification of either option.) +If the response from the standard input begins with the character +.Sq Li y , +the file is copied if permissions allow the copy. .Tp Fl p Causes .Nm cp to preserve in the copy as many of the modification time, access time, -.\" and file mode as allowed by permissions. file mode, user ID, and group ID as allowed by permissions. .Pp If the user ID and group ID cannot be preserved, no error message is displayed and the exit value is not altered. .Pp -If the source file is set user ID or set group ID, and either the user -ID or the group ID cannot be preserved, the set user ID and set group -ID bits are not preserved in the copy's permissions. +If the source file has its set user ID bit on and the user ID cannot +be preserved, the set user ID bit is not preserved +in the copy's permissions. +If the source file has its set group ID bit on and the group ID cannot +be preserved, the set group ID bit is not preserved +in the copy's permissions. +If the source file has both the set user ID and set group ID bits +on and either the user ID or group ID cannot be preserved, neither +the set user ID or set group ID bits are preserved in the copy's +permissions. .Tp Fl R If .Ar source_file designates a directory, .Nm cp copies the directory and the entire subtree connected at that point. -Special file types, such as symbolic links and block and character -devices, are recreated instead of being copied. +This option also causes symbolic links to be copied, rather than +indirected through, and for +.Nm cp +to create special files rather than copying them as normal files. Created directories have the same mode as the corresponding source -directory, unmodified by the process' file mode creation mask (umask). -.Tp Fl r -The -.Fl r -option is identical to the -.Fl R -option with the exception that it does not treat special files -differently from regular files. -Symbolic links are always followed. -This option has been deprecated. +directory, unmodified by the process' umask. .Tp .Pp For each destination file that already exists, its contents are -overwritten if permissions allow, but -.Nm cp -will not change its mode, user ID, or group ID. -However, if the file is not being copied by the super-user, -writing the file may clear the set user ID or set group ID -permission bits. +overwritten if permissions allow, but its mode, user ID, and group +ID are unchanged. .Pp If the destination file does not exist, the mode of the source file is -used as modified by the file mode creation mask (umask). -If the source file is either set user ID or set group ID, those -bits are removed unless the source file and the destination -file are owned by the same user and group. +used as modified by the file mode creation mask +.Pf \&( Ic umask , +see +.Xr csh 1 ) . +If the source file has its set user ID bit on, that bit is removed +unless both the source file and the destination file are owned by the +same user. +If the source file has its set group ID bit on, that bit is removed +unless both the source file and the destination file are in the same +group and the user is a member of that group. +If both the set user ID and set group ID bits are set, all of the above +conditions must be fulfilled or both bits are removed. .Pp Appropriate permissions are required for file creation or overwriting. .Pp +Symbolic links are followed unless the +.Fl R +option is specified, in which case the link itself is copied. +.Pp .Nm Cp exits 0 on success, >0 if an error occurred. .Sh SEE ALSO .Xr mv 1 , .Xr rcp 1 , -.Xr umask 2 +.Xr umask 2 , +.Xr csh 1 .Sh HISTORY The .Nm cp diff --git a/usr/src/bin/csh/csh.1 b/usr/src/bin/csh/csh.1 index 260f8b7467..164ad77e4a 100644 --- a/usr/src/bin/csh/csh.1 +++ b/usr/src/bin/csh/csh.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)csh.1 6.13 (Berkeley) %G% +.\" @(#)csh.1 6.14 (Berkeley) %G% .\" .Dd .Dt CSH 1 @@ -30,7 +30,7 @@ and a C-like syntax. It is used both as an interactive login shell and a shell script command processor. .Ss Argument list processing If the first argument (argument 0) to the shell is -.Fl +.Sq Fl then this is a login shell. The flag arguments are interpreted as follows: @@ -81,7 +81,8 @@ variable to be set, so that commands are echoed immediately before execution. .Tp Fl V Causes the .Ar verbose -variable to be set even before `\&.cshrc' is executed. +variable to be set even before +.Pa \&.cshrc is executed. .Tp Fl X Is to .Fl x @@ -97,7 +98,7 @@ After processing of flag arguments, if arguments remain but none of the .Fl s , or .Fl t -options was given, the first argument is taken as the name of a file of +options were given, the first argument is taken as the name of a file of commands to be executed. The shell opens this file, and saves its name for possible resubstitution by `$0'. @@ -108,7 +109,7 @@ is not a `#', i.e. if the script does not start with a comment. Remaining arguments initialize the variable .Ar argv . .Pp -.\" An instance of +An instance of .Nm csh begins by executing commands from the file .Pa /etc/csh.cshrc @@ -151,9 +152,9 @@ directory and The shell splits input lines into words at blanks and tabs with the following exceptions. The characters -`&' `' `;' `<' `>' `(' `)' +`&' `\&|' `;' `<' `>' `(' `)' form separate words. -If doubled in `&&', `\\', `<<' or `>>' these pairs form single words. +If doubled in `&&', `\&|\&|', `<<' or `>>' these pairs form single words. These parser metacharacters may be made part of other words, or prevented their special meaning, by preceding them with `\e'. A newline preceded by a `\e' is equivalent to a blank. @@ -175,7 +176,7 @@ and in quotations using `\`', `\'', and `"'. A simple command is a sequence of words, the first of which specifies the command to be executed. A simple command or -a sequence of simple commands separated by `' characters +a sequence of simple commands separated by `\&|' characters forms a pipeline. The output of each command in a pipeline is connected to the input of the next. Sequences of pipelines may be separated by `;', and are then executed @@ -185,11 +186,11 @@ waiting for it to terminate by following it with an `&'. .Pp Any of the above may be placed in `(' `)' to form a simple command (which may be a component of a pipeline, etc.) -It is also possible to separate pipelines with `\\' or `&&' indicating, +It is also possible to separate pipelines with `\&|\&|' or `&&' indicating, as in the C language, that the second is to be executed only if the first fails or succeeds respectively. (See -.Ar Expressions . ) +.Em Expressions . ) .Ss Jobs The shell associates a .Ar job @@ -487,12 +488,12 @@ abbreviates .Ar `\&0\-y\' .Dp \&* abbreviates `\*(ua\-$', or nothing if only 1 word in event -.Dp Ar x\* +.Dp Ar x\&* abbreviates .Ar `x\-$\' .Dp Ar x\- like -.Ar `x\*\' +.Ar `x\&*\' but omitting word `$' .Dp .Pp @@ -509,7 +510,7 @@ Remove a trailing pathname component, leaving the head. Remove a trailing `.xxx' component, leaving the root name. .Dp e Remove all but the extension `.xxx' part. -.Cx s/ +.Dp Cx s/ .Ar l .Cx \/ .Ar r @@ -580,7 +581,7 @@ if necessary to insulate it from the characters which follow. Thus, after `ls \-ld ~paul' we might do `!{l}a' to do `ls \-ld ~paula', while `!la' would look for a command starting `la'. .Pp -.Ss Quotations with \' and \*(Lq +.Ss Quotations with \' and \&" The quotation of strings by `\'' and `"' can be used to prevent all or some of the remaining substitutions. Strings enclosed in `\'' are prevented any further interpretation. @@ -588,7 +589,7 @@ Strings enclosed in `"' may be expanded as described below. .Pp In both cases the resulting text becomes (all or part of) a single word; only in one special case (see -.Nm "Command Substitition" +.Em Command Substitition below) does a `"' quoted string yield parts of more than one word; `\'' quoted strings never do. .Ss Alias substitution @@ -621,7 +622,7 @@ by flagging it to prevent further aliasing. Other loops are detected and cause an error. .Pp Note that the mechanism allows aliases to introduce parser metasyntax. -Thus we can `alias print \'pr \e!* \\ lpr\'' to make a command which +Thus we can `alias print \'pr \e!* \&| lpr\'' to make a command which .Ar pr 's its arguments to the line printer. .Ss Variable substitution @@ -689,6 +690,7 @@ The following metasequences are provided for introducing variable values into the shell input. Except as noted, it is an error to reference a variable which is not set. .Dw Ds +.Di L .Dp $name .Dp ${name} Are replaced by the words of the value of variable @@ -707,6 +709,7 @@ that value is returned (but .Nm : modifiers and the other forms given below are not available in this case). +.Pp .Dp Cx $name .Op selector .Cx @@ -724,6 +727,7 @@ If the last member of a range is omitted it defaults to `$#name'. The selector `*' selects all words. It is not an error for a range to be empty if the second argument is omitted or in range. +.Pp .Dp $#name .Dp ${#name} Gives the number of words in the variable. @@ -732,9 +736,11 @@ This is useful for later use in a .Op selector .Cx \' . .Cx +.Pp .Dp $0 Substitutes the name of the file from which command input is being read. An error occurs if the name is not known. +.Pp .Dp $number .Dp ${number} Equivalent to @@ -742,26 +748,34 @@ Equivalent to .Op number .Cx \' . .Cx +.Pp +.Dp $* Equivalent to .Cx `$argv .Op * .Cx \' . .Cx -.Pp The modifiers `:e', `:h', `:t', `:r', `:q' and `:x' may be applied to the substitutions above as may `:gh', `:gt' and `:gr'. If braces `{' '}' appear in the command form then the modifiers must appear within the braces. The current implementation allows only one `:' modifier on each `$' expansion. +.Dp .Pp The following substitutions may not be modified with `:' modifiers. +.Pp +.Dw Ds +.Di L .Dp $?name .Dp ${?name} Substitutes the string `1' if name is set, `0' if it is not. +.Pp .Dp $?0 Substitutes `1' if the current input filename is known, `0' if it is not. +.Pp .Dp $$ Substitute the (decimal) process number of the (parent) shell. +.Pp .Dp $< Substitutes a line from the standard input, with no further interpretation thereafter. It can be used @@ -788,8 +802,7 @@ In any case, the single final newline does not force a new word. Note that it is thus possible for a command substitution to yield only part of a word, even if the command outputs a complete line. .Ss Filename substitution -If a word contains any of the characters `*', `?', ` -.Op ' or `{' +If a word contains any of the characters `*', `?', `[' or `{' or begins with the character `~', then that word is a candidate for filename substitution, also known as `globbing'. This word is then regarded as a pattern, and replaced with an alphabetically @@ -797,8 +810,7 @@ sorted list of file names which match the pattern. In a list of words specifying filename substitution it is an error for no pattern to match an existing file name, but it is not required for each pattern to match. -Only the metacharacters `*', `?' and ` -.Op ' imply pattern matching, +Only the metacharacters `*', `?' and `[' imply pattern matching, the characters `~' and `{' being more akin to abbreviations. .Pp In matching filenames, the character `.' at the beginning of a filename @@ -807,12 +819,11 @@ be matched explicitly. The character `*' matches any string of characters, including the null string. The character `?' matches any single character. -The sequence ` -.Op ... -' matches any one of the characters enclosed. -Within ` -.Op ... -', +The sequence +.Sq Op ... +matches any one of the characters enclosed. +Within +.Sq Op ... , a pair of characters separated by `\-' matches any character lexically between the two. .Pp @@ -844,11 +855,13 @@ As a special case `{', `}' and `{}' are passed undisturbed. The standard input and standard output of a command may be redirected with the following syntax: .Dw Ds +.Di L .Dp < name Open file .Ar name (which is first variable, command and filename expanded) as the standard input. +.Pp .Dp << word Read the shell input up to a line which is identical to .Ar word . @@ -865,6 +878,7 @@ Commands which are substituted have all blanks, tabs, and newlines preserved, except for the final newline which is dropped. The resultant text is placed in an anonymous temporary file which is given to the command as standard input. +.Pp .Dp > name .Dp >! name .Dp >& name @@ -886,6 +900,7 @@ The forms involving `&' route the diagnostic output into the specified file as well as the standard output. .Ar Name is expanded in the same way as `<' input filenames are. +.Pp .Dp >> name .Dp >>& name .Dp >>! name @@ -921,7 +936,7 @@ will block and the user will be notified (see above). .Pp Diagnostic output may be directed through a pipe with the standard output. -Simply use the form `\&' rather than just `'. +Simply use the form `\&|&' rather than just `\&|'. .Ss Expressions A number of the builtin commands (to be described subsequently) take expressions, in which the operators are similar to those of C, with @@ -936,7 +951,7 @@ commands. The following operators are available: .Pp .Ds I -\\ && \*(ua & == != =~ !~ <= >= < > +\&|\&| && \&| *(ua & == != =~ !~ <= >= < > << >> + \- * / % ! ~ ( ) .De .Pp @@ -964,7 +979,7 @@ The result of all expressions are strings, which represent decimal numbers. It is important to note that no two components of an expression can appear in the same word; except when adjacent to components of expressions which -are syntactically significant to the parser (`&' `' `<' `>' `(' `)') +are syntactically significant to the parser (`&' `\&|' `<' `>' `(' `)') they should be surrounded by spaces. .Pp Also available in expressions as primitive operands are command executions @@ -1029,7 +1044,7 @@ Builtin commands are executed within the shell. If a builtin command occurs as any component of a pipeline except the last then it is executed in a subshell. .Dw Ds -.Ds L +.Di L .Dp Ic alias .Dp Cx Ic alias .Cx \&\ \& @@ -1052,6 +1067,7 @@ is not allowed to be .Ar alias or .Ar unalias . +.Pp .Dp Ic alloc Shows the amount of dynamic memory acquired, broken down into used and free memory. @@ -1059,12 +1075,14 @@ With an argument shows the number of free and used blocks in each size category. The categories start at size 8 and double at each step. This command's output may vary across system types, since systems other than the VAX may use a different memory allocator. +.Pp .Dp Ic bg .Dp Cx Ic bg \&% .Ar job ... .Cx Puts the current or specified jobs into the background, continuing them if they were stopped. +.Pp .Dp Ic break Causes execution to resume after the .Ic end @@ -1074,11 +1092,13 @@ or .Ic while . The remaining commands on the current line are executed. Multi-level breaks are thus possible by writing them all on one line. +.Pp .Dp Ic breaksw Causes a break from a .Ic switch , resuming after the .Ic endsw . +.Pp .Dp Cx Ic case .Cx \&\ \& .Ar label : @@ -1086,6 +1106,7 @@ resuming after the A label in a .Ic switch statement as discussed below. +.Pp .Dp Ic cd .Dp Cx Ic cd .Cx \&\ \& @@ -1111,12 +1132,14 @@ Finally, if all else fails but .Ar name is a shell variable whose value begins with `/', then this is tried to see if it is a directory. +.Pp .Dp Ic continue Continue execution of the nearest enclosing .Ic while or .Ic foreach . The rest of the commands on the current line are executed. +.Pp .Dp Ic default : Labels the default case in a .Ic switch @@ -1124,9 +1147,11 @@ statement. The default should come after all .Ic case labels. +.Pp .Dp Ic dirs Prints the directory stack; the top of the stack is at the left, the first directory in the stack being the current directory. +.Pp .Dp Cx Ic echo .Cx \&\ \& .Ar wordlist @@ -1141,6 +1166,7 @@ The specified words are written to the shells standard output, separated by spaces, and terminated with a newline unless the .Fl n option is specified. +.Pp .Dp Ic else .Dp Ic end .Dp Ic endif @@ -1152,6 +1178,7 @@ See the description of the and .Ic while statements below. +.Pp .Dp Cx Ic eval .Cx \&\ \& .Ar arg ... @@ -1166,11 +1193,13 @@ parsing occurs before these substitutions. See .Xr tset 1 for an example of using .Ic eval . +.Pp .Dp Cx Ic exec .Cx \&\ \& .Ar command .Cx The specified command is executed in place of the current shell. +.Pp .Dp Ic exit .Dp Cx Ic exit .Cx \&\ \& @@ -1181,12 +1210,14 @@ The shell exits either with the value of the variable (first form) or with the value of the specified .Ic expr (second form). +.Pp .Dp Ic fg .Dp Cx Ic fg \&% .Ar job ... .Cx Brings the current or specified jobs into the foreground, continuing them if they were stopped. +.Pp .Dp Cx Ic foreach .Cx \&\ \& .Ar name (wordlist) @@ -1214,6 +1245,7 @@ to terminate it prematurely. When this command is read from the terminal, the loop is read up once prompting with `?' before any statements in the loop are executed. If you make a mistake typing in a loop at the terminal you can rub it out. +.Pp .Dp Cx Ic glob .Cx \&\ \& .Ar wordlist @@ -1224,6 +1256,7 @@ but no `\e' escapes are recognized and words are delimited by null characters in the output. Useful for programs which wish to use the shell to filename expand a list of words. +.Pp .Dp Cx Ic goto .Cx \&\ \& .Ar word @@ -1235,6 +1268,7 @@ The shell rewinds its input as much as possible and searches for a line of the form `label:' possibly preceded by blanks or tabs. Execution continues after the specified line. +.Pp .Dp Ic hashstat Print a statistics line indicating how effective the internal hash table has been at locating commands (and avoiding @@ -1247,6 +1281,7 @@ is attempted for each component of the .Em path where the hash function indicates a possible hit, and in each component which does not begin with a `/'. +.Pp .Dp Ic history .Dp Cx Ic history .Cx \&\ \& @@ -1279,6 +1314,7 @@ option causes the history list to be printed without leading numbers. This is used to produce files suitable for sourceing using the \-h option to .Ic source . +.Pp .Dp Cx Ic if .Cx \&\ \& .Cx \&( @@ -1303,6 +1339,7 @@ Input/output redirection occurs even if is false, when command is .Sy not executed (this is a bug). +.Pp .Dp Cx Ic if .Cx \&\ \& .Cx \&( @@ -1351,6 +1388,7 @@ the .Ic if must appear alone on its input line or after an .Ic else . ) +.Pp .Dp Ic jobs .Dp Cx Ic jobs .Cx \&\ \& @@ -1359,6 +1397,7 @@ must appear alone on its input line or after an Lists the active jobs; given the .Fl l options lists process id's in addition to the normal information. +.Pp .Dp Cx Ic kill % .Ar job .Cx @@ -1385,6 +1424,7 @@ There is no default, saying just `kill' does not send a signal to the current job. If the signal being sent is TERM (terminate) or HUP (hangup), then the job or process will be sent a CONT (continue) signal as well. +.Pp .Dp Ic limit .Dp Cx Ic limit .Cx \&\ \& @@ -1462,16 +1502,19 @@ For both .Ar resource names and scale factors, unambiguous prefixes of the names suffice. +.Pp .Dp Ic login Terminate a login shell, replacing it with an instance of .Pa /bin/login. This is one way to log off, included for compatibility with .Xr sh 1 . +.Pp .Dp Ic logout Terminate a login shell. Especially useful if .Ic ignoreeof is set. +.Pp .Dp Ic nice .Dp Cx Ic nice .Cx \&\ \& @@ -1490,7 +1533,8 @@ scheduling priority for this shell to 4. The second form sets the priority -to the given number. +to the given +.Ar number . The final two forms run command at priority 4 and .Ar number respectively. @@ -1500,6 +1544,7 @@ Command is always executed in a sub-shell, and the restrictions placed on commands in simple .Ic if statements apply. +.Pp .Dp Ic nohup .Dp Cx Ic nohup .Cx \&\ \& @@ -1513,6 +1558,7 @@ All processes detached with `&' are effectively .Cx Ic nohup .Cx \'ed . .Cx +.Pp .Dp Ic notify .Dp Cx Ic notify % .Cx \&\ \& @@ -1523,6 +1569,7 @@ current or specified jobs changes; normally notification is presented before a prompt. This is automatic if the shell variable .Ic notify is set. +.Pp .Dp Ic onintr .Dp Cx Ic onintr .Cx \&\ \& @@ -1546,6 +1593,7 @@ being ignored, all forms of .Ic onintr have no meaning and interrupts continue to be ignored by the shell and all invoked commands. +.Pp .Dp Ic popd .Dp Cx Ic popd .Cx \&\ \& @@ -1564,6 +1612,7 @@ discards the .Cx entry in the stack. The elements of the directory stack are numbered from 0 starting at the top. +.Pp .Dp Ic pushd .Dp Cx Ic pushd .Cx \&\ \& @@ -1594,6 +1643,7 @@ With a numeric argument, rotates the argument of the directory stack around to be the top element and changes to it. The members of the directory stack are numbered from the top starting at 0. +.Pp .Dp Ic rehash Causes the internal hash table of the contents of the directories in the @@ -1604,6 +1654,7 @@ to directories in the while you are logged in. This should only be necessary if you add commands to one of your own directories, or if a systems programmer changes the contents of one of the system directories. +.Pp .Dp Cx Ic repeat .Cx \&\ \& .Ar count command @@ -1622,6 +1673,7 @@ times. I/O redirections occur exactly once, even if .Ar count is 0. +.Pp .Dp Ic set .Dp Cx Ic set .Cx \&\ \& @@ -1667,6 +1719,7 @@ In all cases the value is command and filename expanded. These arguments may be repeated to set multiple values in a single set command. Note however, that variable expansion happens for all arguments before any setting occurs. +.Pp .Dp Ic setenv .Dp Cx Ic setenv .Cx \&\ \& @@ -1684,7 +1737,11 @@ to be a single string. The second form sets .Ar name to an empty string. -The most commonly used environment variable USER, TERM, and PATH +The most commonly used environment variable +.Ev USER , +.Ev TERM , +and +.Ev PATH are automatically imported to and exported from the .Nm csh variables @@ -1695,6 +1752,7 @@ and there is no need to use .Ic setenv for these. +.Pp .Dp Ic shift .Dp Cx Ic shift .Cx \&\ \& @@ -1710,6 +1768,7 @@ It is an error for .Ic argv not to be set or to have less than one word as value. The second form performs the same function on the specified variable. +.Pp .Dp Cx Ic source .Cx \&\ \& .Ar name @@ -1735,17 +1794,20 @@ Normally input during commands is not placed on the history list; the \-h option causes the commands to be placed in the history list without being executed. +.Pp .Dp Ic stop .Dp Cx Ic stop % .Ar job ... .Cx Stops the current or specified job which is executing in the background. +.Pp .Dp Ic suspend Causes the shell to stop in its tracks, much as if it had been sent a stop signal with .Ic ^Z . This is most often used to stop shells started by -.Xr su 1 . +.Xr su 1 . +.Pp .Dp Cx Ic switch .Cx \&\ \& .Ar (string) @@ -1764,11 +1826,7 @@ This is most often used to stop shells started by Each case label is successively matched, against the specified .Ar string which is first command and filename expanded. -The file metacharacters `*', `?' and -.Cx \&\ \& -.Op \&... -.Cx \' -.Cx +The file metacharacters `*', `?' and `[...]' may be used in the case labels, which are variable expanded. If none of the labels match before a `default' label is found, then @@ -1782,6 +1840,7 @@ Otherwise control may fall through case labels and default labels as in C. If no label matches and there is no default, execution continues after the .Ic endsw . +.Pp .Dp Ic time .Dp Cx Ic time .Cx \&\ \& @@ -1795,6 +1854,7 @@ as described under the .Ic time variable is printed. If necessary, an extra shell is created to print the time statistic when the command completes. +.Pp .Dp Ic umask .Dp Cx Ic umask .Cx \&\ \& @@ -1805,6 +1865,7 @@ value (second form). The mask is given in octal. Common values for the mask are 002 giving all access to the group and read and execute access to others or 022 giving all access except no write access for users in the group or others. +.Pp .Dp Cx Ic unalias .Cx \&\ \& .Ar pattern @@ -1813,9 +1874,11 @@ All aliases whose names match the specified pattern are discarded. Thus all aliases are removed by `unalias *'. It is not an error for nothing to be .Ic unaliased . +.Pp .Dp Ic unhash Use of the internal hash table to speed location of executed programs is disabled. +.Pp .Dp Ic unlimit .Dp Cx Ic unlimit .Cx \&\ \& @@ -1841,6 +1904,7 @@ limitations are removed. If .Fl h is given, the corresponding hard limits are removed. Only the super-user may do this. +.Pp .Dp Cx Ic unset .Cx \&\ \& .Ar pattern @@ -1850,6 +1914,7 @@ Thus all variables are removed by `unset *'; this has noticeably distasteful side-effects. It is not an error for nothing to be .Ic unset . +.Pp .Dp Cx Ic unsetenv .Cx \&\ \& .Ar pattern @@ -1859,11 +1924,13 @@ environment. See also the .Ic setenv command above and .Xr printenv 1 . +.Pp .Dp Ic wait All background jobs are waited for. It the shell is interactive, then an interrupt can disrupt the wait, at which time the shell prints names and job numbers of all jobs known to be outstanding. +.Pp .Dp Cx Ic while .Cx \&\ \& .Ar (expr) @@ -1886,11 +1953,13 @@ must appear alone on their input lines.) Prompting occurs here the first time through the loop as for the .Ic foreach statement if the input is a terminal. +.Pp .Dp Cx Ic % .Cx \&\ \& .Ar job .Cx Brings the specified job into the foreground. +.Pp .Dp Cx Ic % .Cx \&\ \& .Ar job @@ -1898,6 +1967,7 @@ Brings the specified job into the foreground. .Ic & .Cx Continues the specified job in the background. +.Pp .Dp Ic @ .Dp Cx Ic @ .Cx \&\ \& @@ -1940,7 +2010,7 @@ Spaces are, however, mandatory in separating components of .Ar expr which would otherwise be single words. .Pp -Special postfix `++' and `\-\\-' operators increment and decrement +Special postfix `++' and `\-\-' operators increment and decrement .Ar name respectively, i.e. `@ i++'. .Ss Pre-defined and environment variables @@ -1963,18 +2033,24 @@ this setting occurs only at initialization; these variables will not then be modified unless this is done explicitly by the user. .Pp -This shell copies the environment variable USER into the variable +This shell copies the environment variable +.Ev USER +into the variable .Ar user , -TERM into +.Ev TERM +into .Ar term , and -HOME into +.Ev HOME +into .Ar home , and copies these back into the environment whenever the normal shell variables are reset. -The environment variable PATH is likewise handled; it is not +The environment variable +.Ev PATH +is likewise handled; it is not necessary to worry about its setting other than in the file -.Ar \& .cshrc +.Ar \&.cshrc as inferior .Nm csh processes will import the definition of @@ -1983,10 +2059,7 @@ from the environment, and re-export it if you then change it. .Tp Ic argv Set to the arguments to the shell, it is from this variable that positional parameters are substituted, i.e. `$1' is replaced by -.Cx $argv -.Op 1 -.Cx \' , -.Cx +`$argv[1]', etc. .Tp Ic cdpath Gives a list of alternate directories searched to find subdirectories @@ -2009,8 +2082,8 @@ Enable file name completion. .Tp Ic histchars Can be given a string value to change the characters used in history substitution. The first character of its value is used as the -history substitution character, replacing the default character !. -The second character of its value replaces the character \(ua in +history substitution character, replacing the default character `!'. +The second character of its value replaces the character `\(ua' in quick substitutions. .Tp Ic history Can be given a numeric value to control the size of the history list. @@ -2089,7 +2162,7 @@ nor the option will normally hash the contents of the directories in the .Ar path variable after reading -.Ar \& .cshrc , +.Ar \&.cshrc , and each time the .Ar path variable is reset. If new commands are added to these directories @@ -2103,7 +2176,7 @@ If a `!' appears in the string it will be replaced by the current event number unless a preceding `\e' is given. Default is `% ', or `# ' for the super-user. .Tp Ic savehist -is given a numeric value to control the number of entries of the +Is given a numeric value to control the number of entries of the history list that are saved in ~/.history when the user logs out. Any command which has been referenced in this many events will be saved. During start up the shell sources ~/.history into the history list @@ -2166,10 +2239,18 @@ the shell concatenates with the given command name to form a path name of a file which it then attempts to execute. .Pp Parenthesized commands are always executed in a subshell. -Thus `(cd ; pwd) ; pwd' prints the +Thus +.Pp +.Dl (cd ; pwd) ; pwd +.Pp +prints the .Ar home directory; leaving you where you were (printing this after the home directory), -while `cd ; pwd' leaves you in the +while +.Pp +.Dl cd ; pwd +.Pp +leaves you in the .Ar home directory. Parenthesized commands are most often used to prevent @@ -2198,14 +2279,16 @@ and only allows words to be prepended to the argument list without modification. The shell normally ignores .Ar quit signals. -Jobs running detached (either by `&' or the +Jobs running detached (either by +.Ic \&& +or the .Ic bg or .Ic %... & commands) are immune to signals generated from the keyboard, including hangups. Other signals have the values which the shell inherited from its parent. -The shells handling of interrupts and terminate signals +The shell's handling of interrupts and terminate signals in shell scripts can be controlled by .Ic onintr . Login shells catch the @@ -2278,7 +2361,7 @@ and a C-like syntax. There are now many shells which also have these mechanisms, plus a few more (and maybe some bugs too), which are available thru the internet, or as contributed software such as the -.Xr ksh (korn\ shell) . +.Xr ksh korn\ shell . .Sh BUGS When a command is restarted from a stop, the shell prints the directory it started in if this is different @@ -2307,7 +2390,7 @@ Commands within loops, prompted for by `?', are not placed in the list. Control structure should be parsed rather than being recognized as built-in commands. This would allow control commands to be placed anywhere, -to be combined with `', and to be used with `&' and `;' metasyntax. +to be combined with `\&|', and to be used with `&' and `;' metasyntax. .Pp It should be possible to use the `:' modifiers on the output of command substitutions. diff --git a/usr/src/bin/date/date.1 b/usr/src/bin/date/date.1 index 23fc16c754..86515dbb2e 100644 --- a/usr/src/bin/date/date.1 +++ b/usr/src/bin/date/date.1 @@ -3,18 +3,11 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)date.1 6.7 (Berkeley) %G% +.\" @(#)date.1 6.8 (Berkeley) %G% .\" .Dd -.\" .Os BSD 4.4 -.\" Copyright (c) 1980 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. -.\" -.\" @(#)date.1 6.6 (Berkeley) 4/1/87 -.\" .Dt DATE 1 -.Os BSD 4 +.Os BSD 4.4 .Sh NAME .Nm date .Nd display or set date and time @@ -23,33 +16,38 @@ .Op Fl nu .Op Fl d Ar dst .Op Fl t Ar minutes_west -.Op yymmddhhmm Op ss +.Op yymmddhhmm [\&.ss] .Sh DESCRIPTION .Nm Date displays today's date and time when invoked without arguments. Providing an argument will set the desired date; -only the superuser can set the date. The +only the superuser can set the date. +.Pp +Options are: +.Pp +.Tw Ds .Tp Fl d Set the kernel's values for daylight savings time. If .Ar dst is non-zero, future calls to -.Ar gettimeofday -2 will return a non-zero -.Ar tz_dsttime . +.Xr gettimeofday 2 +will return a non-zero +.Ql tz_dsttime . .Tp Fl t Set the kernel's values for minutes west of GMT. .Ar Minutes_west provides the number of minutes returned by future calls to -.Ar gettimeofday -2 in -.Ar tz_minuteswest . +.Xr gettimeofday 2 +in +.Ql tz_minuteswest . .Tp Fl u Display or set the date in GMT (universal) time. .Tp .Pp The canonical representation for setting the date and time: +.Dw Ds .Dp Ar yy Year in abbreviated form (.e.g 89 for 1989). .Dp Ar mm @@ -81,7 +79,7 @@ Providing a system stays running, date will handle time changes for daylight/standards savings time and leap times. .Pp If -.Ar timed 8 +.Xr timed 8 is running to synchronize the clocks of machines in a local area network, .Nm date @@ -90,31 +88,31 @@ machines unless the .Fl n option is given. .Sh FILES -.Dw Pa /usr/adm/messages +.Dw /var/log/messages .Di L -.Dp Pa /usr/adm/wtmp +.Dp Pa /var/log/wtmp A record of date resets and time changes. -.Dp Pa /usr/adm/messages, +.Dp Pa /var/log/messages A record of the name of the user setting the time. .Sh SEE ALSO .Xr gettimeofday 2 , .Xr utmp 5 , -.Xr timed 8 , +.Xr timed 8 .br .Em TSP:\ The\ Time\ Synchronization Protocol .Em for UNIX 4.3BSD , R. Gusella and\ S.\ Zatti .Sh HISTORY -.Nm +.Nm Date appeared in Version 6 AT&T UNIX. .Sh DIAGNOSTICS Exit status is 0 on success, 1 on complete failure to set the date, and 2 on successfully setting the local date but failing globally. .Pp Occasionally, when -.Ar timed +.Xr timed synchronizes the time on many hosts, the setting of a new time value may require more than a few seconds. On these occasions, @@ -124,7 +122,7 @@ The message `Communication error with timed' occurs when the communication between .Nm date and -.Ar timed +.Xr timed fails. .Sh BUGS The system attempts to keep the date in a format closely compatible diff --git a/usr/src/bin/dd/dd.1 b/usr/src/bin/dd/dd.1 index aa62d5e515..aab330339b 100644 --- a/usr/src/bin/dd/dd.1 +++ b/usr/src/bin/dd/dd.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)dd.1 6.2 (Berkeley) %G% +.\" @(#)dd.1 6.3 (Berkeley) %G% .\" .Dd .Dt DD 1 @@ -15,7 +15,9 @@ .Nm dd .Op options \&... .Sh DESCRIPTION -The dd utility copies the specified input file to the specified +The +.Nm +utility copies the specified input file to the specified output with possible conversions. .Pp The following options are available: @@ -33,7 +35,7 @@ default. .Tc Ic ibs= .Ar n .Cx -Input block size. +Input block size .Va n bytes (default is 512 bytes). @@ -148,7 +150,9 @@ If the option is not specified, the standard input is used. .Pp The input files can be any file type and -on completion, dd writes the number of input and output +on completion, +.Nm +writes the number of input and output blocks, full and partial counts, to the standard error. .Pp A partial block may be caused by a read or write operation @@ -161,27 +165,25 @@ them. .Pp For .Li SIGINT , -the dd utility writes status information to +the +.Nm +utility writes status information to standard error before exiting. It takes the default action for all other signals. .Pp The -.Nm dd +.Nm utility exits 0 on success, and >0 if an error occurs. .Pp -If an error is detected, and the noerror opption has not -been supplied, the cause is reported and the dd utility +If an error is detected, and the noerror option has not +been supplied, the cause is reported and the +.Nm +utility aborts the copy of the file. -.\" .Pp -.\" The following environment variables affect the execution of -.\" dd: -.\" .Tp -.\" LC_TYPE -.\" The locale for character classification. .Sh SEE ALSO .Xr tr 1 .Sh STANDARDS The -.Nm dd +.Nm function is expected to be POSIX 1003.2 compatible. diff --git a/usr/src/bin/df/df.1 b/usr/src/bin/df/df.1 index 78dc7dc652..a7dcbea857 100644 --- a/usr/src/bin/df/df.1 +++ b/usr/src/bin/df/df.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)df.1 6.6 (Berkeley) %G% +.\" @(#)df.1 6.7 (Berkeley) %G% .\" .Dd .Dt DF 1 @@ -25,7 +25,9 @@ or on the filesystem of which is a part. If neither a file or a filesystem argument is given, statistics for every filesystem mounted is displayed. +.Pp The following options are available: +.Tw Ds .Tp Fl i Include statistics on the number of free inodes. .Tp Fl k diff --git a/usr/src/bin/echo/echo.1 b/usr/src/bin/echo/echo.1 index 6d3776e314..a0341ee875 100644 --- a/usr/src/bin/echo/echo.1 +++ b/usr/src/bin/echo/echo.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)echo.1 6.3 (Berkeley) %G% +.\" @(#)echo.1 6.4 (Berkeley) %G% .\" .Dd .Dt ECHO 1 @@ -16,13 +16,15 @@ .Op Fl n .Op string\& ... .Sh DESCRIPTION -The echo utility writes its arguments to standard output, +The +.Nm +utility writes its arguments to standard output, followed by a character. If there are no arguments, only the character is written. .Pp The following option is available: -.Tw Fl +.Tw Ds .Tp Fl n The output is not terminated with a newline. .Tp diff --git a/usr/src/bin/ed/ed.1 b/usr/src/bin/ed/ed.1 index 061fbae7ff..e5d466de5c 100644 --- a/usr/src/bin/ed/ed.1 +++ b/usr/src/bin/ed/ed.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)ed.1 6.4 (Berkeley) %G% +.\" @(#)ed.1 6.5 (Berkeley) %G% .\" .Dd .Dt ED 1 @@ -31,6 +31,7 @@ command (see below) on the named file; that is to say, the file is read into .Nm ed 's buffer so that it can be edited. +.Tw Ds .Tp Fl Suppresses the printing of explanatory output @@ -92,12 +93,12 @@ Any character except a special character matches itself. Special characters are the regular expression delimiter plus -.Sq Li \e\[ +.Sq Cm \e\[. and sometimes -.Sq Li ^*$ . +.Sq Cm ^*$ . .Tp 2. A -.Sq Ic \&. +.Sq Cm \&. matches any character. .Tp 3. A @@ -109,10 +110,12 @@ matches that character. A nonempty string .Op Ar s or +.Oo .Cx \&( -.Op \&^ Ar s +.Op Cm \&^ Ar s .Cx \&) .Cx +.Oo matches any character in (or not in) .Ar s . In diff --git a/usr/src/bin/hostname/hostname.1 b/usr/src/bin/hostname/hostname.1 index a20d447f62..ae22238813 100644 --- a/usr/src/bin/hostname/hostname.1 +++ b/usr/src/bin/hostname/hostname.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)hostname.1 6.5 (Berkeley) %G% +.\" @(#)hostname.1 6.6 (Berkeley) %G% .\" .Dd .Dt HOSTNAME 1 @@ -25,12 +25,13 @@ normally run at boot time. .Pp Options: +.Tw Ds .Tp Fl s Trims off any domain information from the printed name. .Tp .Sh SEE ALSO -.Xr gethostname 2 , +.Xr gethostname 2 .Sh HISTORY .Nm Hostname appeared in 4.2 BSD. diff --git a/usr/src/bin/kill/kill.1 b/usr/src/bin/kill/kill.1 index 23b7f1a9f4..d01a553632 100644 --- a/usr/src/bin/kill/kill.1 +++ b/usr/src/bin/kill/kill.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)kill.1 6.3 (Berkeley) %G% +.\" @(#)kill.1 6.4 (Berkeley) %G% .\" .Dd .Dt KILL 1 @@ -27,6 +27,9 @@ with .Sq Li \&& . .Nm Kill is intelligent about who owns a process. +.Pp +Options available: +.Pp .Tw Ds .Tp Fl signal_name A symbolic signal name. To find out all the possible signal names @@ -40,7 +43,7 @@ stripped of the common SIG prefix. A (nonnegative) decimal integer, representing the signal to be used instead of TERM as the sig argument in the effective call to -.Nm kill 1 . +.Xr kill 2 . .Tp .Pp Some of the more commonly used signals with kill: diff --git a/usr/src/bin/ln/ln.1 b/usr/src/bin/ln/ln.1 index f72641b3bc..b948e63e26 100644 --- a/usr/src/bin/ln/ln.1 +++ b/usr/src/bin/ln/ln.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)ln.1 6.4 (Berkeley) %G% +.\" @(#)ln.1 6.5 (Berkeley) %G% .\" .Dd .Dt LN 1 @@ -13,23 +13,32 @@ .Nd make links .Sh SYNOPSIS .Nm ln -.Op Fl s Ar source_file -.Op target_file +.Op Fl s +.Ar source_file +.Op target_file .Nm ln .Op Fl s -.Ar source_file ... target_dir +.Ar source_file ... +.Op target_dir .Sh DESCRIPTION The .Nm ln utility creates a new -directory entry (a link) -for a file which -inherits the same modes. -The entry behaves in most cases as if it were the -original file. -It is useful for keeping groups of files together -in directories, but with out multiple copies of the same file. -There are two kinds of links: hard links and symbolic links. +directory entry (linked file) +which inherits the same modes as the orginal +file. +It is useful for maintaining multiple copies of a file in +many places at once - without the `copies'; instead, +a link `points' to the original copy. +There are two types of links; hard links and symbolic links. +How a link `points' to a file is one of the differences +between a hard or symbolic link. +.Pp +Option available: +.Tw Ds +.Tp Fl s +Create a symbolic link. +.Tp .Pp By default .Nm ln @@ -43,9 +52,6 @@ to reference the file. Hard links may not refer to directories (unless the proper incantations are supplied) and may not span file systems. .Pp -Options: -.Tp Fl s -Create symbolic links. A symbolic link contains the name of the file to which it is linked. The referenced file is used when an .Xr open 2 @@ -59,7 +65,6 @@ The .Xr readlink 2 call may be used to read the contents of a symbolic link. Symbolic links may span file systems and may refer to directories. -.Tp .Pp Given one or two arguments, .Nm ln diff --git a/usr/src/bin/mkdir/mkdir.1 b/usr/src/bin/mkdir/mkdir.1 index 8308342785..dee7bdba21 100644 --- a/usr/src/bin/mkdir/mkdir.1 +++ b/usr/src/bin/mkdir/mkdir.1 @@ -3,33 +3,39 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mkdir.1 6.5 (Berkeley) %G% +.\" @(#)mkdir.1 6.6 (Berkeley) %G% .\" -.TH MKDIR 1 "%Q"" -.AT 3 -.SH NAME -mkdir \- make directories -.SH SYNOPSIS -\fBmkdir [ \fI-p\fB ] directory_name ... -.SH DESCRIPTION -.I Mkdir +.Dd +.Dt MKDIR 1 +.Os BSD 4.4 +.Sh NAME +.Nm mkdir +.Nd make directories +.Sh SYNOPSIS +.Nm mkdir +.Op Fl p Ar directory_name ... +.Sh DESCRIPTION +.Nm Mkdir creates the directories named as operands, in the order specified, -using mode 0777 modified by the current -.IR umask (2). -.PP +using mode +.Li \&0777 +modified by the current +.Xr umask 2 . +.Pp The options are as follows: -.TP -.I -p +.Tw Ds +.Tp Fl p Create intermediate directories as required. If this option is not specified, the full path prefix of each operand must already exist. -.PP -The parent directory must be writable by the user. -.PP -.I Mkdir +.Tp +.Pp +The user must have write permission in the parent directory. +.Pp +.Nm Mkdir exits 0 if successful, and >0 if an error occurred. -.SH "HISTORY" +.Sh SEE ALSO +.Xr rmdir 1 +.Sh STANDARDS Mkdir is POSIX 1003.2 compliant. .br -This manual page derived from the POSIX 1003.2 manual page. -.SH "SEE ALSO" -rmdir(1) +This manual page is derived from the POSIX 1003.2 manual page. diff --git a/usr/src/bin/mv/mv.1 b/usr/src/bin/mv/mv.1 index 20b11520d5..28eeb9526b 100644 --- a/usr/src/bin/mv/mv.1 +++ b/usr/src/bin/mv/mv.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mv.1 6.4 (Berkeley) %G% +.\" @(#)mv.1 6.5 (Berkeley) %G% .\" .Dd .Dt MV 1 @@ -92,6 +92,7 @@ The .Nm mv utility exits 0 on success, and >0 if an error occurs. .Sh SEE ALSO +.Xr cp 1 .Sh STANDARDS The .Nm mv diff --git a/usr/src/bin/pwd/pwd.1 b/usr/src/bin/pwd/pwd.1 index 0cda4afc73..ea0e66e383 100644 --- a/usr/src/bin/pwd/pwd.1 +++ b/usr/src/bin/pwd/pwd.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)pwd.1 6.2 (Berkeley) %G% +.\" @(#)pwd.1 6.3 (Berkeley) %G% .\" .Dd .Dt PWD 1 diff --git a/usr/src/bin/rcp/rcp.1 b/usr/src/bin/rcp/rcp.1 index 4f885eaa12..65e3a50717 100644 --- a/usr/src/bin/rcp/rcp.1 +++ b/usr/src/bin/rcp/rcp.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rcp.1 6.10 (Berkeley) %G% +.\" @(#)rcp.1 6.11 (Berkeley) %G% .\" .Dd .Dt RCP 1 @@ -93,7 +93,7 @@ are on the current machine. .Sh HISTORY .Nm Rcp appeared in 4.2 BSD. The version of rcp described here -is new with 4.4BSD and is part of Kerberos. +has been reimplemented with Kerberos in 4.3+Reno BSD. .Sh BUGS Doesn't detect all cases where the target of a copy might be a file in cases where only a directory should be legal. diff --git a/usr/src/bin/rm/rm.1 b/usr/src/bin/rm/rm.1 index 0d29891fa3..72c4218bce 100644 --- a/usr/src/bin/rm/rm.1 +++ b/usr/src/bin/rm/rm.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rm.1 6.3 (Berkeley) %G% +.\" @(#)rm.1 6.4 (Berkeley) %G% .\" .Dd .Dt RM 1 @@ -21,6 +21,7 @@ The rm utility removes the directory entry specified by each file argument. .Pp The following options are available: +.Tw 8n .Tp Fl f Force each specified directory entry to be removed without prompting for confirmation, regardless of @@ -33,14 +34,14 @@ requesting confirmation before removing each existing directory entry, regardless of the permissions of the file to which it refers. .Tp Fl R -Permit directories to be removed. +Permit directories to be removed (recursively). .Pp .Tp Fl r Equivalent to -.FL R. +.Fl R . .Tp .Pp -The following operands are available: +The following argument is available: .Tw Fl .Tp Ar file A pathname of a directory entry to be removed. @@ -55,8 +56,8 @@ All the named directory entries were removed. .Tp Li >0 An error occurred. .Tp -.Sh ENVIRONMENT .Sh SEE ALSO +.Xr rmdir 1 .Sh STANDARDS The .Nm rm diff --git a/usr/src/bin/rmail/rmail.8 b/usr/src/bin/rmail/rmail.8 index bc501f0647..1f51115324 100644 --- a/usr/src/bin/rmail/rmail.8 +++ b/usr/src/bin/rmail/rmail.8 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rmail.8 6.5 (Berkeley) %G% +.\" @(#)rmail.8 6.6 (Berkeley) %G% .\" .Dd .Dt RMAIL 1 diff --git a/usr/src/bin/rmdir/rmdir.1 b/usr/src/bin/rmdir/rmdir.1 index afc0fcd7ca..4509abe2fe 100644 --- a/usr/src/bin/rmdir/rmdir.1 +++ b/usr/src/bin/rmdir/rmdir.1 @@ -1,66 +1,60 @@ -.\" Copyright (c) 1983, 1990 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1990 The Regents of the University of California. +.\" All rights reserved. .\" -.\" @(#)rmdir.1 6.2 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH RMDIR 1 "%Q" -.UC 5 -.SH NAME -rmdir, rm \- remove (unlink) directories or files -.SH SYNOPSIS -.B rmdir -dir ... -.PP -.B rm -[ -.B \-f -] [ -.B \-r -] [ -.B \-i -] [ -.B \- -] file ... -.PP -.SH DESCRIPTION -.PP -.I Rmdir -removes entries for the named directories, which must be empty. -.PP -.I Rm -removes the entries for one or more files from a directory. -If an entry was the last link to the file, the file is destroyed. -Removal of a file requires write permission in its directory, -but neither read nor write permission on the file itself. -.PP -If a file has no write permission and the standard input is a terminal, -its permissions are printed and a line is read from the standard input. -If that line begins with `y' the file is deleted, otherwise the file remains. -No questions are asked and no errors are reported when the -.B \-f -(force) option is given. -.PP -If a designated file is a directory, -an error comment is printed unless the optional argument -.B \-r -has been used. In that case, -.I rm -recursively deletes the entire contents of the specified directory, -and the directory itself. -.PP -If the -.B \-i -(interactive) option is in effect, -.I rm -asks whether to delete each file, and, under -.BR \-r , -whether to examine each directory. -.PP -The null option -.B \- -indicates that all the arguments following it are to be treated as -file names. This allows the specification of file names starting with -a minus. -.SH "SEE ALSO" -rm(1), unlink(2), rmdir(2) +.\" @(#)rmdir.1 6.3 (Berkeley) %G% +.\" +.Dd +.Dt RMDIR 1 +.Os BSD 4.4 +.Sh NAME +.Nm rmdir +.Nd remove directories +.Sh SYNOPSIS +.Nm rmdir +.Op Fl p +.Ar directory ... +.Sh DESCRIPTION +The rmdir utility removes the directory entry specified by +each +.Ar directory +argument, provided it is empty. +.Pp +Arguments are processed in the order given. +In order to remove both a parent directory and a subdirectory +of that parent, the subdirectory +must be specified first so the parent directory +is empty when +.Nm rmdir +tries to remove it. +.\" .Pp +.\" The following option is available: +.\" .Tw Ds +.\" .Tp Fl p +.\" Each +.\" .Ar directory +.\" argument is treated as a pathname of which all +.\" components will be removed, if they are empty, +.\" starting with the last most component. +.\" (See +.\" .Xr rm 1 +.\" for fully non-discriminant recursive removal). +.Pp +The +.Nm rmdir +utility exits with one of the following values: +.Tw Ds +.Tp Li \&0 +Each directory entry specified by a dir operand +referred to an empty directory and was removed +successfully. +.Tp Li \&>\&0 +An error occurred. +.Tp +.Sh SEE ALSO +.Xr rm 1 +.Sh STANDARDS +The +.Nm rmdir +function is expected to be POSIX 1003.2 compatible. diff --git a/usr/src/bin/sleep/sleep.1 b/usr/src/bin/sleep/sleep.1 index 569b625bf2..dd9c280513 100644 --- a/usr/src/bin/sleep/sleep.1 +++ b/usr/src/bin/sleep/sleep.1 @@ -1,38 +1,80 @@ -.\" Copyright (c) 1990 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1990 The Regents of the University of California. +.\" All rights reserved. .\" -.\" @(#)sleep.1 6.2 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH SLEEP 1 "%Q" -.AT 3 -.SH NAME -sleep \- suspend execution for an interval -.SH SYNOPSIS -.B sleep -time -.SH DESCRIPTION -.I Sleep -suspends execution for -.I time -seconds. -It is used to execute a command after a certain amount of time as in: -.PP - (sleep 105; command)& -.PP -or to execute a command every so often, as in: -.PP - while true -.br - do -.br - command -.br - sleep 37 -.br - done -.SH "SEE ALSO" -setitimer(2), alarm(3C), sleep(3) -.SH BUGS -.I Time -must be less than 2,147,483,647 seconds. +.\" @(#)sleep.1 6.3 (Berkeley) %G% +.\" +.Dd +.Dt SLEEP 1 +.Os BSD 4.4 +.Sh NAME +.Nm sleep +.Nd suspend execution for an interval of time +.Sh SYNOPSIS +.Nm sleep +.Ar seconds +.Sh DESCRIPTION +The +.Nm sleep +command +suspends execution for a minimum of +.Ar seconds . +.Nm Sleep +is used to schedule the execution of other commands (see +EXAMPLES below). +.Pp +The +.Nm Sleep +utility exits with one of the following values: +.Tw Ds +.Tp Li \&0 +On successful completetion, or if the signal SIGALRM was received. +.Tp Li \&>\&0 +An error occurred. +.Tp +.Sh EXAMPLES +To schedule the execution of a command for +.Va x +number seconds later: +.Pp +.Dl (sleep 1800; sh command_file >& errors)& +.Pp +This incantation would wait a half hour before +running the script command_file. (See the +.Xr at 1 +utility.) +.Pp +To reiteratively run a command (with the +.Xr csh 1 ) : +.Pp +.Ds I +while (1) + if (! -r zzz.rawdata) then + sleep 300 + else + foreach i (`ls *.rawdata`) + sleep 70 + awk -f collapse_data $i >> results + end + break + endif +end +.De +.Pp +The scenario for a script such as this might be: a program currently +running is taking longer than expected to process a series of +files, and it would be nice to have +another program start processing the files created by the first +program as soon as it is finished (when zzz.rawdata is created). +The script checks every five minutes for the file zzz.rawdata, +when the file is found, then another portion processing +is done curteously by sleeping for 70 seconds in between each +awk job. +.Sh SEE ALSO +.Xr setitimer 2 , +.Xr alarm 3 , +.Xr sleep 3 , +.Xr at 1 +.Sh STANDARDS +The sleep function is expected to be POSIX 1003.2 compatible. diff --git a/usr/src/bin/stty/stty.1 b/usr/src/bin/stty/stty.1 index 39bfcc9d24..d87b0bbaeb 100644 --- a/usr/src/bin/stty/stty.1 +++ b/usr/src/bin/stty/stty.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)stty.1 6.6 (Berkeley) %G% +.\" @(#)stty.1 6.7 (Berkeley) %G% .\" .Dd .Dt STTY 1 @@ -29,6 +29,7 @@ Some combinations of arguments are mutually exclusive on some terminal types. .Pp The following options are available: +.Tw Ds .Tp Fl a Write to standard output all the current settings for the terminal. @@ -336,16 +337,19 @@ the speed information is displayed as follows: .Ds I "speed %d baud;", .De +.Pp Otherwise speeds are displayed as: .Pp .Ds I "ispeed %d baud; ospeed %d baud;", , .De +.Pp Control characters are displayed as: .Pp .Ds I "%s = %s;", , .De +.Pp where value is either the character, or some visual representation of the character if it is non-printing, or the string "" if the character is disabled. diff --git a/usr/src/libexec/bugfiler/sendbug.1 b/usr/src/libexec/bugfiler/sendbug.1 index aedad2f90c..0aef068c27 100644 --- a/usr/src/libexec/bugfiler/sendbug.1 +++ b/usr/src/libexec/bugfiler/sendbug.1 @@ -3,35 +3,55 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)sendbug.1 6.5 (Berkeley) %G% +.\" @(#)sendbug.1 6.6 (Berkeley) %G% .\" -.TH SENDBUG 1 "%Q" -.UC 5 -.ad -.SH NAME -sendbug \- mail a system bug report to 4bsd-bugs -.SH SYNOPSIS -.B sendbug [ address ] -.SH DESCRIPTION -.PP +.Dd +.Dt SENDBUG 1 +.Os BSD 4.2 +.Sh NAME +.Nm sendbug +.Nd mail a system bug report to 4bsd-bugs +.Sh SYNOPSIS +.Nm sendbug +.Op Ar address +.Sh DESCRIPTION Bug reports sent to `4bsd-bugs@Berkeley.EDU' are intercepted by a program which expects bug reports to conform to a standard format. -.I Sendbug +.Nm Sendbug is a shell script to help the user compose and mail bug reports in the correct format. -.I Sendbug +.Nm Sendbug works by invoking the editor specified by the environment variable -.I EDITOR +.Ev EDITOR on a temporary copy of the bug report format outline. The user must fill in the -appropriate fields and exit the editor. The default editor is -.IR vi (1). -.I Sendbug -then mails the completed report to `4bsd-bugs@Berkeley.EDU' or the address +appropriate fields and exit the editor. +.Nm Sendbug +then mails the completed report to `4bsd-bugs@Berkeley.EDU' or the +.Ar address specified on the command line. -.SH FILES -.nf -.ta \w'/usr/ucb/bugformat 'u -/usr/ucb/bugformat contains the bug report outline -.fi -.SH "SEE ALSO" -vi(1), environ(7), bugfiler(8), sendmail(8) +.Sh ENVIRONMENT +.Nm Sendbug +will utilize the following environment variable if it exists: +.Tw Fl +.Tp Ev EDITOR +Specifies the preferred editor. If +.Ev EDITOR +is not set, +.Nm +defaults to +.Xr vi 1 . +.Tp +.Sh FILES +.Dw /usr/share/misc/bugformat +.Di L +.Dp Pa /usr/share/misc/bugformat +contains the bug report outline +.Dp +.Sh SEE ALSO +.Xr vi 1 , +.Xr environ 7 , +.Xr bugfiler 8 , +.Xr sendmail 8 +.Sh HISTORY +.Nm Sendbug +appeared in 4.2 BSD. diff --git a/usr/src/old/adb/common_source/adb.1 b/usr/src/old/adb/common_source/adb.1 index 47e28d0138..bac41f9d14 100644 --- a/usr/src/old/adb/common_source/adb.1 +++ b/usr/src/old/adb/common_source/adb.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)adb.1 5.8 (Berkeley) %G% +.\" @(#)adb.1 5.9 (Berkeley) %G% .\" .Dd .Dt ADB 1 @@ -69,9 +69,9 @@ The .Fl I option specifies a directory where files to be read with -.Li $< +.Ic $< or -.Li $<< +.Ic $<< (see below) will be sought; the default is .Pa /usr/lib/adb . .Pp @@ -165,7 +165,7 @@ hexadecimal radix. Thus If no prefix appears, then the .Em default radix is used; see the -.Li $d +.Ic $d command. The default radix is initially hexadecimal. The hexadecimal digits are .Li 0123456789abcdefABCDEF @@ -197,7 +197,7 @@ is a register name then the value of the register is obtained from the system header in .Ar corfil . The register names are those printed by the -.Li $r +.Ic $r command. .Tp Va symbol A @@ -393,7 +393,7 @@ to quote the three numeric formats. .Cx Print 1 byte in the current radix (which may be either signed or unsigned; see the -.Li $d +.Ic $d command). .Dp Cx Ic 2 .Cx \&\ \ \& @@ -503,7 +503,10 @@ Print 1 byte as a character. .Cx Print 1 byte as a character, using the standard escape convention where control characters -are printed as ^X and the delete character is printed as ^?. +are printed as +.Cx \&^ Ar X +.Cx +and the delete character is printed as ^?. .Dp Cx Ic s .Cx \&\ \ \& .Va n @@ -513,8 +516,9 @@ Print the addressed characters until a zero character is reached. .Cx \&\ \ \& .Va n .Cx -Print a string using the ^ -.Ar X +Print a string using the +.Cx \&^ Ar X +.Cx escape convention (see .Ar C above). @@ -580,17 +584,17 @@ Print a space. .Va 0 .Cx Print a newline. -.Dp Ic \*(Rq...\*(Lq +.Dp Ic \*(Lq...\*(Rq .Va 0 -\&\ \ \& +.br Print the enclosed string. -.Dp ^ +.Dp Ic \&^ .Ad Dot is decremented by the current increment. Nothing is printed. -.Dp + +.Dp Ic \&+ .Ad Dot is incremented by 1. Nothing is printed. -.Dp \- +.Dp Ic \&\- .Ad Dot is decremented by 1. Nothing is printed. .Dp newline @@ -642,7 +646,7 @@ when writing to the subprocess address space. .Op Ic ?/ .Cx New values for -.Ad ( b1 , e1 , f1 ) +.Pf \&( Ad b1 , e1 , f1 ) are recorded. If less than three expressions are given then the remaining map parameters are left unchanged. If the @@ -652,20 +656,20 @@ or is followed by .Li * then -the second segment ( -.Ad ( b2 , e2 , f2 ) +the second segment +.Pf \&( Ad b2 , e2 , f2 ) of the mapping is changed. If the list is terminated by .Ic ? or .Ic / then the file -.Ar ( objfil +.Pf \&( Ar objfil or .Ar corfil respectively) is used for subsequent requests. For example, -.Li /m? +.Sq Li /m? will cause .Ic / to refer to @@ -677,9 +681,7 @@ to refer to is assigned to the variable or register named. .Tp Ic \&! A shell -.Cx \&( -.Pa /bin/sh ) -.Cx +.Pf \&( Pa /bin/sh ) is called to read the rest of the line following .Ic \&! . .Tp Cx Cm $ @@ -789,7 +791,7 @@ Print all non zero variables in octal. .Tp Cm m Print the address map. .Tp Cm p -.Em ( Kernel debugging ) +.Pf \&( Em Kernel debugging ) Change the current kernel memory mapping to map the designated .Sy user structure to the address given by the symbol @@ -911,9 +913,9 @@ The text segment size. The address in a file associated with a written address is determined by a mapping associated with that file. Each mapping is represented by two triples -.Ad ( b1 , e1 , f1 ) +.Pf \&( Ad b1 , e1 , f1 ) and -.Ad ( b2 , e2 , f2 ) +.Pf \&( Ad b2 , e2 , f2 ) and the .Ad file .Ad address @@ -984,6 +986,7 @@ file can be examined with no address translation. .Pp .Sh FILES .Dw a.out +.Di L .Dp Pa a.out .Dp Pa core .Dp diff --git a/usr/src/old/as.vax/as.1 b/usr/src/old/as.vax/as.1 index 96f79432b4..b2e72fe668 100644 --- a/usr/src/old/as.vax/as.1 +++ b/usr/src/old/as.vax/as.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)as.1 6.4 (Berkeley) %G% +.\" @(#)as.1 6.5 (Berkeley) %G% .\" .Dd .Dt AS 1 @@ -22,7 +22,7 @@ .Op Fl \&R .Op Fl \&t Ar directory .Op Fl \&o Ar outfile -.Op Ar source_file(s) +.Op Ar source_file ... .Sh DESCRIPTION The .Nm as @@ -111,12 +111,11 @@ John F. Reiser .br Robert R. Henry .Sh HISTORY -The .Nm As -appeared as a PDP11 -assembler in Version 6 AT&T UNIX. It has been hacked a bit -at various times to accomodate different DEC hardware, including this -VAX version. +appeared +in Version 6 AT&T UNIX. The version decsribed here is derived from +Version 7 AT&T +.Nm as . .Sh BUGS .Fl J should be eliminated; the assembler should automatically choose among diff --git a/usr/src/old/awk/awk.1 b/usr/src/old/awk/awk.1 index e7c384975c..e0a75b5211 100644 --- a/usr/src/old/awk/awk.1 +++ b/usr/src/old/awk/awk.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)awk.1 6.3 (Berkeley) %G% +.\" @(#)awk.1 6.4 (Berkeley) %G% .\" .Dd .Dt AWK 1 @@ -15,12 +15,8 @@ .Oo .Op Fl \&F Ar \&c .Oo -.\".Op Op Fl \&f Ar file Op Ar prog -.Cx \&[ -.Op Fl f Ar file +.Op Fl f Ar prog_file .Op Ar prog -.Cx \&] -.Cx .Ar .Sh DESCRIPTION .Nm Awk @@ -41,7 +37,7 @@ specified as .Fl f .Ar file . .Pp -.Tw Fl +.Tw Ds .Tp Cx Fl F .Ar c .Cx @@ -49,7 +45,7 @@ Specify a field separator of .Ar c . .Tp Fl f Use -.Ar file +.Ar prog_file as an input .Ar prog (an awk script). @@ -58,7 +54,7 @@ as an input Files are read in order; if there are no files, the standard input is read. The file name -.Fl +.Sq Fl means the standard input. Each line is matched against the pattern portion of every pattern-action statement; @@ -142,12 +138,7 @@ and .Ic int . The last truncates its argument to an integer. The function -.Cx Ic substr -.Cx ( -.Ar s , -.Ar \& m , -.Ar \& n ) -.Cx +.Fn substr s m n returns the .Cx Ar n .Cx \- @@ -157,14 +148,9 @@ substring of .Ar s that begins at position .Ar m . -The function -.Cx Ic sprintf -.Cx ( -.Ar fmt , -.Ar \& expr , -.Ar \& expr , -.Ar \& ... ) -.Cx +The +.Fn sprintf fmt expr expr \&... +function formats the expressions according to the .Xr printf 3 @@ -190,7 +176,8 @@ between an occurrence of the first pattern and the next occurrence of the second. .Pp A relational expression is one of the following: -.Ds +.Pp +.Ds I expression matchop regular-expression expression relop expression .De @@ -290,6 +277,5 @@ is a derivative of the original and not the Toolchest version. .Sh BUGS There are no explicit conversions between numbers and strings. To force an expression to be treated as a number add 0 to it; -to force it to be treated as a string concatenate -.Dq -to it. +to force it to be treated as a string concatenate "" (an empty +string) to it. diff --git a/usr/src/old/cpio/cpio.1 b/usr/src/old/cpio/cpio.1 index e1296846d2..bf7e9f1557 100644 --- a/usr/src/old/cpio/cpio.1 +++ b/usr/src/old/cpio/cpio.1 @@ -3,11 +3,11 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cpio.1 5.4 (Berkeley) %G% +.\" @(#)cpio.1 5.5 (Berkeley) %G% .\" -.Dd .\" @(#)cpio.1 5.3 (Berkeley) 3/29/88 .\" +.Dd .Dt CPIO 1 .Os BSD 4.4 .Sh NAME @@ -32,6 +32,7 @@ has three functional modes; copy out, copy in and pass. .Pp Functional Options: +.Tw Ds .Tp Fl o Copy out \- reads the standard input to obtain a list of path names and copies those files onto the standard @@ -46,11 +47,17 @@ which is assumed to be the product of a previous Only files with names that match patterns are selected. Patterns are given in the name-generating notation of .Xr sh 1 . -In patterns, meta-characters ?, *, and -.Op ... +In patterns, meta-characters +.Sq Li \&? , +.Sq Li \&* , +and +.Sq Li [...] match the -slash / character. Multiple patterns may be specified and -if no patterns are specified, the default for patterns is * +slash +.Sq Li \&/ +character. Multiple patterns may be specified and +if no patterns are specified, the default for patterns is +.Sq Li \&* (i.e., select all files). The extracted files are conditionally created and copied into the current directory tree based upon the options described below. The @@ -73,6 +80,7 @@ options described below. .Tp .Pp Options for the above functional options: +.Tw Ds .Tp Fl a Reset access times of input files after they have been copied. @@ -99,7 +107,7 @@ replace a newer file with the same name). Verbose: causes a list of file names to be printed. When used with the t option, the table of contents looks like the output of an -.Li ls -l +.Ql ls -l command (see .Xr ls 1 ) . .Tp Fl l @@ -127,7 +135,7 @@ option. .Tp Fl 6 Process an old (i.e., UNIX System Sixth Edition format) file. Only useful with -.FL i +.Fl i (copy in). .Tp .Sh EXAMPLES @@ -135,14 +143,14 @@ The first example below copies the contents of a directory into an archive; the second duplicates a directory hierarchy: .Pp -.Dl ls cpio -o >/dev/rmt/0m +.Dl ls \&| cpio -o >/dev/rmt/0m .Pp .Dl cd olddir -.Dl find . -depth -print cpio -pdl newdir +.Dl find . -depth -print \&| cpio -pdl newdir .Pp The trivial case .Pp -.Dl find . -depth -print cpio -oB >/dev/fmt/0m +.Dl find . -depth -print \&| cpio -oB >/dev/fmt/0m .Pp can be handled more efficiently by: .Pp @@ -151,9 +159,8 @@ can be handled more efficiently by: .Sh SEE ALSO .Xr ar 1 , .Xr find 1 , -.Xr ls 1 . +.Xr ls 1 , .Xr cpio 4 -in the UNIX System User Reference Manual. .Sh HISTORY The .Nm cpio diff --git a/usr/src/old/dbx/dbx.1 b/usr/src/old/dbx/dbx.1 index 411cb1b181..2b6525d732 100644 --- a/usr/src/old/dbx/dbx.1 +++ b/usr/src/old/dbx/dbx.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)dbx.1 6.4 (Berkeley) %G% +.\" @(#)dbx.1 6.5 (Berkeley) %G% .\" .Dd .Dt DBX 1 @@ -20,7 +20,7 @@ .Op Fl c Ar file .Op Ar objfile Op Ar coredump .Sh DESCRIPTION -.Nm dbx +.Nm Dbx is a tool for source level debugging and execution of programs under UNIX. The @@ -41,11 +41,12 @@ The machine level facilities of .Nm dbx can be used on any program. .Pp -The object file contains a symbol table that includes the name of the +The object file contains a symbol table that includes the names of all the source files translated by the compiler to create it. These files are available for perusal while using the debugger. .Pp -If a file named ``core'' +If a file named +.Pa core exists in the current directory or a .Ar coredump @@ -54,10 +55,14 @@ file is specified, can be used to examine the state of the program when it faulted. .Pp -If the file ``.dbxinit'' exists in the current directory then the +If the file +.Pa .dbxinit +exists in the current directory then the debugger commands in it are executed. .Nm Dbx -also checks for a ``.dbxinit'' in the user's home directory +also checks for a +.Pa .dbxinit +in the user's home directory if there isn't one in the current directory. .Pp The command line options and their meanings are: @@ -73,7 +78,9 @@ Otherwise the reason for termination will be reported and the user offered the option of entering the debugger or letting the program fault. .Nm Dbx -will read from ``/dev/tty'' when +will read from +.Pa /dev/tty +when .Fl r is specified and standard input is not a terminal. @@ -98,7 +105,7 @@ and in the directory where .Ar objfile is located. The directory search path can also be set with the -.Ar use +.Ic use command. .Tp Cx Fl c .Cx \&\ \& @@ -364,17 +371,11 @@ in the static scope. If static and dynamic searches do not yield a result, an arbitrary symbol is chosen and the message -.Cx `` -.Op using Ar qualified name -.Cx \'\' -.Cx +.Dq Li [using Ar qualified name] is printed. The name resolution procedure may be overridden by qualifying an identifier with a block name, e.g., -.Cx `` -Ar module.variable -.Cx \'\'. -.Cx +.Dq Li module.variable For C, source files are treated as modules named by the file name without ``.c''. .Pp @@ -472,8 +473,10 @@ Print out a list of the active procedures and function. Print the full qualification of all the symbols whose name matches the given identifier. The order in which the symbols are printed is not meaningful. +.Dp .Ss Accessing Source Files .Pp +.Di L .Dp Cx Ar /regular expression .Op / .Cx @@ -535,7 +538,7 @@ If the name of a procedure or function is given lines .Ar n-k to -.Ar n +k +.Ar n+k are listed where .Ar n is the first statement @@ -592,6 +595,7 @@ one can say Subsequently, the command ``b(12)'' will expand to ``stop at 12''. .Pp .Dp Cx Ic set +.Ws .Ar name .Op \&= Ar expression .Cx @@ -784,7 +788,7 @@ commands from the given .Tp .Sh ENVIRONMENT .Nm Dbx -checks these environment variables: +utilizes the following environment variables: .Ds I EDITOR HOME diff --git a/usr/src/old/groups/groups.1 b/usr/src/old/groups/groups.1 index c146f54c76..c07a1ea084 100644 --- a/usr/src/old/groups/groups.1 +++ b/usr/src/old/groups/groups.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)groups.1 6.2 (Berkeley) %G% +.\" @(#)groups.1 6.3 (Berkeley) %G% .\" .Dd .Dt GROUPS 1 diff --git a/usr/src/old/ld/ld.1 b/usr/src/old/ld/ld.1 index 81bfafb50d..183e430487 100644 --- a/usr/src/old/ld/ld.1 +++ b/usr/src/old/ld/ld.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)ld.1 6.3 (Berkeley) %G% +.\" @(#)ld.1 6.4 (Berkeley) %G% .\" .Dd .Dt LD 1 @@ -32,7 +32,7 @@ run. (In the latter case, the .Fl r option must be given -to preserve the relocation bits.)\ +to preserve the relocation bits.) The output of .Nm ld is left on @@ -131,8 +131,11 @@ is a string. searches for libraries first in any directories specified with .Fl L -options, then in the standard directories `/lib', `/usr/lib', and -`/usr/local/lib'. +options, then in the standard directories +.Pa /lib , +.Pa /usr/lib , +and +.Pa /usr/local/lib . A library is searched when its name is encountered, so the placement of a .Fl l diff --git a/usr/src/old/machine/machine.1 b/usr/src/old/machine/machine.1 index aaee9ac064..9db1e87b00 100644 --- a/usr/src/old/machine/machine.1 +++ b/usr/src/old/machine/machine.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)machine.1 5.2 (Berkeley) %G% +.\" @(#)machine.1 5.3 (Berkeley) %G% .\" .Dd %Q .Os BSD 4.4 diff --git a/usr/src/old/pcc/cc/cc.1 b/usr/src/old/pcc/cc/cc.1 index 2a73e21d5e..0cf939259a 100644 --- a/usr/src/old/pcc/cc/cc.1 +++ b/usr/src/old/pcc/cc/cc.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)cc.1 6.5 (Berkeley) %G% +.\" @(#)cc.1 6.6 (Berkeley) %G% .\" .Dd .Dt CC 1 @@ -38,7 +38,7 @@ The following options are interpreted by See .Xr ld 1 for load-time options. -.Tw Fl +.Tw Ds .Tp Fl c Suppress the loading phase of the compilation, and force an object file to be produced even if only one program is compiled. @@ -110,10 +110,13 @@ prevent the macro preprocessor from eliding comments. Name the final output file .Ar output . If this option is used the file `a.out' will be left undisturbed. -.Tp Cx Fl D +.Tp +.Dw Ds +.Di L +.Dp Cx Fl D .Ar name=def .Cx -.Tp Cx Fl D +.Dp Cx Fl D .Ar name .Cx Define the @@ -121,6 +124,8 @@ Define the to the preprocessor, as if by `#define'. If no definition is given, the name is defined as "1". +.Dp +.Tw Ds .Tp Cx Fl U .Ar name .Cx @@ -129,7 +134,7 @@ Remove any initial definition of .Tp Cx Fl I .Ar dir .Cx -`#include files' +`#include' files whose names do not begin with `/' are always sought first in the directory @@ -168,6 +173,7 @@ Find only the designated compiler passes in the files whose names are constructed by a .Fl B option. +.Tp .Pp Other arguments are taken @@ -182,7 +188,7 @@ given) to produce an executable program with name .Pa a.out . .Sh FILES .Dw /usr/libexec/sccom -.Ds L +.Di L .Dp Pa file.c input file .Dp Pa file.o @@ -207,10 +213,10 @@ startoff for profiling startoff for gprof-profiling .Dp Pa /usr/lib/libc.a standard library, see -.Ar intro 3 +.Xr intro 3 .Dp Pa /usr/lib/libc_p.a profiling library, see -.Ar intro 3 +.Xr intro 3 .Dp Pa /usr/include standard directory for `#include' files .Dp Pa mon.out @@ -223,11 +229,11 @@ file produced for analysis by .Sh SEE ALSO B. W. Kernighan and D. M. Ritchie, .Em The Programming Language , -Prentice-.Xr Hall, +Prentice-Hall, 1978 .Pp B. W. Kernighan, -.Em Programming in C\-em a tutorial +.Em Programming in C \- a tutorial .Pp D. M. Ritchie, .Em C Reference Manual @@ -248,7 +254,6 @@ or loader. The .Nm compiler was distributed with Version 6 AT&T UNIX. -The current version was derived from the original. .Sh BUGS The compiler currently ignores advice to put .Ic char , diff --git a/usr/src/old/pcc/lint/lpass1/lint.1 b/usr/src/old/pcc/lint/lpass1/lint.1 index 069e139fd8..15a01b493a 100644 --- a/usr/src/old/pcc/lint/lpass1/lint.1 +++ b/usr/src/old/pcc/lint/lpass1/lint.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley Software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)lint.1 6.3 (Berkeley) %G% +.\" @(#)lint.1 6.5 (Berkeley) %G% .\" .Dd .Dt LINT 1 @@ -49,7 +49,7 @@ use the .Fl C option: .Pp -.DL lint \-Cfoo files . . . +.Dl lint \-Cfoo files . . . .Pp where .Ar files @@ -118,7 +118,7 @@ are not understood; this causes various lies. Certain conventional comments in the C source will change the behavior of .Nm lint : -.Tw Fl +.Tw Ds .Tp Li /*NOTREACHED*/ at appropriate points stops comments about unreachable code. @@ -147,9 +147,6 @@ S.C. Johnson. Lint library construction implemented by Edward Wang. .Sh FILES .Dw /usr/libdata/lint/llib-port.ln .Di L -.\" Pa /usr/libdata/lint/llib.ln -.\" .Op 12 -.\" programs .Dp Pa /usr/libdata/lint/llib-lc.ln declarations for standard functions .Dp Pa /usr/libdata/lint/llib-lc diff --git a/usr/src/old/pr/pr.1 b/usr/src/old/pr/pr.1 index d3d9ca31d2..5b83a97361 100644 --- a/usr/src/old/pr/pr.1 +++ b/usr/src/old/pr/pr.1 @@ -3,28 +3,32 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)pr.1 6.2 (Berkeley) %G% +.\" @(#)pr.1 6.3 (Berkeley) %G% .\" .Dd .Dt PR 1 -.Os BSD 4.4 +.Os BSD 4.3+Reno .Sh NAME .Nm pr .Nd Print files. .Sh SYNOPSIS -.Ar pr -.Op +page +.Nm pr .Oo +.Op Cm \&+ Ar page .Op Fl Ar column +.Oo .Op Fl f .Op Fl hheader .Op Fl llines .Op Fl m +.Oo .Op Fl s Ar char +.Oo .Op Fl t +.Oo .Op Fl w Ar width -.Ar .Oo +.Ar .Sh DESCRIPTION The .Nm pr @@ -42,20 +46,29 @@ Lines that do not fit into a text column are truncated. If standard output is associated with a terminal, diagnostic messages are suppressed -until the pr utility has completed processing. +until the +.Nm +utility has completed processing. .Pp The following options are available: .Tw Fl -.Tp Ar +page +.Tc Cm \&+ +.Ar page +.Cx Begin output at page number page of the formatted input. -.Tp Ar \-column +.Tc Fl +.Ar column +.Cx Produce output that is columns wide (default is 1) and is in text column rank order. This -option should not be used with \-m. +option should not be used with +.Fl m . When -used with \-t, use the minimum number of lines +used with +.Fl t , +use the minimum number of lines to display the output. .Tp Fl f Use character for new pages, @@ -77,7 +90,8 @@ page length to lines. If lines is smaller than the sum of both the header and trailer depths (in lines), the pr utility suppresses -both the header and trailer, as if the \-t +both the header and trailer, as if the +.Fl t option were in effect. .Tp Fl m Merge files. @@ -116,11 +130,13 @@ A pathname of a file to be printed. .Tp .Pp If no file -operands are specified, or if a file operand is \-, +operands are specified, or if a file operand is +.Sq Fl , the standard input is used. .Pp The standard input is used only if no file operands are -specified, or if a file operand is \-. +specified, or if a file operand is +.Sq Fl . .Pp If pr receives an interrupt while printing to a terminal, it flushes all accumulated error messages to the screen before @@ -131,7 +147,9 @@ file (or files). This pagination is optionally done using s or a sequence of s. Page headers are -generated unless the \-t option is specified. +generated unless the +.Fl t +option is specified. .Pp The .Nm pr @@ -141,7 +159,8 @@ Error messages are written to standard error during the printing process (if output is redirected) or after all successful file printing is complete (when printing to a terminal). -.Sh FILES +.Sh SEE ALSO +.Xr more 1 .Sh STANDARDS The .Nm pr diff --git a/usr/src/old/ratfor/ratfor.1 b/usr/src/old/ratfor/ratfor.1 index c124814561..d7d0b6d678 100644 --- a/usr/src/old/ratfor/ratfor.1 +++ b/usr/src/old/ratfor/ratfor.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)ratfor.1 6.3 (Berkeley) %G% +.\" @(#)ratfor.1 6.4 (Berkeley) %G% .\" .Dd .Dt RATFOR 1 diff --git a/usr/src/old/refer/OTHERS/roffbib.1 b/usr/src/old/refer/OTHERS/roffbib.1 index 550aec7b48..c29764d5c0 100644 --- a/usr/src/old/refer/OTHERS/roffbib.1 +++ b/usr/src/old/refer/OTHERS/roffbib.1 @@ -1,116 +1,144 @@ -.\" Copyright (c) 1983 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1983, 1990 Regents of the University of California. +.\" All rights reserved. .\" -.\" @(#)roffbib.1 6.2 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH ROFFBIB 1 "" -.UC 5 -.SH NAME -roffbib \- run off bibliographic database -.SH SYNOPSIS -.B roffbib -[ -.B \-e -] [ -.B \-h -] [ -.B \-n -] [ -.B \-o -] [ -.B \-r -] [ -.B \-s -] [ -.BI \-T term -] [ -.B \-x -] [ -.B \-m -.I mac -] [ -.B \-V -] [ -.B \-Q -] [ file ... ] -.SH DESCRIPTION -.I Roffbib -prints out all records in a bibliographic database, +.\" @(#)roffbib.1 6.3 (Berkeley) %G% +.\" +.Dd +.Dt ROFFBIB 1 +.Os BSD 4.2 +.Sh NAME +.Nm roffbib +.Nd run off bibliographic database +.Sh SYNOPSIS +.Nm roffbib +.Op Fl e +.Op Fl h +.Op Fl n +.Op Fl o +.Op Fl r +.Op Fl s +.Oo +.Op Fl T Ar term +.Oo +.Op Fl x +.Op Fl m Ar mac +.Op Fl V +.Op Fl Q +.Ar +.Sh DESCRIPTION +.Nm Roffbib +is a shell script which prints out all records in a bibliographic database, in bibliography format rather than as footnotes or endnotes. Generally it is used in conjunction with -.IR sortbib : -.LP -.RS -sortbib database | roffbib -.RE -.LP -.I Roffbib +.Xr sortbib : +.Pp +.Dl sortbib database \&| roffbib +.Pp +.Nm Roffbib accepts most of the options understood by -.IR nroff (1), -most importantly the -.B \-T +.Xr nroff 1 , +such as the +.Fl T flag to specify terminal type. -.PP -If abstracts or comments are entered following the %X field key, -.I roffbib +.Pp +If abstracts or comments are entered in the database following the %X field key, +.Nm roffbib will format them into paragraphs for an annotated bibliography. Several %X fields may be given if several annotation paragraphs are desired. -The -.B \-x -flag will suppress the printing of these abstracts. -.PP -A user-defined set of macros -may be specified after the -.B \-m +.Pp +Options exclusive to +.Nm roffbib : +.Tp Fl x +Suppresses the printing of %X abstracts. +.Tp Fl V +Send output to the Versatec (use vtroff). +.Tp Fl Q +Queue the output to the default troff device. +.Tp +.Pp +If neither the +.Fl Q +or +.Fl V +flags are given, +.Nm +sends the output to the standard output. +The default macros for +.Nm +are in +.Pa /usr/share/tmac/tmac.bib . +These can be over ridden by +specifying a user-defined set with the +.Fl m option. -There should be a space between the -.B \-m -and the macro filename. -This set of macros will replace the ones -defined in /usr/lib/tmac/tmac.bib. -The -.B \-V -flag will send output to the Versatec; the -.B \-Q -flag will queue output for the phototypesetter. -.PP +.Pp Four command-line registers control formatting style of the bibliography, much like the number registers of -.IR ms (7). +.Xr ms 7 . The command-line argument -.BR \-r N1 +.Cx Fl r +.Ar N1 +.Cx will number -the references starting at one (1). +the references starting at one 1 . The flag -.BR \-r V2 +.Cx Fl r +.Ar V2 +.Cx will double space the biblio\%graphy, while -.BR \-r V1 +.Cx Fl r +.Ar V1 +.Cx will double space references but single space annotation paragraphs. The line length can be changed from the default 6.5 inches to 6 inches with the -.BR \-r L6i +.Cx Fl r +.Ar L6i +.Cx argument, and the page offset can be set from the default of 0 to one inch by specifying -.BR \-r O1i +.Cx Fl r +.Ar O1i +.Cx (capital O, not zero). Note: with the -.B \-V +.Fl V and -.B \-Q +.Fl Q flags the default page offset is already one inch. -.SH FILES -.ta \w'/usr/lib/tmac/tmac.bib\0\0'u -.nf -/usr/lib/tmac/tmac.bib file of macros used by \fInroff/troff\fP -.fi -.SH SEE ALSO -refer(1), addbib(1), sortbib(1), indxbib(1), lookbib(1) -.SH BUGS +.Pp +.Nm Roffbib +is limited, but it is a good script to copy and adopt +for one's own needs, as it does demonstrate usage of +.Xr refer 1 . +.Sh FILES +.Dw /usr/share/tmac/tmac.bib +.Di L +.Dp Pa /usr/bin/roffbib +.Nm +script. +.Dp Pa /usr/share/tmac/tmac.bib +file of macros used by +.Xr nroff 1 +and +.Xr troff 1 +.Dp +.Sh SEE ALSO +.Xr refer 1 , +.Xr addbib 1 , +.Xr sortbib 1 , +.Xr indxbib 1 , +.Xr lookbib 1 +.Sh HISTORY +.Nm Roffbib +appeared in 4.2 BSD. +.Sh BUGS Users have to rewrite macros to create customized formats. diff --git a/usr/src/old/refer/addbib/addbib.1 b/usr/src/old/refer/addbib/addbib.1 index dec361065e..6f25d369bb 100644 --- a/usr/src/old/refer/addbib/addbib.1 +++ b/usr/src/old/refer/addbib/addbib.1 @@ -2,7 +2,7 @@ .\" All rights reserved. .\" .\" -.\" @(#)addbib.1 6.2 (Berkeley) %G% +.\" @(#)addbib.1 6.3 (Berkeley) %G% .\" .Dd .Os BSD 4.2 @@ -17,14 +17,14 @@ .Ar database .Sh DESCRIPTION When this program starts up, answering -.Li y +.Ql y to the initial -.Li Instructions? +.Ql Instructions? prompt yields directions; typing -.Li n +.Ql n or -.Li RETURN +.Ql RETURN skips them. .Nm Addbib then prompts for various bibliographic fields, @@ -32,23 +32,23 @@ reads responses from the terminal, and sends output records to a .Ar database . A null response (just -.Li RETURN ) +.Ql RETURN ) means to leave out that field. A minus sign -.Li (\-) +.Ql \- means to go back to the previous field. A trailing backslash allows a field to be continued on the next line. The repeating -.Li Continue? +.Ql Continue? prompt allows the user either to resume by typing -.Li y +.Ql y or -.Li RETURN , +.Ql RETURN , to quit the current session by typing -.Li n +.Ql n or -.Li q , +.Ql q , or to edit the .Ar database with any system editor (.e.g. @@ -62,7 +62,7 @@ The option suppresses prompting for an abstract; asking for an abstract is the default. Abstracts are ended with a -.Li CTRL-d . +.Ql CTRL-d . The .Fl p option causes @@ -155,6 +155,7 @@ Berkeley .Dp .Sh FILES .Dw promptfile +.Di L .Dp Pa promptfile optional file to define prompting .Sh SEE ALSO diff --git a/usr/src/old/refer/lookbib/lookbib.1 b/usr/src/old/refer/lookbib/lookbib.1 index bd1d61bb09..50c7db754f 100644 --- a/usr/src/old/refer/lookbib/lookbib.1 +++ b/usr/src/old/refer/lookbib/lookbib.1 @@ -1,100 +1,148 @@ -.\" Copyright (c) 1983 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1983, 1990 Regents of the University of California. +.\" All rights reserved. .\" -.\" @(#)lookbib.1 6.2 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH LOOKBIB 1 "April 29, 1985" -.UC 5 -.SH NAME -indxbib, lookbib \- build inverted index for a bibliography, find references in a bibliography -.SH SYNOPSIS -.B indxbib -database ... -.br -.B lookbib -[ -.B \-n -] database -.SH DESCRIPTION -.I Indxbib -makes an inverted index to the named -.I databases -(or files) for use by -.IR lookbib (1) +.\" @(#)lookbib.1 6.3 (Berkeley) %G% +.\" +.Dd +.Dt LOOKBIB 1 +.Os BSD 4.2 +.Sh NAME +.Nm indxbib , lookbib +.Nd build inverted index for a bibliography, +find references in a bibliography +.Sh SYNOPSIS +.Nm indxbib +.Ar database ... +.Nm lookbib +.Op Fl n +.Ar database +.Sh DESCRIPTION +.Nm Indxbib +builds an inverted index to the named +.Ar databases +(or files), which can then be +used by +.Nm lookbib +and +.Xr refer 1 . +The files are assumed to be +.Xr refer +style bibliographic databases +(see +.Xr addbib 1 ) . +.Pp +.Nm Indxbib +is a shell script which calls +.Nm mkey and -.IR refer (1). -These files contain bibliographic references -(or other kinds of information) separated by blank lines. -.PP -A bibliographic reference is a set of lines, -constituting fields of bibliographic information. -Each field starts on a line beginning with a ``%'', -followed by a key-letter, then a blank, -and finally the contents of the field, -which may continue until the next line starting with ``%''. -.PP -.I Indxbib -is a shell script that calls -/usr/lib/refer/mkey and /usr/lib/refer/inv. +.Nm inv . The first program, -.I mkey, +.Nm mkey , truncates words to 6 characters, and maps upper case to lower case. It also discards words shorter than 3 characters, words among the 100 most common English words, and numbers (dates) < 1900 or > 2000. -These parameters can be changed; see page 4 of the -.I Refer -document by Mike Lesk. +These parameters can be changed; see page 4 of a +.Em Refer +document by Mike Lesk (See the SEE ALSO section below). The second program, -.I inv, -creates an entry file (.ia), -a posting file (.ib), and a tag file (.ic), +.Nm inv , +creates an entry file +.Cx \&( +.Ar file +.Cx .ia), +.Cx +a posting file +.Cx \&( +.Ar file +.Cx .ib), +.Cx +and a tag file +.Cx \&( +.Ar file +.Cx .ic), +.Cx all in the working directory. -.PP -.I Lookbib +.Pp +.Nm Lookbib uses an inverted index made by -.I indxbib +.Nm indxbib to find sets of bibliographic references. It reads keywords typed after the ``>'' prompt on the terminal, and retrieves records containing all these keywords. If nothing matches, nothing is returned except another ``>'' prompt. -.PP -.I Lookbib +.Pp +.Nm Lookbib will ask if you need instructions, and will print some brief information if -you reply ``y''. The ``\-n'' flag turns off the prompt for instructions. -.PP +you reply ``y''. The +.Fl n +flag turns off the prompt for instructions. +.Pp It is possible to search multiple databases, as long as they have a common index made by -.I indxbib. +.Nm indxbib . In that case, only the first argument given to -.I indxbib +.Nm indxbib is specified to -.I lookbib. -.PP +.Nm lookbib . +.Pp If -.I lookbib -does not find the index files (the .i[abc] files), +.Nm lookbib +does not find the index files (the +.Cx \&( +.Ar file +.Cx .i[abc] +.Cx +files), it looks for a reference file with the same name as the argument, without the suffixes. -It creates a file with a '.ig' suffix, suitable for use with -.I fgrep. +It creates a file with a +`.ig' suffix, suitable for use with +.Xr fgrep 1 . It then uses this fgrep file to find references. -This method is simpler to use, but the .ig file is slower to use -than the .i[abc] files, and does not allow the use of multiple reference files. -.SH FILES -.IR x .ia, -.IR x .ib, -.IR x .ic, -where -.I x -is the first argument, or if these are not present, then -.IR x .ig, -.IR x -.SH SEE ALSO -refer(1), addbib(1), sortbib(1), roffbib(1), lookbib(1) -.SH BUGS +This method is simpler to use, but the +.Cx Ar file +.Cx .ig +.Cx +is slower to use +than the +.Cx Ar file +.Cx .i[abc] +.Cx +files, and does not allow the use of multiple reference files. +.Sh FILES +.Dw /usr/libexec/mkey +.Di L +.Dp Pa \&*.ia +entry file +.Dp Pa \&*.ib +posting file +.Dp Pa \&*.ic +tag file +.Dp Pa \&*.ig +ascii file created if index files not found. +.Dp Pa /usr/libexec/mkey +make keys program +.Dp Pa /usr/libexec/inv +hash and invert program +.Dp +.Sh SEE ALSO +.Xr refer 1 , +.Xr addbib 1 , +.Xr sortbib 1 , +.Xr roffbib 1 , +.Xr lookbib 1 +.Sh BUGS +More than one blank line in between citations +can wreak havoc. +.Pp Probably all dates should be indexed, since many disciplines refer to literature written in the 1800s or earlier. +.Sh HISTORY +A +.Nm lookbib +appeared in Version 32 AT&T Unix. diff --git a/usr/src/old/refer/refer/refer.1 b/usr/src/old/refer/refer/refer.1 index 7b9b1e0b58..1044a5a4ce 100644 --- a/usr/src/old/refer/refer/refer.1 +++ b/usr/src/old/refer/refer/refer.1 @@ -2,226 +2,217 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)refer.1 6.3 (Berkeley) %G% +.\" @(#)refer.1 6.4 (Berkeley) %G% .\" -.TH REFER 1 "%Q" -.AT 3 -.SH NAME -refer \- find and insert literature references in documents -.SH SYNOPSIS -.B refer -[ -.B \-a -] [ -.B \-b -] [ -.B \-c -] [ -.B \-e -] [ -.BI \-f n -] [ -.BI \-k x -] [ -.BI \-l m,n -] [ -.B \-n -] [ -.B \-p -bib -] [ -.BI \-s keys -] [ -.BI \-B l.m -] [ -.B \-P -] [ -.B \-S -] [ file ... ] -.SH DESCRIPTION -.I Refer +.Dd +.Dt REFER 1 +.Os ATT 7th +.Sh NAME +.Nm refer +.Nd find and insert literature references in documents +.Sh SYNOPSIS +.Nm refer +.Op Fl a +.Op Fl b +.Op Fl c +.Op Fl e +.Oo +.Op Fl f Ar n +.Op Fl k Ar x +.Op Fl l Ar m,n +.Oo +.Op Fl n +.Op Fl p Ar bib +.Oo +.Op Fl s Ar keys +.Op Fl B Ar l.m +.Oo +.Op Fl P +.Op Fl S +.Op Ar +.Sh DESCRIPTION +.Nm Refer is a preprocessor for -.I nroff +.Xr nroff 1 or -.IR troff (1) +.Xr troff 1 that finds and formats references for footnotes or endnotes. It is also the base for a series of programs designed to index, search, sort, and print stand-alone bibliographies, or other data entered in the appropriate form. -.PP +.Pp Given an incomplete citation with sufficiently precise keywords, -.I refer +.Nm refer will search a bibliographic database for references containing these keywords anywhere in the title, author, journal, etc. The input file (or standard input) is copied to standard output, -except for lines between .[ and .] delimiters, +except for lines between \&.[ +and \&.] +delimiters, which are assumed to contain keywords, and are replaced by information from the bibliographic database. The user may also search different databases, override particular fields, or add new fields. The reference data, from whatever source, are assigned to a set of -.I troff +.Xr troff 1 strings. Macro packages such as -.IR ms (7) +.Xr ms 7 print the finished reference text from these strings. By default references are flagged by footnote numbers. -.PP +.Pp The following options are available: -.TP 6 -.BI \-a n +.Tw Fl +.Tc Fl a +.Ar n +.Cx Reverse the first -.I n +.Ar n author names (Jones, J. A. instead of J. A. Jones). If -.I n +.Ar n is omitted all author names are reversed. -.ns -.TP -.B \-b +.Tp Fl b Bare mode: do not put any flags in text (neither numbers nor labels). -.ns -.TP -.BI \-c keys -Capitalize (with C\s-2APS\s0 S\s-2MALL\s+2 C\s-2APS\s0) +.Tc Fl c +.Ar keys +.Cx +Capitalize (with C\s-2APS\s+2 S\s-2MALL\s+2 C\s-2APS\s+2) the fields whose key-letters are in -.IR keys . -.ns -.TP -.B \-e +.Ar keys . +.Tp Fl e Instead of leaving the references where encountered, accumulate them until a sequence of the form -.nf - .[ - $LIST$ - .] -.fi +.Ds I +\&.[ +$LIST$ +\&.] +.De is encountered, and then write out all references collected so far. Collapse references to same source. -.ns -.TP -.BI \-f n +.Tc Fl f +.Ar n +.Cx Set the footnote number to -.I n +.Ar n instead of the default of 1 (one). With labels rather than numbers, this flag is a no-op. -.ns -.TP -.BI \-k x +.Tc Fl k +.Ar x +.Cx Instead of numbering references, use labels as specified in a reference data line beginning -.I %x; +.Ar \&%x ; by default -.I x +.Ar x is -.B L. -.ns -.TP -.BI \-l m , n +.Cm L . +.Tc Fl l +.Ar m , n +.Cx Instead of numbering references, use labels made from the senior author's last name and the year of publication. Only the first -.I m +.Ar m letters of the last name and the last -.I n +.Ar n digits of the date are used. If either -.I m +.Ar m or -.I n +.Ar n is omitted the entire name or date respectively is used. -.ns -.TP -.B \-n -Do not search the default file /usr/share/dict/papers/Ind. -If there is a REFER environment variable, +.Tp Fl n +Do not search the default file +.Pa /var/db/Ind . +If there is a +.Ev REFER +environment variable, the specified file will be searched instead of the default file; in this case the -.B \-n +.Fl n flag has no effect. -.ns -.TP -.BI \-p \0bib +.Tc Fl p +.Ws +.Ar bib +.Cx Take the next argument -.I bib +.Ar bib as a file of references to be searched. The default file is searched last. -.ns -.TP -.BI \-s keys +.Tc Fl s +.Ar keys +.Cx Sort references by fields whose key-letters are in the -.I keys +.Ar keys string; permute reference numbers in text accordingly. Implies -.BR \-e . +.Fl e . The key-letters in -.I keys +.Ar keys may be followed by a number to indicate how many such fields are used, with -.B + +.Cm + taken as a very large number. The default is -.B AD +.Cm AD which sorts on the senior author and then date; to sort, for example, on all authors and then title, use -.BR -sA+T . -.ns -.TP -.BI \-B l.m +.Fl sA+T . +.Tc Fl B +.Ar l.m +.Cx Bibliography mode. Take a file composed of records separated by blank lines, and turn them into -.I troff +.Xr troff 1 input. Label -.I l +.Ar \&l will be turned into the macro -.I .m +.Ar \&.m with -.I l +.Ar \&l defaulting to -.B %X +.Cm \&%X and -.I .m +.Cm \&.m defaulting to -.B .AP +.Cm \&.AP (annotation paragraph). -.ns -.TP -.B \-P +.Tp Fl P Place punctuation marks .,:;?! after the reference signal, rather than before. (Periods and commas used to be done with strings.) -.ns -.TP -.B \-S +.Tp Fl S Produce references in the Natural or Social Science format. -.PP +.Tp +.Pp To use your own references, put them in the format described below. They can be searched more rapidly by running -.IR indxbib (1) +.Xr indxbib 1 on them before using -.I refer; +.Nm refer ; failure to index results in a linear search. When -.I refer +.Nm refer is used with the -.I eqn, -.I neqn +.Xr eqn 1 , +.Xr neqn 1 or -.I tbl +.Xr tbl 1 preprocessors -.I refer +.Nm refer should be first, to minimize the volume of data passed through pipes. -.PP +.Pp The -.I refer +.Nm refer preprocessor and associated programs expect input from a file of references composed of records separated by blank lines. @@ -233,37 +224,63 @@ and finally the contents of the field, and continue until the next line starting with ``%''. The output ordering and formatting of fields is controlled by the macros specified for -.I nroff/troff +.Xr nroff 1 +or +.Xr troff 1 (for footnotes and endnotes) or -.I roffbib +.Xr roffbib 1 (for stand-alone bibliographies). For a list of the most common key-letters and their corresponding fields, see -.IR addbib (1). +.Xr addbib 1 . An example of a -.I refer +.Nm refer entry is given below. -.SH EXAMPLE -.PP -.nf +.Sh ENVIRONMENT +The following environment variable is used by +.Nm refer +if it exists. +.Tw Fl +.Tp Ev REFER +Specify an alternate default search file for publication lists. +.Tp +.Sh EXAMPLES +.Pp +.Ds I %A M. E. Lesk -%T Some Applications of Inverted Indexes on the \s-1UNIX\s0 System -%B \s-1UNIX\s0 Programmer's Manual +%T Some Applications of Inverted Indexes on the UNIX System +%B UNIX Programmer's Manual %V 2b %I Bell Laboratories %C Murray Hill, NJ %D 1978 -.fi -.SH FILES -.ta \w'/usr/dict/share/papers\0\0'u -/usr/share/dict/papers directory of default publication lists -.br -/usr/lib/refer directory of companion programs -.SH SEE ALSO -addbib(1), sortbib(1), roffbib(1), indxbib(1), lookbib(1) -.SH AUTHOR +.De +.Sh FILES +.Dw /usr/share/dict/papers +.Di L +.Dp Pa /usr/share/dict/papers +directory of default publication lists. +.Dp Pa /var/db/Ind +default search file (for +.Em hunt +phase). +.Dp Pa /usr/share/dict/eign +contains common words. +.Dp Pa /usr/libexec +directory where companion programs reside. +.Dp +.Sh SEE ALSO +.Xr addbib 1 , +.Xr sortbib 1 , +.Xr roffbib 1 , +.Xr indxbib 1 , +.Xr lookbib 1 +.Sh HISTORY +.Nm Refer +appeared in Version 7 AT&T Unix. +.Sh AUTHOR Mike Lesk -.SH BUGS +.Sh BUGS Blank spaces at the end of lines in bibliography fields will cause the records to sort and reverse incorrectly. Sorting large numbers of references causes a core dump. diff --git a/usr/src/old/roff/nroff/nroff.1 b/usr/src/old/roff/nroff/nroff.1 index 4188592368..64bee1017a 100644 --- a/usr/src/old/roff/nroff/nroff.1 +++ b/usr/src/old/roff/nroff/nroff.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)nroff.1 6.4 (Berkeley) %G% +.\" @(#)nroff.1 6.5 (Berkeley) %G% .\" .Dd .Dt NROFF 1 diff --git a/usr/src/old/sh/sh.1 b/usr/src/old/sh/sh.1 index e765aac6cd..77ecaa1d47 100644 --- a/usr/src/old/sh/sh.1 +++ b/usr/src/old/sh/sh.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)sh.1 6.5 (Berkeley) %G% +.\" @(#)sh.1 6.6 (Berkeley) %G% .\" .Dd .Dt SH 1 @@ -948,7 +948,7 @@ shell appeared in Version 6 AT&Y UNIX. If .Ic \&<\&< is used to provide standard input to an asynchronous -process invoked by +process invoked by .Ic \&& , the shell gets mixed up about naming the input document. A garbage file diff --git a/usr/src/share/man/man1/cd.1 b/usr/src/share/man/man1/cd.1 index fb5c5839d3..c307f24048 100644 --- a/usr/src/share/man/man1/cd.1 +++ b/usr/src/share/man/man1/cd.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cd.1 6.2 (Berkeley) %G% +.\" @(#)cd.1 6.3 (Berkeley) %G% .\" .Dd .Dt CD 1 @@ -19,7 +19,7 @@ The cd utility changes the working directory to .Ar directory . .Pp -.The +The .Ar directory is an absolute or relative pathname which becomes the new working directory. @@ -31,7 +31,7 @@ on the CDPATH environment variable (see below). The following environment variables affect the execution of cd: .Pp -.Tw Ar +.Tw Fl .Tp Ev HOME If .Nm cd diff --git a/usr/src/usr.bin/apply/apply.1 b/usr/src/usr.bin/apply/apply.1 index 8ef1dc5a17..7e7282e4b4 100644 --- a/usr/src/usr.bin/apply/apply.1 +++ b/usr/src/usr.bin/apply/apply.1 @@ -2,7 +2,7 @@ .\" All rights reserved. .\" .\" -.\" @(#)apply.1 6.2 (Berkeley) %G% +.\" @(#)apply.1 6.3 (Berkeley) %G% .\" .Dd .Dt APPLY 1 @@ -34,7 +34,7 @@ is zero, is run without arguments once for each .Ar arg Character sequences of the form -Cx % +.Cx % .Ar d .Cx in @@ -88,7 +88,7 @@ Rob Pike Shell metacharacters in .Ar command may have bizarre effects; it is best to enclose complicated -commands in single quotes \(aa\ \(aa. +commands in single quotes (\(aa\ \(aa). .Pp There is no way to pass a literal `%2' if `%' is the argument expansion character. diff --git a/usr/src/usr.bin/apropos/apropos.1 b/usr/src/usr.bin/apropos/apropos.1 index 1f792f5a72..d6e030d4c1 100644 --- a/usr/src/usr.bin/apropos/apropos.1 +++ b/usr/src/usr.bin/apropos/apropos.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)apropos.1 6.8 (Berkeley) %G% +.\" @(#)apropos.1 6.9 (Berkeley) %G% .\" .Dd .Dt APROPOS 1 @@ -44,7 +44,7 @@ searches for a database named The supplied .Ar path must be a colon (\*(Lq:\*(Rq) separated list of directories. -This search path may also be set using the environmental variable +This search path may also be set using the environment variable .Ev MANPATH . .Tp Fl m Augment the list of standard directories where @@ -70,10 +70,11 @@ environmental variable. The format of the path is a colon (\*(Lq:\*(Rq) separated list of directories. .Tp .Sh FILES -.Tw whatis.db -.Tp Pa whatis.db +.Dw whatis.db +.Di L +.Dp Pa whatis.db name of the apropos database -.Tp +.Dp .Sh SEE ALSO .Xr man 1 , .Xr whatis 1 , diff --git a/usr/src/usr.bin/ar/ar.1 b/usr/src/usr.bin/ar/ar.1 index 6591f399eb..29ff8041a5 100644 --- a/usr/src/usr.bin/ar/ar.1 +++ b/usr/src/usr.bin/ar/ar.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)ar.1 6.3 (Berkeley) %G% +.\" @(#)ar.1 6.4 (Berkeley) %G% .\" .Dd .Dt AR 1 @@ -136,10 +136,11 @@ places its temporary files in the directory /tmp. This option causes them to be placed in the local directory. .Tp .Sh FILES -.Tw /tmp/v* -.Tp Pa tmp/v* +.Dw /tmp/v* +.Di L +.Dp Pa tmp/v* temporaries -.Tp +.Dp .Sh SEE ALSO .Xr lorder 1 , .Xr ld 1 , diff --git a/usr/src/usr.bin/at/at/at.1 b/usr/src/usr.bin/at/at/at.1 index 7be505252f..96a9e1395d 100644 --- a/usr/src/usr.bin/at/at/at.1 +++ b/usr/src/usr.bin/at/at/at.1 @@ -3,15 +3,14 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)at.1 6.3 (Berkeley) %G% +.\" @(#)at.1 6.4 (Berkeley) %G% .\" .Dd .Dt AT 1 -.Dd .Os BSD 4 .Sh NAME .Nm at -.Sd run command(s) at a specific time +.Nd schedule execution of commands `at' a given time .Sh SYNOPSIS .Nm at .Op Fl c @@ -22,15 +21,23 @@ .Op Ar command_file .Sh DESCRIPTION .Nm At -allows commands to be run at a user specified time. -The commands can be given to +schedules execution of commands at the specified +.Ar time . +The commands may be given to .Nm via the .Ar command_file or accepted from the standard input. .Nm At will pass these commands to the appropriate -shell at the requested time. +shell at the requested time. While awaiting +execution, the jobs reside in a spool directory +and may be examined by the +.Xr atq 1 +program. +.Pp +Options available: +.Pp .Tp Fl c .Ar Command_file contains @@ -49,18 +56,21 @@ no errors occur, then a short message is sent informing the user that no errors occurred. .Tp .Pp -If no file name is specified, +If a +.Ar command_file +is not specified, .Nm at prompts for commands from standard input until a -.Li \&^D is typed. +.Ql \&^D +is typed. .Pp The format of the spool file is as follows: A four line header that includes the owner of the job, the name of the job, the shell used to run the job, and whether mail will be -set after the job is executed. The header is followed by a -.Ic cd +sent after the job is executed. The header is followed by a +.Nm cd command to the current directory and a -.Ic umask +.Nm umask command to set the modes on any files created by the job. Then .Nm at @@ -79,13 +89,9 @@ is hour and is minutes, or the traditional 12 hour time with qualifying options: .Df I -.Dp Li am -am -.Dp Li a +.Dp Li am , a am -.Dp Li pm -pm -.Dp Li p +.Dp Li pm , p pm .Dp Li n noon @@ -93,7 +99,7 @@ noon midnight .Dp .De -The time can be abbreviated as shown below in the EXAMPLES. +The time can be abbreviated as shown below in EXAMPLES. .Pp A .Ar day @@ -102,33 +108,36 @@ letters of its name. A week (7 days) may be specified by the argument .Em week . If a month name is given, the following argument is expected to -be the day. +be the day (numeric). .Sh ENVIRONMENT -If no shell is specified, +If a shell is not specified, the current environment variable .Ev SHELL is used. -Examples +.Sh EXAMPLES .Pp -.Dp Li at 10p +.Tw Ar +.Tp Li at 10p Execute at 10pm today, or tomorrow if 10pm has past. Use the shell found in the environment variable .Ev SHELL. -.Dp Li at -c -m 1705 mo +.Tp Li at -c -m 1705 mo Execute at 5:05pm on Monday using .Xr csh 1 and send mail upon completion or termination of the job. -.Dp Li at -s -m 1200n week +.Tp Li at -s -m 1200n week Use .Xr sh 1 , send mail upon completetion, start at noon o'clock, one week from today. -.Dp Li at -s 8a apr 1 -Try it for fun. -.Dp -.Pp +.Tp Li at -s 8a apr 1 +Ideally this would be given late in March. The +commands would be run at 8 am on April first, using +the +.Xr sh 1 . +.Tp .Sh ERRORS Errors must be collected via the .Fl m @@ -137,7 +146,7 @@ from inside the .Ar command_file. .Sh FILES .Dw /var/spool/at/yy.ddd.hhhh.* -.Ds L +.Di L .Dp Pa /var/spool/at spooling area .Dp Pa /var/spool/at/yy.ddd.hhhh.* @@ -159,7 +168,7 @@ executor (run by .Sh DIAGNOSTICS Complains about various syntax errors and times out of range. .Sh HISTORY -.Nm +.Nm At appeared in Version 7 AT&T UNIX. .Sh BUGS The queueing mechanism @@ -182,5 +191,6 @@ If the system crashes, mail is not sent to the user informing them that the job was not completed. .Pp Sometimes old spool files are not removed from the directory -/var/spool/at/past. This is usually due to a system crash, +.Pa /var/spool/at/past . +This is usually due to a system crash, and requires that they be removed by hand. diff --git a/usr/src/usr.bin/at/atq/atq.1 b/usr/src/usr.bin/at/atq/atq.1 index 6a9598cdb7..2d109d051b 100644 --- a/usr/src/usr.bin/at/atq/atq.1 +++ b/usr/src/usr.bin/at/atq/atq.1 @@ -3,14 +3,16 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)atq.1 6.3 (Berkeley) %G% +.\" @(#)atq.1 6.4 (Berkeley) %G% .\" .Dd .Dt ATQ 1 .Os BSD 4.3 .Sh NAME .Nm atq -.Nd print the queue of jobs waiting to be run +.Nd display the +.Xr at 1 +job queue .Sh SYNOPSIS .Nm atq .Op Fl c @@ -18,12 +20,16 @@ .Op Ar name ... .Sh DESCRIPTION .Nm Atq -prints the queue of jobs that are waiting to be run -at a later date. These jobs were created with the +displays the queue of jobs, created by the .Xr at 1 -command. +command, +which are currently awaiting execution. With no flags, the queue is sorted in the order that the jobs will be executed. +.Pp +Options available are: +.Pp +.Tw Ds .Tp Fl c the queue is sorted by the time that the .Li at @@ -36,10 +42,11 @@ in the queue are printed. If a name(s) is provided, only those files belonging to that user(s) are displayed. .Sh FILES -.Tw /var/spool/at -.Tp /var/spool/at +.Dw /var/spool/at +.Di L +.Dp Pa /var/spool/at spool area -.Tp +.Dp .Sh SEE ALSO .Xr at 1 , .Xr atrm 1 , diff --git a/usr/src/usr.bin/at/atrm/atrm.1 b/usr/src/usr.bin/at/atrm/atrm.1 index 532753154e..304b90f000 100644 --- a/usr/src/usr.bin/at/atrm/atrm.1 +++ b/usr/src/usr.bin/at/atrm/atrm.1 @@ -3,14 +3,15 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)atrm.1 6.3 (Berkeley) %G% +.\" @(#)atrm.1 6.4 (Berkeley) %G% .\" .Dd .Dt ATRM 1 .Os BSD 4.3 .Sh NAME .Nm atrm -.Nd remove jobs spooled by at +.Nd remove jobs spooled by +.Xr at 1 .Sh SYNOPSIS .Nm atrm .Op Fl f @@ -28,6 +29,8 @@ removes jobs that were created with the .Xr at 1 command. .Pp +Options available are: +.Pp .Tp Fl f all information regarding the removal of the specified jobs is suppressed. @@ -54,10 +57,11 @@ This form of invoking .Nm atrm is useful only to the super-user. .Sh FILES -.Tw /usr/spool/at -.Tp /usr/spool/at +.Dw /usr/spool/at +.Di L +.Dp Pa /usr/spool/at spool area -.Tp +.Dp .Sh SEE ALSO .Xr at 1 , .Xr atq 1 , diff --git a/usr/src/usr.bin/basename/basename.1 b/usr/src/usr.bin/basename/basename.1 index 11c31df6f6..db8f1d58fa 100644 --- a/usr/src/usr.bin/basename/basename.1 +++ b/usr/src/usr.bin/basename/basename.1 @@ -3,36 +3,48 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)basename.1 6.3 (Berkeley) %G% +.\" @(#)basename.1 6.4 (Berkeley) %G% .\" .Dt BASENAME 1 .Dd .Os BSD 4.4 .Sh NAME -.Nm basename -.Nd Extract filename from pathname +.Nm basename , dirname +.Nd return filename or directory portion of pathname .Sh SYNOPSIS .Nm basename .Ar string -.Op suffix +.Op Ar suffix +.Nm dirname +.Ar string .Sh DESCRIPTION .Nm Basename -strips -.Ar string -of its pathname prefix +deletes any prefix ending with the last slash +.Sq Li \&/ +character present in +.Ar string , and a .Ar suffix , -if given, to the standard output. +if given. +The resulting filename is written to the standard output. If .Ar string ends in the slash character, -.Li / , +.Sq Li / , or is the same as the .Ar suffix argument, a newline is output. A non-existant suffix is ignored. .Pp +.Nm Dirname +deletes the filename portion, beginning +with the last slash +.Sq Li \&/ +character to the end of +.Ar string , +and writes the result to the standard output. +.Sh EXAMPLES The following line sets the shell variable .Ev FOO to @@ -40,11 +52,17 @@ to .Pp .Dl FOO=`dirname /usr/bin/trail` .Pp -.Ar baseline -utility exits 0 on success, and >0 if an error occurs. +Both the +.Nm basename +and +.Nm dirname +exit 0 on success, and >0 if an error occurs. .Sh SEE ALSO +.Xr csh 1 .Xr sh 1 .Sh STANDARDS The -.Nm baseline -function is expected to be POSIX 1003.2 compatible. +.Nm basename +and +.Nm dirname +functions are expected to be POSIX 1003.2 compatible. diff --git a/usr/src/usr.bin/bc/bc.1 b/usr/src/usr.bin/bc/bc.1 index 542b01dac7..ae47ded019 100644 --- a/usr/src/usr.bin/bc/bc.1 +++ b/usr/src/usr.bin/bc/bc.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)bc.1 6.5 (Berkeley) %G% +.\" @(#)bc.1 6.6 (Berkeley) %G% .\" .Dd .Dt BC 1 @@ -23,7 +23,7 @@ It takes input from any files given, then reads the standard input. The .Tp Fl l -argument stands for the name +allow specification of an arbitrary precision math library. .Tp Fl c .Nm Bc @@ -45,31 +45,34 @@ L means letter a-z, E means expression, S means statement. .Pp Comments -.Dl are enclosed in /* and */. +.Ds I +are enclosed in /* and */. +.De .Pp Names -.Dl simple variables: L -.Df I -array elements: L -.Op E -.De -.Df I +.Ds I +simple variables: L +array elements: L [ E ] The words `ibase', `obase', and `scale' .De .Pp Other operands -.Dl arbitrarily long numbers with optional sign and decimal point. -.Dl \&( E \&) -.Dl sqrt ( E ) -.Dl length ( E ) number of significant decimal digits -.Dl scale ( E ) number of digits right of decimal point -.Dl L ( E , ... , E ) +.Ds I +arbitrarily long numbers with optional sign and decimal point. +\&( E \&) +sqrt ( E ) +length ( E ) number of significant decimal digits +scale ( E ) number of digits right of decimal point +L ( E , ... , E ) +.De .Pp Operators -.Dl \&+ \- * / % ^ (% is remainder; ^ is power) -.Dl \&++ \-\- (prefix and postfix; apply to names) -.Dl \&== <= >= != < > -.Dl \&= += \-= *= /= %= ^= +.Ds I +\&+ \- * / % ^ (% is remainder; ^ is power) +\&++ \-\- (prefix and postfix; apply to names) +\&== <= >= != < > +\&= += \-= *= /= %= ^= +.De .Pp Statements .Ds I @@ -95,7 +98,7 @@ define L ( L ,..., L ) { Functions in .Fl l math library -.Dw ss(x) +.Dw j(n,x) .Dp s(x) sine .Dp c(x) @@ -163,12 +166,14 @@ prints approximate values of the exponential function of the first ten integers. .Sh FILES .\" /usr/lib/lib.b mathematical library -.Ds L .Dw Dc(1) +.Di L .Dp Pa dc(1) desk calculator proper +.Dp .Sh SEE ALSO .Xr dc 1 -.L. .L. .Cherry and R. Morris, +.br +L. L. Cherry and R. Morris, .Em BC \- An arbitrary precision desk-calculator language .Sh HISTORY The @@ -177,8 +182,8 @@ command appeared in Version 7 AT&T UNIX. .Sh BUGS No &&, \(or\\(or, or ! operators. .br -.Li For +.Ql For statement must have all three E's. .br -.Li Quit +.Ql Quit is interpreted when read, not when executed. diff --git a/usr/src/usr.bin/biff/biff.1 b/usr/src/usr.bin/biff/biff.1 index e84eb84a62..c238bc06c2 100644 --- a/usr/src/usr.bin/biff/biff.1 +++ b/usr/src/usr.bin/biff/biff.1 @@ -3,14 +3,14 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)biff.1 6.3 (Berkeley) %G% +.\" @(#)biff.1 6.4 (Berkeley) %G% .\" .Dd .Dt BIFF 1 .Os BSD 4 .Sh NAME .Nm biff -.Nd be notified if mail arrives and who it is from +.Nd be\ notified\ if mail arrives and who it is from .Sh SYNOPSIS .Nm biff .Op Cm yn @@ -30,13 +30,11 @@ disables it. When mail notification is enabled, the header and first few lines of the message will be printed on your screen whenever mail arrives. A -.Li ``biff y'' +.Ql biff y command is often included in the file -.Pa \& -login +.Pa \&.login or -.Pa \& -profile +.Pa \&.profile to be executed at each login. .Pp .Nm Biff diff --git a/usr/src/usr.bin/cal/cal.1 b/usr/src/usr.bin/cal/cal.1 index 2de126788b..ab555844ed 100644 --- a/usr/src/usr.bin/cal/cal.1 +++ b/usr/src/usr.bin/cal/cal.1 @@ -6,7 +6,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cal.1 6.6 (Berkeley) %G% +.\" @(#)cal.1 6.7 (Berkeley) %G% .\" .Dd .Dt CAL 1 @@ -21,10 +21,10 @@ .Sh DESCRIPTION .Nm Cal displays a simple calendar. -If no options or arguments are given, -.Nm cal -displays the current month. +If arguments are not specified, +the current month is displayed. The options are as follows: +.Tw Ds .Tp Fl j Display julian dates (days one-based, numbered from January 1). .Tp Fl y @@ -41,8 +41,8 @@ displayed. .Pp A year starts on Jan 1. .Pp -The Gregorian Reformation is assumed to have occurred on 3rd of September -in 1752. +The Gregorian Reformation is assumed to have occurred +in 1972 on the 3rd of September. By this time, most countries had recognized the reformation (although a few did not recognize it until the early 1900's.) Ten days following that date were eliminated by diff --git a/usr/src/usr.bin/calendar/calendar.1 b/usr/src/usr.bin/calendar/calendar.1 index effc6123f4..e1dec60d90 100644 --- a/usr/src/usr.bin/calendar/calendar.1 +++ b/usr/src/usr.bin/calendar/calendar.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)calendar.1 6.8 (Berkeley) %G% +.\" @(#)calendar.1 6.9 (Berkeley) %G% .\" .Dd .\" @@ -71,7 +71,7 @@ June ... Every June 1st. .Sh FILES The following default calendar files are provided: .Dw calendar.christian -.Ds L +.Di L .Dp Pa calendar.birthday Births and deaths of famous ( and not- so- famous) people. .Dp Pa calendar.christian @@ -117,9 +117,7 @@ command appeared in Version 7 AT&T UNIX. The version of .Nm calendar released with this man page -is not derived from the AT&T version. -.\" what is status of code?? are phrases like today's date a problem? -.\" todays's and tomorrow' are only AT&T similarities +is unrelated. .Sh BUGS .Nm Calendar doesn't handle events that move around from year to year, i.e. diff --git a/usr/src/usr.bin/checknr/checknr.1 b/usr/src/usr.bin/checknr/checknr.1 index c28bf5eeae..2c863e336f 100644 --- a/usr/src/usr.bin/checknr/checknr.1 +++ b/usr/src/usr.bin/checknr/checknr.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)checknr.1 6.4 (Berkeley) %G% +.\" @(#)checknr.1 6.5 (Berkeley) %G% .\" .Dd .Dt CHECKNR 1 @@ -32,16 +32,19 @@ If no files are specified, checks the standard input. Delimiters checked are: .Pp -.Dl Font changes using \efx ... \efP. -.Pp -.Dl Size changes using \esx ... \es0. -.Pp .Df I +.Bu +Font changes using \efx ... \efP. +.Bu +Size changes using \esx ... \es0. +.Bu Macros that come in open ... close forms, for example, the .TS and .TE macros which must always come in pairs. +.Tp .De .Pp Options: +.Tw Ds .Tp Fl a Add additional pairs of macros to the list of known macros. This must be followed by groups of six characters, each group defining @@ -52,9 +55,7 @@ the first macro name, another period, and the second macro name. For example, to define a pair .BS and .ES, use -.Cx Ar a -.Li \&.BS.ES -.Cx +.Ql \-a.BS.ES .Pp .Tp Fl c Define commands which would otherwise be complained about @@ -68,7 +69,7 @@ Ignore \es size changes. .Tp .Pp .Nm Checknr -is intended to be used on documents that are prepared with +is intended for use on documents that are prepared with .Nm checknr in mind, much the same as .Xr lint 1 . @@ -79,7 +80,7 @@ While it will work to directly go into the next font or explicitly specify the original font or point size, and many existing documents actually do this, such a practice will produce complaints from -.Nm checknr +.Nm checknr . Since it is probably better to use the \efP and \es0 forms anyway, you should think of this as a contribution to your document preparation style. diff --git a/usr/src/usr.bin/chpass/chpass.1 b/usr/src/usr.bin/chpass/chpass.1 index 69b56a5e31..f5c45b4288 100644 --- a/usr/src/usr.bin/chpass/chpass.1 +++ b/usr/src/usr.bin/chpass/chpass.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)chpass.1 5.8 (Berkeley) %G% +.\" @(#)chpass.1 5.9 (Berkeley) %G% .\" .Dd .Dt CHPASS 1 @@ -27,6 +27,7 @@ The information is formatted and supplied to an editor for changes. Only the information that the user is allowed to change is displayed. .Pp The options are as follows: +.Tw Ds .Tp Fl a The super-user is allowed to directly supply a user database entry, in the format specified by @@ -121,7 +122,7 @@ is the month name (the first three characters are sufficient), is the day of the month, and .Ar year is the year. -.Pp +.bp The .Ar class field is currently unused. In the near future it will be a key to @@ -129,10 +130,14 @@ a .Xr termcap 5 style database of user attributes. .Pp -The user's home directory is the full UNIX path name where the user +The user's +.Ar home directory +is the full UNIX path name where the user will be placed at login. .Pp -The shell field is the command interpreter the user prefers. +The +.Ar shell +field is the command interpreter the user prefers. If the .Ar shell field is empty, the Bourne shell, @@ -144,8 +149,13 @@ shell. Non-standard is defined as a shell not found in .Pa /etc/shells . .Pp -The last four fields are for storing the user's full name, office -location, and home and work telephone numbers. +The last four fields are for storing the user's +.Ar full name , office location , +and +.Ar home +and +.Ar work telephone +numbers. .Pp Once the information has been verified, .Nm chpass @@ -183,6 +193,6 @@ The list of approved shells Robert Morris and Ken Thompson, .Ar UNIX Password security .Sh HISTORY -First release 4.4 Bsd. +First release 4.3 Reno BSD. .Sh BUGS User information should (and eventually will) be stored elsewhere. diff --git a/usr/src/usr.bin/cmp/cmp.1 b/usr/src/usr.bin/cmp/cmp.1 index 0c7d73dec1..7ae0df8289 100644 --- a/usr/src/usr.bin/cmp/cmp.1 +++ b/usr/src/usr.bin/cmp/cmp.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cmp.1 6.3 (Berkeley) %G% +.\" @(#)cmp.1 6.4 (Berkeley) %G% .\" .Dd .Dt CMP 1 @@ -13,32 +13,30 @@ .Nd compare two files .Sh SYNOPSIS .Nm cmp -.Op Fl l Fl s +.Op Fl l Li \&| Fl s .Ar file1 file2 .Sh DESCRIPTION -The cmp utility compares two files. +The cmp utility compares two files of any type and +writes the results to the standard output. Under default options, -cmp writes no output if the files are the same; if they -differ, it writes to standard output the byte and line -number at which the first difference occurred. +.Nm +is silent +if the files are the same; if they +differ, the byte and line +number at which the first difference occurred is reported. Bytes and lines are numbered beginning with one. .Pp The following options are available: +.Tw Ds .Tp Fl l Print the byte number (decimal) and the differing -bytes (octal) for each difference. +byte values (octal) for each difference, respectively. .Tp Fl s Print nothing for differing files; return exit status only. .Tp .Pp -Nothing is guaranteed if both -.Fl s -and -.Fl l -are given. -.Pp The following operands are available: .Tw file1 .Tp Ar file1 @@ -46,60 +44,25 @@ A pathname of the first file to be compared. If .Ar file1 is -.Cx Fl -.Cx , -.Cx +.Sq Fl , the standard input is used. .Tp Ar file2 A pathname of the second file to be compared. .Tp .Pp -The input files can be any file type. -.Pp -Results of the comparison are written to standard output. -When no options are used, the format is: -.Pp -.Ds I -"%s %s differ: char %d, line %d\en", , -, , -.De -.Pp -When the -.Fl l -option is used, the format is: -.Pp -.Ds I -"%d %o %o\en", , , - -.De -.Pp -for each byte that differs. The first byte number is from -file1 while the second is from file2. -.Pp -If file1 and file2 are identical for the entire length of -the shorter file, the following format is used, unless the -.Fl s -option is specified. -.Pp -.Ds I -"cmp: EOF on %s\en", -.De -.Pp -No output is written to standard output when the -.Fl s option -is used. -.Pp The .Nm cmp utility exits with one of the following values: -.Tw Fl +.Tw Ds .Tp 0 The files are identical. .Tp 1 The files are different; this includes the case where one file is identical to the first part of the other. -In the latter case, if the -s option has +In the latter case, if the +.Fl s +option has not been specified, cmp writes to standard error that EOF was reached in the shorter file (before any differences were found). @@ -107,9 +70,10 @@ any differences were found). An error occurred. .Tp .Sh SEE ALSO -diff 1 , -diff3 1 +.Xr diff 1 , +.Xr diff3 1 .Sh STANDARDS The .Nm cmp function is expected to be POSIX 1003.2 compatible. +This manual page is derived from the POSIX 1003.2 manual page. diff --git a/usr/src/usr.bin/col/col.1 b/usr/src/usr.bin/col/col.1 index 5ec958d5da..7ae3b06955 100644 --- a/usr/src/usr.bin/col/col.1 +++ b/usr/src/usr.bin/col/col.1 @@ -2,11 +2,11 @@ .\" All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by -.\" Michael Rendell of the Memorial University of Newfoundland. +.\" Michael Rendell. .\" .\" %sccs.include.redist.man% .\" -.\" @(#)col.1 6.5 (Berkeley) %G% +.\" @(#)col.1 6.6 (Berkeley) %G% .\" .Dd .Dt COL 1 diff --git a/usr/src/usr.bin/colcrt/colcrt.1 b/usr/src/usr.bin/colcrt/colcrt.1 index 2ec92d9779..fdf865ecfb 100644 --- a/usr/src/usr.bin/colcrt/colcrt.1 +++ b/usr/src/usr.bin/colcrt/colcrt.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)colcrt.1 6.5 (Berkeley) %G% +.\" @(#)colcrt.1 6.6 (Berkeley) %G% .\" .Dd .Dt COLCRT 1 @@ -14,7 +14,7 @@ .Sh SYNOPSIS .Nm colcrt .Op Fl -.Op Fl 2 +.Op Fl \&2 .Ar .Sh DESCRIPTION .Nm Colcrt @@ -24,6 +24,7 @@ is destructive. Half-line characters and underlining (changed to dashing `\-') are placed on new lines in between the normal output lines. .Pp +.Tw Ds .Tp Fl Suppress all underlining. It is especially useful for previewing @@ -46,7 +47,7 @@ A typical use of .Nm colcrt would be .Pp -.Dl tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more +.Dl tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more .Sh SEE ALSO .Xr nroff 1 , .Xr troff 1 , @@ -57,7 +58,7 @@ would be Appeared in 3 BSD. .Sh BUGS Should fold underlines onto blanks even with the -.Fl +.Sq Fl option so that a true underline character would show; if we did this, however, .Nm colcrt diff --git a/usr/src/usr.bin/colrm/colrm.1 b/usr/src/usr.bin/colrm/colrm.1 index 61e523c4ae..db244c71f5 100644 --- a/usr/src/usr.bin/colrm/colrm.1 +++ b/usr/src/usr.bin/colrm/colrm.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)colrm.1 6.4 (Berkeley) %G% +.\" @(#)colrm.1 6.5 (Berkeley) %G% .\" .Dd .Dt COLRM 1 @@ -13,10 +13,7 @@ .Nd remove columns from a file .Sh SYNOPSIS .Nm colrm -.Cx [ startcol -.Op endcol -.Cx ] -.Cx +.Op Ar startcol Op Ar endcol .Sh DESCRIPTION .Nm Colrm removes selected columns from a file. Input is taken from standard input. diff --git a/usr/src/usr.bin/column/column.1 b/usr/src/usr.bin/column/column.1 index a83bd4bfd5..7398dc174a 100644 --- a/usr/src/usr.bin/column/column.1 +++ b/usr/src/usr.bin/column/column.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)column.1 5.5 (Berkeley) %G% +.\" @(#)column.1 5.6 (Berkeley) %G% .\" .Dd .Os BSD 4.4 @@ -31,6 +31,7 @@ operands, or, by default, from the standard input. Empty lines are ignored. .Pp The options are as follows: +.Tw Ds .Tp Fl c Output is formatted for a display .Ar columns @@ -53,16 +54,19 @@ Fill columns before filling rows. .Nm Column exits 0 on success, >0 if an error occurred. .Sh ENVIRONMENT -.Tp Ar COLUMNS -The environmental variable COLUMNS is used to determine the size of +.Tw Fl +.Tp Ev COLUMNS +The environment variable +.Ev COLUMNS +is used to determine the size of the screen if no other information is available. .Sh EXAMPLES -.Dl (printf "PERM LINKS OWNER SIZE MONTH DAY HH:MM/YEAR NAME\en"; -.Dl ls -l sed 1d) column -t +.Dl (printf "PERM LINKS OWNER SIZE MONTH DAY HH:MM/YEAR NAME\en" \&; +.Dl ls -l sed 1d) \&| column -t .Sh SEE ALSO .Xr colrm 1 , .Xr ls 1 , .Xr paste 1 , .Xr sort 1 .Sh HISTORY -4.4 BSD. +4.3 Reno BSD. diff --git a/usr/src/usr.bin/comm/comm.1 b/usr/src/usr.bin/comm/comm.1 index 90196da502..b39cffb873 100644 --- a/usr/src/usr.bin/comm/comm.1 +++ b/usr/src/usr.bin/comm/comm.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)comm.1 6.3 (Berkeley) %G% +.\" @(#)comm.1 6.4 (Berkeley) %G% .\" .Dd .Os BSD 4.4 @@ -30,9 +30,12 @@ lines only in .Ar file2 ; and lines in both files. .Pp -The filename ``-'' means the standard input. +The filename +.Sq Fl +means the standard input. .Pp The following options are available: +.Tw Ds .Tp Fl 1 Suppress printing of column 1. .Tp Fl 2 diff --git a/usr/src/usr.bin/compress/compress.1 b/usr/src/usr.bin/compress/compress.1 index c0d19fca6f..654214c2ed 100644 --- a/usr/src/usr.bin/compress/compress.1 +++ b/usr/src/usr.bin/compress/compress.1 @@ -7,7 +7,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)compress.1 6.7 (Berkeley) %G% +.\" @(#)compress.1 6.8 (Berkeley) %G% .\" .Dd .Dt COMPRESS 1 @@ -40,7 +40,7 @@ Whenever possible, each .Ar file is replaced by one with the extension -.Sy \&.Z , +.Ar \&.Z , while keeping the same ownership modes, access and modification times. If no files are specified, the standard input is compressed to the standard output. @@ -77,10 +77,8 @@ is identical to that of Specify .Ar bits code limit (see below). -The .Tp Fl v -option causes -the printing of the percentage reduction of each file. +Print the percentage reduction of each file. .Tp .Pp .Nm Compress @@ -252,5 +250,5 @@ should be used for file transfer to architectures with a small process data space (64KB or less, as exhibited by the DEC PDP series, the Intel 80286, etc.) .Pp -.Nm compress +.Nm Compress should be more flexible about the existence of the `.Z' suffix. diff --git a/usr/src/usr.bin/ctags/ctags.1 b/usr/src/usr.bin/ctags/ctags.1 index 91a47a815a..0b329c517d 100644 --- a/usr/src/usr.bin/ctags/ctags.1 +++ b/usr/src/usr.bin/ctags/ctags.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)ctags.1 6.6 (Berkeley) %G% +.\" @(#)ctags.1 6.7 (Berkeley) %G% .\" .Dd .Dt CTAGS 1 @@ -30,10 +30,12 @@ Using the file, .Xr ex 1 can quickly locate these object -definitions. Depending on the options provided to .Nm ctags , +definitions. Depending on the options provided to +.Nm ctags , objects will consist of subroutines, typedefs, defines, structs, enums and unions. .Pp +.Tw Ds .Tp Fl x .Nm ctags produces a list of object @@ -53,13 +55,13 @@ it may be desired to run the output through Sample use: .Pp .Ds I -ctags \-v files sort \-f > index +ctags \-v files \&| sort \-f > index vgrind \-x index .De .Tp Fl f Places the tag descriptions in a file called -.Ar tagsfile. The default behaviour is to place them in a file -named +.Ar tagsfile . +The default behaviour is to place them in a file .Ar tags . .Tp Fl F use forward searching patterns (/.../) (the default). @@ -71,9 +73,9 @@ append to file. .Tp Fl d create tags for -.Ar #defines +.Li #defines that don't take arguments; -.Ar #defines +.Li #defines that take arguments are tagged automatically. .Tp Fl t create tags for typedefs, structs, unions, and enums. @@ -109,7 +111,7 @@ contain any Pascal or Fortran routine definitions, and, if not, are searched for C style definitions. .Pp The tag -.Ar main +.Li main is treated specially in C programs. The tag formed is created by prepending .Ar M @@ -171,18 +173,13 @@ functions is a hack. relies on the input being well formed, and any syntactical errors will completely confuse it. It also finds some legal syntax confusing; for example, as it doesn't understand -.Cx Ar #ifdef -.Cx 's, -.Cx +.Sf Li #ifdef 's, (incidentally, that's a feature, not a bug) any code with unbalanced braces inside -.Cx Ar #ifdef -.Cx 's +.Sf Li #ifdef 's will cause it to become somewhat disoriented. -.Cx In a similar fashion, multiple line changes within a definition will cause it to enter the last line of the object, rather than the first, as the searching pattern. The last line of multiple line -.Ar typedef -'s +.Sf Li typedef 's will similarly be noted. diff --git a/usr/src/usr.bin/cut/cut.1 b/usr/src/usr.bin/cut/cut.1 index 7c0d6ac47d..bfce2b4564 100644 --- a/usr/src/usr.bin/cut/cut.1 +++ b/usr/src/usr.bin/cut/cut.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)cut.1 5.2 (Berkeley) %G% +.\" @(#)cut.1 5.3 (Berkeley) %G% .\" .Dd .Dt CUT 1 @@ -33,10 +33,10 @@ standard output. The items specified by .Ar list can be in terms of column position or in terms of fields delimited -by a special character. +by a special character. Column numbering starts from 1. .Pp .Ar List -is a comma or whitespace separated set of one-based numbers and/or +is a comma or whitespace separated set of increasing numbers and/or number ranges. Number ranges consist of a number, a dash .Li (``\-'') , @@ -81,7 +81,7 @@ Unless specified, lines with no delimiters are passed through unmodified. .Tp .Pp .Nm Cut -exit 0 on success, 1 if an error occurred. +exits 0 on success, 1 if an error occurred. .Sh SEE ALSO .Xr paste 1 .Sh STANDARDS diff --git a/usr/src/usr.bin/dc/dc.1 b/usr/src/usr.bin/dc/dc.1 index bc41ef1654..5d92294ee3 100644 --- a/usr/src/usr.bin/dc/dc.1 +++ b/usr/src/usr.bin/dc/dc.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)dc.1 6.3 (Berkeley) %G% +.\" @(#)dc.1 6.4 (Berkeley) %G% .\" .Dd .Dt DC 1 @@ -179,8 +179,7 @@ structures for programs. .Nm Dc appeared in Version 6 AT&T Unix. .Sh DIAGNOSTICS -.Tp Ar -.\" .Tw x\ is\ unimplemented +.Tw Ar .Tp Li x is unimplemented where x is an octal number. .Tp Li stack empty diff --git a/usr/src/usr.bin/deroff/deroff.1 b/usr/src/usr.bin/deroff/deroff.1 index 2dafa89d8d..d8e1df431b 100644 --- a/usr/src/usr.bin/deroff/deroff.1 +++ b/usr/src/usr.bin/deroff/deroff.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)deroff.1 6.3 (Berkeley) %G% +.\" @(#)deroff.1 6.4 (Berkeley) %G% .\" .Dd .Dt DEROFF 1 diff --git a/usr/src/usr.bin/diction/diction/diction.1 b/usr/src/usr.bin/diction/diction/diction.1 index fc7bd418c1..b38f0c9b79 100644 --- a/usr/src/usr.bin/diction/diction/diction.1 +++ b/usr/src/usr.bin/diction/diction/diction.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)diction.1 4.4 (Berkeley) %G% +.\" @(#)diction.1 4.5 (Berkeley) %G% .\" .Dd .Dt DICTION 1 @@ -25,17 +25,17 @@ finds all sentences in a document that contain phrases from a data base of bad or wordy diction. Each phrase is bracketed with -.Op . +.Sq [\|] . Because .Nm diction runs .Xr deroff 1 before looking at the text, formatting header files should be included as part of the input. -.Tw Fl +.Tw Ds .Tp Fl mm -The default macro package -.Fl ms +The default macro package, +.Fl ms , may be overridden with the flag .Fl mm . .Tp Fl ml diff --git a/usr/src/usr.bin/diff/diff/diff.1 b/usr/src/usr.bin/diff/diff/diff.1 index ad775d1a07..cd2485de4d 100644 --- a/usr/src/usr.bin/diff/diff/diff.1 +++ b/usr/src/usr.bin/diff/diff/diff.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)diff.1 6.5 (Berkeley) %G% +.\" @(#)diff.1 6.6 (Berkeley) %G% .\" .Dd .Dt DIFF 1 @@ -13,13 +13,6 @@ .Nd differential file and directory comparator .Sh SYNOPSIS .Nm diff -.Op Fl l -.Op Fl r -.Op Fl s -.Op Fl cefhn -.Op Fl biwt -.Ar dir1 dir2 -.Nm diff .Op Fl cefhn .Op Fl biwt .Ar file1 file2 @@ -27,6 +20,13 @@ .Op Fl D Ar string .Op Fl biw .Ar file1 file2 +.Nm diff +.Op Fl l +.Op Fl r +.Op Fl s +.Op Fl cefhn +.Op Fl biwt +.Ar dir1 dir2 .Sh DESCRIPTION The .Nm diff @@ -34,75 +34,11 @@ utility compares the contents of .Ar file1 and .Ar file2 -and writes to the standard output a minimal list of changes necessary to -convert one of the files into the other. +and writes to the standard output the list of changes necessary to +convert one file into the other. No output is produced if the files are identical. .Pp -If both arguments are directories, -.Nm diff -sorts the contents of the directories by name, and then runs the -regular file -.Nm diff -algorithm, producing a change list, -on text files which are different. -Binary files which differ, -common subdirectories, and files which appear in only one directory -are described as such. -.Pp -If only one of -.Ar file1 -and -.Ar file2 -is a directory, -.Nm diff -is applied to the non-directory file and the file contained in -the directory file with a filename that is the same as the -last component of the non-directory file. -.Pp -If either the -.Ar file1 -or -.Ar file2 -is -.Fl , -the standard input is -used in its place. -.Pp -Options when comparing directories are: -.Tw Fl -.Tp Fl l -long output format; each text file -.Sf Nm diff \'d -is piped through -.Xr pr 1 -to paginate it, -other differences are remembered and summarized -after all text file differences are reported. -.Tp Fl r -causes application of -.Nm diff -recursively to common subdirectories encountered. -.Tp Fl s -causes -.Nm diff -to report files which are the same, which are otherwise not mentioned. -.Tc Fl S -.Ar name -.Cx -starts a directory -.Nm diff -in the middle beginning with file -.Ar name . -.Tp -.Pp -Output options. Except for -.Fl b , -.Fl w , -.Fl i -or -.Fl t -which may be given with any of the others, -the following options are mutually exclusive: +Output options (mutually exclusive): .Tw Fl .Tp Fl c produces a diff with lines of context. @@ -157,9 +93,7 @@ insert or delete command. This is the form used by .Tc Fl D .Ar string .Cx -causes -.Nm diff -to create a merged version of +creates a merged version of .Ar file1 and .Ar file2 @@ -173,6 +107,9 @@ while defining .Ar string will yield .Ar file2 . +.Tp +.Pp +Comparison options: .Tp Fl b causes trailing blanks (spaces and tabs) to be ignored, and other strings of blanks to compare equal. @@ -191,15 +128,71 @@ is similar to but causes whitespace (blanks and tabs) to be totally ignored. E.g., ``if\ (\ a\ ==\ b\ )'' will compare equal to ``if(a==b)''. .Tp +.Pp +Directory comparison options: +.Tw Fl +.Tp Fl l +long output format; each text file +.Sf Nm diff \'d +is piped through +.Xr pr 1 +to paginate it, +other differences are remembered and summarized +after all text file differences are reported. +.Tp Fl r +causes application of +.Nm diff +recursively to common subdirectories encountered. +.Tp Fl s +causes +.Nm diff +to report files which are the same, which are otherwise not mentioned. +.Tc Fl S +.Ar name +.Cx +re-starts a directory +.Nm diff +in the middle beginning with file +.Ar name . +.Tp +.Pp +If both arguments are directories, +.Nm diff +sorts the contents of the directories by name, and then runs the +regular file +.Nm diff +algorithm, producing a change list, +on text files which are different. +Binary files which differ, +common subdirectories, and files which appear in only one directory +are described as such. +.Pp +If only one of +.Ar file1 +and +.Ar file2 +is a directory, +.Nm diff +is applied to the non-directory file and the file contained in +the directory file with a filename that is the same as the +last component of the non-directory file. +.Pp +If either the +.Ar file1 +or +.Ar file2 +is +.Fl , +the standard input is +used in its place. .Ss Output Style The default (without .Fl e , .Fl c , -.Fl n , or -.Fl t +.Fl n .\" -C -options) diff utility +options) output contains lines of these forms, where .Va XX , YY , ZZ , QQ are line numbers respective of file order. @@ -373,10 +366,10 @@ The and .Fl e options -have difficulties producing lines with the -first and only character -.Dq Li \&. , -as this is a command character for +do not provide special handling for lines on which the +first and only character is +.Dq Li \&. . +This can cause problems for .Xr ed 1 . .Pp When comparing directories with the @@ -393,5 +386,5 @@ and then decides to run the algorithm if they are not equal. This may cause a small amount of spurious output if the files then turn out to be identical because the only differences are -insignificant blank string or case differences. +insignificant white space or case differences. .\" .Sh STANDARDS diff --git a/usr/src/usr.bin/diff/diff3/diff3.1 b/usr/src/usr.bin/diff/diff3/diff3.1 index c5ff0af5a3..8660f4ef51 100644 --- a/usr/src/usr.bin/diff/diff3/diff3.1 +++ b/usr/src/usr.bin/diff/diff3/diff3.1 @@ -3,11 +3,11 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)diff3.1 6.3 (Berkeley) %G% +.\" @(#)diff3.1 6.4 (Berkeley) %G% .\" .Dd .Dt DIFF3 1 -.Os BSD 4.4 +.Os BSD 4.3+Reno .Sh NAME .Nm diff3 .Nd 3-way differential file comparison @@ -113,51 +113,51 @@ The lines beneath this notation are ranges of lines which are exclusively different in file .Va n . .Tp -.Sh EXAMPLES -.Pp -If three files were to contain: -.Ds I -.Cw mooxthree mooxthree mooxthree -.Cl file1 file2 file3 -.Cl moo moo moo -.Cl moo too moon moon -.Cl moo three moo moo moo moo -.Cl tangent beam milk -.Cl moo moo sun butter -.Cl \tcloud beam -.Cl \tmoo moo -.Cl \tmoo moo -.Cw -.De -.Pp -The command line -.Pp -.Dl diff3 -e file1 file2 file3 -.Pp -produces the following ed script: -.Pp -.Ds C -====1 -1:2,4c - moo two - moo three - tangent -2:2c -3:2c - moon -==== -1:5a -2:4,8c - beam - sun - cloud - moo moo - moo moo -3:4,6c - milk - butter - beam -.De +.\" .Sh EXAMPLES +.\" .Pp +.\" If three files were to contain: +.\" .Ds I +.\" .Cw mooxthree mooxthree mooxthree +.\" .Cl file1 file2 file3 +.\" .Cl moo moo moo +.\" .Cl moo too moon moon +.\" .Cl moo three moo moo moo moo +.\" .Cl tangent beam milk +.\" .Cl moo moo sun butter +.\" .Cl \tcloud beam +.\" .Cl \tmoo moo +.\" .Cl \tmoo moo +.\" .Cw +.\" .De +.\" .Pp +.\" The command line +.\" .Pp +.\" .Dl diff3 -e file1 file2 file3 +.\" .Pp +.\" produces the following ed script: +.\" .Pp +.\" .Ds C +.\" ====1 +.\" 1:2,4c +.\" moo two +.\" moo three +.\" tangent +.\" 2:2c +.\" 3:2c +.\" moon +.\" ==== +.\" 1:5a +.\" 2:4,8c +.\" beam +.\" sun +.\" cloud +.\" moo moo +.\" moo moo +.\" 3:4,6c +.\" milk +.\" butter +.\" beam +.\" .De .Sh FILES .Dw /usr/bin/diff3 .Di L diff --git a/usr/src/usr.bin/du/du.1 b/usr/src/usr.bin/du/du.1 index d863d37360..85d780420a 100644 --- a/usr/src/usr.bin/du/du.1 +++ b/usr/src/usr.bin/du/du.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)du.1 6.6 (Berkeley) %G% +.\" @(#)du.1 6.7 (Berkeley) %G% .\" .Dd .Dt DU 1 @@ -21,6 +21,7 @@ utility displays the block usage of files in the current directory or for the entire tree of a given pathname. .Pp The options are as follows: +.Tw Ds .Tp Fl a Generate an entry for each file. .Tp Fl k diff --git a/usr/src/usr.bin/error/error.1 b/usr/src/usr.bin/error/error.1 index 25f0a0d359..86a0c70f2b 100644 --- a/usr/src/usr.bin/error/error.1 +++ b/usr/src/usr.bin/error/error.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)error.1 6.4 (Berkeley) %G% +.\" @(#)error.1 6.5 (Berkeley) %G% .\" .Dd .Dt ERROR 1 @@ -30,6 +30,7 @@ permits error messages and source code to be viewed simultaneously without machinations of multiple windows in a screen editor. .Pp Options are: +.Tw Ds .Tp Fl n Do .Em not @@ -48,15 +49,15 @@ are to be touched. .Tp Fl v After all files have been touched, overlay the visual editor -.Xr vi +.Xr vi 1 with it set up to edit all files touched, and positioned in the first touched file at the first error. If -.Xr vi +.Xr vi 1 can't be found, try -.Xr ex +.Xr ex 1 or -.Xr ed +.Xr ed 1 from standard places. .Tp Fl t Take the following argument as a suffix list. @@ -106,7 +107,7 @@ For example, when using the .Xr csh 1 syntax, .Pp -.Dl make \-s lint \& error \-q \-v +.Dl make \-s lint \&| error \-q \-v .Pp will analyze all the error messages produced by whatever programs @@ -231,7 +232,7 @@ will orderly terminate what it is doing. .Sh FILES .Dw ~/.errorrc .Di L -.Dp ~/.errorrc +.Dp Pa ~/.errorrc function names to ignore for .Xr lint 1 error messages diff --git a/usr/src/usr.bin/ex/ex.1 b/usr/src/usr.bin/ex/ex.1 index f8b8d3af93..38ccc39797 100644 --- a/usr/src/usr.bin/ex/ex.1 +++ b/usr/src/usr.bin/ex/ex.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)ex.1 6.5 (Berkeley) %G% +.\" @(#)ex.1 6.6 (Berkeley) %G% .\" .Dd .Dt EX 1 @@ -97,7 +97,7 @@ in a useful, functional way, and is useful with the The .Nm command uses the following environment variables. -.Tw Ar +.Tw Fl .Tp Ev EXINIT User specified startup values for .Nm ex . diff --git a/usr/src/usr.bin/expand/expand.1 b/usr/src/usr.bin/expand/expand.1 index 681f95cca5..e997887651 100644 --- a/usr/src/usr.bin/expand/expand.1 +++ b/usr/src/usr.bin/expand/expand.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)expand.1 6.4 (Berkeley) %G% +.\" @(#)expand.1 6.5 (Berkeley) %G% .\" .Dd .Dt EXPAND 1 @@ -14,8 +14,10 @@ .Nd expand tabs to spaces, and vice versa .Sh SYNOPSIS .Nm expand -.Op \-tabstop -.Op \-tab1,tab2,...,tabn +.Oo +.Op Fl Ar tabstop +.Op Fl Ar tab1,tab2,...,tabn +.Oo .Ar .Nm unexpand .Op Fl a @@ -46,6 +48,7 @@ files and writes the result on the standard output. Option (with .Nm unexpand only): +.Tw Ds .Tp Fl a By default, only leading blanks and tabs are reconverted to maximal strings of tabs. If the diff --git a/usr/src/usr.bin/f77/f77.vax/f77.1 b/usr/src/usr.bin/f77/f77.vax/f77.1 index 7d7091f9e7..3d71dfc70d 100644 --- a/usr/src/usr.bin/f77/f77.vax/f77.1 +++ b/usr/src/usr.bin/f77/f77.vax/f77.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)f77.1 6.6 (Berkeley) %G% +.\" @(#)f77.1 6.7 (Berkeley) %G% .\" .Dd .Dt F77 1 @@ -25,7 +25,7 @@ Fortran 77 source programs; they are compiled, and each object program is left on the file in the current directory whose name is that of the source with `.o' substituted -for '.f'. +for `.f'. .Pp Arguments whose names end with `.F' are also taken to be Fortran 77 source programs; these are first processed by the C preprocessor before being @@ -34,7 +34,8 @@ compiled by .Pp Arguments whose names end with `.r' or `.e' are taken to be Ratfor or EFL source programs respectively; these are first transformed by the -appropriate preprocessor, then compiled by f77. +appropriate preprocessor, then compiled by +.Nm f77 . .Pp Arguments whose names end with `.c' or `.s' are taken to be C or assembly source programs and are compiled or assembled, producing a `.o' file. @@ -160,27 +161,27 @@ Use the string .Ar x as a Ratfor option in processing `.r' files. .Tc Fl N -.Op Ar qxscn +.Op Cm qxscn .Ar nnn .Cx Make static tables in the compiler bigger. The compiler will complain if it overflows its tables and suggest you apply one or more of these flags. These flags have the following meanings: .Tw Ds -.Tp r q +.Tp Cm r q Maximum number of equivalenced variables. Default is 150. -.Tp Ar x +.Tp Cm x Maximum number of external names (common block names, subroutine and function names). Default is 200. -.Tp Ar s +.Tp Cm s Maximum number of statement numbers. Default is 401. -.Tp Ar c +.Tp Cm c Maximum depth of nesting for control statements (e.g. DO loops). Default is 20. .Tp Ar n Maximum number of identifiers. Default is 1009. .Tp -Tp Fl U +.Tp Fl U Do not convert upper case letters to lower case. The default is to convert Fortran programs to lower case except within character string constants. .Tp @@ -201,14 +202,14 @@ Programs compiled with produce memory dumps in file .Pa core upon abnormal termination if the -.Fl +.Sq Fl flag was specified during loading. If the environment variable .Ev f77_dump_flag is set to a value beginning with -.Ar y +.Sq Ar y or -.Ar n , +.Sq Ar n , dumps for abnormal terminations are respectively forced or suppressed. .Sh FILES @@ -256,12 +257,6 @@ file produced for analysis by .Xr gprof 1 . .Dp .Sh SEE ALSO -S. I. Feldman, P. J. Weinberger, J. Berkman, -.Em A Portable Fortran 77 Compiler -.br -D. L. Wasley, J. Berkman, -.Em Introduction to the f77 I/.Xr O Library -.br .Xr fpr 1 , .Xr fsplit 1 , .Xr ld 1 , @@ -275,6 +270,12 @@ D. L. Wasley, J. Berkman, .Xr prof 1 , .Xr gprof 1 , .Xr cc 1 +.br +S. I. Feldman, P. J. Weinberger, J. Berkman, +.Em A Portable Fortran 77 Compiler +.br +D. L. Wasley, J. Berkman, +.Em Introduction to the f77 I/.Xr O Library .Sh DIAGNOSTICS The diagnostics produced by .Nm f77 diff --git a/usr/src/usr.bin/false/false.1 b/usr/src/usr.bin/false/false.1 index 7dcfc171de..1320fc493c 100644 --- a/usr/src/usr.bin/false/false.1 +++ b/usr/src/usr.bin/false/false.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)false.1 6.2 (Berkeley) %G% +.\" @(#)false.1 6.3 (Berkeley) %G% .\" .Dd .Dt FALSE 1 diff --git a/usr/src/usr.bin/file/file.1 b/usr/src/usr.bin/file/file.1 index 2036cf0ce4..c371db97b6 100644 --- a/usr/src/usr.bin/file/file.1 +++ b/usr/src/usr.bin/file/file.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)file.1 6.2 (Berkeley) %G% +.\" @(#)file.1 6.3 (Berkeley) %G% .\" .Dd .Dt FILE 1 diff --git a/usr/src/usr.bin/find/find.1 b/usr/src/usr.bin/find/find.1 index d3a78f281c..91f557e017 100644 --- a/usr/src/usr.bin/find/find.1 +++ b/usr/src/usr.bin/find/find.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)find.1 6.14 (Berkeley) %G% +.\" @(#)find.1 6.15 (Berkeley) %G% .\" .Dd .Dt FIND 1 @@ -163,12 +163,14 @@ True if the difference between the file last modification time and the time was started, rounded up to the next full 24\-hour period, is .Ar n 24\-hour periods. -.Tp Cx Ic ok +.Tp Cx Ic \&ok .Cx \&\ \& .Ar utility +.Ws .Op argument ... ; +.Cx The -.Ic ok +.Ic \&ok primary is identical to the .Ic exec primary with the exception that @@ -177,7 +179,7 @@ requests user affirmation for the execution of the utility by printing a message to the terminal and reading a response. If the response is other than ``y'' the command is not executed and the value of the -.Ar ok +.Ar \&ok expression is false. .Tp Cx Ic name .Cx \&\ \& @@ -227,7 +229,7 @@ The expression is appended to the user specified expression if neither .Ic exec , .Ic ls , or -.Ic ok +.Ic \&ok is specified. .Tp Ic prune This primary always evaluates to true. @@ -254,6 +256,7 @@ bytes. True if the file is of the specified type. Possible file types are as follows: .Pp +.Df I .Tw Ds .Tp Cm b block special @@ -270,6 +273,7 @@ FIFO .Tp Cm s socket .Tp +.De .Pp .Tp Cx Ic user .Cx \&\ \& diff --git a/usr/src/usr.bin/finger/finger.1 b/usr/src/usr.bin/finger/finger.1 index 9bc50ad5cf..86b4a3e36b 100644 --- a/usr/src/usr.bin/finger/finger.1 +++ b/usr/src/usr.bin/finger/finger.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)finger.1 6.10 (Berkeley) %G% +.\" @(#)finger.1 6.11 (Berkeley) %G% .\" .Dd .Dt FINGER 1 @@ -26,6 +26,7 @@ command has two basic output formats providing essentially the same information. .Pp Options are: +.Tw Ds .Tp Fl s .Nm Finger displays the user's login name, real name, terminal name and write diff --git a/usr/src/usr.bin/fmt/fmt.1 b/usr/src/usr.bin/fmt/fmt.1 index 2dab736264..4b40aa2987 100644 --- a/usr/src/usr.bin/fmt/fmt.1 +++ b/usr/src/usr.bin/fmt/fmt.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)fmt.1 6.5 (Berkeley) %G% +.\" @(#)fmt.1 6.6 (Berkeley) %G% .\" .Dd .Dt FMT 1 diff --git a/usr/src/usr.bin/fpr/fpr.1 b/usr/src/usr.bin/fpr/fpr.1 index 10d3bdad7a..8a8bd8ecb5 100644 --- a/usr/src/usr.bin/fpr/fpr.1 +++ b/usr/src/usr.bin/fpr/fpr.1 @@ -6,7 +6,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)fpr.1 6.6 (Berkeley) %G% +.\" @(#)fpr.1 6.7 (Berkeley) %G% .\" .Dd .Dt FPR 1 diff --git a/usr/src/usr.bin/from/from.1 b/usr/src/usr.bin/from/from.1 index e83561177e..9852af3ceb 100644 --- a/usr/src/usr.bin/from/from.1 +++ b/usr/src/usr.bin/from/from.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)from.1 6.4 (Berkeley) %G% +.\" @(#)from.1 6.5 (Berkeley) %G% .\" .Dd .Dt FROM 1 diff --git a/usr/src/usr.bin/fsplit/fsplit.1 b/usr/src/usr.bin/fsplit/fsplit.1 index 310a98fa87..b0d3eecf29 100644 --- a/usr/src/usr.bin/fsplit/fsplit.1 +++ b/usr/src/usr.bin/fsplit/fsplit.1 @@ -6,7 +6,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)fsplit.1 6.4 (Berkeley) %G% +.\" @(#)fsplit.1 6.5 (Berkeley) %G% .\" .Dd .Dt FSPLIT 1 diff --git a/usr/src/usr.bin/ftp/ftp.1 b/usr/src/usr.bin/ftp/ftp.1 index 04a3e3a7f3..17ca8b3ee9 100644 --- a/usr/src/usr.bin/ftp/ftp.1 +++ b/usr/src/usr.bin/ftp/ftp.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)ftp.1 6.14 (Berkeley) %G% +.\" @(#)ftp.1 6.15 (Berkeley) %G% .\" .Dd .Dt FTP 1 @@ -27,6 +27,7 @@ remote network site. .Pp Options may be specified at the command line, or to the command interpreter. +.Tw Ds .Tp Fl v Verbose option forces .Nm ftp @@ -66,20 +67,21 @@ server on that host; otherwise, will enter its command interpreter and await instructions from the user. When .Nm ftp -is awaiting commands from the user the prompt \*(Lqftp>\*(Rq +is awaiting commands from the user the prompt +.Ql ftp> is provided to the user. The following commands are recognized by .Nm ftp : .Tw Fl .Tp Cx Ic \&! -.Cx \&\ \& +.Ws .Op Ar command Op Ar args .Cx Invoke an interactive shell on the local machine. If there are arguments, the first is taken to be a command to execute directly, with the rest of the arguments as its arguments. .Tp Cx Ic \&$ -.Cx \&\ \& +.Ws .Ar macro-name .Op Ar args .Cx @@ -90,7 +92,7 @@ that was defined with the command. Arguments are passed to the macro unglobbed. .Tp Cx Ic account -.Cx \&\ \& +.Ws .Op Ar passwd .Cx Supply a supplemental password required by a remote system for access @@ -98,9 +100,9 @@ to resources once a login has been successfully completed. If no argument is included, the user will be prompted for an account password in a non-echoing input mode. .Tp Cx Ic append -.Cx \&\ \& +.Ws .Ar local-file -.Cx \&\ \& +.Ws .Op Ar remote-file .Cx Append a local file to a file on the remote machine. If @@ -116,7 +118,7 @@ File transfer uses the current settings for .Ic format , .Ic mode , and -.Ic structure . +.Ic structure . .Tp Ic ascii Set the file transfer .Ic type @@ -143,7 +145,7 @@ is on (default is off), remote computer file names with all letters in upper case are written in the local directory with the letters mapped to lower case. .Tp Cx Ic cd -.Cx \&\ \& +.Ws .Ar remote-directory .Cx Change the working directory on the remote machine @@ -153,14 +155,14 @@ to Change the remote machine working directory to the parent of the current remote machine working directory. .Tp Cx Ic chmod -.Cx \&\ \& +.Ws .Ar mode file-name .Cx -Change the permission modes the file +Change the permission modes of the file .Ar file-name on the remote sytem to -.Ic mode . +.Ar mode . .Tp Ic close Terminate the FTP session with the remote server, and return to the command interpreter. @@ -181,14 +183,14 @@ distinguished from a record delimiter only when .Ic cr is off. .Tp Cx Ic delete -.Cx \&\ \& +.Ws .Ar remote-file .Cx Delete the file .Ar remote-file on the remote machine. .Tp Cx Ic debug -.Cx \&\ \& +.Ws .Op Ar debug-value .Cx Toggle debugging mode. If an optional @@ -197,11 +199,12 @@ is specified it is used to set the debugging level. When debugging is on, .Nm ftp prints each command sent to the remote machine, preceded -by the string \*(Lq-->\*(Rq. +by the string +.Ql \-\-> .Tp Cx Ic dir -.Cx \&\ \& +.Ws .Op Ar remote-directory -.Cx \&\ \& +.Ws .Op Ar local-file .Cx Print a listing of the directory contents in the @@ -226,7 +229,7 @@ output comes to the terminal. A synonym for .Ar close . .Tp Cx Ic form -.Cx \&\ \& +.Ws .Ar format .Cx Set the file transfer @@ -235,9 +238,9 @@ to .Ar format . The default format is \*(Lqfile\*(Rq. .Tp Cx Ic get -.Cx \&\ \& +.Ws .Ar remote-file -.Cx \&\ \& +.Ws .Op Ar local-file .Cx Retrieve the @@ -282,10 +285,7 @@ Expansion of a directory name is likely to be different from expansion of the name of an ordinary file: the exact result depends on the foreign operating system and ftp server, and can be previewed by doing -.Cx ` -.Cx Li mls remote-files \- -.Cx \'. -.Cx +.Ql mls remote-files \- Note: .Ic mget and @@ -299,7 +299,7 @@ archive of the subtree (in binary mode). Toggle hash-sign (``#'') printing for each data block transferred. The size of a data block is 1024 bytes. .Tp Cx Ic help -.Cx \&\ \& +.Ws .Op Ar command .Cx Print an informative message about the meaning of @@ -308,7 +308,7 @@ If no argument is given, .Nm ftp prints a list of the known commands. .Tp Cx Ic idle -.Cx \&\ \& +.Ws .Op Ar seconds .Cx Set the inactivity timer on the remote server to @@ -318,7 +318,7 @@ If .Ar seconds is ommitted, the current inactivity timer is printed. .Tp Cx Ic lcd -.Cx \&\ \& +.Ws .Op Ar directory .Cx Change the working directory on the local machine. If @@ -326,16 +326,17 @@ no .Ar directory is specified, the user's home directory is used. .Tp Cx Ic ls -.Cx \&\ \& +.Ws .Op Ar remote-directory -.Cx \&\ \& +.Ws .Op Ar local-file .Cx Print a listing of the contents of a directory on the remote machine. The listing includes any system-dependent information that the server chooses to include; for example, most UNIX systems will produce -output from the command \*(Lqls -l\*(Rq. +output from the command +.Ql ls \-l . (See also .Ic nlist . ) @@ -351,10 +352,10 @@ output. If no local file is specified, or if .Ar local-file is -.Fl , +.Sq Fl , the output is sent to the terminal. .Tp Cx Ic macdef -.Cx \&\ \& +.Ws .Ar macro-name .Cx Define a macro. @@ -368,26 +369,26 @@ defined macros. Macros remain defined until a .Ic close command is executed. -The macro processor interprets '$' and '\\' as special characters. -A '$' followed by a number (or numbers) is replaced by the +The macro processor interprets `$' and `\e' as special characters. +A `$' followed by a number (or numbers) is replaced by the corresponding argument on the macro invocation command line. -A '$' followed by an 'i' signals that macro processor that the -executing macro is to be looped. On the first pass '$i' is +A `$' followed by an `i' signals that macro processor that the +executing macro is to be looped. On the first pass `$i' is replaced by the first argument on the macro invocation command line, on the second pass it is replaced by the second argument, and so on. -A '\\' followed by any character is replaced by that character. -Use the '\\' to prevent special treatment of the '$'. +A `\e' followed by any character is replaced by that character. +Use the `\e' to prevent special treatment of the `$'. .Tp Cx Ic mdelete -.Cx \&\ \& +.Ws .Op Ar remote-files .Cx Delete the .Ar remote-files on the remote machine. .Tp Cx Ic mdir -.Cx \&\ \& +.Ws .Ar remote-files -.Cx \&\ \& +.Ws .Ar local-file .Cx Like @@ -400,7 +401,7 @@ target local file for receiving .Ic mdir output. .Tp Cx Ic mget -.Cx \&\ \& +.Ws .Ar remote-files .Cx Expand the @@ -427,14 +428,14 @@ new local directories can be created with .Cx Li \&! mkdir directory .Cx \'. .Tp Cx Ic mkdir -.Cx \&\ \& +.Ws .Ar directory-name .Cx Make a directory on the remote machine. .Tp Cx Ic mls -.Cx \&\ \& +.Ws .Ar remote-files -.Cx \&\ \& +.Ws .Ar local-file .Cx Like @@ -450,7 +451,7 @@ target local file for receiving .Ic mls output. .Tp Cx Ic mode -.Cx \&\ \& +.Ws .Op Ar mode-name .Cx Set the file transfer @@ -459,12 +460,12 @@ to .Ar mode-name . The default mode is \*(Lqstream\*(Rq mode. .Tp Cx Ic modtime -.Cx \&\ \& +.Ws .Ar file-name .Cx Show the last modification time of the file on the remote machine. .Tp Cx Ic mput -.Cx \&\ \& +.Ws .Ar local-files .Cx Expand wild cards in the list of local files given as arguments @@ -484,12 +485,12 @@ exist on the current system, the remote file is considered Otherwise, this command is identical to .Ar get . .Tp Cx Ic nlist -.Cx \&\ \& +.Ws .Op Ar remote-directory -.Cx \&\ \& +.Ws .Op Ar local-file .Cx -Print a list of the files of a +Print a list of the files in a directory on the remote machine. If .Ar remote-directory is left unspecified, the current working directory is used. @@ -505,7 +506,7 @@ is .Fl , the output is sent to the terminal. .Tp Cx Ic nmap -.Cx \&\ \& +.Ws .Op Ar inpattern outpattern .Cx Set or unset the filename mapping mechanism. @@ -533,9 +534,9 @@ processed according to the and .Ic case settings). -Variable templating is accomplished by including the sequences '$1', '$2', ..., '$9' in +Variable templating is accomplished by including the sequences `$1', `$2', ..., `$9' in .Ar inpattern . -Use '\\' to prevent this special treatment of the '$' character. +Use `\\' to prevent this special treatment of the `$' character. All other characters are treated literally, and are used to determine the .Ic nmap .Op Ar inpattern @@ -547,15 +548,16 @@ $1.$2 and the remote file name "mydata.data", $1 would have the value The .Ar outpattern determines the resulting mapped filename. -The sequences '$1', '$2', ...., '$9' are replaced by any value resulting +The sequences `$1', `$2', ...., `$9' are replaced by any value resulting from the .Ar inpattern template. -The sequence '$0' is replace by the original filename. +The sequence `$0' is replace by the original filename. Additionally, the sequence .Cx ` .Op Ar seq1 , Ar seq2 .Cx \' +.Cx is replaced by .Op Ar seq1 if @@ -578,11 +580,11 @@ the output filename "myfile.data" for input filenames "myfile.data" and "myfile.myfile" for the input filename ".myfile". Spaces may be included in .Ar outpattern , -as in the example: nmap $1 sed "s/ *$//" > $1 . -Use the '\\' character to prevent special treatment -of the '$','[','[', and ',' characters. +as in the example: `nmap $1 sed "s/ *$//" > $1' . +Use the `\e' character to prevent special treatment +of the `$','[','[', and `,' characters. .Tp Cx Ic ntrans -.Cx \&\ \& +.Ws .Op Ar inchars Op Ar outchars .Cx Set or unset the filename character translation mechanism. @@ -612,9 +614,9 @@ is longer than the length of .Ar outchars , the character is deleted from the file name. .Tp Cx Ic open -.Cx \&\ \& +.Ws .Ar host -.Cx \&\ \& +.Ws .Op Ar port .Cx Establish a connection to the specified @@ -641,7 +643,7 @@ will transfer all files, and any .Ic mdelete will delete all files. .Tp Cx Ic proxy -.Cx \&\ \& +.Ws .Ar ftp-command .Cx Execute an ftp command on a secondary control connection. @@ -674,9 +676,9 @@ to the host on the primary control connection. Third party file transfers depend upon support of the ftp protocol PASV command by the server on the secondary control connection. .Tp Cx Ic put -.Cx \&\ \& +.Ws .Ar local-file -.Cx \&\ \& +.Ws .Op Ar remote-file .Cx Store a local file on the remote machine. If @@ -701,26 +703,27 @@ machine. A synonym for .Ic bye . .Tp Cx Ic quote -.Cx \&\ \& -.Ar crg1 arg2 ... +.Ws +.Ar arg1 arg2 ... .Cx The arguments specified are sent, verbatim, to the remote FTP server. .Tp Cx Ic recv -.Cx \&\ \& +.Ws .Ar remote-file -.Cx \&\ \& +.Ws .Op Ar local-file .Cx A synonym for get. .Tp Cx Ic remotehelp -.Cx \&\ \& +.Ws .Op Ar command-name .Cx Request help from the remote FTP server. If a .Ar command-name is specified it is supplied to the server as well. .Tp Cx Ic remotestatus +.Ws .Op Ar file-name .Cx With no arguments, show status of remote machine. If @@ -729,9 +732,9 @@ is specified, show status of .Ar file-name on remote machine. .Tp Cx Ic rename -.Cx \&\ \& +.Ws .Op Ar from -.Cx \&\ \& +.Ws .Op Ar to .Cx Rename the file @@ -745,7 +748,7 @@ ftp server. Resynchronization may be necessary following a violation of the ftp protocol by the remote server. .Tp Cx Ic rmdir -.Cx \&\ \& +.Ws .Ar directory-name .Cx Delete a directory on the remote machine. @@ -768,9 +771,9 @@ will not affect local files generated from a shell command (see below). The default value is off. .Tp Cx Ic send -.Cx \&\ \& +.Ws .Ar local-file -.Cx \&\ \& +.Ws .Op Ar remote-file .Cx A synonym for put. @@ -789,13 +792,13 @@ PORT commands for each data transfer. This is useful for certain FTP implementations which do ignore PORT commands but, incorrectly, indicate they've been accepted. .Tp Cx Ic site -.Cx \&\ \& +.Ws .Ar arg1 arg2 ... .Cx The arguments specified are sent, verbatim, to the remote FTP server as a SITE command. .Tp Cx Ic size -.Cx \&\ \& +.Ws .Ar file-name .Cx Return size of @@ -805,13 +808,13 @@ on remote machine. Show the current status of .Nm ftp . .Tp Cx Ic struct -.Cx \&\ \& +.Ws .Op Ar struct-name .Cx Set the file transfer .Ar structure to -.Ar struct-name . +.Ar struct-name . By default \*(Lqstream\*(Rq structure is used. .Tp Ic sunique Toggle storing of files on remote machine under unique file names. @@ -827,7 +830,7 @@ talk to TENEX machines. .Tp Ic trace Toggle packet tracing. .Tp Cx Ic type -.Cx \&\ \& +.Ws .Op Ar type-name .Cx Set the file transfer @@ -837,29 +840,34 @@ to If no type is specified, the current type is printed. The default type is network ASCII. .Tp Cx Ic umask -.Cx \&\ \& +.Ws .Op Ar newmask .Cx Set the default umask on the remote server to -.Ic newmask . +.Ar newmask . If -.Ic newmask +.Ar newmask is ommitted, the current umask is printed. .Tp Cx Ic user -.Cx \&\ \& +.Ws .Ar user-name -.Cx \&\ \& +.Ws .Op Ar password -.Cx \&\ \& +.Ws .Op Ar account .Cx Identify yourself to the remote FTP server. If the -password is not specified and the server requires it, +.Ar password +is not specified and the server requires it, .Nm ftp will prompt the user for it (after disabling local echo). -If an account field is not specified, and the FTP server +If an +.Ar account +field is not specified, and the FTP server requires it, the user will be prompted for it. -If an account field is specified, an account command will +If an +.Ar account +field is specified, an account command will be relayed to the remote server after the login sequence is completed if the remote server did not require it for logging in. @@ -875,15 +883,15 @@ if verbose is on, when a file transfer completes, statistics regarding the efficiency of the transfer are reported. By default, verbose is on. .Tp Cx Ic ? -.Cx \&\ \& +.Ws .Op Ar command .Cx A synonym for help. .Tp .Pp Command arguments which have embedded spaces may be quoted with -quote (") marks. -.Sh "ABORTING A FILE TRANSFER" +quote `"' marks. +.Sh ABORTING A FILE TRANSFER To abort a file transfer, use the terminal interrupt key (usually Ctrl-C). Sending transfers will be immediately halted. @@ -891,7 +899,8 @@ Receiving transfers will be halted by sending a ftp protocol ABOR command to the remote server, and discarding any further data received. The speed at which this is accomplished depends upon the remote server's support for ABOR processing. -If the remote server does not support the ABOR command, an "ftp>" +If the remote server does not support the ABOR command, an +.Ql ftp> prompt will not appear until the remote server has completed sending the requested file. .Pp @@ -905,19 +914,23 @@ violations of the ftp protocol. If the delay results from unexpected remote server behavior, the local .Nm ftp program must be killed by hand. -.Sh "FILE NAMING CONVENTIONS" +.Sh FILE NAMING CONVENTIONS Files specified as arguments to .Nm ftp commands are processed according to the following rules. -.Tw Fl +.Tw Ds .Tp \&1) -If the file name \*(Lq\-\*(Rq is specified, the +If the file name +.Sq Fl +is specified, the .Ar stdin (for reading) or .Ar stdout (for writing) is used. .Tp \&2) -If the first character of the file name is \*(Lq\*(Rq, the +If the first character of the file name is +.Sq \&| , +the remainder of the argument is interpreted as a shell command. .Nm Ftp then forks a shell, using @@ -936,7 +949,7 @@ c.f. the command. If the .Nm ftp -command expects a single local file ( .e.g. +command expects a single local file (.e.g. .Ic put ) , only the first filename generated by the "globbing" operation is used. .Tp \&4) @@ -969,7 +982,7 @@ The resulting filename may then be altered by the remote server if .Ic sunique is on. .Tp -.Sh "FILE TRANSFER PARAMETERS" +.Sh FILE TRANSFER PARAMETERS The FTP specification specifies many parameters which may affect a file transfer. The .Ic type @@ -989,7 +1002,7 @@ file transfer parameters: .Ic form , and .Ic struct . -.Sh "THE .netrc FILE" +.Sh THE .netrc FILE The .Pa .netrc file contains login and initialization information @@ -999,18 +1012,23 @@ The following tokens are recognized; they may be separated by spaces, tabs, or new-lines: .Tw password .Tp Cx Ic machine -.Cx \&\ \& +.Ws .Ar name .Cx -Identify a remote machine name. -The auto-login process searches the .netrc file for a +Identify a remote machine +.Ar name . +The auto-login process searches the +.Pa .netrc +file for a .Ic machine token that matches the remote machine specified on the .Nm ftp command line or as an .Ic open command argument. -Once a match is made, the subsequent .netrc tokens are processed, +Once a match is made, the subsequent +.Pa .netrc +tokens are processed, stopping when the end of file is reached or another .Ic machine or a @@ -1029,7 +1047,9 @@ token, and it must be after all .Ic machine tokens. This is normally used as: +.Pp .Dl default login anonymous password user@site +.Pp thereby giving the user .Ar automatic anonymous ftp login to @@ -1040,14 +1060,15 @@ by using the .Fl n flag to disable auto-login. .Tp Cx Ic login -.Cx \&\ \& +.Ws .Ar name .Cx Identify a user on the remote machine. If this token is present, the auto-login process will initiate -a login using the specified name. +a login using the specified +.Ar name . .Tp Cx Ic password -.Cx \&\ \& +.Ws .Ar string .Cx Supply a password. @@ -1065,7 +1086,7 @@ will abort the auto-login process if the is readable by anyone besides the user. .Tp Cx Ic account -.Cx \&\ \& +.Ws .Ar string .Cx Supply an additional account password. @@ -1074,7 +1095,7 @@ specified string if the remote server requires an additional account password, or the auto-login process will initiate an ACCT command if it does not. .Tp Cx Ic macdef -.Cx \&\ \& +.Ws .Ar name .Cx Define a macro. @@ -1094,11 +1115,15 @@ auto-login process. .Tp .Sh ENVIRONMENT .Nm Ftp -makes use of the -.Ev HOME -and -.Ev SHELL -environment variables. +utilizes the following environment variables. +.Tw Fl +.Tp Ev HOME +For default location of a +.Pa .netrc +file, if one exists. +.Tp Ev SHELL +For default shell. +.Tp .Sh SEE ALSO .Xr ftpd 8 .Sh HISTORY diff --git a/usr/src/usr.bin/gcore/gcore.1 b/usr/src/usr.bin/gcore/gcore.1 index efed7635bf..00f9b5566c 100644 --- a/usr/src/usr.bin/gcore/gcore.1 +++ b/usr/src/usr.bin/gcore/gcore.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)gcore.1 6.2 (Berkeley) %G% +.\" @(#)gcore.1 6.3 (Berkeley) %G% .\" .Dd .Dt GCORE 1 diff --git a/usr/src/usr.bin/gprof/gprof.1 b/usr/src/usr.bin/gprof/gprof.1 index 7827501bf3..70d7b50d45 100644 --- a/usr/src/usr.bin/gprof/gprof.1 +++ b/usr/src/usr.bin/gprof/gprof.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)gprof.1 6.5 (Berkeley) %G% +.\" @(#)gprof.1 6.6 (Berkeley) %G% .\" .Dd .Dt GPROF 1 diff --git a/usr/src/usr.bin/graph/graph.1 b/usr/src/usr.bin/graph/graph.1 index 3eb25ba0e6..434ab4e05e 100644 --- a/usr/src/usr.bin/graph/graph.1 +++ b/usr/src/usr.bin/graph/graph.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)graph.1 6.2 (Berkeley) %G% +.\" @(#)graph.1 6.3 (Berkeley) %G% .\" .Dd .Dt GRAPH 1 diff --git a/usr/src/usr.bin/grep/egrep/grep.1 b/usr/src/usr.bin/grep/egrep/grep.1 index e3d8077283..244d0c69e5 100644 --- a/usr/src/usr.bin/grep/egrep/grep.1 +++ b/usr/src/usr.bin/grep/egrep/grep.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)grep.1 6.4 (Berkeley) %G% +.\" @(#)grep.1 6.5 (Berkeley) %G% .\" .Dd .Dt GREP 1 @@ -108,7 +108,7 @@ Pathnames are listed once per file searched. If the standard input is searched, the pathname -.Fl +.Sq Fl is written. .Tp Fl n Each output line is preceded by its relative line @@ -151,14 +151,14 @@ standard input is used. The .Nm grep utility exits with one of the following values: -.Tw Ds -.Tp Li \&0 +.Dw Ds +.Dp Li \&0 One or more lines were selected. -.Tp Li \&1 +.Dp Li \&1 No lines were selected. -.Tp Li \&>1 +.Dp Li \&>1 An error occurred. -.Tp +.Dp .Sh EXTENDED REGULAR EXPRESSIONS The following characters are interpreted by .Nm egrep : @@ -185,11 +185,13 @@ the set of {$,.,^,[,],|,?,+,*,(,)}. .Tp .Sh EXAMPLES To find all occurances of the word patricia in a file: +.Pp .Dl grep patricia myfile .Pp To find all occurences to the pattern .Sq Li \&.Pp at the beginning of a line: +.Pp .Dl grep '^\e.Pp' .Pp The apostrophys assure the entire expression is evaluated by @@ -207,6 +209,7 @@ escapes the which would otherwise match any character. .Pp A simple example of an extended regular expression: +.Pp .Dl egrep '19|20|25' calendar .Pp Peruses the file calendar looking for either 19, 20 diff --git a/usr/src/usr.bin/head/head.1 b/usr/src/usr.bin/head/head.1 index 5f8c714f3c..9a8a131032 100644 --- a/usr/src/usr.bin/head/head.1 +++ b/usr/src/usr.bin/head/head.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)head.1 6.3 (Berkeley) %G% +.\" @(#)head.1 6.4 (Berkeley) %G% .\" .Dd .Os BSD 4.4 diff --git a/usr/src/usr.bin/hexdump/hexdump.1 b/usr/src/usr.bin/hexdump/hexdump.1 index 1456fca004..7bd2502990 100644 --- a/usr/src/usr.bin/hexdump/hexdump.1 +++ b/usr/src/usr.bin/hexdump/hexdump.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)hexdump.1 5.9 (Berkeley) %G% +.\" @(#)hexdump.1 5.10 (Berkeley) %G% .\" .Dd .Dt HEXDUMP 1 @@ -37,7 +37,7 @@ Display the input offset in hexadecimal, followed by sixteen space-separated, three column, space-filled, characters of input data per line. .Tp Fl d -Two-byte decimal display. +.Em Two-byte decimal display. Display the input offset in hexadecimal, followed by eight space-separated, five column, zero-filled, two-byte units of input data, in unsigned decimal, per line. @@ -52,7 +52,8 @@ Specify a format string to be used for displaying data. .Cx Specify a file that contains one or more newline separated format strings. Empty lines and lines whose first non-blank character is a hash mark -(#) are ignored. +.Pf \&( Cm \&# ) +are ignored. .Tc Fl n .Ws .Ar length @@ -61,7 +62,7 @@ Interpret only .Ar length bytes of input. .Tp Fl o -Two-byte octal display. +.Em Two-byte octal display. Display the input offset in hexadecimal, followed by eight space-separated, six column, zero-filled, two byte quantities of input data, in octal, per line. @@ -75,15 +76,28 @@ bytes from the beginning of the input. By default, .Ar offset is interpreted as a decimal number. -With a leading ``0x'' or ``0X'', +With a leading +.Cm 0x +or +.Cm 0X , .Ar offset is interpreted as a hexadecimal number, -otherwise, with a leading ``0'', +otherwise, with a leading +.Cm 0 , .Ar offset is interpreted as an octal number. -Appending the character ``b'', ``k'', or ``m'' to +Appending the character +.Cm b , +.Cm k , +or +.Cm m +to .Ar offset -causes it to be interpreted as a multiple of 512, 1024, or 1048576, +causes it to be interpreted as a multiple of +.Li 512 , +.Li 1024 , +or +.Li 1048576 , respectively. .Tp Fl v The @@ -96,7 +110,7 @@ identical to the immediately preceding group of output lines (except for the input offsets), are replaced with a line comprised of a single asterisk. .Tp Fl x -Two-byte hexadecimal display. +.Em Two-byte hexadecimal display. Display the input offset in hexadecimal, followed by eight, space separated, four column, zero-filled, two-byte quantities of input data, in hexadecimal, per line. @@ -131,14 +145,24 @@ Any whitespace before or after the slash is ignored. .Pp The format is required and must be surrounded by double quote (" ") marks. -It is interpreted as a fprintf-style format string, with the +It is interpreted as a fprintf-style format string (see +.Xr fprintf 3 ) , +with the following exceptions: -.Ds I -.Tw Ds -.Tp \&Unsupported \&fprintf \&Conversion \&Characters: +.Df I +.Bu +An asterisk (*) may not be used as a field width or precision. +.Bu +A byte count or field precision +.Em is +required for each ``s'' conversion +character (unlike the +.Xr fprintf 3 +default which prints the entire string if the precision is unspecified). +.Bu The conversion characters ``h'', ``n'', and ``p'' are not supported. -.Tp Supported Escape Sequences: +.Bu The single character escape sequences described in the C standard are supported: .Ds I @@ -153,40 +177,40 @@ described in the C standard are supported: .Cl \ev .Cw .De -.Tp Taboo: -An asterisk (*) may not be used as a field width or precision. -.Tp ``\&%s'' Anomaly: -A byte count or field precision -.Em is -required for each ``s'' conversion -character (unlike the -.Xr fprintf 3 -default which prints the entire string if the precision is unspecified). .Tp .De .Pp Hexdump also supports the the following additional conversion strings: .Tw Fl .Tc Cm \&_a -.Op dox +.Op Cm dox .Cx Display the input offset, cumulative across input files, of the next byte to be displayed. -The appended characters ``d'', ``o'', and ``x'' specify the display base +The appended characters +.Cm d , +.Cm o , +and +.Cm x +specify the display base as decimal, octal or hexadecimal respectively. .Tc Cm \&_A -.Op dox +.Op Cm dox .Cx -Identical to the _a conversion string except that it is only performed +Identical to the +.Cm \&_a +conversion string except that it is only performed once, when all of the input data has been processed. .Tp Cm \&_c Output characters in the default character set. Nonprinting characters are displayed in three character, zero-padded -octal, except for those representable by standard escape notation, -which are displayed as the following two character strings. +octal, except for those representable by standard escape notation +(see above), +which are displayed as two character strings. .Tp Cm _p Output characters in the default character set. -Nonprinting characters are displayed as a single ``.''. +Nonprinting characters are displayed as a single +.Dq Cm \&. . .Tp Cm _u Output US ASCII characters, with the exception that control characters are displayed using the following, lower-case, names. @@ -204,20 +228,20 @@ strings. .Pp The default and supported byte counts for the conversion characters are as follows: -.Tw Fl +.Df I +.Tw %c,_%c,_%c,_%c,_%c,_%c .Tp Li \&%_c , %_p , %_u , \&%c One byte counts only. .Tc Li \&%d , \&%i , \&%o , -.Ws -.Li \&%u , \&%X , \&%x +.Li \&\ %u , \&%X , \&%x .Cx Four byte default, one and two byte counts supported. .Tc Li \&%E , \&%e , \&%f , -.Ws -.Li \&%G , \&%g +.Li \&\ %G , \&%g .Cx Eight byte default, four byte counts supported. .Tp +.De .Pp The amount of data interpreted by each format string is the sum of the data required by each format unit, which is the iteration count times the @@ -239,7 +263,10 @@ during the last iteration. .Pp It is an error to specify a byte count as well as multiple conversion characters or strings unless all but one of the conversion characters -or strings is ``_a'' or ``_A''. +or strings is +.Cm \&_a +or +.Cm \&_A . .Pp If, as a result of the specification of the .Fl n @@ -251,9 +278,15 @@ end of data will display some number of the zero bytes). Further output by such format strings is replaced by an equivalent number of spaces. An equivalent number of spaces is defined as the number of spaces -output by an ``s'' conversion character with the same field width +output by an +.Cm s +conversion character with the same field width and precision as the original conversion character or conversion -string but with any ``+'', `` '', or ``#'' conversion flag characters +string but with any +.Dq Li \&+ , +.Dq \&\ \& , +.Dq Li \&# +conversion flag characters removed, and referencing a NULL string. .Pp If no format strings are specified, the default display is equivalent @@ -261,7 +294,7 @@ to specifying the .Fl x option. .Pp -.Nm Hexdump +.Nm hexdump exits 0 on success and >0 if an error occurred. .Sh EXAMPLES Display the input in perusal format: @@ -278,7 +311,9 @@ Implement the \-x option: "%07.7_Ax\en" "%07.7_ax " 8/2 "%04x " "\en" .De +.Sh SEE ALSO +.Xr adb 1 .Sh STANDARDS The -.Nm Hexdump +.Nm hexdump utility is expected to be POSIX 1003.2 compatible. diff --git a/usr/src/usr.bin/hexdump/od.1 b/usr/src/usr.bin/hexdump/od.1 index e9c20e254c..003fa1bb62 100644 --- a/usr/src/usr.bin/hexdump/od.1 +++ b/usr/src/usr.bin/hexdump/od.1 @@ -3,12 +3,12 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)od.1 5.2 (Berkeley) %G% +.\" @(#)od.1 5.3 (Berkeley) %G% .\" .Dd %Q .Os BSD 4.4 .Dt OD 1 -.SH NAME +.Sh NAME .Nm od .Nd octal, decimal, hex, ascii dump .Sh SYNOPSIS @@ -27,12 +27,12 @@ provides compatibility for the options listed above. .Pp It does not provide compatibility for the options ``-s'' and ``-w'', nor is compatibility provided for the extended argument syntax of -``[ -.Cx Op Sy \&+ +.Cx ``[ +.Op Sy \&+ .Li offset .Op Sy \&. .Op Sy b -.Cx [label] ]''. +.Cx [label]]''. .Cx .Sh SEE ALSO .Xr hexdump 1 diff --git a/usr/src/usr.bin/indent/indent.1 b/usr/src/usr.bin/indent/indent.1 index 84e6ab0be5..542449a5eb 100644 --- a/usr/src/usr.bin/indent/indent.1 +++ b/usr/src/usr.bin/indent/indent.1 @@ -5,7 +5,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)indent.1 6.7 (Berkeley) %G% +.\" @(#)indent.1 6.8 (Berkeley) %G% .\" .Dd .Dt INDENT 1 @@ -480,9 +480,9 @@ environment variable. .Sh FILES .Dw \&./.indent.pro .Di L -.Dp \&./.indent.pro +.Dp Pa \&./.indent.pro profile file -.Dp ~/.indent.pro +.Dp Pa ~/.indent.pro profile file .Dp .Sh HISTORY diff --git a/usr/src/usr.bin/join/join.1 b/usr/src/usr.bin/join/join.1 index a99e42fb7e..b63f2feeea 100644 --- a/usr/src/usr.bin/join/join.1 +++ b/usr/src/usr.bin/join/join.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)join.1 6.2 (Berkeley) %G% +.\" @(#)join.1 6.3 (Berkeley) %G% .\" .Dd .Dt JOIN 1 @@ -80,22 +80,32 @@ The following options are available: .Ar file_number .Cx In addition to the default output, produce a line -for each unpairable line in file file_number, where -file_number is 1 or 2. +for each unpairable line in file +.Ar file_number , +where +.Ar file_number +is 1 or 2. .Tc Fl e .Ws .Ar string .Cx -Replace empty output fields by string string. +Replace empty output fields by the string +.Ar string . .Tc Fl j .Ws .Ar file_number field .Cx -Join on the fieldth field of file -file_number. -If file_number is missing, (i.e., the +Join on the +.Sf Ar field 'th +field of file +.Ar file_number . +If +.Ar file_number +is missing, (i.e., the first digit of the option argument is neither 1 nor -2), use the fieldth field in each file. +2), use the +.Sf Ar field 'th +field in each file. Fields are decimal integers starting with 1. .Tc Fl o @@ -103,8 +113,12 @@ decimal integers starting with 1. .Ar list .Cx Each output line comprises the fields specified in -list, each element of which has the form -file_number.field, where file_number is a file +.Ar list , +each element of which has the form +.Ql file_number.field , +where +.Ar file_number +is a file number and field is a decimal integer field number. The elements of list are either comma or separated. The list is written only for lines with matching join fields, @@ -113,50 +127,73 @@ and is not output unless specifically requested. .Ws .Ar char .Cx -Use character char as a separator, for both input +Use character +.Ar char +as a separator, for both input and output. Every appearance of char in a line is significant. When this option is specified, the collating sequence should be the same as sort -without the -b option. +without the +.Fl b +option. .Tc Fl v .Ws .Ar file_number .Cx Instead of the default output, produce a line only -for each unpairable line in file_number, where -file_number is 1 or 2. +for each unpairable line in +.Ar file_number , +where +.Ar file_number +is 1 or 2. .Tc Fl 1 .Ws .Ar field .Cx -Join on the fieldth field of file 1. +Join on the +.Sf Ar field 'th +field of file 1. Fields are decimal integers starting with 1. .Tc Fl 2 .Ws .Ar field .Cx -Join on the fieldth field of file 2. +Join on the +.Sf Ar field 'th +field of file 2. Fields are decimal integers starting with 1. .Tp .Pp -If both -a 1 and -a 2 are specified, both sets of information -are output, -a 2 always first, regardless of the specified +If both +.Ql \-a 1 +and +.Ql \-a 2 +are specified, both sets of information +are output, +.Ql \-a 2 +always first, regardless of the specified order. .Pp The following arguments are required: -.Tw Fl -.Tp Ar file1 -.Tp Ar file2 +.Dw Fl +.Di L +.Dp Ar file1 +.Dp Ar file2 A pathname of a file to be joined. If either of -the file1 or file2 arguments is -.Fl +the +.Ar file1 +or +.Ar file2 +arguments is +.Sq Fl the standard input is used in its place. +.Dp .Pp The .Nm join diff --git a/usr/src/usr.bin/kdump/kdump.1 b/usr/src/usr.bin/kdump/kdump.1 index 204136b53a..8abad88a4f 100644 --- a/usr/src/usr.bin/kdump/kdump.1 +++ b/usr/src/usr.bin/kdump/kdump.1 @@ -1,52 +1,80 @@ -.TH KDUMP 1 -.SH NAME -.I kdump -\- display kernel trace data -.SH SYNOPSIS -.B kdump -[ -.B -dnlTR -] -.B -f -trfile ] -[ -.B -t -trstr ] -.SH DESCRIPTION -.I Kdump -displays kernel trace files produced with ktrace(1) in a human readable format. -Without the -f flag, kdump reads the file "ktrace.out" in the current +.\" Copyright (c) 1990 The Regents of the University of California. +.\" All rights reserved. +.\" +.\" %sccs.include.redist.man% +.\" +.\" @(#)kdump.1 1.3 (Berkeley) %G% +.\" +.Dd +.Dt KDUMP 1 +.Sh NAME +.Nm kdump +.Nd display kernel trace data +.Sh SYNOPSIS +.Nm kdump +.Op Fl dnlTR +.Op Fl f Ar trfile +.Op Fl t Ar trstr +.Sh DESCRIPTION +.Nm Kdump +displays kernel trace files produced with +.Xr ktrace 1 +in a human readable format. +Without the +.Fl f +flag, +.Nm kdump +reads the file +.Sq Pa ktrace.out +in the current directory. -Following is a description of the options: -.br -.TP -.B \-d +.Pp +Options: +.Tw Fl +.Tp Fl d Display all numbers in decimal. -.TP -.B \-n -Suppress ad hoc translations. Normally kdump tries to decode many +.Tp Fl n +Suppress ad hoc translations. Normally +.Nm kdump +tries to decode many system calls into a more human readable format. For example, ioctl values are replaced with the macro name and errno values are replaced -with the sys_errlist string. Suppressing this feature yields a more consistent +with the +.Li sys_errlist +string. Suppressing this feature yields a more consistent output format and is easily amenable to further processing. -.TP -.B \-l +.Tp Fl l Loop reading end-of-file. -.TP -.B \-T +.Tp Fl T Display absolute timestamps for each entry (seconds since epoch). -.TP -.B \-R +.Tp Fl R Display relative timestamps (time since previous entry). -.TP -.B \-t trstr -See -t in ktrace(1). -.TP -.B \-f trfile -See -t in ktrace(1). -.TP -.B \-m maxdata -Display at most \fBmaxdata\fP bytes when decoding i/o. -.SH SEE ALSO -.IR ktrace(1) +.Tc Fl t +.Ws +.Ar trstr +.Cx +See +.Fl t +in +.Xr ktrace 1 . +.Tc Fl f +.Ws +.Ar trfile +.Cx +See +.Fl t +in +.Xr ktrace 1 . +.Tc Fl m +.Ws +.Ar maxdata +.Cx +Display at most +.Ar maxdata +bytes when decoding i/o. +.Tp +.Sh SEE ALSO +.Xr ktrace 1 \- enable kernel process tracing. +.Sh HISTORY +4.4 BSD. diff --git a/usr/src/usr.bin/ktrace/ktrace.1 b/usr/src/usr.bin/ktrace/ktrace.1 index 2c9b7ea537..278ffecdaa 100644 --- a/usr/src/usr.bin/ktrace/ktrace.1 +++ b/usr/src/usr.bin/ktrace/ktrace.1 @@ -1,148 +1,148 @@ -.TH KTRACE 1 -.SH NAME -.I ktrace -\- enable kernel process tracing -.SH SYNOPSIS -.ll +1i \" XXX - don't want it to wrap -.B ktrace -[ -.B -Cica -] -[ -.B -p -pid ] -[ -.B -g -pgrp ] -[ -.B -f -trfile ] -[ -.B -t -trstr ] -.ll -1i -.br -.B ktrace -[ -.B -ida -] [ -.B -f -trfile ] [ command ] -.SH DESCRIPTION -.I Ktrace -enables kernel trace logging for the specified processes. -Kernel trace data is logged to the file "ktrace.out" in the +.\" Copyright (c) 1990 The Regents of the University of California. +.\" All rights reserved. +.\" +.\" %sccs.include.redist.man% +.\" +.\" @(#)ktrace.1 1.3 (Berkeley) %G% +.\" +.Dd +.Dt KTRACE 1 +.Sh NAME +.Nm ktrace +.Nd enable kernel process tracing +.Sh SYNOPSIS +.Nm ktrace +.Op Fl Cica +.Op Fl p Ar pid +.Op Fl g Ar pgrp +.Op Fl f Ar trfile +.Op Fl t Ar trstr +.Nm ktrace +.Op Fl ida +.Op Fl f Ar trfile +.Op command +.Sh DESCRIPTION +.Nm Ktrace +enables kernel trace logging for the specified processes. +Kernel trace data is logged to the file +.Sq Pa ktrace.out +in the current directory, or to the file named with the -.B -f +.Fl f flag. -The current set of kernel operations that can be traced -include: system calls, namei translations, signal processing, and i/o. -By default, all operations -are traced. To restrict logging to specific operations, use the -.B -t +The current set of kernel operations that can be traced include: +system calls, namei translations, signal processing, and i/o. +By default, all operations are +traced. To restrict logging to specific operations, use the +.Fl t flag as described below. Once tracing is enabled on a process, trace data will be logged until either the process exits or the trace point is cleared with the -.B -c -flag. -A traced process can generate enormous amounts of log -data quickly; compounded -with the action of the inherit flag, \fB\-i\fP, tracing can become unwieldly. +.Fl c +flag. A traced process can generate enormous amounts of log +data quickly; compounded with the action of the inherit flag, +.Fl i , +tracing can become unwieldly. It is strongly suggested that the user memorize how to globally disable all tracing before attempting to trace a process. The following command is sufficient to -disable tracing on all user owned processes (if root, all processes in the system): -.nf - - $ trace -C - -.fi -The trace file is binary format: use kdump(1) to decode -it. -Following is a description of the options: -.br -.TP -.B \-C +disable tracing on all user owned processes +(if root, all processes in the system): +.Pp +.Dl \&$ trace -C +.Pp +The +trace file is binary format: use +.Xr kdump 1 +to decode it. +Following +is a description of the options: +.Tw Ds +.Tp Fl C Disable tracing on all user owned processes (if root, all processes in the system). -.TP -.B \-f trfile -Log trace records to \fBtrfile\fP instead of "trace.out". -.TP -.B \-t trstr +.Tc Fl f +.Ws +.Ar trfile +.Cx +Log trace records to +.Ar trfile +instead +of +.Dq Pa trace.out . +.Tc Fl t +.Ws +.Ar trstr +.Cx The string argument represents the kernel trace points, one per letter. The following table equates the letters with the tracepoints: -.nf - - c - trace system calls - n - trace namei translations - i - trace I/O - s - trace processing of signals - -.fi -.TP -.B \-p pid -Enable (disable) tracing on the indicated process id (only one -p -flag allowed); -.TP -.B \-g pgid +.Dw Ds +.Dp Cm c +trace system calls +.Dp Cm n +trace namei translations +.Dp Cm i +trace I/O +.Dp Cm s +trace processing of signals +.Dp +.Tc Fl p +.Ws +.Ar pid +.Cx +Enable (disable) tracing on the indicated process id (only one +.Fl p +flag +allowed); +.Tc Fl g +.Ws +.Ar pgid +.Cx Enable (disable) tracing on all processes in the indicated process group. -.TP -.B \-a +.Tp Fl a Append to the tracefile instead of truncating it. -.TP -.B \-c -Clear the indicated trace points. -.TP -.B \-i +.Tp Fl c +Clear +the indicated trace points. +.Tp Fl i Pass the trace flag to all future children of the designated processes. -.TP -.B \-I +.Tp Fl I Pass the trace flag to all current and future children of the designated processes. -.TP -.B command -Run \fBcommand\fP with the specified trace flags. -.LP -The -p, -g, and \fBcommand\fP options are mutually exclusive. -.SH EXAMPLES -.nf +.Tp Ar command +Run +.Ar command +with the specified trace flags. +.Tp +.Pp +The +.Fl p , +.Fl g , +and command options are mutually exclusive. +.Sh EXAMPLES +.Ds I # trace all kernel operations of process id 34 - - $ ktrace -p34 - +.Dl $ ktrace -p34 # trace all kernel operations of processes in process group 15 and # pass the trace flags to all current and future children - - $ ktrace -Ig15 - +.Dl $ ktrace -Ig15 # disable all tracing of process 65 - - $ ktrace -cp65 - +.Dl $ ktrace -cp65 # disable tracing signals on process 70 and all current children - - $ ktrace -ts -cip70 - +.Dl $ ktrace -ts -cip70 # enable tracing of i/o on process 67 - - $ ktrace -ti -p67 - +.Dl $ ktrace -ti -p67 # run the command "w", tracing only system calls - - $ ktrace -tc w - +.Dl $ ktrace -tc w # disable all tracing to the file "tracedata" - - $ ktrace -c -f tracedata - +.Dl $ ktrace -c -f tracedata # disable tracing of all processes owned by the user - - $ ktrace -C - -.fi -.SH SEE ALSO -.IR kdump(1) +.Dl $ ktrace -C +.De +.Sh SEE ALSO +.Xr kdump 1 \- display kernel trace data. +.Sh HISTORY +4.4 BSD. diff --git a/usr/src/usr.bin/last/last.1 b/usr/src/usr.bin/last/last.1 index c07ca8a8be..9df2c023ea 100644 --- a/usr/src/usr.bin/last/last.1 +++ b/usr/src/usr.bin/last/last.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)last.1 6.5 (Berkeley) %G% +.\" @(#)last.1 6.6 (Berkeley) %G% .\" .Dd .Dt LAST 1 @@ -35,12 +35,16 @@ a crash or shutdown, .Nm last will so indicate. .Pp +.Tw Fl +.Tc Fl f +.Ws +.Ar file +.Cx .Nm Last reads the file -.Ar file , -or by default, +.Ar file +instead of the default, .Pa /var/log/wtmp . -.Tw Ds .Tc Fl .Ar \&# .Cx @@ -80,7 +84,8 @@ logs in at reboots of the system, thus If .Nm last is interrupted, it indicates to what date the search has -progressed. If interrupted with a quit signal .Nm last +progressed. If interrupted with a quit signal +.Nm last indicates how far the search has progressed and then continues. .Sh FILES diff --git a/usr/src/usr.bin/lastcomm/lastcomm.1 b/usr/src/usr.bin/lastcomm/lastcomm.1 index 0399ff580d..353d32fe7f 100644 --- a/usr/src/usr.bin/lastcomm/lastcomm.1 +++ b/usr/src/usr.bin/lastcomm/lastcomm.1 @@ -3,23 +3,20 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lastcomm.1 6.5 (Berkeley) %G% +.\" @(#)lastcomm.1 6.6 (Berkeley) %G% .\" .Dd .Dt LASTCOMM 1 -.UC +.Os BSD 3.0 .Sh NAME .Nm lastcomm .Nd show last commands executed in reverse order .Sh SYNOPSIS .Nm lastcomm .Op Fl f Ar file -.Op Ar command name -\&... -.Op Ar user name -\&... -.Op Ar terminal name -\&... +.Op Ar command \&... +.Op Ar user \&... +.Op Ar terminal \&... .Sh DESCRIPTION .Nm Lastcomm gives information on previously executed commands. @@ -27,23 +24,32 @@ With no arguments, .Nm lastcomm prints information about all the commands recorded during the current accounting file's lifetime. -.Tw Ds -.Tp Fl f -option -causes -.Nm lastcomm -to read from a file other than the default +.Pp +Option: +.Pp +.Tw Fl +.Tp Cx Fl f +.Ws +.Ar file +.Cx +Read from +.Ar file +rather than the default accounting file. .Tp .Pp If called with arguments, only accounting entries with a matching -.Ar command name , -.Ar user name , +.Ar command +name, +.Ar user +name, or -.Ar terminal name +.Ar terminal +name are printed. So, for example: +.Pp .Dl lastcomm a.out root ttyd0 .Pp would produce a listing of all the @@ -55,6 +61,7 @@ on the terminal .Ar ttyd0 . .Pp For each process entry, the following are printed. +.Pp .Ds I The name of the user who ran the process. Flags, as accumulated by the accounting facilities in the system. diff --git a/usr/src/usr.bin/learn/learn/learn.1 b/usr/src/usr.bin/learn/learn/learn.1 index a4350ac0d0..9467eab45b 100644 --- a/usr/src/usr.bin/learn/learn/learn.1 +++ b/usr/src/usr.bin/learn/learn/learn.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)learn.1 6.4 (Berkeley) %G% +.\" @(#)learn.1 6.5 (Berkeley) %G% .\" .Dd .Dt LEARN 1 diff --git a/usr/src/usr.bin/leave/leave.1 b/usr/src/usr.bin/leave/leave.1 index 30ffef5919..c31f2d39ef 100644 --- a/usr/src/usr.bin/leave/leave.1 +++ b/usr/src/usr.bin/leave/leave.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)leave.1 6.3 (Berkeley) %G% +.\" @(#)leave.1 6.4 (Berkeley) %G% .\" .Dd .Dt LEAVE 1 @@ -12,7 +12,7 @@ .Nd remind you when you have to leave .Sh SYNOPSIS .Nm leave -.Op Op \&+ Ar hhmm +.Op [\&+] Ar hhmm .Sh DESCRIPTION .Nm Leave waits until the specified time, then reminds you that you @@ -24,11 +24,20 @@ When you log off, exits just before it would have printed the next message. .Pp -The time of day is in the form hhmm where hh is a time in -hours (on a 12 or 24 hour clock). +Options: +.Pp +.Tw Fl +.Tp Ar hhmm +The time of day is in the form +.Ar hhmm +where +.Ar hh +is a time in +hours (on a 12 or 24 hour clock), and +.Ar mm +are minutes. All times are converted to a 12 hour clock, and assumed to be in the next 12 hours. -.Tw Ds .Tp Ic \&+ If the time is preceeded by `+', the alarm will go off in hours and minutes from the current time. @@ -48,7 +57,7 @@ or .Pp Leave ignores interrupts, quits, and terminates. To get rid of it you should either log off or use -.Dq Li kill \-9 +.Ql kill \-9 giving its process id. .Sh SEE ALSO .Xr calendar 1 diff --git a/usr/src/usr.bin/locate/locate/locate.1 b/usr/src/usr.bin/locate/locate/locate.1 index 0951e9831c..8c032716b9 100644 --- a/usr/src/usr.bin/locate/locate/locate.1 +++ b/usr/src/usr.bin/locate/locate/locate.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)locate.1 5.2 (Berkeley) %G% +.\" @(#)locate.1 5.3 (Berkeley) %G% .\" .Dd .Dt LOCATE 1 diff --git a/usr/src/usr.bin/lock/lock.1 b/usr/src/usr.bin/lock/lock.1 index 9e6272e137..1b742cf48a 100644 --- a/usr/src/usr.bin/lock/lock.1 +++ b/usr/src/usr.bin/lock/lock.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lock.1 6.6 (Berkeley) %G% +.\" @(#)lock.1 6.7 (Berkeley) %G% .\" .Dd .Dt LOCK 1 diff --git a/usr/src/usr.bin/logger/logger.1 b/usr/src/usr.bin/logger/logger.1 index 3af969aaac..ff794fe905 100644 --- a/usr/src/usr.bin/logger/logger.1 +++ b/usr/src/usr.bin/logger/logger.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)logger.1 6.5 (Berkeley) %G% +.\" @(#)logger.1 6.6 (Berkeley) %G% .\" .Dd .Dt LOGGER 1 diff --git a/usr/src/usr.bin/login/login.1 b/usr/src/usr.bin/login/login.1 index 3bc4f48411..37e4eef8ea 100644 --- a/usr/src/usr.bin/login/login.1 +++ b/usr/src/usr.bin/login/login.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)login.1 6.7 (Berkeley) %G% +.\" @(#)login.1 6.8 (Berkeley) %G% .\" .Dd .Dt LOGIN 1 @@ -69,20 +69,20 @@ a leading dash .Sq Fl . .Pp Login also modifies the -environment -.Xr environ 7 +environment (see +.Xr environ 7 ) with information specifying home directory, command interpreter, terminal type (if available) and user name. .Pp Options: .Pp -.Tw Fl +.Tw Ds .Tp Fl p Causes the remainder of the environment to be preserved, otherwise any previous environment is discarded. .Tp Fl h option is used by -.Ar telnetd 8 +.Xr telnetd 8 (at initial login) and other servers to list the host from which the connection was received. diff --git a/usr/src/usr.bin/look/look.1 b/usr/src/usr.bin/look/look.1 index 7467b6fda9..36756a703c 100644 --- a/usr/src/usr.bin/look/look.1 +++ b/usr/src/usr.bin/look/look.1 @@ -3,11 +3,11 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)look.1 6.3 (Berkeley) %G% +.\" @(#)look.1 6.4 (Berkeley) %G% .\" .Dd .Dt LOOK 1 -.Os ATT 7th +.Os BSD 4.4 .Sh NAME .Nm look .Nd display lines beginning with a given string @@ -19,7 +19,7 @@ .Sh DESCRIPTION The .Nm Look -utility searchs a text +utility searchs a text .Ar file for all matches of @@ -35,6 +35,7 @@ is not specified, the file is used. .Pp Options: +.Tw Ds .Tp Ar d Dictionary character set and order. .Tp Ar f diff --git a/usr/src/usr.bin/lorder/lorder.1 b/usr/src/usr.bin/lorder/lorder.1 index fb64b523c2..e6bceca503 100644 --- a/usr/src/usr.bin/lorder/lorder.1 +++ b/usr/src/usr.bin/lorder/lorder.1 @@ -3,35 +3,42 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lorder.1 6.4 (Berkeley) %G% +.\" @(#)lorder.1 6.5 (Berkeley) %G% .\" -.TH LORDER 1 "Q" -.UC 4 -.SH NAME -lorder \- list dependencies for object files -.SH SYNOPSIS -.ft B -lorder file ... -.ft R -.SH DESCRIPTION -The -.I lorder +.Dd +.Dt LORDER 1 +.Os BSD 4.4 +.Sh NAME +.Nm lorder +.Nd list dependencies for object files +.Sh SYNOPSIS +.Nm lorder +.Ar file ... +.Sh DESCRIPTION +The +.Nm lorder utility uses -.IR nm (1) +.Xr nm 1 to determine interdependencies in the list of object files specified on the command line. -.I Lorder +.Nm Lorder outputs a list of file names where the first file contains a symbol which is defined by the second file. -.PP -The output is normally used with -.IR tsort (1) +.Pp +The output is normally used with +.Xr tsort 1 when a library is created to determine the optimum ordering of the object modules so that all references may be resolved in a single pass of the loader. -.SH EXAMPLES -.RS -ar cr library.a `lorder ${OBJS} | tsort` -.RE -.SH "SEE ALSO" -ar(1), ld(1), nm(1), ranlib(1), tsort(1) +.Sh EXAMPLES +.Pp +.Dl ar cr library.a `lorder ${OBJS} tsort` +.Sh SEE ALSO +.Xr ar 1 , +.Xr ld 1 , +.Xr nm 1 , +.Xr ranlib 1 , +.Xr tsort 1 +.Sh HISTORY +.Nm Lorder +appeared in Version 7 AT&T Unix. diff --git a/usr/src/usr.bin/m4/m4.1 b/usr/src/usr.bin/m4/m4.1 index ba5584c5a8..2a8a10a6b6 100644 --- a/usr/src/usr.bin/m4/m4.1 +++ b/usr/src/usr.bin/m4/m4.1 @@ -2,16 +2,15 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" This code is derived from software contributed to Berkeley by +.\" The code is derived from software contributed to Berkeley by .\" Ozan Yigit. .\" .\" %sccs.include.redist.man% .\" -.\" @(#)m4.1 6.5 (Berkeley) %G% +.\" @(#)m4.1 6.6 (Berkeley) %G% .\" .Dd .Dt M4 1 -.DA 08 Jan 1986 .Sh NAME .Nm m4 .Nd macro language preprocessor for Ratfor and Pascal @@ -28,6 +27,7 @@ M4 reads standard input, and writes the results to the standard output. .Pp The options and their effects are as follows: .Pp +.Tw _Dname[=Val] .Tp Cx Fl D .Ar name .Op Ar \&=Val @@ -53,9 +53,8 @@ processor provides a kind of like syntax and some of the macro functions will be familiar: -.Tw Ds +.Tw \&undiver .Tp Ic define -usage: .Ar define(name [, val]) .br the second argument is installed as the value of the macro @@ -77,13 +76,11 @@ argument. Argument 0 is the name of the macro; missing arguments are replaced by the null string. .Tp Ic defn -usage: .Ar defn(name [, name ...]) .br returns the quoted definition of its argument(s). Useful in renaming macros. .Tp Ic undefine -usage: .Ar undefine(name [, name ...]) .br removes the definition of the macro(s) named. If there is @@ -91,27 +88,23 @@ more than one definition for the named macro, (due to previous use of .Ic pushdef ) all definitions are removed. .Tp Ic pushdef -usage: .Ar pushdef(name [, val]) .br like .Ic define , but saves any previous definition by stacking the current definition. .Tp Ic popdef -usage: .Ar popdef(name [, name ...]) .br removes current definition of its argument(s), exposing the previous one if any. .Tp Ic ifdef -usage: .Ar ifdef(name, if-def [, ifnot-def]) .br if the first argument is defined, the value is the second argument, otherwise the third. If there is no third argument, the value is null. .Tp Ic shift -usage: .Ar shift(arg, arg, arg, ...) .br returns all but its first argument. @@ -120,14 +113,12 @@ commas in between. The quoting nullifies the effect of the extra scan that will subsequently be performed. .Tp Ic changequote -usage: .Ar changequote(lqchar, rqchar) .br change quote symbols to the first and second arguments. With no arguments, the quotes are reset back to the default characters. (i.e., \*`\\*'). .Tp Ic changecom -usage: .Ar changecom(lcchar, rcchar) .br change left and right comment markers from the default @@ -140,7 +131,6 @@ With one argument, the left marker becomes the argument and the right marker becomes newline. With two arguments, both markers are affected. .Tp Ic divert -usage: .Ar divert(divnum) .br .Nm m4 @@ -153,7 +143,6 @@ argument. Output diverted to a stream other than 0 through 9 disappears into bitbucket. .Tp Ic undivert -usage: .Ar undivert([divnum [, divnum ...]) .br causes immediate output of text from diversions named as @@ -167,17 +156,14 @@ unless .Ic m4wrap is defined. .Tp Ic divnum -usage: .Ar divnum() .br returns the value of the current output stream. .Tp Ic dnl -usage: .Ar dnl() .br reads and discards characters up to and including the next newline. .Tp Ic ifelse -usage: .Ar ifelse(arg, arg, if-same [, ifnot-same \&| arg,\ arg\ ...]) .br has three or more arguments. @@ -188,19 +174,16 @@ repeated with arguments 4, 5, 6 and 7. Otherwise, the value is either the fourth string, or, if it is not present, null. .Tp Ic incr -usage: .Ar incr(num) .br returns the value of its argument incremented by 1. The value of the argument is calculated by interpreting an initial digit-string as a decimal number. .Tp Ic decr -usage: .Ar decr(num) .br returns the value of its argument decremented by 1. .Tp Ic eval -usage: .Ar eval(expression) .br evaluates its argument as a constant expression, using integer arithmetic. @@ -220,19 +203,16 @@ or by the ternary operator Parentheses may be used for grouping. Octal numbers may be specified as in C. .Tp Ic len -usage: .Ar len(string) .br returns the number of characters in its argument. .Tp Ic index -usage: .Ar index(search-string, string) .br returns the position in its first argument where the second argument begins (zero origin), or \-1 if the second argument does not occur. .Tp Ic substr -usage: .Ar substr(string, index [, length]) .br returns a substring of its first argument. @@ -242,7 +222,6 @@ the third argument indicates the length of the substring. A missing third argument is taken to be large enough to extend to the end of the first string. .Tp Ic translit -usage: .Ar translit(source, from [, to]) .br transliterates the characters in its first argument @@ -252,12 +231,10 @@ in the second argument are deleted from the first argument. If the third argument is missing altogether, all characters in the second argument are deleted from the first argument. .Tp Ic include -usage: .Ar include(filename) .br returns the contents of the file named in the argument. .Tp Ic sinclude -usage: .Ar sinclude(filename) .br is identical to @@ -265,21 +242,18 @@ is identical to except that it says nothing if the file is inaccessible. .Tp Ic paste -usage: .Ar paste(filename) .br returns the contents of the file named in the argument without any processing, unlike .Ic include . .Tp Ic spaste -usage: .Ar spaste(filename) .br is identical to .Ic paste , except that it says nothing if the file is inaccessible. .Tp Ic syscmd -usage: .Ar syscmd(command) .br executes the @@ -287,13 +261,11 @@ UNIX command given in the first argument. No value is returned. .Tp Ic sysval -usage: .Ar sysval() .br is the return code from the last call to .Ic syscmd . .Tp Ic maketemp -usage: .Ar maketemp(string) .br fills in a string of @@ -301,7 +273,6 @@ XXXXXX in its argument with the current process ID. .Tp Ic m4exit -usage: .Ar m4exit([exitcode]) .br causes immediate exit from @@ -309,20 +280,17 @@ causes immediate exit from Argument 1, if given, is the exit code; the default is 0. .Tp Ic m4wrap -usage: .Ar m4wrap(m4-macro-or-built-in) .br argument 1 will be pushed back at final .Ic EOF ; .Dl example: m4wrap(`dumptable()'). -.Tp Ic errprint "(str -usage: +.Tp Ic errprint .Ar errprint(str [, str, str, ...]) .br prints its argument(s) on stderr. If there is more than one argument, each argument is separated by a space during the output. .Tp Ic dumpdef -usage: .Ar dumpdef([name, name, ...]) .br prints current names and definitions, @@ -394,7 +362,8 @@ does not handle character constants.) .Sh SEE ALSO .Xr cc 1 , .Xr cpp 1 . -.Xr m4 1 , +.Xr m4 1 +.br .Em The M4 Macro Processor by B. W. Kernighan and D. M. Ritchie. .Sh HISTORY diff --git a/usr/src/usr.bin/mail/mail.1 b/usr/src/usr.bin/mail/mail.1 index fb9eec9494..4762e99e12 100644 --- a/usr/src/usr.bin/mail/mail.1 +++ b/usr/src/usr.bin/mail/mail.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mail.1 6.15 (Berkeley) %G% +.\" @(#)mail.1 6.16 (Berkeley) %G% .\" .Dd .Dt MAIL 1 @@ -34,6 +34,7 @@ a command syntax reminiscent of .Xr ed 1 with lines replaced by messages. .Pp +.Tw Ds .Tp Fl v Verbose mode. The details of delivery are displayed on the users terminal. @@ -49,14 +50,16 @@ input isn't a terminal. In particular, the special character when sending mail is only active in interactive mode. .Tp Fl n -Inhibits reading /usr/share/misc/Mail.rc upon startup. +Inhibits reading +.Pa /usr/share/misc/Mail.rc +upon startup. .Tp Fl N Inhibits the initial display of message headers when reading mail or editing a mail folder. .Tp Fl s Specify subject on command line (only the first argument after the -Fl s +.Fl s flag is used as a subject; be careful to quote subjects containing spaces.) .Tp Fl c @@ -99,7 +102,7 @@ In normal usage .Nm mail is given no arguments and checks your mail out of the post office, then -prints out a one line header of each message there. +prints out a one line header of each message found. The current message is initially the first message (numbered 1) and can be printed using the .Ic print @@ -234,7 +237,8 @@ The current list of such aliases can be displayed with the command in .Nm mail . System wide distribution lists can be created by editing -/usr/lib/aliases, see +.Pa /etc/aliases , +see .Xr aliases 5 and .Xr sendmail 8 ; @@ -539,7 +543,7 @@ or or never referenced in his system mailbox, and removing all other messages from his system mailbox. If new mail has arrived during the session, the message -.Dq LI You have new mail +.Dq Li You have new mail is given. If given while editing a mailbox file with the .Fl f @@ -594,7 +598,7 @@ option. Arguments are of the form .Ar option . Quotation marks may be placed around any part of the assignment statement to quote blanks or tabs, i.e. -.Dq Li set indentprefix=\*(Lq \*(Rq +.Dq Li set indentprefix="->" .Tp Ic saveignore .Ic Saveignore is to @@ -771,7 +775,7 @@ command) are not included. .Ar messages .Cx Identical to -Ic \&~f , +.Ic \&~f , except all message headers are included. .Tp Ic \&~h Edit the message header fields by typing each one in turn and allowing @@ -809,8 +813,9 @@ is set. .Ar filename .Cx Read the named file into the message. -.Tp Ic \&~s -string +.Tp Cx Ic \&~s +.Ar string +.Cx Cause the named string to become the current subject field. .Tp Cx Ic \&~\&t .Ar name ... @@ -827,7 +832,7 @@ text to the end of your message. .Ar filename .Cx Write the message onto the named file. -.Tp Cx Ic \&~\\ +.Tp Cx Ic \&~\&| .Ar command .Cx Pipe the message through the command as a filter. If the command gives @@ -861,7 +866,8 @@ The binary options include the following: Causes messages saved in .Ar mbox to be appended to the end rather than prepended. -This should always be set (perhaps in /usr/lib/Mail.rc). +This should always be set (perhaps in +.Pa /usr/share/misc/Mail.rc ) . .Tp Ar ask Causes .Nm mail diff --git a/usr/src/usr.bin/make/make.1 b/usr/src/usr.bin/make/make.1 index afd5f84ebc..8a4946d635 100644 --- a/usr/src/usr.bin/make/make.1 +++ b/usr/src/usr.bin/make/make.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)make.1 5.2 (Berkeley) %G% +.\" @(#)make.1 5.3 (Berkeley) %G% .\" .Dd .Dt MAKE 1 @@ -141,6 +141,7 @@ and are usually created from them. The exact relationship between the target and the source is determined by the operator that separates them. The three operators are as follows: +.Tw Ds .Tp Ic \&: A target is considered out-of-date if its modification time is less than those of any of its sources. @@ -197,6 +198,7 @@ Variables in make are much like variables in the shell, and, by tradition, consist of all upper-case letters. The five operators that can be used to assign values to variables are as follows: +.Tw Ds .Tp Ic \&= Assign the value to the variable. Any previous value is overridden. @@ -350,32 +352,32 @@ Replaces each word in the variable with everything but its suffix. .Op Cm g .Cx Modify the first occurrence of -.Ar old _pattern +.Ar old_pattern in each word to be replaced with -.Ar new _pattern . +.Ar new_pattern . If a ``g'' is appended to the last slash of the pattern, all occurrences in each word are replaced. If -.Ar old _pattern +.Ar old_pattern begins with a carat (``^''), -.Ar old _pattern +.Ar old_pattern is anchored at the beginning of each word. If -.Ar old _pattern +.Ar old_pattern ends with a dollar sign (``$''), it is anchored at the end of each word. Inside -.Ar new _string , +.Ar new_string , an ampersand (``&'') is replaced by -.Ar old _pattern . +.Ar old_pattern . Any character may be used as a delimiter for the parts of the modifier string. The anchoring, ampersand and delimiter characters may be escaped with a backslash (``\e''). .Pp Variable expansion occurs in the normal fashion inside both -.Ar old _string +.Ar old_string and -.Ar new _string +.Ar new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign (``$''), not a preceding dollar sign as is usual. .Tp Cm T @@ -383,7 +385,7 @@ Replaces each word in the variable with its last component. .Tp Ar old_string=new_string This is the System V style variable substitution. It must be the last modifier specified. -.Ar Old _string +.Ar Old_string is anchored at the end of each word, so only suffixes or entire words may be replaced. .Tp @@ -399,7 +401,9 @@ to form the file name. If angle brackets are used, the included makefile is expected to be in the system makefile directory. If double quotes are used, the including makefile's directory and any -directories specified using the -I option are searched before the system +directories specified using the +.Fl I +option are searched before the system makefile directory. .Pp Conditional expressions are also preceded by a single dot as the first @@ -673,13 +677,12 @@ Each source specifies a suffix to .Nm make . If no sources are specified, any previous specifies suffices are deleted. .Sh ENVIRONMENT -.Nm make -can utilize the +.Nm Make +utilizes the following environment variables, if they exist: .Ev MAKE , .Ev MAKEFLAGS and -.Ev MAKEOBJDIR -environment variables. +.Ev MAKEOBJDIR . .Sh FILES .Dw /usr/share/mk .Di L diff --git a/usr/src/usr.bin/mesg/mesg.1 b/usr/src/usr.bin/mesg/mesg.1 index 62737fdc3c..f3cf7d6861 100644 --- a/usr/src/usr.bin/mesg/mesg.1 +++ b/usr/src/usr.bin/mesg/mesg.1 @@ -1,29 +1,67 @@ -.\" Copyright (c) 1987, 1990 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1987, 1990 The Regents of the University of California. +.\" All rights reserved. .\" -.\" @(#)mesg.1 6.4 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH MESG 1 "%Q" -.AT 3 -.SH NAME -mesg \- permit or deny messages -.SH SYNOPSIS -.B mesg -[ -.B n -] [ -.B y -] -.SH DESCRIPTION -\fIMesg\fP with argument \fBn\fP forbids messages via \fIwrite\fP -and \fItalk\fP by revoking non-user write permission on the user's -terminal. \fIMesg\fP with argument \fBy\fP reinstates permission. -\fIMesg\fP without arguments reports the current state without -changing it. -.SH FILES -/dev/tty* -.SH "SEE ALSO" -write(1), talk(1) -.SH DIAGNOSTICS -Exit status is 0 if messages are receivable, 1 if not, -1 on error. +.\" @(#)mesg.1 6.5 (Berkeley) %G% +.\" +.Dd +.Dt MESG 1 +.Os BSD 4.4 +.Sh NAME +.Nm mesg +.Nd Display (do not display) messages from other users +.Sh SYNOPSIS +.Nm mesg +.Op Cm n Li \&| Cm y +.Sh DESCRIPTION +The +.Nm mesg +utility allows a user to decide if other users may write +messages to his or her screen. Programs such as +.Xr talk 1 , +.Xr write 1 +and +.Xr echo 1 +are social and display a message on the target user's terminal. +Sometimes this is inconvenient. +.Pp +Options: +.Tw Ds +.Tp Cm n +Disallow messages, providing peace, and informing the contacting +party +that `Your party is refusing messages'. +.Tp Cm y +Allow messages to be displayed. +.Tp +.Pp +If no arguments are given, +.Nm mesg +displays the present message status. +.Pp +The +.Nm mesg +utility exits with one of the following values: +.Dw Ds +.Dp Li \&\ 0 +messages are allowed +.Dp Li \&\ 1 +messages are not allowed +.Dp Li \&\-\&1 +An error has occurred. +.Dp +.Sh FILES +.Dw /dev/[pt]ty[pq]? +.Di L +.Dp Pa /dev/[pt]ty[pq]? +.Dp +.Sh SEE ALSO +.Xr write 1 , +.Xr talk 1 , +.Xr echo 1 , +.Xr biff 1 +.Sh HISTORY +A +.Nm mesg +command appeared in Version 6 AT&T Unix. diff --git a/usr/src/usr.bin/mkdep/mkdep.1 b/usr/src/usr.bin/mkdep/mkdep.1 index 537d225a0e..fe9acafa2c 100644 --- a/usr/src/usr.bin/mkdep/mkdep.1 +++ b/usr/src/usr.bin/mkdep/mkdep.1 @@ -3,44 +3,65 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mkdep.1 5.9 (Berkeley) %G% +.\" @(#)mkdep.1 5.10 (Berkeley) %G% .\" -.TH MKDEP 1 "%Q" -.UC 5 -.SH NAME -mkdep \- construct Makefile dependency list -.SH SYNOPSIS -.B mkdep -[ -.B \-ap -] [ -.B \-f depend_file -] [ flags ] file ... -.SH DESCRIPTION -\fIMkdep\fP takes a set of flags for the C compiler and a list +.Dd +.Dt MKDEP 1 +.Os BSD 4.2 +.Sh NAME +.Nm mkdep +.Nd construct Makefile dependency list +.Sh SYNOPSIS +.Nm mkdep +.Op Fl ap +.Op Fl f Ar depend_file +.Op Ar flags +.Ar file ... +.Sh DESCRIPTION +.Nm Mkdep +takes a set of flags for the C compiler and a list of C source files as arguments and constructs a set of include -file dependencies which are written into the file \fIdepend_file\fP, -or ``.depend'' by default. An example of its use in a Makefile +file dependencies which are written into the file +.Ar depend_file , +or +.Pa \&.depend +by default. An example of its use in a Makefile might be: -.nf -.RS - +.Pp +.Ds I CFLAGS= -O -DDEBUG -I../include -I. SRCS= file1.c file2.c depend: mkdep ${CFLAGS} ${SRCS} -.RE -.PP +.De +.Pp where the macro SRCS is the list of C source files and the macro CFLAGS is the list of flags for the C compiler. -.PP -If the \fB-p\fP option is provided, \fImkdep\fP produces dependencies -of the form ``program: program.c'' so that subsequent makes will -produce \fIprogram\fP directly from its C module rather than using an -intermediate \fI.o\fP module. This is useful in directories that +.Pp +Options: +.Tw Ds +.Tp Fl p +.Nm mkdep +produces dependencies of the form +.Dq Li program: program.c +so that subsequent makes will produce +.Ar program +directly from its C module rather than using an intermediate +.Pa \&.o +module. This is useful in directories that contain many programs, each of whose source is contained in a single -C module. The \fB-a\fP option causes appending to the output file, -so that multiple \fImkdep\fP's may be run from a single Makefile. -.SH "SEE ALSO" -cc(1), cpp(1), make(1) +C module. +.Tp Fl a +Append to the output file, +so that multiple +.Sf Nm mkdep \&'s +may be run from a single Makefile. +.Tp +.Sh SEE ALSO +.Xr cc 1 , +.Xr cpp 1 , +.Xr make 1 +.Sh HISTORY +.Nm Mkdep +appeared in the 4.3 Tahoe BSD release. diff --git a/usr/src/usr.bin/mkfifo/mkfifo.1 b/usr/src/usr.bin/mkfifo/mkfifo.1 index 1651800cb2..a8379c3121 100644 --- a/usr/src/usr.bin/mkfifo/mkfifo.1 +++ b/usr/src/usr.bin/mkfifo/mkfifo.1 @@ -3,34 +3,40 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mkfifo.1 5.2 (Berkeley) %G% +.\" @(#)mkfifo.1 5.3 (Berkeley) %G% .\" -.TH MKFIFO 1 "%Q" -.AT 3 -.SH NAME -mkfifo \- make fifos -.SH SYNOPSIS -\fBmkfifo [ \fI-p\fB ] fifo_name ... -.SH DESCRIPTION -.I Mkfifo -creates the fifos named as operands, in the order specified, -using mode 0777. -.PP -The options are as follows: -.TP -.I -p +.Dd +.Dt MKFIFO 1 +.Os ATT 7th +.Sh NAME +.Nm mkfifo +.Nd make fifos +.Sh SYNOPSIS +.Nm mkfifo +.Op Fl p +.Ar fifo_name ... +.Sh DESCRIPTION +.Nm Mkfifo +creates the fifos requested, in the order specified, +using mode +.Li \&0777 . +.Pp +Options available are: +.Tw Ds +.Tp Fl p Create intermediate directories as required. If this option is not specified, the full path prefix of each operand must already exist. -.PP -.I Mkfifo +.Tp +.Pp +.Nm Mkfifo requires write permission in the parent directory. -.PP -.I Mkfifo +.Pp +.Nm Mkfifo exits 0 if successful, and >0 if an error occurred. -.SH "HISTORY" +.Sh STANDARDS Mkfifo is POSIX 1003.2 compliant. .br This manual page derived from the POSIX 1003.2 manual page. -.SH "SEE ALSO" -mkdir(1), -rm(1) +.Sh SEE ALSO +.Xr mkdir 1 , +.Xr rm 1 diff --git a/usr/src/usr.bin/mkstr/mkstr.1 b/usr/src/usr.bin/mkstr/mkstr.1 index 632bd787a1..82459ae33b 100644 --- a/usr/src/usr.bin/mkstr/mkstr.1 +++ b/usr/src/usr.bin/mkstr/mkstr.1 @@ -3,89 +3,104 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mkstr.1 6.3 (Berkeley) %G% +.\" @(#)mkstr.1 6.4 (Berkeley) %G% .\" -.TH MKSTR 1 "%Q" -.UC -.SH NAME -mkstr \- create an error message file by massaging C source -.SH SYNOPSIS -.B mkstr -[ -.B \- -] -messagefile prefix file ... -.SH DESCRIPTION -.I Mkstr -is used to create files of error messages. -Its use can make programs with large numbers of error diagnostics much -smaller, and reduce system overhead in running the program as the -error messages do not have to be constantly swapped in and out. -.PP -.I Mkstr -will process each of the specified -.I files, -placing a massaged version of the input file in a file whose name +.Dd +.Dt MKSTR 1 +.Sh NAME +.Nm mkstr +.Nd create an error message file by massaging C source +.Sh SYNOPSIS +.Nm mkstr +.Op Fl +.Ar messagefile +.Ar prefix file ... +.Sh DESCRIPTION +.Nm Mkstr +creates files containing error messages extracted from C source, +and restructures the same C source, to utilize the created error message +file. +The intent of +.Nm mkstr +was to reduce the size of large programs and +reduce swapping (see BUGS section below). +.Pp +.Nm Mkstr +processes each of the specified +.Ar files , +placing a restructured version of the input in a file whose name consists of the specified -.I prefix +.Ar prefix and the original name. A typical usage of -.I mkstr -would be -.DT -.PP - mkstr pistrings xx *.c -.PP -This command would cause all the error messages from the C source +.Nm mkstr +is +.Pp +.Dl mkstr pistrings xx *.c +.Pp +This command causes all the error messages from the C source files in the current directory to be placed in the file -.I pistrings -and processed copies of the source for these files to be placed in +.Ar pistrings +and restructured copies of the sources to be placed in files whose names are prefixed with -.I xx. -.PP -To process the error messages in the source to the message file -.I mkstr -keys on the string -\%`error("' +.Ar xx . +.Pp +Options: +.Tw Ds +.Tp Fl +Error messages are placed at the end of the specified +message file for recompiling part of a large +.Nm mkstr +ed +program. +.Tp +.Pp +.Nm mkstr +finds error messages in the source by +searching for the string +.Li \&`error("' in the input stream. -Each time it occurs, the C string starting at the `"' is placed +Each time it occurs, the C string starting at the +.Sq \&"\& +is stored in the message file followed by a null character and a new-line character; -the null character terminates the message so it can be easily used -when retrieved, the new-line character makes it possible to sensibly -.I cat -the error message file to see its contents. -The massaged copy of the input file then contains a -.I lseek -pointer into the file which can be used to retrieve the message, i.e.: -.IP -.DT -.nf -\fBchar\fR efilname[] = "/usr/lib/pi_strings"; -\fBint\fR efil = -1; -.sp +The new source is restructured with +.Xr lseek 2 +pointers into the error message file for retrieval. +.Ds I +char efilname = "/usr/lib/pi_strings"; +int efil = -1; + error(a1, a2, a3, a4) -{ - \fBchar\fR buf[256]; +\&{ + char buf[256]; - \fBif\fR (efil < 0) { + if (efil < 0) { efil = open(efilname, 0); - \fBif\fR (efil < 0) { + if (efil < 0) { oops: perror(efilname); - exit(1); + exit 1 ; } } - \fBif\fR (lseek(efil, (long) a1, 0) |\|| read(efil, buf, 256) <= 0) - \fBgoto\fR oops; + if (lseek(efil, (long) a1, 0) \ read(efil, buf, 256) <= 0) + goto oops; printf(buf, a2, a3, a4); } -.fi -.PP -The optional -.B \- -causes the error messages to be placed at the end of the specified -message file for recompiling part of a large -.IR mkstr \|ed -program. -.SH SEE\ ALSO -lseek(2), xstr(1) +.De +.Sh SEE ALSO +.Xr lseek 2 , +.Xr xstr 1 +.Sh HISTORY +.Nm Mkstr +appeared in 3 BSD. +.Sh BUGS +.Nm mkstr +was intended for the limited architecture of the PDP 11 family. +Very few programs in 4.4 BSD actually use it. The pascal interpreter, +.Xr pi 1 +and the editor, +.Xr ex 1 +are two programs that are built this way. +It is not an efficient method, the error messages +should be stored in the program text. diff --git a/usr/src/usr.bin/more/more.1 b/usr/src/usr.bin/more/more.1 index d9ae6528a4..059582f734 100644 --- a/usr/src/usr.bin/more/more.1 +++ b/usr/src/usr.bin/more/more.1 @@ -4,7 +4,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)more.1 5.12 (Berkeley) %G% +.\" @(#)more.1 5.13 (Berkeley) %G% .\" .Dd .Dt MORE 1 @@ -71,7 +71,10 @@ Suppressing line numbers with the .Fl n flag will avoid this problem. Using line numbers means: the line number will be displayed in the -= command, and the v command will pass the current line number to the editor. +.Cm = +command, and the +.Cm v +command will pass the current line number to the editor. .Tp Fl s The .Fl s @@ -153,7 +156,7 @@ The entire N lines are displayed, even if N is more than the screen size. .Tp Ic k Scroll backward N lines, default 1. The entire N lines are displayed, even if N is more than the screen size. -.Tp Ic d +.Tp Cx Ic d .Ws .Cx or .Ws @@ -162,7 +165,7 @@ The entire N lines are displayed, even if N is more than the screen size. Scroll forward N lines, default one half of the screen size. If N is specified, it becomes the new default for subsequent d and u commands. -.Tp Ic u +.Tp Cx Ic u .Ws .Cx or .Ws @@ -175,7 +178,7 @@ subsequent d and u commands. Go to line N in the file, default 1 (beginning of file). .Tp Ic G Go to line N in the file, default the end of the file. -.Tp Ic p +.Tp Cx Ic p .Ws .Cx or .Ws @@ -186,7 +189,7 @@ and 100. (This works if standard input is being read, but only if .Nm more has already read to the end of the file. It is always fast, but not always useful.) -.Tp Ic r +.Tp Cx Ic r .Ws .Cx or .Ws @@ -215,17 +218,17 @@ N defaults to 1. The pattern is a regular expression, as recognized by .Xr ed . The search starts at the second line displayed. -.Tp Cx Ic \&? +.Tp Cx Ic \&\? .Ar pattern .Cx Search backward in the file for the N-th line containing the pattern. The search starts at the line immediately before the top line displayed. -.Tp Ic \&/! +.Tp Cx Ic \&/\&! .Ar pattern .Cx Like /, but the search is for the N-th line which does NOT contain the pattern. -.Tp Ic \&?! +.Tp Cx Ic \&?\&! .Ar pattern .Cx Like ?, but the search is for the N-th line @@ -297,12 +300,19 @@ Exits .Tp .Sh ENVIRONMENT .Nm More -uses the following environment variables: -.Ev MORE , -.Ev EDITOR , -.Ev SHELL -and -.Ev TERM . +utilizes the following environment variables, if they exist: +.Tw Fl +.Tp Ev MORE +This variable may be set with favored options to +.Nm more . +.Tp Ev EDITOR +Specify default editor. +.Tp Ev SHELL +Current shell in use (normally set by the shell at login time). +.Tp Ev TERM +Specifies terminal type, used by more to get the terminal +characteristics necessary to manipulate the screen. +.Tp .Sh SEE ALSO .Xr ctags 1 , .Xr vi 1 diff --git a/usr/src/usr.bin/msgs/msgs.1 b/usr/src/usr.bin/msgs/msgs.1 index dd4de67190..babecd3d01 100644 --- a/usr/src/usr.bin/msgs/msgs.1 +++ b/usr/src/usr.bin/msgs/msgs.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)msgs.1 6.5 (Berkeley) %G% +.\" @(#)msgs.1 6.6 (Berkeley) %G% .\" .Dd .Dt MSGS 1 @@ -97,7 +97,7 @@ The .Fl s option is used for setting up the posting of messages. The line .Pp -.Dl msgs: /usr/ucb/msgs \-s" +.Dl msgs: \&"\&| /usr/ucb/msgs \-s\&" .Pp should be included in .Pa /etc/aliases @@ -158,6 +158,7 @@ file, useful for reviews of recent messages. .Tp Fl p causes long messages to be piped through .Xr more 1 . +.Tp .Pp Within .Nm msgs @@ -165,11 +166,13 @@ you can also go to any specific message by typing its number when .Nm msgs requests input as to what to do. .Sh ENVIRONMENT -.Nm Msgs uses the +.Nm Msgs +uses the .Ev HOME and .Ev TERM -environment variables. +environment variables for the default home directory and +terminal type. .Sh FILES .Dw /usr/msgs/* .Di L diff --git a/usr/src/usr.bin/mt/mt.1 b/usr/src/usr.bin/mt/mt.1 index 0a06bc1b14..54f340833f 100644 --- a/usr/src/usr.bin/mt/mt.1 +++ b/usr/src/usr.bin/mt/mt.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mt.1 6.4 (Berkeley) %G% +.\" @(#)mt.1 6.5 (Berkeley) %G% .\" .Dd .Os BSD 4.4 @@ -75,6 +75,8 @@ Print status information about the tape unit. returns a 0 exit status when the operation(s) were successful, 1 if the command was unrecognized, and 2 if an operation failed. .Sh ENVIRONMENT +If the following environment variable exists, it is utilized by +.Nm mt . .Tw Fl .Tp Ev TAPE .Nm Mt @@ -82,7 +84,8 @@ checks the .Ev TAPE environment variable if the argument -.Ar tapename is not given. +.Ar tapename +is not given. .Sh FILES .Dw /dev/rmt* .Di L diff --git a/usr/src/usr.bin/netstat/netstat.1 b/usr/src/usr.bin/netstat/netstat.1 index d03c65bc0c..9e19afd4bd 100644 --- a/usr/src/usr.bin/netstat/netstat.1 +++ b/usr/src/usr.bin/netstat/netstat.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)netstat.1 6.10 (Berkeley) %G% +.\" @(#)netstat.1 6.11 (Berkeley) %G% .\" .Dd .Dt NETSTAT 1 @@ -61,7 +61,7 @@ for debugging. With the default display, show the state of all sockets; normally sockets used by server processes are not shown. -.Fl d +.Tp Fl d With either interface display (option .Fl i or an interval, as described below), @@ -121,14 +121,14 @@ The following address families are recognized: .Ar inet , for -.Li AF _INET , +.Li AF_INET , .Ar ns , for -.Li AF _NS , +.Li AF_NS , and .Ar unix , for -.Li AF _UNIX . +.Li AF_UNIX . .Tp .Pp The arguments, diff --git a/usr/src/usr.bin/nfsstat/nfsstat.1 b/usr/src/usr.bin/nfsstat/nfsstat.1 index ebde2f4747..5cad1d5992 100644 --- a/usr/src/usr.bin/nfsstat/nfsstat.1 +++ b/usr/src/usr.bin/nfsstat/nfsstat.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)nfsstat.1 5.2 (Berkeley) %G% +.\" @(#)nfsstat.1 5.3 (Berkeley) %G% .\" .Dd .Dt NFSSTAT 1 diff --git a/usr/src/usr.bin/nice/nice.1 b/usr/src/usr.bin/nice/nice.1 index 4cf7faf59d..77cb324551 100644 --- a/usr/src/usr.bin/nice/nice.1 +++ b/usr/src/usr.bin/nice/nice.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)nice.1 6.4 (Berkeley) %G% +.\" @(#)nice.1 6.5 (Berkeley) %G% .\" .Dd .Dt NICE 1 @@ -46,8 +46,6 @@ command executed by .Nm nice . .Sh SEE ALSO .Xr csh 1 , -.Xr nice 1 , -.\" .Xr setpriority 2 , .Xr renice 8 .Sh HISTORY .Nm Nice diff --git a/usr/src/usr.bin/nm/nm.1 b/usr/src/usr.bin/nm/nm.1 index 96bb870b2b..3555fb5d8a 100644 --- a/usr/src/usr.bin/nm/nm.1 +++ b/usr/src/usr.bin/nm/nm.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)nm.1 6.3 (Berkeley) %G% +.\" @(#)nm.1 6.4 (Berkeley) %G% .\" .Dd .Dt NM 1 diff --git a/usr/src/usr.bin/nohup/nohup.1 b/usr/src/usr.bin/nohup/nohup.1 index d89ed352bb..114cdeec74 100644 --- a/usr/src/usr.bin/nohup/nohup.1 +++ b/usr/src/usr.bin/nohup/nohup.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)nohup.1 6.4 (Berkeley) %G% +.\" @(#)nohup.1 6.5 (Berkeley) %G% .\" .Dd .Dt NOHUP 1 @@ -35,6 +35,8 @@ as the standard output. exits 1 if an error occurs, otherwise the exit status is that of .Ar command . .Sh ENVIRONMENT +The following variable is utilized by +.Nm nohup . .Tw Fl .Tp Ev HOME If the output file diff --git a/usr/src/usr.bin/pagesize/pagesize.1 b/usr/src/usr.bin/pagesize/pagesize.1 index 9abb626f25..6a4afc0cec 100644 --- a/usr/src/usr.bin/pagesize/pagesize.1 +++ b/usr/src/usr.bin/pagesize/pagesize.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)pagesize.1 6.3 (Berkeley) %G% +.\" @(#)pagesize.1 6.4 (Berkeley) %G% .\" .Dd .Dt PAGESIZE 1 diff --git a/usr/src/usr.bin/pascal/eyacc/eyacc.1 b/usr/src/usr.bin/pascal/eyacc/eyacc.1 index 5a3dcc3cff..884e33cc67 100644 --- a/usr/src/usr.bin/pascal/eyacc/eyacc.1 +++ b/usr/src/usr.bin/pascal/eyacc/eyacc.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)eyacc.1 6.2 (Berkeley) %G% +.\" @(#)eyacc.1 6.4 (Berkeley) %G% .\" .Dd .Dt EYACC 1 @@ -38,9 +38,12 @@ as minor changes had been made for efficiency reasons. by Susan L. Graham, Charles B. Haley and W. N. Joy; SIGPLAN Conference on Compiler Construction, August 1979. +.Sh HISTORY +.Nm Eyacc +appeared in 4.0 BSD. .Sh AUTHORS S. C. Johnson -.Pp +.br .Nm Eyacc modifications by Charles Haley and William Joy. .Sh BUGS diff --git a/usr/src/usr.bin/passwd/passwd.1 b/usr/src/usr.bin/passwd/passwd.1 index 92a1177e68..e413cd3a28 100644 --- a/usr/src/usr.bin/passwd/passwd.1 +++ b/usr/src/usr.bin/passwd/passwd.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)passwd.1 6.7 (Berkeley) %G% +.\" @(#)passwd.1 6.8 (Berkeley) %G% .\" .Dd .Dt PASSWD 1 diff --git a/usr/src/usr.bin/paste/paste.1 b/usr/src/usr.bin/paste/paste.1 index c99d8efa3a..920ff227a7 100644 --- a/usr/src/usr.bin/paste/paste.1 +++ b/usr/src/usr.bin/paste/paste.1 @@ -1,12 +1,13 @@ .\" Copyright (c) 1989, 1990 The Regents of the University of California. .\" All rights reserved. .\" +.\" .\" This code is derived from software contributed to Berkeley by -.\" Adam S. Moskowitz of Menlo Consulting. +.\" Adam S. Moskowitz. .\" .\" %sccs.include.redist.man% .\" -.\" @(#)paste.1 5.2 (Berkeley) %G% +.\" @(#)paste.1 5.3 (Berkeley) %G% .\" .Dd .Dt PASTE 1 diff --git a/usr/src/usr.bin/plot/plot.1 b/usr/src/usr.bin/plot/plot.1 index 4426934dfd..2f25ec353b 100644 --- a/usr/src/usr.bin/plot/plot.1 +++ b/usr/src/usr.bin/plot/plot.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)plot.1 6.5 (Berkeley) %G% +.\" @(#)plot.1 6.6 (Berkeley) %G% .\" .Dd .Dt PLOT 1 diff --git a/usr/src/usr.bin/printenv/printenv.1 b/usr/src/usr.bin/printenv/printenv.1 index 8ccb598be8..3ed4265ddc 100644 --- a/usr/src/usr.bin/printenv/printenv.1 +++ b/usr/src/usr.bin/printenv/printenv.1 @@ -3,16 +3,14 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)printenv.1 6.3 (Berkeley) %G% +.\" @(#)printenv.1 6.4 (Berkeley) %G% .\" .Dd .Dt PRINTENV 1 .UC .Sh NAME -.Nm printenv -.Nd print out the environment -.Nm env -.Nd set and print out the environment +.Nm printenv , env +.Nd print out the environment, set and print environment .Sh SYNOPSIS .Nm printenv .Op Ar name @@ -46,7 +44,7 @@ an environmental variable, with a value of .Ar value . The option -.Fl +.Sq Fl causes .Nm env to completely ignore the environment diff --git a/usr/src/usr.bin/printf/printf.1 b/usr/src/usr.bin/printf/printf.1 index b2d96934e7..073aae284b 100644 --- a/usr/src/usr.bin/printf/printf.1 +++ b/usr/src/usr.bin/printf/printf.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)printf.1 5.7 (Berkeley) %G% +.\" @(#)printf.1 5.8 (Berkeley) %G% .\" .Dd .Dt PRINTF 1 @@ -74,7 +74,7 @@ Write a backslash character. .Tp Cx Cm \e .Ar num .Cx -Write an 8-bit character whose numeric value is the 1-, 2-, or 3-digit +Write an 8-bit character whose ASCII value is the 1-, 2-, or 3-digit octal number .Ar num . .Tp @@ -182,8 +182,8 @@ The is printed in the style `[\-]ddd.ddd' where the number of d's after the decimal point is equal to the precision specification for the argument. -If the precision is missing, 6 digits are printed after the decimal point; -if the precision is explicitly 0, no digits and no decimal point are printed. +If the precision is missing, 6 digits are given; if the precision +is explicitly 0, no digits and no decimal point are printed. .Tp Cm eE The .Ar argument @@ -195,7 +195,7 @@ is printed in the style where there is one digit before the decimal point and the number after is equal to the precision specification for the argument; when the precision is -missing, 6 digits are printed after the decimal point. +missing, 6 digits are produced. An upper-case E is used for an `E' format. .Tp Cm gG The @@ -229,12 +229,10 @@ exits 0 on success, 1 on failure. .Sh SEE ALSO .Xr printf 3 .Sh HISTORY -.Nm printf -as a command is new to 4.4 BSD. It is modeled -after the -.Xr printf 3 -function which appeared in -Version 6 AT&T UNIX. +.Nm Printf +as a command, appears in 4.3+Reno BSD. It is modeled +after the standard library function, +.Xr printf 3 . .Sh BUGS Since the number is translated from ASCII to floating-point, and then back again, floating-point precision may be lost. diff --git a/usr/src/usr.bin/ptx/ptx.1 b/usr/src/usr.bin/ptx/ptx.1 index 37250292eb..af06a074ee 100644 --- a/usr/src/usr.bin/ptx/ptx.1 +++ b/usr/src/usr.bin/ptx/ptx.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)ptx.1 6.3 (Berkeley) %G% +.\" @(#)ptx.1 6.4 (Berkeley) %G% .\" .Dd .Dt PTX 1 @@ -14,7 +14,7 @@ .Nm ptx .Op option \&... -.Op input Op output +.Op input [output] .Sh DESCRIPTION .Nm Ptx generates a permuted index to file diff --git a/usr/src/usr.bin/quota/quota.1 b/usr/src/usr.bin/quota/quota.1 index d3da9dd8c8..f28872e817 100644 --- a/usr/src/usr.bin/quota/quota.1 +++ b/usr/src/usr.bin/quota/quota.1 @@ -7,7 +7,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)quota.1 6.5 (Berkeley) %G% +.\" @(#)quota.1 6.6 (Berkeley) %G% .\" .Dd .Dt QUOTA 1 @@ -32,19 +32,32 @@ .Nm Quota displays users' disk usage and limits. By default only the user quotas are printed. +.Pp +Options: +.Pp +.Tw Ds +.Tp Fl g +Print group quotas for the group +of which the user is a member. The optional -.Fl g -flag specifies that group quotas -for the groups of which the user is a member should be printed. +.Fl u +flag is equivalent to the default. +.Tp Fl v +.Nm quota +will display quotas on filesystems +where no storage is allocated. +.Tp Fl q +Print a more terse message, +containing only information +on filesystems where usage is over quota. +.Tp +.Pp Specifying both .Fl g and .Fl u -specifies that both the user quotas and the group quotas for -the groups of which the user is a member should be printed. -The optional -.Fl u -flag is equivalent to the default. +displays both the user quotas and the group quotas (for +the user). .Pp Only the super-user may use the .Fl u @@ -57,18 +70,6 @@ flag and optional .Ar group argument to view only the limits of groups of which they are members. .Pp -If a -.Fl v -flag is supplied, -.Nm quota -will also display quotas on filesystems -where no storage is allocated. -.Pp -The -.Fl q -flag prints a more terse message, -containing only information -on filesystems where usage is over quota. The .Fl q flag takes precedence over the @@ -77,7 +78,7 @@ flag. .Pp .Nm Quota reports the quotas of all the filesystems listed in -.Nm /etc/fstab . +.Pa /etc/fstab . If .Nm quota exits with a non-zero status, one or more filesystems @@ -85,10 +86,10 @@ are over quota. .Sh FILES .Dw quota.group .Di L -.Nm quota.user -at the filesystem root with user quotas -.Nm quota.group -at the filesystem root with group quotas +.Dp Pa quota.user +located at the filesystem root with user quotas +.Dp Pa quota.group +located at the filesystem root with group quotas .Dp Pa /etc/fstab to find filesystem names and locations .Dp diff --git a/usr/src/usr.bin/ranlib/ranlib.1 b/usr/src/usr.bin/ranlib/ranlib.1 index 34d3b550a5..51b9ea51d6 100644 --- a/usr/src/usr.bin/ranlib/ranlib.1 +++ b/usr/src/usr.bin/ranlib/ranlib.1 @@ -1,33 +1,39 @@ .\" Copyright (c) 1990 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" All rights reserved. .\" -.\" @(#)ranlib.1 6.3 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" +.\" @(#)ranlib.1 6.4 (Berkeley) %G% +.\" +.Dd .Dt RANLIB 1 -.Os ATT 7th +.BSD 4.4 .Sh NAME .Nm ranlib -.Nd convert archives to random libraries +.Nd preprocess archives for efficient linking .Sh SYNOPSIS .Nm ranlib .Op Fl t -.Ar archive ... +.Ar archive_file ... .Sh DESCRIPTION .Nm Ranlib -converts each -.Ar archive -to a form which the loader can load more rapidly. +is a preprocessor for the loading utility +.Xr ld 1 . .Nm Ranlib -does this by adding a table of contents called +creates a randomized library from the given +.Ar archive_file +with +the file entry named .Sy \&__.SYMDEF -to the beginning of the archive. -.Nm Ranlib -uses -.Xr ar 1 -to reconstruct the archive, so that sufficient temporary file space must -be available in the file system which contains the current directory. -.Pp +prepended. +The +.Sy \&__.SYMDEF +file entry is a dictionary the loader can detect and interpret +to resolve external references at link time. +To generate the library, the +.Xr ar 1 +utility is used. +.Tw 8n .Tp Fl t Ranlib only "touches" the archives and does not modify them. This is useful after copying an archive @@ -43,20 +49,16 @@ an symbol table. .Tp .Sh SEE ALSO -.Xr ld 1 , .Xr ar 1 , +.Xr ld 1 , .Xr lorder 1 , -.Xr make 1 +.Xr make 1 , +.Xr nm 1 .Sh HISTORY .Nm Ranlib appeared in Version 7 AT&T UNIX. .Sh BUGS -Because generation of a library by -.Xr ar -and randomization of the library by -.Nm ranlib -are separate processes, phase errors are possible. The loader, -.Xr ld , -warns when the modification date of a library is more recent than the -creation date of its dictionary; but this means that you get the -warning even if you only copy the library. +The archiving is a separate process and phase +errors may occur (see the +.Fl t +option above). diff --git a/usr/src/usr.bin/rdist/rdist.1 b/usr/src/usr.bin/rdist/rdist.1 index d4a0fa1bcc..c30701c8b2 100644 --- a/usr/src/usr.bin/rdist/rdist.1 +++ b/usr/src/usr.bin/rdist/rdist.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rdist.1 6.8 (Berkeley) %G% +.\" @(#)rdist.1 6.9 (Berkeley) %G% .\" .Dd .Dt RDIST 1 @@ -39,12 +39,12 @@ to direct the updating of files and/or directories. .Pp Options specific to the first SYNOPSIS form: .Pp -.Tw Ar +.Tw Fl .Tp Fl If .Ar distfile is -.Fl , +.Sq Fl , the standard input is used. .Tp Cx Fl f .Cx \&\ \& @@ -57,7 +57,7 @@ Use the specified If either the .Fl f or -.Fl +.Sq Fl option is not specified, the program looks first for .Dq Pa distfile , then @@ -333,7 +333,7 @@ after a program has been updated. The following is a small example: .Pp .Ds I -HOSTS = ( matisse root@arpa) +HOSTS = ( matisse root@arpa ) .sp FILES = ( /bin /lib /usr/bin /usr/games \t/usr/include/{*.h,{stand,sys,vax*,pascal,machine}/*.h} diff --git a/usr/src/usr.bin/rlogin/rlogin.1 b/usr/src/usr.bin/rlogin/rlogin.1 index e73121b410..6c8a9bcdf8 100644 --- a/usr/src/usr.bin/rlogin/rlogin.1 +++ b/usr/src/usr.bin/rlogin/rlogin.1 @@ -3,105 +3,141 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rlogin.1 6.15 (Berkeley) %G% +.\" @(#)rlogin.1 6.16 (Berkeley) %G% .\" -.TH RLOGIN 1 "%Q" -.UC 5 -.SH NAME -rlogin \- remote login -.SH SYNOPSIS -.ft B -rlogin [ \-8KLdx ] [ \-e char ] [ \-k realm ] [ \-l username ] host -.ft R -.SH DESCRIPTION -.I Rlogin +.Dd +.Dt RLOGIN 1 +.Os BSD 4.2 +.Sh NAME +.Nm rlogin +.Nd remote login +.Sh SYNOPSIS +.Ar rlogin +.Op Fl 8KLdx +.Op Fl e Ar char +.Op Fl k Ar realm +.Op Fl l Ar username +.Ar host +.Sh DESCRIPTION +.Nm Rlogin starts a terminal session on a remote host -.IR host . -.PP -.I Rlogin +.Ar host . +.Pp +.Nm Rlogin first attempts to use the Kerberos authorization mechanism, described below. If the remote host does not supporting Kerberos the standard Berkeley -.I rhosts +.Pa rhosts authorization mechanism is used. The options are as follows: -.TP -\-8 -The \-8 option allows an eight-bit input data path at all times; otherwise +.Tw Fl +.Tp Fl 8 +The +.Fl 8 +option allows an eight-bit input data path at all times; otherwise parity bits are stripped except when the remote side's stop and start characters are other than ^S/^Q. Eight-bit mode is the default. -.TP -\-K -The \-K option turns off all Kerberos authentication. -.TP -\-L -The \-L option allows the rlogin session to be run in ``litout'' (see -.IR tty (4)) +.Tp Fl K +The +.Fl K +option turns off all Kerberos authentication. +.Tp Fl L +The +.Fl L +option allows the rlogin session to be run in ``litout'' (see +.Xr tty 4 ) mode. -.TP -\-d -The \-d option turns on socket debugging (see -.IR setsockopt (2)) +.Tp Fl d +The +.Fl d +option turns on socket debugging (see +.Xr setsockopt 2 ) on the TCP sockets used for communication with the remote host. -.TP -\-e +.Tp Fl e By default, the tilde (``~'') character is the escape character. -The \-e option allows specification of a different escape character. -.TP -\-k -The \-k option requests rlogin to obtain tickets for the remote host +The +.Fl e +option allows specification of a different escape character. +.Tp Fl k +The +.FL k +option requests rlogin to obtain tickets for the remote host in realm -.I realm -instead of the remote host's realm as determined by -.IR krb_realmofhost (3). -.TP -\-x -The \-x option turns on DES encryption for all data passed via the +.Ar realm +instead of the remote host's realm as determined by +.Xr krb_realmofhost 3 . +.Tp Fl x +The +.Fl x +option turns on DES encryption for all data passed via the rlogin session. This may impact response time and CPU utilization, but provides increased security. -.PP +.Tp +.Pp A line of the form ``~.'' disconnects from the remote host, where ``~'' is the escape character. Similarly, the line ``~^Z'' will suspend the -.I rlogin +.Nm rlogin session. Substitution of the delayed-suspend character (normally ^Y) for the suspend character suspends the send portion of the rlogin, but allows output from the remote system. -.PP +.Pp All echoing takes place at the remote site, so that (except for delays) the -.I rlogin +.Nm rlogin is transparent. Flow control via ^S/^Q and flushing of input and output on interrupts are handled properly. -.SH KERBEROS AUTHENTICATION -Each user may have a private authorization list in the file ``.klogin'' +.Sh KERBEROS AUTHENTICATION +Each user may have a private authorization list in the file +.Pa .klogin in their home directory. Each line in this file should contain a Kerberos principal name of the -form -.IR principal.instance@realm . +form +.Ar principal.instance@realm . If the originating user is authenticated to one of the principals named -in ``.klogin'', access is granted to the account. -The principal \fIaccountname\fP.@\fIlocalrealm\fP is granted access if -there is no ``.klogin'' file. +in +.Pa .klogin , +access is granted to the account. +The principal +.Ar accountname.@localrealm +is granted access if +there is no +.Pa .klogin +file. Otherwise a login and password will be prompted for on the remote machine as in -.IR login (1). -To avoid certain security problems, the ``.klogin'' file must be owned by +.Xr login 1 . +To avoid certain security problems, the +.Pa .klogin +file must be owned by the remote user. -.PP +.Pp If Kerberos authentication fails, a warning message is printed and the standard Berkeley -.I rlogin +.Em rlogin is used instead. -.SH SEE ALSO -rsh(1), kerberos(3), krb_sendauth(3), krb_realmofhost(3) -.SH BUGS -.I Rlogin +.Sh ENVIRONMENT +The following environment variable is utilized by +.Nm rlogin : +.Tw Fl +.Tp Ev TERM +to find user's terminal type. +.Tp +.Sh SEE ALSO +.Xr rsh 1 , +.Xr kerberos 3 , +.Xr krb_sendauth 3 , +.Xr krb_realmofhost 3 +.Sh HISTORY +.Nm Rlogin +appeared in 4.2 BSD. +.Sh BUGS +.Nm Rlogin will be replaced by -.IR telnet (1) +.Xr telnet 1 in the near future. -.PP +.Pp More of the environment should be propagated. diff --git a/usr/src/usr.bin/rsh/rsh.1 b/usr/src/usr.bin/rsh/rsh.1 index d607b60d0b..dd8c55e976 100644 --- a/usr/src/usr.bin/rsh/rsh.1 +++ b/usr/src/usr.bin/rsh/rsh.1 @@ -3,124 +3,145 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rsh.1 6.7 (Berkeley) %G% +.\" @(#)rsh.1 6.8 (Berkeley) %G% .\" -.TH RSH 1 "%Q" -.UC 5 -.SH NAME -rsh \- remote shell -.SH SYNOPSIS -.ft B -rsh [ \-Kdnx ] [ \-k realm ] [ \-l username ] host [ command ] -.ft R -.SH DESCRIPTION -.I Rsh +.Dd +.Dt RSH 1 +.Os BSD 4.2 +.Sh NAME +.Nm rsh +.Nd remote shell +.Sh SYNOPSIS +.Ar rsh +.Op Fl Kdnx +.Op Fl k Ar realm +.Op Fl l Ar username +.Ar host +.Op command +.Sh DESCRIPTION +.Nm Rsh executes -.I command +.Ar command on -.IR host . -.PP -.I Rsh +.Ar host . +.Pp +.Nm Rsh copies its standard input to the remote command, the standard output of the remote command to its standard output, and the standard error of the remote command to its standard error. Interrupt, quit and terminate signals are propagated to the remote command; -.I rsh +.Nm rsh normally terminates when the remote command does. The options are as follows: -.TP -\-K -The \-K option turns off all Kerberos authentication. -.TP -\-d -The \-d option turns on socket debugging (using -.IR setsockopt (2)) +.Tp Fl K +The +.Fl K +option turns off all Kerberos authentication. +.Tp Fl d +The +.Fl d +option turns on socket debugging (using +.Xr setsockopt 2 ) on the TCP sockets used for communication with the remote host. -.TP -\-k -The \-k option causes -.I rsh +.Tp Fl k +The +.Fl k +option causes +.Nm rsh to obtain tickets for the remote host in -.I realm +.Ar realm instead of the remote host's realm as determined by -.IR krb_realmofhost (3). -.TP -\-l +.Xr krb_realmofhost 3 . +.Tp Fl l By default, the remote username is the same as the local username. -The \-l option allows the remote name to be specified. +The +.Fl l +option allows the remote name to be specified. Kerberos authentication is used, and authorization is determined as in -.IR rlogin (1). -.TP -\-n -The \-n option redirects input from the special device ``/dev/null'' +.Xr rlogin 1 . +.Tp Fl n +The +.Fl n +option redirects input from the special device +.Pa /dev/null (see the BUGS section of this manual page). -.TP -\-x -The \-x option turns on DES encryption for all data exchange. +.Tp Fl x +The +.Fl x +option turns on DES encryption for all data exchange. This may introduce a significant delay in response time. -.PP +.Tp +.Pp If no -.I command +.Ar command is specified, you will be logged in on the remote host using -.IR rlogin (1). -.PP +.Xr rlogin 1 . +.Pp Shell metacharacters which are not quoted are interpreted on local machine, while quoted metacharacters are interpreted on the remote machine. For example, the command -.sp -.RS -rsh otherhost cat remotefile >> localfile -.RE -.sp +.Pp +.Dl rsh otherhost cat remotefile >> localfile +.Pp appends the remote file -.I remotefile +.Ar remotefile to the local file -.I localfile, +.Ar localfile , while -.sp -.RS -rsh otherhost cat remotefile ">>" other_remotefile -.RE -.sp +.Pp +.Dl rsh otherhost cat remotefile \&">>\&" other_remotefile +.Pp appends -.I remotefile +.Ar remotefile to -.I other_remotefile. -.PP -Many sites specify a large number of host names as commands in the -directory /usr/hosts. -If this directory is included in your search path, you can use the -shorthand ``host command'' for the longer form ``rsh host command''. -.SH FILES -/usr/hosts/* -.DT -.SH SEE ALSO -rlogin(1), kerberos(3), krb_sendauth(3), krb_realmofhost(3) -.SH BUGS +.Ar other_remotefile . +.\" .Pp +.\" Many sites specify a large number of host names as commands in the +.\" directory /usr/hosts. +.\" If this directory is included in your search path, you can use the +.\" shorthand ``host command'' for the longer form ``rsh host command''. +.Sh FILES +.Dw /etc/hosts +.Di L +.Dp Pa /etc/hosts +.Dp +.Sh SEE ALSO +.Xr rlogin 1 , +.Xr kerberos 3 , +.Xr krb_sendauth 3 , +.Xr krb_realmofhost 3 +.Sh HISTORY +.Nm Rsh +appeared in 4.2 BSD +.Sh BUGS If you are using -.IR csh (1) +.Xr csh 1 and put a -.IR rsh (1) +.Nm rsh in the background without redirecting its input away from the terminal, it will block even if no reads are posted by the remote command. If no input is desired you should redirect the input of -.I rsh -to /dev/null using the \-n option. -.PP +.Nm rsh +to +.Pa /dev/null +using the +.Fl n +option. +.Pp You cannot run an interactive command (like -.IR rogue (6) +.Xr rogue 6 or -.IR vi (1)) +.Xr vi 1 ) using -.IR rsh ; +.Nm rsh ; use -.IR rlogin (1) +.Xr rlogin 1 instead. -.PP +.Pp Stop signals stop the local -.I rsh +.Nm rsh process only; this is arguably wrong, but currently hard to fix for reasons too complicated to explain here. diff --git a/usr/src/usr.bin/ruptime/ruptime.1 b/usr/src/usr.bin/ruptime/ruptime.1 index 41b0fe7355..33a2f59bd9 100644 --- a/usr/src/usr.bin/ruptime/ruptime.1 +++ b/usr/src/usr.bin/ruptime/ruptime.1 @@ -3,48 +3,53 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)ruptime.1 6.6 (Berkeley) %G% +.\" @(#)ruptime.1 6.7 (Berkeley) %G% .\" -.TH RUPTIME 1 "%Q" -.UC 5 -.SH NAME -ruptime \- display status of local network machines -.SH SYNOPSIS -.ft B -.nf -ruptime [ -alrtu ] -.fi -.ft R -.SH DESCRIPTION -.I Ruptime -displays a status line like -.IR uptime (1) -for each host on the local network, sorted by host name. -The information is obtained from packets broadcast once per minute -by the hosts. -.PP -Machines for which no status report has been received for the last 11 +.Dd +.Dt RUPTIME 1 +.Os BSD 4.2 +.Sh NAME +.Nm ruptime +.Nd show host status of local machines +.Sh SYNOPSIS +.Nm ruptime +.Op Fl alrtu +.Sh DESCRIPTION +.Nm Ruptime +gives a status line like +.Ar uptime +for each machine on the local network; these are formed from packets +broadcast by each host on the network once a minute. +.Pp +Machines for which no status report has been received for 11 minutes are shown as being down. -.PP -The options are as follows: -.TP -\-a -Users idle for more than an hour are not counted unless the \-a -option is specified. -.TP -\-l -Sort the output by load average, greatest to least, instead of host name. -.TP -\-r -Reverse the sort order. -.TP -\-t -Sort the output by uptime, longest to shortest, instead of host name. -.TP -\-u -Sort the output by number of users, most to least, instead of host name. -.SH FILES -.DT -/var/rwho/whod.* data files -.SH SEE ALSO -rwho(1), uptime(1), w(1) +.Pp +Options: +.Tw Ds +.Tp Fl a +Users idle an hour or more are not counted unless the +.Fl a +flag is given. +.Tp Fl l +Sort by load average. +.Tp Fl r +Reverses the sort order. +.Tp Fl t +Sort by uptime. +.Tp Fl u +Sort by number of users. +.Tp +.Pp +The default listing is sorted by host name. +.Sh FILES +.Dw /usr/var/rwho/whod.* +.Di L +.Dp Pa /usr/var/rwho/whod.* +data files +.Dp +.Sh SEE ALSO +.Xr rwho 1 +.Xr uptime 1 +.Sh HISTORY +.Nm Ruptime +appeared in 4.2 BSD. diff --git a/usr/src/usr.bin/rwho/rwho.1 b/usr/src/usr.bin/rwho/rwho.1 index 24eaa716ed..7a16e3366a 100644 --- a/usr/src/usr.bin/rwho/rwho.1 +++ b/usr/src/usr.bin/rwho/rwho.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)rwho.1 6.4 (Berkeley) %G% +.\" @(#)rwho.1 6.5 (Berkeley) %G% .\" .Dd .Dt RWHO 1 diff --git a/usr/src/usr.bin/sccs/sccs.1 b/usr/src/usr.bin/sccs/sccs.1 index 477513b080..98949e8ac9 100644 --- a/usr/src/usr.bin/sccs/sccs.1 +++ b/usr/src/usr.bin/sccs/sccs.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)sccs.1 2.7 (Berkeley) %G% +.\" @(#)sccs.1 2.8 (Berkeley) %G% .\" .Dd .Os BSD 4.4 diff --git a/usr/src/usr.bin/script/script.1 b/usr/src/usr.bin/script/script.1 index 93beec283e..13f518589b 100644 --- a/usr/src/usr.bin/script/script.1 +++ b/usr/src/usr.bin/script/script.1 @@ -1,42 +1,95 @@ .\" Copyright (c) 1980, 1990 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" All rights reserved. .\" -.\" @(#)script.1 6.2 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH SCRIPT 1 "%Q" -.UC 4 -.SH NAME -script \- make typescript of terminal session -.SH SYNOPSIS -.B script -[ -.B \-a -] [ file ] -.SH DESCRIPTION -.I Script +.\" @(#)script.1 6.3 (Berkeley) %G% +.\" +.Dd +.Dt SCRIPT 1 +.Os BSD 4 +.Sh NAME +.Nm script +.Nd make typescript of terminal session +.Sh SYNOPSIS +.Nm script +.Op Fl a +.Op Ar file +.Sh DESCRIPTION +.Nm Script makes a typescript of everything printed on your terminal. -The typescript is written to -.IR file , -or appended to -.IR file -if the -.B \-a -option is given. -It can be sent to the line printer later with -.IR lpr . -If no file name is given, the typescript -is saved in the file -.IR typescript . -.PP -The script ends when the forked shell exits. -.PP -This program is useful when using a crt and a hard-copy -record of the dialog is desired, as for a student handing -in a program that was developed on a crt when hard-copy -terminals are in short supply. -.SH BUGS -.I Script -places -.B everything -in the log file. This is not what the naive user expects. +It is useful for students who need a hardcopy record of an interactive +session as proof of an assignment, as the typescript file +can be printed out later with +.Xr lpr 1 . +.Pp +If the argument +.Ar file +is given, +.Nm +saves all dialogue in +.Ar file . +If no file name is given, the typescript is saved in the file +.Pa typescript . +.Pp +Option: +.Tw Ds +.Tp Fl a +Append the output to +.Ar file +or +.Pa typescript , +retaining the prior contents. +.Tp +.Pp +The script ends when the forked shell exits (a +.Em control-D +to exit +the Bourne shell +.Pf \&( Xr sh 1 ) , +and +.Em exit , +.Em logout +or +.Em control-d +(if +.Em ignoreeof +is not set) for the +C-shell, +.Xr csh 1 ) . +.Pp +Certain interactive commands, such as +.Xr vi 1 , +create garbage in the typescript file. +.Nm Script +works best with commands that do not manipulate the +screen, the results are meant to emulate a hardcopy +terminal. +.Sh ENVIRONMENT +The following environment variable is utilized by +.Nm script : +.Tw SHELL +.Tp Ev SHELL +If the variable +.Ev SHELL +exists, the shell forked by +.Nm script +will be that shell. If +.Ev SHELL +is not set, the Bourne shell +is assumed. (Most shells set this variable automatically). +.Tp +.Sh SEE ALSO +.Xr csh 1 +(for the +.Em history +mechanism). +.Sh HISTORY +.Nm Script +appeared in 3 BSD. +.Sh BUGS +.Nm Script +places +.Sy everything +in the log file, including linefeeds and backspaces. +This is not what the naive user expects. diff --git a/usr/src/usr.bin/size/size.1 b/usr/src/usr.bin/size/size.1 index f2f1f954d5..773342d96b 100644 --- a/usr/src/usr.bin/size/size.1 +++ b/usr/src/usr.bin/size/size.1 @@ -1,22 +1,32 @@ -.\" Copyright (c) 1990 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1990 The Regents of the University of California. +.\" All rights reserved. .\" -.\" @(#)size.1 6.2 (Berkeley) %G% +.\" %sccs.include.redist.man% .\" -.TH SIZE 1 "%Q" -.AT 3 -.SH NAME -size \- size of an object file -.SH SYNOPSIS -.B size -[ object ... ] -.SH DESCRIPTION -.I Size -prints the (decimal) number of bytes required by the text, data, and -bss portions, and their sum in hex and decimal, of each object-file argument. -If no file is specified, -.B a.out -is used. -.SH "SEE ALSO" -a.out(5) +.\" @(#)size.1 6.3 (Berkeley) %G% +.\" +.Dd +.Dt SIZE 1 +.Os ATT 7th +.Sh NAME +.Nm size +.Nd display object file segment sizes (text, data and bss) +.Sh SYNOPSIS +.Nm size +.Op Ar object_file ... +.Sh DESCRIPTION +.Nm Size +displays the text, data and bss segment sizes of the given +.Ar object_file +in bytes (decimal), and the sum of the three segments (hexidecimal and +decimal). If +.Ar object_file +is not given, +.Nm +will search for the file +.Pa a.out . +.Sh SEE ALSO +.Xr a.out 5 +.Sh HISTORY +.Nm Size +appeared in Version 6 AT&T Unix. diff --git a/usr/src/usr.bin/systat/systat.1 b/usr/src/usr.bin/systat/systat.1 index 0ec349b253..b3201a5689 100644 --- a/usr/src/usr.bin/systat/systat.1 +++ b/usr/src/usr.bin/systat/systat.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)systat.1 6.7 (Berkeley) %G% +.\" @(#)systat.1 6.9 (Berkeley) %G% .\" .Dd .Dt SYSTAT 1 @@ -19,7 +19,7 @@ .Nm Systat displays various system statistics in a screen oriented fashion using the curses screen display library, -.Xr curses (3X ) . +.Xr curses 3 . .Pp While .Nm systat diff --git a/usr/src/usr.bin/telnet/telnet.1 b/usr/src/usr.bin/telnet/telnet.1 index 44e2a422a2..ed7a9864d2 100644 --- a/usr/src/usr.bin/telnet/telnet.1 +++ b/usr/src/usr.bin/telnet/telnet.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)telnet.1 6.10 (Berkeley) %G% +.\" @(#)telnet.1 6.11 (Berkeley) %G% .\" .Dd .Dt TELNET 1 @@ -17,8 +17,6 @@ protocol .Nm telnet .Op Fl d .Op Fl n Ar tracefile -.Op Fl l Ar user -.Op Fl e Ar escapechar .Op Ar host Op Ar port .Sh DESCRIPTION The @@ -56,30 +54,6 @@ for recording trace information. See the .Ic set tracefile command below. -.Tp Cx Fl l -.Cx \&\ \& -.Ar user -.Cx -When connecting to the remote system, if the remote system -understands the ENVIRON option, then -.Ar user -will be sent to the remote system as the value for the variable USER. -This option may also be used with the -.Ic open -command. -.Tp Cx Fl e -.Cx \&\ \& -.Ar escape char -.Cx -Sets the initial -.Nm -.B telnet -escape character to -.Ar escape char. -If -.Ar escape char -is ommitted, then -there will be no escape character. .Tp Ar host Indicates the official name, an alias, or the Internet address of a remote host. @@ -182,7 +156,6 @@ Only enough of each command to uniquely identify it need be typed .Ic toggle , .Ic unset , .Ic slc , -.Ic environ , and .Ic display commands). @@ -249,30 +222,6 @@ option. This requires that the .Li LINEMODE option be enabled. -.Tp Cx Ic softtabs -.Cx \&\ \& -.Pq Ic \-softtabs -.Cx -Attempt to enable (disable) the -.Li SOFT_TAB -mode of the -.Li LINEMODE -option. -This requires that the -.Li LINEMODE -option be enabled. -.Tp Cx Ic litecho -.Cx \&\ \& -.Pq Ic \-litecho -.Cx -Attempt to enable (disable) the -.Li LIT_ECHO -mode of the -.Li LINEMODE -option. -This requires that the -.Li LINEMODE -option be enabled. .Tp Ic \&? Prints out help information for the .Ic mode @@ -283,11 +232,6 @@ command. .Ar host .Cx \&\ \& .Cx [ -.Op Fl l -.Cx \&\ \& -.Ar user -.Cx ] -.Cx [ .Op Fl .Cx \&\ \& .Ar port @@ -304,12 +248,6 @@ The host specification may be either a host name (see .Xr hosts 5 ) or an Internet address specified in the \*(Lqdot notation\*(Rq (see .Xr inet 3 ) . -The -.Op Fl l -option may be used to specify the user name -to be passed to the remote system via the -.Li ENVIRON -option. When connecting to a non-standard port, .Nm telnet omits any automatic initiation of @@ -699,11 +637,6 @@ The initial value for the worderase character is taken to be the terminal's .Ic worderase character. -.Tp Ic \&? -Displays the legal -.Ic set -.Pq Ic unset -commands. .Tp .Tp Cx Ic slc .Cx \&\ \& @@ -746,74 +679,16 @@ Verify the current settings for the current special characters. The remote side is requested to send all the current special character settings, and if there are any discrepencies with the local side, the local side will switch to the remote value. -.Tp Ic \&? +.Ic Ic \&? Prints out help information for the .Ic slc command. .Tp -.Tp Cx Ic environ -.Cx \&\ \& -.Ar arguments... -.Cx -The -.Ic environ -command is used to manipulate the -the variables that my be sent through the -.Li TELNET ENVIRON -option. -The initial set of variables is taken from the users -environment; with only the -.Ev USER -and -.Ev DISPLAY variables -being exported. -.br -Valid arguments for the \fBenviron\fP command are: -.Tw Fl -.Tp Cx Ic define -.Cx \&\ \& -.Ar variable value -.Cx -Define the variable -.Ar variable -to have a value of -.Ar value. -Any variables defined by this command are automatically exported. -The -.Ar value -may be enclosed in single or double quotes so -that tabs and spaces may be included. -.Tp Cx Ic undefine -.Cx \&\ \& -.Ar variable -.Cx -Remove -.Ar variable -from the list of environment variables. -.Tp Cx Ic export -.Cx \&\ \& -.Ar variable -.Cx -Mark the variable -.Ar variable -to be exported to the remote side. -.Tp Cx Ic unexport -.Cx \&\ \& -.Ar variable -.Cx -Mark the variable -.Ar variable -to not be exported unless -explicitly asked for by the remote side. -.Tp Ic list -List the current set of environment variables. -Those marked with a \fB*\fR will be sent automatically, -other variables will only be sent if explicitly requested. .Tp Ic \&? -Prints out help information for the -.Ic environ -command. -.Tp +Displays the legal +.Ic set +.Pq Ic unset +commands. .Tp Cx Ic toggle .Cx \&\ \& .Ar arguments ... @@ -928,9 +803,7 @@ If this is TRUE, then the .Ic flush , -.Ic interrupt , .Ic quit , -.Ic erase , and .Ic kill characters (see @@ -940,9 +813,7 @@ above) are recognized locally, and transformed into (hopefully) appropriate control sequences (respectively .Ic ao , -.Ic ip , .Ic brk , -.Ic ec , and .Ic el ; see @@ -966,7 +837,6 @@ and .B suspend are sent as .Ic eof and -.Ic susp , see .Ic send above). @@ -1028,18 +898,12 @@ If a command is specified, will print the help information for just that command. .Sh ENVIRONMENT .Nm Telnet -uses at least the +uses the .Ev HOME , -.Ev SHELL , -.Ev USER , -.Ev DISPLAY , +.Ev SHELL and .Ev TERM environent variables. -Other envirnoment variables may be propogated -to the other side via the -.Li TELNET ENVIRON -option. .Sh FILES .Dw ~/.telnetrc .Di L diff --git a/usr/src/usr.bin/tip/tip.1 b/usr/src/usr.bin/tip/tip.1 index 89041848d3..afab2316df 100644 --- a/usr/src/usr.bin/tip/tip.1 +++ b/usr/src/usr.bin/tip/tip.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)tip.1 6.5 (Berkeley) %G% +.\" @(#)tip.1 6.6 (Berkeley) %G% .\" .Dd .Dt TIP 1 @@ -49,7 +49,8 @@ interface is included for those people attached to the describes only .Nm tip . .Pp -Options: +Available Option: +.Tw Ds .Tp Fl v Set verbose mode. .Tp @@ -68,7 +69,9 @@ remote machine). .Cx \&\ \& .Op Ar name .Cx -Change directory to name (no argument +Change directory to +.Ar name +(no argument implies change to your home directory). .Tp Ic \&~! Escape to a shell (exiting the shell will @@ -137,7 +140,9 @@ Get a summary of the tilde escapes .Tp .Pp .Nm Tip -uses the file /etc/remote to find how to reach a particular +uses the file +.Pa /etc/remote +to find how to reach a particular system and to find out how it should operate while talking to the system; refer to @@ -152,7 +157,8 @@ When establishes a connection it sends out a connection message to the remote system; the default value, if any, is defined in -.Pa /etc/remote (see +.Pa /etc/remote +(see .Xr remote 5 ) . .Pp When @@ -341,14 +347,15 @@ and more. .Tp .Sh ENVIRONMENT .Nm Tip -uses the followinf environment variables: -.Tp Ar SHELL +uses the following environment variables: +.Tw Fl +.Tp Ev SHELL (str) The name of the shell to use for the ~! command; default value is ``/bin/sh'', or taken from the environment. -.Tp Ar HOME +.Tp Ev HOME (str) The home directory to use for the ~c command; default value is taken from the environment. -.Tp Ar HOST +.Tp Ev HOST Check for a default host if none specified. .Tp .Pp @@ -370,6 +377,8 @@ private system descriptions private phone numbers .Dp ~/.tiprc initialization file. +.Dp Pa tip.record +record file .Dp /var/log/aculog line access log .Dp Pa /var/spool/uucp/LCK..* diff --git a/usr/src/usr.bin/tset/tset.1 b/usr/src/usr.bin/tset/tset.1 index 7b24a1f037..0e449d1bde 100644 --- a/usr/src/usr.bin/tset/tset.1 +++ b/usr/src/usr.bin/tset/tset.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)tset.1 6.4 (Berkeley) %G% +.\" @(#)tset.1 6.5 (Berkeley) %G% .\" .Dd .Dt TSET 1 @@ -147,8 +147,8 @@ and messages. .Tp .Pp -When used in a startup script ( -.Pa \&.profile +When used in a startup script +.Pf \&( Pa \&.profile for .Xr sh 1 users or @@ -340,7 +340,7 @@ or ``\-1'' is reset to its default value. All arguments to may be used with reset. .Pp This is most useful after a program dies leaving a terminal in a funny -state. You may have to type `` +state. You may have to type .Dq Li reset to get it to work since diff --git a/usr/src/usr.bin/what/what.1 b/usr/src/usr.bin/what/what.1 index d3fb4dbbd1..3a2fc68d4a 100644 --- a/usr/src/usr.bin/what/what.1 +++ b/usr/src/usr.bin/what/what.1 @@ -2,7 +2,7 @@ .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" -.\" @(#)what.1 6.1 (Berkeley) %G% +.\" @(#)what.1 6.2 (Berkeley) %G% .\" .TH WHAT 1 "" .UC 4 diff --git a/usr/src/usr.bin/window/window.1 b/usr/src/usr.bin/window/window.1 index d757cfa5d7..c4c2ccb1e3 100644 --- a/usr/src/usr.bin/window/window.1 +++ b/usr/src/usr.bin/window/window.1 @@ -6,7 +6,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)window.1 6.12 (Berkeley) %G% +.\" @(#)window.1 6.13 (Berkeley) %G% .\" .Dd .Dt WINDOW 1 diff --git a/usr/src/usr.bin/xinstall/install.1 b/usr/src/usr.bin/xinstall/install.1 index 01065088f0..1d8631ed64 100644 --- a/usr/src/usr.bin/xinstall/install.1 +++ b/usr/src/usr.bin/xinstall/install.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)install.1 6.8 (Berkeley) %G% +.\" @(#)install.1 6.9 (Berkeley) %G% .\" .Dd .Dt INSTALL 1 @@ -17,9 +17,12 @@ .Op.Fl m Ar mode .Op Fl o Ar owner .Op Fl g Ar group -.Ar file1 file2 ; -or -.if n .br +.Ar file1 file2 +.Nm install +.Op Fl cs +.Op.Fl m Ar mode +.Op Fl o Ar owner +.Op Fl g Ar group .Ar file1 \&... .Ar fileN directory @@ -58,7 +61,7 @@ number of systems and binary types. refuses to move a file onto itself. .Pp Installing -.Pa dev/null +.Pa /dev/null creates an empty file. .Pp Upon successful completion a value of 0 is returned. diff --git a/usr/src/usr.sbin/chown/chgrp.1 b/usr/src/usr.sbin/chown/chgrp.1 index a2af09d878..19f50fe94e 100644 --- a/usr/src/usr.sbin/chown/chgrp.1 +++ b/usr/src/usr.sbin/chown/chgrp.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)chgrp.1 6.4 (Berkeley) %G% +.\" @(#)chgrp.1 6.5 (Berkeley) %G% .\" .Dd .Dt CHGRP 1 @@ -24,9 +24,11 @@ operand to the ID specified by the group operand. .Pp Options: +.Tw Ds .Tp Fl R Recursively change file group IDs. -For each file +For each +.Ar file operand that names a directory, chgrp changes the group of the directory and all files in the file hierarchy below it. @@ -38,6 +40,7 @@ query about strange modes (unless user does not have proper permissions). .Tp .Pp Operands: +.Tw Ds .Tp Ar group The .Ar group @@ -55,10 +58,11 @@ The .Nm chgrp utility exits 0 on success, and >0 if an error occurs. .Sh FILES -.Dw group -.Ds L -.Dp Pa group +.Dw /etc/group +.Di L +.Dp Pa /etc/group Group ID file +.Dp .Sh SEE ALSO .Xr chown 2 , .Xr chown 8 , @@ -68,3 +72,4 @@ Group ID file The .Nm chgrp function is expected to be POSIX 1003.2 compatible. +This manual page is derived from the POSIX 1003.2 manual page. diff --git a/usr/src/usr.sbin/lpr/lpq/lpq.1 b/usr/src/usr.sbin/lpr/lpq/lpq.1 index 60ff2458d9..fd8a71d665 100644 --- a/usr/src/usr.sbin/lpr/lpq/lpq.1 +++ b/usr/src/usr.sbin/lpr/lpq/lpq.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lpq.1 6.7 (Berkeley) %G% +.\" @(#)lpq.1 6.8 (Berkeley) %G% .\" .Dd .Dt LPQ 1 @@ -20,17 +20,18 @@ .Op job # ... .Op user ... .Sh DESCRIPTION -.Nm lpq +.Nm Lpq examines the spooling area used by .Xr lpd 8 for printing files on the line printer, and reports the status of the specified jobs or all jobs associated with a user. -.Nm lpq +.Nm Lpq invoked without any arguments reports on any jobs currently in the queue. .Pp Options: .Pp +.Tw Ds .Tp Fl P Specify a particular printer, otherwise the default line printer is used (or the value of the @@ -94,7 +95,7 @@ the lock file to obtain the currently active job .Xr lpc 8 , .Xr lpd 8 .Sh HISTORY -.Nm +.Nm Lpq appeared in 3 BSD. .Sh BUGS Due to the dynamic nature of the information in the spooling directory diff --git a/usr/src/usr.sbin/lpr/lpr/lpr.1 b/usr/src/usr.sbin/lpr/lpr/lpr.1 index 34cfe5570b..996809153d 100644 --- a/usr/src/usr.sbin/lpr/lpr/lpr.1 +++ b/usr/src/usr.sbin/lpr/lpr/lpr.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lpr.1 6.6 (Berkeley) %G% +.\" @(#)lpr.1 6.7 (Berkeley) %G% .\" .Dd .Dt LPR 1 @@ -26,68 +26,75 @@ .Oo .Op Fl w Ar num .Oo -.Op Fl pltndgvcfrmhs +.Op Fl cdfghlnmprstv .Op Ar name ... .Oo .Sh DESCRIPTION .Nm Lpr uses a spooling daemon to print the named files when facilities become available. If no names appear, the standard input is assumed. -.Fl P -option may be used to force output to a specific printer. Normally, -the default printer is used (site dependent), or the value of the -environment variable -.Ev PRINTER -is used. .Pp The following single letter options are used to notify the line printer spooler that the files are not standard text files. The spooling daemon will use the appropriate filters to print the data accordingly. .Tw Fl -.Tp Fl p -Use -.Xr pr 1 -to format the files (equivalent to -.Em print ) . -.Tp Fl l -Use a filter which allows control characters to be printed and suppresses -page breaks. -.Tp Fl t -The files are assumed to contain data from -.Xr troff 1 -(cat phototypesetter commands). -.Tp Fl n -The files are assumed to contain data from -.Em ditroff -(device independent troff). +.Tp Fl c +The files are assumed to contain data produced by +.Xr cifplot 1 .Tp Fl d The files are assumed to contain data from .Em tex (DVI format from Stanford). +.Tp Fl f +Use a filter which interprets the first character of each line as a +standard FORTRAN carriage control character. .Tp Fl g The files are assumed to contain standard plot data as produced by the .Xr plot routines (see also .Xr plot for the filters used by the printer spooler). +.Tp Fl l +Use a filter which allows control characters to be printed and suppresses +page breaks. +.Tp Fl n +The files are assumed to contain data from +.Em ditroff +(device independent troff). +.Tp Fl p +Use +.Xr pr 1 +to format the files (equivalent to +.Em print ) . +.Tp Fl t +The files are assumed to contain data from +.Xr troff 1 +(cat phototypesetter commands). .Tp Fl v The files are assumed to contain a raster image for devices like the Benson Varian. -.Tp Fl c -The files are assumed to contain data produced by -.Xr cifplot 1 -.Tp Fl f -Use a filter which interprets the first character of each line as a -standard FORTRAN carriage control character. .Tp .Pp -The remaining single letter options have the following meaning. +These options apply to the handling of +the print job: .Tw Fl +.Tp Fl P +Force output to a specific printer. Normally, +the default printer is used (site dependent), or the value of the +environment variable +.Ev PRINTER +is used. +.Tp Fl h +Suppress the printing of the burst page. +.Tp Fl m +Send mail upon completion. .Tp Fl r Remove the file upon completion of spooling or upon completion of printing (with the .Fl s option). +.Tp Fl s +Use symbolic links. Usually files are copied to the spool directory. The .Fl s option will use @@ -95,35 +102,10 @@ option will use to link data files rather than trying to copy them so large files can be printed. This means the files should not be modified or removed until they have been printed. -.Tp Fl m -Send mail upon completion. -.Tp Fl h -Suppress the printing of the burst page. -.Tp Fl s -Use symbolic links. Usually files are copied to the spool directory. -.Tp Fl C -Uses the following argument as a job classification -for use on the burst page. For example, -.Pp -.Dl lpr \-C EECS foo.c +.Tp .Pp -causes the system name (the name returned by -.Xr hostname 1 ) -to be replaced on the burst page by EECS, -and the file foo.c to be printed. -.Tp Fl J -Uses the following argument as the job name to print on the burst page. -Normally, the first file's name is used. -.Tp Fl U -Uses the following argument as the user name to print on the burst page, -and for accounting purposes. -This option is only honored if the real user-id is daemon -(or that specified in the printcap file instead of daemon), -and is intended for those instances where print filters wish to requeue jobs. -.Tp Fl T -Uses the next argument as the title used by -.Xr pr 1 -instead of the file name. +The remaining options apply to copies, the page display, and headers: +.Tw Fl .Tc Fl \&# .Ar num .Cx @@ -138,7 +120,58 @@ of the file bar.c, etc. On the other hand, .Pp .Dl cat foo.c bar.c more.c \&| lpr \-#3 .Pp -will give three copies of the concatenation of the files. +will give three copies of the concatenation of the files. Often +a site will disable this feature to encourage use of a photocopier +instead. +.Tc Fl +.Op Cm 1234 +.Ws +.Ar font +.Cx +Specifies a +.Ar font +to be mounted on font position +.Ar i . +The daemon +will construct a +.Li .railmag +file referencing +the font pathname. +.Tc Fl C +.Ws +.Ar class +.Cx +Job classification +to use on the burst page. For example, +.Pp +.Dl lpr \-C EECS foo.c +.Pp +causes the system name (the name returned by +.Xr hostname 1 ) +to be replaced on the burst page by EECS, +and the file foo.c to be printed. +.Tc Fl J +.Ws +.Ar job +.Cx +Job name to print on the burst page. +Normally, the first file's name is used. +.Tc Fl T +.Ws +.Ar title +.Cx +Title name for +.Xr pr 1 , +instead of the file name. +.Tc Fl U +.Ws +.Ar user +.Cx +User name to print on the burst page, +also for accounting purposes. +This option is only honored if the real user-id is daemon +(or that specified in the printcap file instead of daemon), +and is intended for those instances where print filters wish to requeue jobs. .Tc Fl i .Ws .Op numcols @@ -155,14 +188,6 @@ Uses .Ar num as the page width for .Xr pr 1 . -.Tp Fl 1234 -Specifies a font to be mounted on font position -.Ar i . -The daemon -will construct a -.Li .railmag -file referencing -the font pathname. .Tp .Sh ENVIRONMENT If the following environment variable exists, it is used by @@ -200,7 +225,6 @@ temporary copies of "cf" files .Sh HISTORY .Nm Lpr appeared in 3 BSD. -.Sh BUGS .Sh DIAGNOSTICS If you try to spool too large a file, it will be truncated. .Nm Lpr diff --git a/usr/src/usr.sbin/lpr/lprm/lprm.1 b/usr/src/usr.sbin/lpr/lprm/lprm.1 index 079caa355e..9b9ac2951e 100644 --- a/usr/src/usr.sbin/lpr/lprm/lprm.1 +++ b/usr/src/usr.sbin/lpr/lprm/lprm.1 @@ -3,99 +3,122 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lprm.1 6.4 (Berkeley) %G% +.\" @(#)lprm.1 6.5 (Berkeley) %G% .\" -.TH LPRM 1 "%Q" -.UC 5 -.SH NAME -lprm \- remove jobs from the line printer spooling queue -.SH SYNOPSIS -.B lprm -[ -.BI \-P printer -] [ -.B \- -] [ -job # ... -] [ -user ... -] -.SH DESCRIPTION -.I Lprm +.Dd +.Dt LPRM 1 +.Os BSD 4.2 +.Sh NAME +.Nm lprm +.Nd remove jobs from the line printer spooling queue +.Sh SYNOPSIS +.Nm lprm +.Oo +.Op Fl P Ar printer +.Oo +.Op Fl +.Op job # ... +.Op Ar user ... +.Sh DESCRIPTION +.Nm Lprm will remove a job, or jobs, from a printer's spool queue. Since the spooling directory is protected from users, using -.I lprm +.Nm lprm is normally the only method by which a user may remove a job. -.PP -.I Lprm -without any arguments will delete the currently active job if it is -owned by the user who invoked -.IR lprm . -.PP -If the -.B \- -flag is specified, -.I lprm -will remove all jobs which a user -owns. If the super-user employs this flag, the spool queue will -be emptied entirely. The owner is determined by the user's login name +The owner of a job is determined by the user's login name and host name on the machine where the -.I lpr +.Xr lpr 1 command was invoked. -.PP -Specifying a user's name, or list of user names, will cause -.I lprm +.Pp +Options and arguments: +.Tw Fl +.Tc Fl P +.Ar printer +.Cx +Specify the queue associated with a specific +.Ar printer +(otherwise the default printer is used). +.Tp Fl +If a single +.Sq Fl +is given, +.Nm lprm +will remove all jobs which a user +owns. If the super-user employs this flag, the spool queue will +be emptied entirely. +.Tp Ar user +Causes +.Nm lprm to attempt to remove any jobs queued belonging to that user (or users). This form of invoking -.I lprm +.Nm lprm is useful only to the super-user. -.PP +.Tp Ar job\ \&# A user may dequeue an individual job by specifying its job number. This number may be obtained from the -.IR lpq (1) +.Ar lpq 1 program, e.g. -.PP -.nf -.in +0.5i -.ta \w'k0-k9 'u +\w'Type 'u +\w'"/usr/lib/lpd" 'u -.ta \w'1st: 'u +\w'(standard input) 'u -% lpq \-l +.Pp +.Ds I +.Cw \&a 1st:standard_input) +.Cl \&% lpq \-l -1st: ken [job #013ucbarpa] - (standard input) 100 bytes -% lprm 13 -.in -0.5i -.fi -.PP -.I Lprm -will announce the names of any files it removes and is silent if +.Cl 1st:ken\t\t[job #013ucbarpa] +.Cl \t(standard input) 100 bytes +.Cl % lprm 13 +.Cw +.De +.Tp +.Pp +If neither arguments or options are given, +.Nm Lprm +will delete the currently active job if it is +owned by the user who invoked +.Nm lprm . +.Pp +.Nm Lprm +announces the names of any files it removes and is silent if there are no jobs in the queue which match the request list. -.PP -.I Lprm +.Pp +.Nm Lprm will kill off an active daemon, if necessary, before removing any spooling files. If a daemon is killed, a new one is automatically restarted upon completion of file removals. -.PP -The -.B \-P -option may be usd to specify the queue associated with a specific -printer (otherwise the default printer, or the value of the PRINTER -variable in the environment is used). -.SH FILES -.nf -.ta \w'/usr/spool/*/lock 'u -/etc/printcap printer characteristics file -/usr/spool/* spooling directories -/usr/spool/*/lock lock file used to obtain the pid of the current - daemon and the job number of the currently active job -.fi -.SH "SEE ALSO" -lpr(1), -lpq(1), -lpd(8) -.SH DIAGNOSTICS +.Sh ENVIRONMENT +The following environment variable exists, it is utilized by +.Nm lprm . +.Tw Fl +.Tp Ev PRINTER +If the environment variable +.Ev PRINTER +exists, +and a printer has not been specified with the +.Fl P +option, +the default printer is assumed from +.Ev PRINTER . +.Tp +.Sh FILES +.Dw /var/spool/*/lock/ +.Di L +.Dp Pa /etc/printcap +printer characteristics file +.Dp Pa /var/spool/* +spooling directories +.Dp Pa /var/spool/*/lock +lock file used to obtain the pid of the current +daemon and the job number of the currently active job +.Dp +.Sh SEE ALSO +.Xr lpr 1 , +.Xr lpq 1 , +.Xr lpd 8 +.Sh DIAGNOSTICS ``Permission denied" if the user tries to remove files other than his own. -.SH BUGS +.Sh BUGS Since there are race conditions possible in the update of the lock file, the currently active job may be incorrectly identified. +.Sh HISTORY +.Nm Lprm +appeared in 3 BSD. diff --git a/usr/src/usr.sbin/lpr/lptest/lptest.1 b/usr/src/usr.sbin/lpr/lptest/lptest.1 index 43191d424f..bab90342c5 100644 --- a/usr/src/usr.sbin/lpr/lptest/lptest.1 +++ b/usr/src/usr.sbin/lpr/lptest/lptest.1 @@ -3,22 +3,20 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)lptest.1 6.4 (Berkeley) %G% +.\" @(#)lptest.1 6.5 (Berkeley) %G% .\" -.TH LPTEST 1 "%Q" -.UC 6 -.SH NAME -lptest \- generate lineprinter ripple pattern -.SH SYNOPSIS -.B lptest -[ -.B length -[ -.B count -] ] -.br -.SH DESCRIPTION -.I Lptest +.Dd +.Dt LPTEST 1 +.Os BSD 4.3 +.Sh NAME +.Nm lptest +.Nd generate lineprinter ripple pattern +.Sh SYNOPSIS +.Nm lptest +.Op Ar length +.Op Ar count +.Sh DESCRIPTION +.Nm Lptest writes the traditional "ripple test" pattern on standard output. In 96 lines, this pattern will print all 96 printable ASCII characters @@ -27,20 +25,21 @@ While originally created to test printers, it is quite useful for testing terminals, driving terminal ports for debugging purposes, or any other task where a quick supply of random data is needed. -.PP -The -.I length -argument specifies the output line length if the the default +.Pp +The +.Ar length +argument specifies the output line length if the the default length of 79 is inappropriate. -.PP +.Pp The -.I count +.Ar count argument specifies the number of output lines to be generated if the default count of 200 is inappropriate. -Note that if -.I count +Note that if +.Ar count is to be specified, -.I length +.Ar length must be also be specified. -.SH "SEE ALSO" -.SH BUGS +.Sh HISTORY +.Nm Lptest +appeared in 4.3 BSD. diff --git a/usr/src/usr.sbin/mtree/mtree.8 b/usr/src/usr.sbin/mtree/mtree.8 index 612b848ce5..8fe6b76600 100644 --- a/usr/src/usr.sbin/mtree/mtree.8 +++ b/usr/src/usr.sbin/mtree/mtree.8 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)mtree.8 5.6 (Berkeley) %G% +.\" @(#)mtree.8 5.7 (Berkeley) %G% .\" .Dd .Dt MTREE 8 @@ -88,7 +88,7 @@ The last modification time of the file. .Tp Cm type The type of the file; may be set to any one of the following: .Tw Cm -.Tp Tp Cm block +.Tp Cm block block special device .Tp Cm char character special device @@ -193,7 +193,5 @@ df.man size=5263 tar.man size=3324 \&.. .De -.\" .Sh ENVIRONMENT .Sh HISTORY -.Nm Mtree -debuts in 4.4 BSD. +4.3 Reno BSD. diff --git a/usr/src/usr.sbin/sendmail/src/newaliases.1 b/usr/src/usr.sbin/sendmail/src/newaliases.1 index b201489931..c017fb72c4 100644 --- a/usr/src/usr.sbin/sendmail/src/newaliases.1 +++ b/usr/src/usr.sbin/sendmail/src/newaliases.1 @@ -1,33 +1,29 @@ -.\" Copyright (c) 1985 The Regents of the University of California. +.\" Copyright (c) 1985, 1990 The Regents of the University of California. .\" All rights reserved. .\" -.\" Redistribution and use in source and binary forms are permitted -.\" provided that the above copyright notice and this paragraph are -.\" duplicated in all such forms and that any documentation, -.\" advertising materials, and other materials related to such -.\" distribution and use acknowledge that the software was developed -.\" by the University of California, Berkeley. The name of the -.\" University may not be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +.\" %sccs.include.redist.man% .\" -.\" @(#)newaliases.1 6.3 (Berkeley) %G% +.\" @(#)newaliases.1 6.4 (Berkeley) %G% .\" -.TH NEWALIASES 1 "" -.UC 4 -.SH NAME -newaliases \- rebuild the data base for the mail aliases file -.SH SYNOPSIS -.B newaliases -.SH DESCRIPTION -.I Newaliases +.Dd +.Dt NEWALIASES 1 +.Os BSD 4 +.Sh NAME +.Nm newaliases +.Nd rebuild the data base for the mail aliases file +.Sh SYNOPSIS +.Nm newaliases +.Sh DESCRIPTION +.Nm Newaliases rebuilds the random access data base for the mail aliases file -.IR /usr/lib/aliases . +.Pa /etc/aliases . It must be run each time -.I /usr/lib/aliases +.Pa /etc/aliases is changed in order for the change to take effect. -.SH SEE ALSO -aliases(5), sendmail(8) +.Sh SEE ALSO +.\" .Xr aliases 5 , +.Xr sendmail 8 +.Sh HISTORY +.Nm Newaliases +appeared in 4.0 BSD. -- 2.20.1