diff --git a/doc/Protocol-A.texi b/doc/Protocol-A.texi
index 000deecaee4dc1cf910364bb659f21cb0e28c3de..7ccf0ef298a87eb21865aa35fd8214aa18615b4d 100644
--- a/doc/Protocol-A.texi
+++ b/doc/Protocol-A.texi
@@ -1,5 +1,5 @@
 \input texinfo                         @c -*-texinfo-*-
-@c $Id: Protocol-A.texi,v 1.38 1998/10/11 17:38:40 jsk Exp $
+@c $Id: Protocol-A.texi,v 1.39 1998/10/14 20:40:45 ceder Exp $
 @c %**start of header
 @setfilename protocol-a.info
 @settitle LysKOM Protocol A
@@ -3170,7 +3170,8 @@ The conference type has the @code{secret} bit set, but the
 
 This call deletes the conference @code{conf} from the LysKOM
 database. Only privileged users and the supervisors of a conference may
-delete it. @b{[Is it possible to delete mailboxes?]}
+delete it. If the conference is a mailbox the corresponding person will
+also be deleted.
 
 @i{Example:}
 @example
@@ -3259,6 +3260,10 @@ This call retrieves the information associated with conference
 @code{conf-no} in the LysKOM server. This call should no longer be used;
 use call 91, @ref{get-conf-stat} instead.
 
+The @code{mask} argument determines if the name is returned or not.  If
+the lowest bit is 1 the name is returned, otherwise the empty string is
+returned instead of the name.
+
 
 @unnumberedsubsubsec Error codes
 
@@ -3818,7 +3823,9 @@ Login required before issuing this call.
 @end example
 
 This call has been replaced by @ref{mark-text} and @ref{unmark-text} and
-should no longer be used.
+should no longer be used.  This call can only set mark-type to a value
+in the range 1 to 255 (inclusive).  If markt-type is set to 0 the mark
+will be removed.
 
 @unnumberedsubsubsec Error codes
 
@@ -7158,7 +7165,7 @@ reject them if a client uses it as an argument to
 * async-new-name::             Conference or person changed name            (5)
 * async-i-am-on::              Client changed i-am-doing string             (6)
 * async-sync-db::              Server is saving the database                (7)
-* async-leave-conf::           Person has been removed from a conf while in (8)
+* async-leave-conf::           Person has been removed from a conference    (8)
 * async-login::                Someone has logged in                        (9)
 * async-broadcast::          O Broadcast message (obsolete)                (10)
 * async-rejected-connection::  LysKOM is full. Log out to make room.       (11)
@@ -7262,10 +7269,27 @@ difference between the two cases.
         async-leave-conf [8] ( conf-no    :   Conf-No );
 @end example
 
-This message is sent to a user if the user's membership in the working
-conference is forcefully revoked. The conference the user is being
+This message is sent to a user when the user's membership in the working
+conference is removed for any reason. The conference the user is being
 removed from is sent in @code{conf-no}.
 
+Earlier versions of the LysKOM Protocol A specifications stated that
+this message was only sent if the membership was "revoked forcefully".
+The exact meaning of that phrasing was never specified.  The lyskomd
+implementation has probably always followed the current version of the
+specification, which means that this message is sent whatever the reason
+for the removal is.
+
+Possible reasons include:
+@itemize @bullet
+@item The session issued a @code{@ref{sub-member}} call.
+@item Some other session issued a @code{@ref{sub-member}} call.
+@item The conference was deleted.
+@item The person was deleted.
+@end itemize
+
+This message is not sent if a membership is transformed from an active
+to a passive membership.
 
 
 @node async-login, async-broadcast, async-leave-conf, Asynchronous Messages