cleanup

7 files changed, 228 insertions, 99 deletions

diff --git a/clients/zaway/zaway.1 b/clients/zaway/zaway.1
index 39b8b07..0433f66 100644
--- a/clients/zaway/zaway.1
+++ b/clients/zaway/zaway.1
@@ -1,25 +1,32 @@
-.\" Copyright 1987 by the Massachusetts Institute of Technology
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
+.\" Copyright 1987,1988 by the Massachusetts Institute of Technology
 .\" All rights reserved.  The file /usr/include/zephyr/mit-copyright.h
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\"	@(#)zaway.1	6.1 (MIT) 7/9/87
 .\"
-.TH ZAWAY 1 "August 6, 1987"
+.TH ZAWAY 1 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 zaway \- tell other people that you aren't around
 .SH SYNOPSIS
 .B zaway
 [
-.BI file
+.I file
 ]
 .SH DESCRIPTION
 .I Zaway
 provides a way for you to automatically send replies when other people
 contact you using
-.I zwrite(1).
-Zaway subscribes itself to class "MESSAGE", instance "*", so that it can
+.I zwrite(1). Zaway
+subscribes itself to class "MESSAGE", instance "*", so that it can
 monitor your incoming messages.  It does not affect the operation of any
-of client receiving messages.  Zaway uses a message file (which defaults
+of client receiving messages.
+.I Zaway
+uses a message file (which defaults
 to $HOME/.away) to describe what reponses should be sent to which
 senders.  The general format of this file
 is:
@@ -32,19 +39,27 @@ is:
 	message
 .fi
 .PP
-Any number of user names may be specified preceeding the message to send
+Any number of user names may be specified preceding the message to send
 to those senders.  If a user name appears more than once, the message will
 be a concatenation of each of the appropriate messages.  There are
 two special names: "*" indicates that the following message should be
 sent to all senders and "%" indicates that the following message should
-only be sent if the user name has not matched yet.  If no file is specified,
-and no default file can be found, the message:
-
+only be sent if the user name has not matched yet. 
+.PP
+If no file is specified,
+and no default file can be found, the following message is returned:
+.in +5
 I'm sorry, but I am currently away from the terminal and am
 not able to receive your message.
-
+.in -5
 If a user name does not match any of those listed in the file, and no
 "*" or "%" field is specified, no return message is sent.
+All messages are preceded by the line "Automated reply:".
+To avoid loops, messages are not sent in response to messages beginning
+with "Automated reply:" or sent by the same Kerberos principal as the
+user running 
+.I zaway.
+
 .SH SAMPLE FILE
 .nf
 >eichin
@@ -57,24 +72,24 @@ Sorry, but I'm gone for the day...
 Hello...I'm not sure who you are.  I'll be back soon,
 though.
 >*
-
 This message comes to you compliments of zaway!
 .fi
 
-Note that the final "compliments" message will be included in all messages,
+The final "compliments" message will be included in all messages,
 whereas the "I'm not sure" message will only be included in messages that
 are not from "eichin", "tony", or "jruser".
 .SH FILES
 $HOME/.away
 .SH SEE ALSO
-zephyr(1), zwgc(1), zhm(8), zephyrd(8)
+zephyr(1), zwgc(1), zwrite(1), zhm(8), zephyrd(8)
 .br
-`Zephyr Notification Service'
+Project Athena Technical Plan Section E.4.1, `Zephyr Notification
+Service'
 .SH AUTHOR
 .PP
 Robert S. French (MIT-Project Athena)
 .sp
-Copyright (c) 1987 by the Massachusetts Institute of Technology
+Copyright (c) 1987,1988 by the Massachusetts Institute of Technology
 .br
 See
 .I zephyr(1)
diff --git a/clients/zctl/zctl.1 b/clients/zctl/zctl.1
index 61f08e8..ed8e977 100644
--- a/clients/zctl/zctl.1
+++ b/clients/zctl/zctl.1
@@ -1,10 +1,14 @@
-.\" Copyright 1987 by the Massachusetts Institute of Technology
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
+.\" Copyright 1987,1988 by the Massachusetts Institute of Technology
 .\" All rights reserved.  The file /usr/include/zephyr/mit-copyright.h
 .\" specifies the terms and conditions for redistribution.
 .\"
-.\"	@(#)zctl.1	6.1 (MIT) 7/9/87
 .\"
-.TH ZCTL 1 "February 7, 1988"
+.TH ZCTL 1 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 zctl \- zephyr control program
 .SH SYNOPSIS
@@ -17,36 +21,55 @@ is a general purpose control program for the
 .I Zephyr(1)
 Notification Service.  It allows the user to subscribe to specific
 notice types, to save the subscriptions in a file (default
-$HOME/.zephyr.subs), and to send control messages to the HostManager,
+$HOME/.zephyr.subs), to change his location information, and to send
+control messages to the HostManager,
 .I zhm(8),
 and the WindowGram client,
 .I zwgc(1).
 .PP
 The commands may be typed on the command line, or may be entered
 interactively by just typing
-.I zctl.
+.I zctl
+and then typing commands to the prompt.
 The commands are as follows:
 .TP 25
 .B add \fIclass instance\fR [ \fIrecipient\fR ]
 Subscribe to \fIclass, instance, recipient\fR, and add this triplet to
 the subscriptions file.
 .TP
+.B add_unsubscription \fIclass instance\fR [ \fIrecipient\fR ]
+Unsubscribe to \fIclass, instance, recipient\fR, and add this triplet
+to the subscriptions file as an un-subscription.
+For an explanation of un-subscriptions, see below.
+.TP
 .B cancel
 Cancel all subscriptions.
 .TP
+.B defaults
+Retrieve the default subscription list from the Zephyr server.
+.TP
 .B delete \fIclass instance\fR [ \fIrecipient\fR ]
 Unsubscribe to \fIclass, instance, recipient\fR, and remove this triplet
 from the subscriptions file.
 .TP
-.B file \fIfile
-Set default subscriptions file to \fIfile.  If \fIfile isn't specified,
+.B delete_unsubscription \fIclass instance\fR [ \fIrecipient\fR ]
+Unsubscribe to \fIclass, instance, recipient\fR, and remove this triplet
+from the subscriptions file as an un-subscription.
+.TP
+.B file [ \fIfile\fR ]
+Set default subscriptions file to \fIfile\fR.  If \fIfile\fR isn't specified,
 show what the current subscriptions file is.
 .TP
 .B flush_locs
 Tell the Zephyr servers to flush all location information associated with
-the user.  This should only be used to remove any stale data that may have
+the user.  This should only be used to remove any incorrect data that may have
 been left after a system crash.
 .TP
+.B hide
+Hide your location as maintained by the Zephyr server.  This does not
+affect the value of the exposure variable (see below, under
+.B set).
+.TP
 .B hm_flush
 Tell the HostManager,
 .I zhm(8),
@@ -59,7 +82,8 @@ List contents of current subscriptions file or \fIfile.
 List all available commands.  May be abbreviated by '?'.
 .TP
 .B load [ \fIfile\fR ]
-Subscribe to all triplets in current subscriptions file or \fIfile.
+Subscribe to all subscription triplets and unsubscribe to all
+un-subscription triplets in current subscriptions file or \fIfile\fR.
 .TP
 .B new_server
 Tell the HostManager,
@@ -70,37 +94,52 @@ to find a new Zephyr server.
 Exit from \fIzctl.
 .TP
 .B retrieve
-Ask the current server to retrieve all current subscriptions.  These include
+Retrieve all current subscriptions from the Zephyr server.  These include
 subscriptions that might have been made by other programs, such as
 .I znol(1).
 .TP
 .B save [ \fIfile\fR ]
-Save subscriptions into current subscriptions file or \fIfile.
+Save all current subscriptions (as returned by the Zephyr server)
+into current subscriptions file or \fIfile\fR.  The 
+file will be replaced.
 .TP
 .B set \fIvar\fR [ \fIvalue\fR ]
 Set the value of Zephyr variable \fIvar\fR to \fIvalue\fR, or null if
 no \fIvalue\fR is specified.  The variable \fBexposure\fR has special
 significance, and can only be set to the values none, opstaff, realm-visible,
 realm-announced, net-visible, and net-announced.  Setting this variable
-immediately updates the information in the Zephyr servers.
+immediately updates the information in the Zephyr servers.  In addition,
+setting this variable to none automatically performs the equivalent of a 
+.B wg_shutdown
+command, and setting it to one of the other values automatically
+performs the equivalent of a 
+.B wg_startup
+command.
+.br
+Any variable settings you make will be stored in \fI$HOME/.zephyr.vars\fR
 .TP
 .B show \fIvar\fR [ \fIvar\fR \ ... ]
 Show the value of the specified Zephyr variables.  If a variable is not
 defined in the user's own variables file, the system variables file
-is searched for a default value.
+(\fI/etc/athena/zephyr.vars\fR) is searched for a default value.
 .TP
 .B subscribe \fIclass instance\fR [ \fIrecipient\fR ]
-Subscribe to \fIclass, instance, recipient, but don't add this triplet to
+Subscribe to \fIclass, instance, recipient\fR, but don't add this triplet to
 the subscriptions file.
 .TP
+.B unhide
+Make your location as maintained by the Zephyr server visible.  This does not
+affect the value of the exposure variable.
+.TP
 .B unload [ \fIfile\fR ]
-Unsubscribe to all triplets in current subscriptions file or \fIfile.
+Unsubscribe to all subscription triplets in current subscriptions file
+or \fIfile\fR.  Un-subscriptions in the file are ignored.
 .TP
 .B unset \fIvar\fR [ \fIvar\fR \ ... ]
 Delete the definitions of the specified Zephyr variables.
 .TP
 .B unsubscribe \fIclass instance\fR [ \fIrecipient\fR ]
-Unsubscribe to \fIclass, instance, recipient, but don't remove this triplet
+Unsubscribe to \fIclass, instance, recipient\fR, but don't remove this triplet
 from the subscriptions file.
 .TP
 .B wg_read
@@ -109,28 +148,27 @@ Tell the WindowGram client,
 to reread its description file.
 .TP
 .B wg_shutdown
-Tell the WindowGram client,
-.I zwgc(1),
-to shutdown; this causes it to ignore all notices until a wg_startup command
-is issued.
+Tell the WindowGram client to shutdown; this causes it to ignore all
+notices until a wg_startup command is issued.
 .TP
 .B wg_startup
-Tell the WindowGram client,
-.I zwgc(1),
-to start accepting notices again; useful after a wg_shutdown command has
-been issued.
+Tell the WindowGram client to start accepting notices again; useful
+after a wg_shutdown command has been issued.
 .PP
-The \fIrecipient\fR field defaults to your kerberos principle.  You
-may also subscribe to recipient ``*''.  There are three macros,
+The \fIrecipient\fR field defaults to your Kerberos principal.  You
+may also subscribe to recipient ``*''.  Any other recipient is silently
+converted to ``*''.  There are three macros,
 .I %host%, %canon%, \fRand\fI %me%.  %host%
-returns the current hostname, \fI%canon%\fR returns the canonical
-hostname, and \fI%me%\fR returns your username.  These macros can be
-used in your \fI$HOME/.zephyr.subs\fR file to specify the
+is converted to the current hostname, \fI%canon%\fR is converted to the
+official hostname as returned by 
+.I gethostbyname(3),
+and \fI%me%\fR is converted to your Kerberos principal.  These macros can be
+used in your \fI$HOME/.zephyr.subs\fR file or as arguments to commands
+to specify the
 .I class, instance, \fRor\fI recipient
 fields.  A sample file might contain the following:
 .PP
 .nf
-	message,personal,%me%
 	message,urgent,%me%
 	syslog,%host%,*
 	mail,pop,%me%
@@ -140,14 +178,29 @@ fields.  A sample file might contain the following:
 reads the environment variable \fBWGFILE\fR, to find the name of the
 file where the windowgram port resides.  If \fBWGFILE\fR does not
 exist, the file defaults to /tmp/wg.\fIuid\fR, where \fIuid\fR is the
-user's id.
+user's UNIX uid.
+.SH UN-SUBSCRIPTIONS
+The zephyr server,
+.I zephyrd(8),
+maintains default subscriptions which are automatically added to all
+users' subscriptions at the time of their first subscription during a
+login session.  If you wish to automatically remove some of these
+default subscriptions, you use 
+.B un-subscriptions.
+When you 
+.B load
+a subscription file containing
+un-subscriptions, the un-subscriptions are automatically sent to the
+server as if you had used the
+.B unsubscribe
+command.
 .SH EXAMPLES
 .TP 25
 .B zctl
 Runs \fIzctl\fR in interactive mode.
 .TP
 .B zctl load
-Loads default subscriptions from \fI$HOME/.zephyr.subs\fR file.
+Load subscriptions and un-subscriptions from \fI$HOME/.zephyr.subs\fR file.
 .TP
 .B zctl sub message personal
 Subscribe to personal messages, but don't add this to the
@@ -160,6 +213,7 @@ Save all current subscriptions to the default subscriptions file.
 Set your exposure level to `none', effectively turning off Zephyr.
 .SH SEE ALSO
 zephyr(1), zwgc(1), zhm(8), zephyrd(8)
+gethostbyname(3)
 .br
 Project Athena Technical Plan Section E.4.1, `Zephyr Notification
 Service'
@@ -170,10 +224,12 @@ $HOME/.zephyr.subs
 .br
 $HOME/.zephyr.vars
 .SH AUTHOR
+.br
+/etc/athena/zephyr.vars
 .PP
 Robert S. French (MIT-Project Athena)
 .sp
-Copyright (c) 1987 by the Massachusetts Institute of Technology
+Copyright (c) 1987,1988 by the Massachusetts Institute of Technology
 .br
 See
 .I zephyr(1)
diff --git a/clients/zleave/zleave.1 b/clients/zleave/zleave.1
index f99eeb8..dfbb946 100644
--- a/clients/zleave/zleave.1
+++ b/clients/zleave/zleave.1
@@ -1,11 +1,14 @@
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
 .\" Copyright (c) 1980 Regents of the University of California.
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"
-.\"	@(#)zleave.1	6.2 (Berkeley) 5/7/86
 .\"
-.TH ZLEAVE 1 "August 6, 1987"
-.UC
+.TH ZLEAVE 1 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 zleave \- remind you when you have to leave
 .SH SYNOPSIS
@@ -30,7 +33,7 @@ hours (on a 12 or 24 hour clock).
 All times are converted to a 12 hour clock, and assumed to
 be in the next 12 hours.
 .PP
-If the time is preceeded by `+', the alarm will go off in hours and minutes
+If the time is preceded by `+', the alarm will go off in hours and minutes
 from the current time.
 .PP
 If no argument is given,
@@ -50,21 +53,28 @@ The
 option cancels the currently running \fIzleave\fR.  If another
 .I zleave
 is running, it is automatically killed when a new time to leave is
-set.  The process id is stored in the file /tmp/zleave.\fIuid\fR
+set.  The process id is stored in the file /tmp/zleave.\fIuid\fR, where
+\fIuid\fR is the user's UNIX uid.
 .PP
 .I Zleave
 automatically subscribes you to Zephyr class "MESSAGE",
-instance "LEAVE".  Therefore, you do not have to add anything to your
+instance "LEAVE".  You do not have to add anything to your
 default subscriptions file (see \fIzctl(1)\fR).
 .PP
-If Zephyr is unavailable, \fIzleave\fR beeps three times per reminder,
-and prints the reminder to the screen.
+If Zephyr is unavailable,
+.I zleave 
+acts essentially like 
+.I leave(1).
 .PP
-Zleave ignores interrupts, quits, and terminates.
+Zleave ignores SIGINT, SIGQUIT, and SIGTERM.
 To get rid of it you should either log off or use the
 .I cancel
 option.
 .SH FILES
-/tmp/zleave.\fIuid
+/tmp/zleave.\fIuid\fR
+/tmp/wg.*
 .SH SEE ALSO
-calendar(1), zephyr(1)
+calendar(1), zephyr(1), leave(1), zctl(1)
+.br
+Project Athena Technical Plan Section E.4.1, `Zephyr Notification
+Service'
diff --git a/clients/zlocate/zlocate.1 b/clients/zlocate/zlocate.1
index 180d312..0a397d4 100644
--- a/clients/zlocate/zlocate.1
+++ b/clients/zlocate/zlocate.1
@@ -1,11 +1,14 @@
-.\" Copyright 1987 by the Massachusetts Institute of Technology
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
+.\" Copyright 1987,1988 by the Massachusetts Institute of Technology
 .\" All rights reserved.  The file /usr/include/zephyr/mit-copyright.h
 .\" specifies the terms and conditions for redistribution.
 .\"
-.\"	@(#)zlocate.1	6.1 (MIT) 7/9/87
 .\"
-.TH ZLOCATE 1 "July 14, 1987"
-.UC 6
+.TH ZLOCATE 1 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 zlocate \- find a user
 .SH SYNOPSIS
@@ -22,16 +25,20 @@ the user is not logged in, or does not want to be found,
 .I zlocate
 prints "Hidden or not logged-in".  Otherwise, each machine that the
 user is currently logged into is printed, along with the time of
-login and tty.
+login and location.  The location is usually the X window system display
+name of the user's display, but may be the terminal name if he is not
+using X or for some other reason is only using the terminal interface to
+.I zwgc(1).
 .SH SEE ALSO
-zctl(1), zephyr(1), zhide(1), znol(1), zwgc(1), zhm(8), zephyrd(8)
+zctl(1), zephyr(1), znol(1), zwgc(1), zhm(8), zephyrd(8), X(1)
 .br
-`Zephyr Notification Service'
+Project Athena Technical Plan Section E.4.1, `Zephyr Notification
+Service'
 .SH AUTHOR
 .PP
 Robert S. French (MIT-Project Athena)
 .sp
-Copyright (c) 1987 by the Massachusetts Institute of Technology
+Copyright (c) 1987,1988 by the Massachusetts Institute of Technology
 .br
 See
 .I zephyr(1)
diff --git a/clients/znol/znol.1 b/clients/znol/znol.1
index 4133191..7f886a2 100644
--- a/clients/znol/znol.1
+++ b/clients/znol/znol.1
@@ -1,10 +1,15 @@
-.\" Copyright 1987 by the Massachusetts Institute of Technology
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
+.\" Copyright 1987,1988 by the Massachusetts Institute of Technology
 .\" All rights reserved.  The file /usr/include/zephyr/mit-copyright.h
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\"	@(#)znol.1	6.1 (MIT) 7/9/87
 .\"
-.TH ZNOL 1 "July 14, 1987"
+.TH ZNOL 1 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 znol \- notify on login or logout of interesting people
 .SH SYNOPSIS
@@ -20,12 +25,14 @@ znol \- notify on login or logout of interesting people
 ]
 .SH DESCRIPTION
 .I Znol
-provides a way for you to be notified when interesting people log in
+provides a way for you to be notified when "interesting" people log in
 or out.  It uses the
 .I Zephyr(1)
 Notification Service, which causes a message to appear on your screen
 for every person specified in a namelist (which defaults to
-$HOME/.anyone).  Anyone in the namelist who is logged in when
+$HOME/.anyone).  The namelist should have one login name per line.  Any
+line starting with `#' is considered a comment and ignored.
+Anyone in the namelist who is logged in when
 .I znol
 is executed is printed to stdout.  The control arguments are as
 follows:
@@ -60,12 +67,13 @@ $HOME/.anyone
 .SH SEE ALSO
 anyone(SIPB), nol(SIPB), zctl(1), zephyr(1), zwgc(1), zhm(8), zephyrd(8)
 .br
-`Zephyr Notification Service'
+Project Athena Technical Plan Section E.4.1, `Zephyr Notification
+Service'
 .SH AUTHOR
 .PP
 Robert S. French (MIT-Project Athena)
 .sp
-Copyright (c) 1987 by the Massachusetts Institute of Technology
+Copyright (c) 1987,1988 by the Massachusetts Institute of Technology
 .br
 See
 .I zephyr(1)
diff --git a/clients/zstat/zstat.8 b/clients/zstat/zstat.8
index 037f4ac..8d6c57f 100644
--- a/clients/zstat/zstat.8
+++ b/clients/zstat/zstat.8
@@ -1,11 +1,14 @@
-.\" Copyright 1987 by the Massachusetts Institute of Technology
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
+.\" Copyright 1987,1988 by the Massachusetts Institute of Technology
 .\" All rights reserved.  The file /usr/include/zephyr/mit-copyright.h
 .\" specifies the terms and conditions for redistribution.
 .\"
-.\"	@(#)zstat.8	6.1 (MIT) 7/9/87
 .\"
-.TH ZSTAT 8 "July 30, 1987"
-.UC 6
+.TH ZSTAT 8 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 zstat \- display Zephyr statistics
 .SH SYNOPSIS
@@ -19,10 +22,11 @@ zstat \- display Zephyr statistics
 ]
 .SH DESCRIPTION
 .I Zstat
-is used to display statistics about a HostManager,
+is used to display statistics reported by a HostManager,
 .I zhm(8),
-or Zephyr Server
-.I zephyrd(8).
+or a Zephyr Server
+.I zephyrd(8),
+or both.
 .TP 12
 .B \-h
 is used to indicate that only HostManager statistics should be displayed.
@@ -31,15 +35,18 @@ is used to indicate that only HostManager statistics should be displayed.
 is used to indicate that only server statistics should be displayed.
 .TP
 If no hosts are specified, the current host is assumed.
+When both HostManager and server statistics are displayed,
+statistics from the current server for each host are displayed.
 .SH SEE ALSO
-zctl(1), zephyr(1), zhide(1), znol(1), zwgc(1), zhm(8), zephyrd(8)
+zephyr(1), zhm(8), zephyrd(8)
 .br
-`Zephyr Notification Service'
+Project Athena Technical Plan Section E.4.1, `Zephyr Notification
+Service'
 .SH AUTHOR
 .PP
-Robert S. French (MIT-Project Athena)
+David C. Jedlinsky (MIT-Project Athena)
 .sp
-Copyright (c) 1987 by the Massachusetts Institute of Technology
+Copyright (c) 1987,1988 by the Massachusetts Institute of Technology
 .br
 See
 .I zephyr(1)
diff --git a/clients/zwrite/zwrite.1 b/clients/zwrite/zwrite.1
index 9a01473..55847fd 100644
--- a/clients/zwrite/zwrite.1
+++ b/clients/zwrite/zwrite.1
@@ -1,10 +1,14 @@
-.\" Copyright 1987 by the Massachusetts Institute of Technology
+.\"	$Source$
+.\"	$Author$
+.\"	$Header$
+.\"
+.\" Copyright 1987,1988 by the Massachusetts Institute of Technology
 .\" All rights reserved.  The file /usr/include/zephyr/mit-copyright.h
 .\" specifies the terms and conditions for redistribution.
 .\"
-.\"	@(#)zwrite.1	6.1 (MIT) 7/9/87
 .\"
-.TH ZWRITE 1 "February 6, 1988"
+.TH ZWRITE 1 "July 1, 1988" "MIT Project Athena"
+.ds ]W MIT Project Athena
 .SH NAME
 zwrite \- write to another user
 .SH SYNOPSIS
@@ -26,6 +30,8 @@ zwrite \- write to another user
 class ] [
 .BI -i
 instance ] [
+.BI -f
+arg ] [
 .BI user \ ...
 ] [
 .BI -m
@@ -47,13 +53,13 @@ understands the following options.
 Causes
 .I zwrite
 to send the message authenticated, using
-.I kerberos
+.I Kerberos
 to perform the authentication.  This is the default.
 .TP
 .B \-d
 Causes
 .I zwrite
-to send the message nonauthenticated.
+to send the message unauthenticated.
 .TP
 .B \-v
 Causes
@@ -77,7 +83,7 @@ Causes
 to ignore the Zephyr variables \fIzwrite-class\fR and \fIzwrite-inst\fR
 when picking a default class and instance.
 .TP
-.B \-c
+.B \-c \fIclass\fR
 Allows a user to specify a different class for the message.  This allows
 a message to be sent to a large group of people with some degree of
 security.  See
@@ -87,14 +93,34 @@ and
 for a description of how to restrict access to classes.  When this option
 is specified, the message is sent to recipient "*" unless an additional
 list of recipients is specified.
+.br
+This argument may not be used in conjunction with the -f option.
 .TP
-.B \-i
+.B \-i \fIinstance\fR
 Allows a user to specify a different instance than the default.
 When this option is used, the message is sent to recipient "*" unless an
 additional list of recipients is specified.  This allows a message to be
 sent to a large group of people (e.g. a development group) just by having
-the members group to messages of class "MESSAGE", the specified instance,
+the members subscribe to messages of class "MESSAGE", the specified instance,
 and recipient "*".
+.br
+This argument may not be used in conjunction with the -f option.
+.TP
+.B \-f \fIarg\fR
+Allows a user to specify an argument to be interpreted as a filesystem
+specification.  The class is set to \fBFILSRV\fR.  The instance is set
+to \fIarg\fR as modified:
+If \fIarg\fR contains no colons (`:'), it is assumed to
+be a host name, and it is converted into an official host name via 
+.I gethostbyname(3).
+If \fIarg\fR contains a colon, the portion preceding the colon is
+treated as a host name, and the colon and any trailing characters are
+appended to the offical host name returned by
+.I gethostbyname.
+If the name fails to resolve into an official host name, the instance is
+set to \fIarg\fR unmodified.
+.br
+This option may not be used in conjunction with the -c or -i option.
 .TP
 .B \-m
 .I Zwrite
@@ -109,20 +135,20 @@ by itself.
 The default class for messages is ``MESSAGE'', and the default instance
 is ``PERSONAL''.  These defaults can be changed by setting the Zephyr
 variables \fIzwrite-class\fR and \fIzwrite-inst\fR, respectively.
+.br
+Command-line options override the defaults.
 .PP
 If the Zephyr variable \fIzephyr-signature\fR is set, its contents are used
 to augment the user's username in the message. 
 .SH SEE ALSO
 kerberosintro(1), zctl(1), zephyr(1), zwgc(1), zhm(8), zephyrd(8)
+gethostbyname(3)
 .br
-`Zephyr Notification Service'
+Project Athena Technical Plan Section E.4.1, `Zephyr Notification
+Service'
 .SH AUTHOR
 .PP
 .br
 Robert S. French (MIT-Project Athena)
 .sp
-Copyright (c) 1987 by the Massachusetts Institute of Technology
-.br
-See
-.I zephyr(1)
-for a full copyright notice.
+Copyright (c) 1987,1988 by the Massachusetts Institute of Technology