From 1addff47eb556474bb990f5f5cdebf624477c1c0 Mon Sep 17 00:00:00 2001 From: Per Cederqvist Date: Sun, 3 Sep 2000 22:27:23 +0000 Subject: [PATCH] (Predefined Aux-Item Types): Added lots of things that aux-items can be set on: cross-reference += letterbox redirect += letterbox x-face += letterbox, server alternate-name += letterbox mx-allow-filter += letterbox mx-reject-forward += letterbox allowed-content-type += letterbox, server Updated the description of the allowed-content-type aux item. --- doc/Protocol-A.texi | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/Protocol-A.texi b/doc/Protocol-A.texi index a79d3f28..ad270905 100644 --- a/doc/Protocol-A.texi +++ b/doc/Protocol-A.texi @@ -2,7 +2,7 @@ @c @c FIXME: Explain how the garb works with nice and keep-commented @c -@c $Id: Protocol-A.texi,v 1.98 2000/09/03 19:53:14 ceder Exp $ +@c $Id: Protocol-A.texi,v 1.99 2000/09/03 22:27:23 ceder Exp $ @c %**start of header @setfilename protocol-a.info @settitle LysKOM Protocol A @@ -856,7 +856,7 @@ An item of this type will never be inherited, can always be deleted, is never anonymous and is never secret. -@item cross-reference [3] (text, conference) +@item cross-reference [3] (text, conference, letterbox) Data is a cross-reference to something else. The contents consist of a letter, a number, and optionally a space and a descriptive text. The letter must be one @@ -911,7 +911,7 @@ The hide-creator, secret and inherit bits are automatically cleared. Once created an item of this type cannot be deleted. -@item redirect [8] (conference) +@item redirect [8] (conference, letterbox) This item indicates that texts should not be sent to the conference, but be directed to some other target instead. Clients should notify @@ -931,7 +931,7 @@ secret bits are cleared automatically. Only one redirect can be specified. -@item x-face [9] (conference) +@item x-face [9] (conference, letterbox, server) Data is the face of the person in compface format. Cool, innit? @@ -940,7 +940,7 @@ a mailbox, the person attached to the mailbox. The hide-creator and secret bits are cleared automatically. -@item alternate-name [10] (text, conference) +@item alternate-name [10] (text, conference, letterbox) Data is a string that the client may use as an alternate to the name of a conference or the subject of a text. Note that the server does not @@ -1107,13 +1107,13 @@ they appear in the message. Clients are encouraged to provide a command to display this information. -@item mx-allow-filter [25] (conference) +@item mx-allow-filter [25] (conference, letterbox) This aux-item has been declared obsolete. It was intended to supply the importer with information on how to filter incoming messages based on regular expressions matching header lines. -@item mx-reject-forward [26] (conference) +@item mx-reject-forward [26] (conference, letterbox) This aux-item has been declared obsolete. It was intended to supplement mx-allow-filter by telling where rejected mails should @@ -1167,22 +1167,26 @@ This is a recommendation only; it is up to the client that creates a new person to also add him to the conferences that are specified via @code{recommended-conf}. -@item allowed-content-type [30] (conference) - -@c FIXME: see comments to 5323623. +@item allowed-content-type [30] (conference, letterbox, server) Data is a non-negative decimal priority number, followed by a space, followed by a LysKOM content type glob pattern. Clients should send texts to a conference only if the content-type matches any of the -allowed-content-type glob patterns. +@code{allowed-content-type} glob patterns of that conference. + +If the conference doesn't have any @code{allowed-content-type}, the +@code{allowed-content-type} items of the server should be used. If the +server also has no @code{allowed-content-type} aux-items, it should be +interpreted as if a single @code{allowed-content-type} aux-item with the +value @samp{1 text/plain} exists. -If there are allowed-content-type aux-items with different priority -numbers, it is a hint to the client about which content-type is most -desirable. Content-types that matches a lower priority number are +If there are @code{allowed-content-type} aux-items with different +priority numbers, it is a hint to the client about which content-type is +most desirable. Content-types that matches a lower priority number are preferred. As an example, consider a conference with the following four -allowed-content-type aux-items: +@code{allowed-content-type} aux-items: @example 1 text/plain @@ -1191,14 +1195,11 @@ allowed-content-type aux-items: 3 text/* @end example -This means that text/plain is preferred, that x-kom/basic and -text/enriched can be used if there is a reason why text/plain is -inadequate, and that any text type (such as text/html) is acceptable. -Other content types, such as x-kom/user-area, should not be used. - -If no allowed-content-type aux-item exists, it should be interpreted as -if a single allowed-content-type aux-item with the value @samp{1 -text/plain} exists. +This means that @samp{text/plain} is preferred, that @samp{x-kom/basic} +and @samp{text/enriched} can be used if there is a reason why +@samp{text/plain} is inadequate, and that any text type (such as +@samp{text/html}) is acceptable. Other content types, such as +@samp{x-kom/user-area}, should not be used. The server does not currently enforce the above restriction on the content type of new texts. This mechanism is currently a hint to the -- GitLab