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

Timestamp:

13/11/08 22:27:55 (14 years ago)

Author:

julian.reschke@…

Message:

Resolve #34: update to current URI spec, get rid of discussion of URI history (closes #34)

File:

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

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

@@ -24 +24 @@
   <!ENTITY notation-abnf              "<xref target='Part1' x:rel='#notation.abnf' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY basic-rules                "<xref target='Part1' x:rel='#basic.rules' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY general-syntax             "<xref target='Part1' x:rel='#general.syntax' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY uri                        "<xref target='Part1' x:rel='#uri' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY full-date                  "<xref target='Part1' x:rel='#full.date' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -313 +312 @@
 </artwork></figure>
 <t anchor="abnf.dependencies">
-  <x:anchor-alias value="absoluteURI"/>
+  <x:anchor-alias value="absolute-URI"/>
   <x:anchor-alias value="Accept"/>
   <x:anchor-alias value="Accept-Charset"/>
@@ -341 +340 @@
 </t>
 <figure><!--Part1--><artwork type="abnf2616">
-  <x:ref>absoluteURI</x:ref>   = &lt;absoluteURI, defined in &general-syntax;&gt;
-  <x:ref>fragment</x:ref>      = &lt;fragment, defined in &general-syntax;&gt;
-  <x:ref>Host</x:ref>          = &lt;Host, defined in &header-host;&gt;
+  <x:ref>absolute-URI</x:ref>  = &lt;absolute-URI, defined in &uri;&gt;
+  <x:ref>fragment</x:ref>      = &lt;fragment, defined in &uri;&gt;
+  <x:ref>Host</x:ref>          = &lt;Host, defined in &uri;&gt;
   <x:ref>HTTP-date</x:ref>     = &lt;HTTP-date, defined in &full-date;&gt;
   <x:ref>product</x:ref>       = &lt;product, defined in &product-tokens;&gt;
-  <x:ref>relativeURI</x:ref>   = &lt;relativeURI, defined in &general-syntax;&gt;
+  <x:ref>relativeURI</x:ref>   = &lt;relativeURI, defined in &uri;&gt;
   <x:ref>TE</x:ref>            = &lt;TE, defined in &header-te;&gt;
 </artwork></figure>
@@ -748 +747 @@
    The Max-Forwards request-header field &MAY; be used to target a
    specific proxy in the request chain. When a proxy receives an OPTIONS
-   request on an absoluteURI for which request forwarding is permitted,
+   request on an absolute-URI for which request forwarding is permitted,
    the proxy &MUST; check for a Max-Forwards field. If the Max-Forwards
    field-value is zero ("0"), the proxy &MUST-NOT; forward the message;
@@ -1948 +1947 @@
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Location"/><iref primary="true" item="Grammar" subitem="Location-v"/>
   <x:ref>Location</x:ref>       = "Location" ":" <x:ref>OWS</x:ref> <x:ref>Location-v</x:ref>
-  <x:ref>Location-v</x:ref>     = <x:ref>absoluteURI</x:ref> [ "#" <x:ref>fragment</x:ref> ]
+  <x:ref>Location-v</x:ref>     = <x:ref>absolute-URI</x:ref> [ "#" <x:ref>fragment</x:ref> ]
 </artwork></figure>
 <t>
@@ -2030 +2029 @@
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Referer"/><iref primary="true" item="Grammar" subitem="Referer-v"/>
   <x:ref>Referer</x:ref>        = "Referer" ":" <x:ref>OWS</x:ref> <x:ref>Referer-v</x:ref>
-  <x:ref>Referer-v</x:ref>      = <x:ref>absoluteURI</x:ref> / <x:ref>relativeURI</x:ref>
+  <x:ref>Referer-v</x:ref>      = <x:ref>absolute-URI</x:ref> / <x:ref>relativeURI</x:ref>
 </artwork></figure>
 <t>