Changeset 1538 for draft-ietf-httpbis/latest/p2-semantics.xml

Timestamp:

18/02/12 10:29:16 (10 years ago)

Author:

fielding@…

Message:

Move definitions of Transfer-Encoding and Content-Length to where
they are first used. Move other transfer encoding stuff (codings,
TE, and Trailers) to its own section. Moved text is unchanged.
Make Upgrade use protocol tokens instead of product tokens (WTF?)
and move product tokens to p2. Reduce protocol registry requirements.
Removed now-empty section on protocol parameters.

File:

• draft-ietf-httpbis/latest/p2-semantics.xml (modified) (6 diffs)

draft-ietf-httpbis/latest/p2-semantics.xml

@@ -72 +72 @@
   <!ENTITY media-types                "<xref target='Part3' x:rel='#media.types' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY message-body               "<xref target='Part1' x:rel='#message.body' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY product-tokens             "<xref target='Part1' x:rel='#product.tokens' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY media-type-message-http    "<xref target='Part1' x:rel='#internet.media.type.message.http' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY status-206                 "<xref target='Part5' x:rel='#status.206' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -386 +385 @@
   <x:anchor-alias value="comment"/>
   <x:anchor-alias value="partial-URI"/>
-  <x:anchor-alias value="product"/>
   <x:anchor-alias value="URI-reference"/>
 <t>
@@ -395 +393 @@
   <x:ref>comment</x:ref>       = &lt;comment, defined in &field-components;&gt;
   <x:ref>partial-URI</x:ref>   = &lt;partial-URI, defined in &uri;&gt;
-  <x:ref>product</x:ref>       = &lt;product, defined in &product-tokens;&gt;
   <x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in &uri;&gt;
 </artwork></figure>
@@ -2382 +2379 @@
 </section>
 
+<section title="Product Tokens" anchor="product.tokens">
+  <x:anchor-alias value="product"/>
+  <x:anchor-alias value="product-version"/>
+<t>
+   Product tokens are used to allow communicating applications to
+   identify themselves by software name and version. Most fields using
+   product tokens also allow sub-products which form a significant part
+   of the application to be listed, separated by whitespace. By
+   convention, the products are listed in order of their significance
+   for identifying the application.
+</t>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="product"/><iref primary="true" item="Grammar" subitem="product-version"/>
+  <x:ref>product</x:ref>         = <x:ref>token</x:ref> ["/" <x:ref>product-version</x:ref>]
+  <x:ref>product-version</x:ref> = <x:ref>token</x:ref>
+</artwork></figure>
+<t>
+   Examples:
+</t>
+<figure><artwork type="example">
+  User-Agent: CERN-LineMode/2.15 libwww/2.17b3
+  Server: Apache/0.8.4
+</artwork></figure>
+<t>
+   Product tokens &SHOULD; be short and to the point. They &MUST-NOT; be
+   used for advertising or other non-essential information. Although any
+   token octet &MAY; appear in a product-version, this token &SHOULD;
+   only be used for a version identifier (i.e., successive versions of
+   the same product &SHOULD; only differ in the product-version portion of
+   the product value).
+</t>
+</section>
+
 
 <section title="Header Field Definitions" anchor="header.field.definitions">
@@ -2765 +2794 @@
 </t>
 <t>
-   The field can contain multiple product tokens (&product-tokens;) and
+   The field can contain multiple
+   product tokens (<xref target="product.tokens"/>) and
    comments (&header-fields;) identifying the server and any significant
    subproducts. The product tokens are listed in order of their significance
@@ -2810 +2840 @@
 </t>
 <t>
-   The field can contain multiple product tokens (&product-tokens;)
+   The field can contain multiple
+   product tokens (<xref target="product.tokens"/>)
    and comments (&header-fields;) identifying the agent and its
    significant subproducts. By convention, the product tokens are listed in