mdoc version three/bsd copyright

SCCS-vsn: old/which/which.1 6.3
SCCS-vsn: usr.bin/who/who.1 6.5

diff --git a/usr/src/old/which/which.1 b/usr/src/old/which/which.1
index d8b2de5..bfdf52a 100644 (file)
--- a/usr/src/old/which/which.1
+++ b/usr/src/old/which/which.1
@@ -1,30 +1,46 @@
-.\" Copyright (c) 1983 The Regents of the University of California.
+.\" Copyright (c) 1980, 1991 Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" %sccs.include.redist.roff%
 .\"
 .\" All rights reserved.
 .\"
 .\" %sccs.include.redist.roff%
 .\"

-.\"    @(#)which.1     6.2 (Berkeley) %G%
+.\"     @(#)which.1    6.3 (Berkeley) %G%

 .\"
 .\"

-.TH WHICH 1 ""
-.UC
-.SH NAME
-which \- locate a program file including aliases and paths (\fIcsh\fR only)
-.SH SYNOPSIS
-.B which
-[ name ] ...
-.SH DESCRIPTION
-.I Which
+.Dd 
+.Dt WHICH 1
+.Os BSD 3
+.Sh NAME
+.Nm which
+.Nd "locate a program file including aliases and paths"
+.Pq Xr csh 1
+only)
+.Sh SYNOPSIS
+.Nm which
+.Op Ar name
+.Ar ...
+.Sh DESCRIPTION
+.Nm Which

 takes a list of names and looks for the files which would be
 executed had these names been given as commands.
 Each argument is expanded if it is aliased,
 and searched for along the user's path.
 takes a list of names and looks for the files which would be
 executed had these names been given as commands.
 Each argument is expanded if it is aliased,
 and searched for along the user's path.

-Both aliases and path are taken from the user's \&.cshrc file.
-.SH FILES
-.ta 1i
-~/\&.cshrc     source of aliases and path values
-.SH DIAGNOSTICS
+Both aliases and path are taken from the user's
+.Pa \&.cshrc
+file.
+.Sh FILES
+.Bl -tag -width ~/\&.cshrc
+.It Pa ~/\&.cshrc
+source of aliases and path values
+.El
+.Sh DIAGNOSTICS

 A diagnostic is given for names which are aliased to more than a single
 word,
 or if an executable file with the argument name was not found in the path.
 A diagnostic is given for names which are aliased to more than a single
 word,
 or if an executable file with the argument name was not found in the path.

-.SH BUGS
-Must be executed by a csh, since only csh's know about aliases.
+.Sh BUGS
+Must be executed by a
+.Xr csh 1 ,
+or some other shell which knows about aliases.
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .

diff --git a/usr/src/usr.bin/who/who.1 b/usr/src/usr.bin/who/who.1
index 6497a7c..c3ba166 100644 (file)
--- a/usr/src/usr.bin/who/who.1
+++ b/usr/src/usr.bin/who/who.1
@@ -1,41 +1,79 @@
-.\" Copyright (c) 1986 The Regents of the University of California.
+.\" Copyright (c) 1986, 1991 Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" All rights reserved.
 .\"

-.\" %sccs.include.proprietary.roff%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"    @(#)who.1       6.4 (Berkeley) %G%
+.\"     @(#)who.1      6.5 (Berkeley) %G%

 .\"
 .\"

-.TH WHO 1 "%Q"
-.AT 3
-.SH NAME
-who \- who is on the system
-.SH SYNOPSIS
-.B who
-[ who-file ] [
-.B "am I"
-]
-.SH DESCRIPTION
-\fIWho,\fP without any argument, reads the /var/run/utmp file,
-and lists the login name, terminal name, and login time for each
-user currently logged into the system.  If a single argument is
-given, \fIwho\fP uses that file instead of /var/run/utmp.  Typically,
-that file will be /var/log/wtmp, which contains a record of all
-the logins, logouts, crashes, shutdowns and time changes since it
-was created.  In either case, each login will be listed with the
-user name, the terminal name (with "/dev/" suppressed), login date
-and time, and, if applicable, the host logged in from.
-.PP
-If /var/log/wtmp is being used as the file, the user name may be empty
+.Dd 
+.Dt WHO 1
+.Os
+.Sh NAME
+.Nm who
+.Nd display who is logged in
+.Sh SYNOPSIS
+.Nm who
+.Op Ar am I
+.Op Ar file 
+.Sh DESCRIPTION
+The utility
+.Nm who
+displays
+a list of all users currently logged on, showing for each user
+the login name,
+tty name, the date and time of login, and hostname if not local.
+.Pp
+Available options:
+.Pp
+.Bl -tag -width file
+.It Ar \&am I
+Returns the invoker's real user name. 
+.It Ar file
+By default,
+.Nm who
+gathers information from the file
+.Pa /var/run/utmp .
+An alternate
+.Ar file
+may be specified which is usually
+.Pa /var/run/wtmp
+(or
+.Pa /var/run/wtmp.[0-6]
+depending on site policy as
+.Pa wtmp
+can grow quite large and daily versions may or may not
+kept around after compression by
+.Xr ac 8 ) .
+The
+.Pa wtmp
+file contains a record of every login, logout,
+crash, shutdown and date change
+since
+.Pa wtmp
+was last truncated or
+created.
+.El
+.Pp
+If
+.Pa /var/log/wtmp
+is being used as the file, the user name may be empty

 or one of the special characters '|', '}' and '~'.  Logouts produce
 an output line without any user name.  For more information on the
 or one of the special characters '|', '}' and '~'.  Logouts produce
 an output line without any user name.  For more information on the

-special characters, see utmp(5).
-.PP
-With two arguments, as in `who am I' (and also `who are you'),
-\fIwho\fP tells you who you are logged in as.
-.SH FILES
-.DT
-/var/run/utmp
-.br
-/var/log/wtmp
-.SH "SEE ALSO"
-last(1), users(1), getuid(2), utmp(5)
+special characters, see
+.Xr utmp 5 .
+.Sh FILES
+.Bl -tag -width /var/log/wtmp.[0-6] -compact
+.It Pa /var/run/utmp
+.It Pa /var/log/wtmp
+.It Pa /var/log/wtmp.[0-6]
+.El
+.Sh SEE ALSO
+.Xr last 1 ,
+.Xr users 1 ,
+.Xr getuid 2 ,
+.Xr utmp 5
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v6 .