--- a/ReSpec.js/bibref/biblio.js	Wed May 25 11:08:54 2011 +0100
+++ b/ReSpec.js/bibref/biblio.js	Wed May 25 11:21:24 2011 +0100
@@ -1,10 +1,10 @@
 berjon.biblio = {
 
 // @@@ These are temporary local additions for rdf-concepts; they should be either removed (many are obsolete) or added to the global file in CVS
-   "RFC-2279" : "<a href=\"http://www.isi.edu/in-notes/rfc2279.txt\"><cite>RFC 2279 - UTF-8, a transformation format of ISO 10646</cide></a>, F. Yergeau, IETF, January 1998. This document is http://www.isi.edu/in-notes/rfc2279.txt",
-   "RFC-2396" : "<a href=\"http://www.isi.edu/in-notes/rfc2396.txt\"><cite>RFC 2396 - Uniform Resource Identifiers (URI): Generic Syntax</cite></a>, T. Berners-Lee, R. Fielding and L. Masinter, IETF, August 1998. This document is http://www.isi.edu/in-notes/rfc2396.txt",
-   "RFC-2732" : "<a href=\"http://www.isi.edu/in-notes/rfc2732.txt\"><cite>RFC 2732 - Format for Literal IPv6 Addresses in URL's</cite></a>, R. Hinden, B. Carpenter and L. Masinter, IETF, December 1999. This document is http://www.isi.edu/in-notes/rfc2732.txt",
-   "RFC-3066" : "<a href=\"http://www.isi.edu/in-notes/rfc3066.txt\"><cite>RFC 3066 - Tags for the Identification of Languages</cite></a>, H.  Alvestrand, IETF, January 2001. This document is http://www.isi.edu/in-notes/rfc3066.txt",
+   "RFC2279" : "<a href=\"http://www.isi.edu/in-notes/rfc2279.txt\"><cite>RFC 2279 - UTF-8, a transformation format of ISO 10646</cide></a>, F. Yergeau, IETF, January 1998. This document is http://www.isi.edu/in-notes/rfc2279.txt",
+   "RFC2396" : "<a href=\"http://www.isi.edu/in-notes/rfc2396.txt\"><cite>RFC 2396 - Uniform Resource Identifiers (URI): Generic Syntax</cite></a>, T. Berners-Lee, R. Fielding and L. Masinter, IETF, August 1998. This document is http://www.isi.edu/in-notes/rfc2396.txt",
+   "RFC2732" : "<a href=\"http://www.isi.edu/in-notes/rfc2732.txt\"><cite>RFC 2732 - Format for Literal IPv6 Addresses in URL's</cite></a>, R. Hinden, B. Carpenter and L. Masinter, IETF, December 1999. This document is http://www.isi.edu/in-notes/rfc2732.txt",
+   "RFC3066" : "<a href=\"http://www.isi.edu/in-notes/rfc3066.txt\"><cite>RFC 3066 - Tags for the Identification of Languages</cite></a>, H.  Alvestrand, IETF, January 2001. This document is http://www.isi.edu/in-notes/rfc3066.txt",
    "IRI-DRAFT" : "<a href=\"http://www.w3.org/International/iri-edit/draft-duerst-iri-04\"><cite>Internationalized Resource Identifiers (IRIs)</cite></a>,  M. D&uuml;rst and M. Suignard, Internet-Draft, June 2003, expires December 2003. This document is http://www.w3.org/International/iri-edit/draft-duerst-iri-04",
    "TAG" : "<a href=\"http://www.w3.org/2001/tag/issues\"><cite>TAG Issues List</cite></a>,  W3C Technical Architecture Group. This document is http://www.w3.org/2001/tag/issues",
    "RDF-MIME-TYPE" : "<a href=\"http://www.iana.org/assignments/media-types/\"><cite>MIME Media Types</cite></a>, The Internet Assigned Numbers Authority (IANA). This document is http://www.iana.org/assignments/media-types/ .  The <a href=\"http://www.w3.org/2001/sw/RDFCore/mediatype-registration\">registration for <code>application/rdf+xml</code></a> is archived at http://www.w3.org/2001/sw/RDFCore/mediatype-registration .",

--- a/index.html	Wed May 25 11:08:54 2011 +0100
+++ b/index.html	Wed May 25 11:21:24 2011 +0100
@@ -101,8 +101,7 @@
           // This is important for Rec-track documents, do not copy a patent URI from a random
           // document unless you know what you're doing. If in doubt ask your friendly neighbourhood
           // Team Contact.
-// @@@
-          wgPatentURI:  "",
+          wgPatentURI:  "http://www.w3.org/2004/01/pp-impl/46168/status",
 
           // if this parameter is set to true, ReSpec.js will embed various RDFa attributes
           // throughout the generated specification. The triples generated use vocabulary items
@@ -397,7 +396,7 @@
     title="URI reference">URI reference</a>, or <dfn><abbr>
     URIref</abbr></dfn>), a literal,
     or blank (having no separate form of identification).
-    Properties are <cite>URI references</cite>. (See [[!RFC-2396]],
+    Properties are <cite>URI references</cite>. (See [[!RFC2396]],
     section 4, for a description of URI
     reference forms, noting that relative URIs are not used in an
     RDF graph. See also <a href="#section-Graph-URIref">section
@@ -671,6 +670,15 @@
 </section>
 
 
+<section id="section-conformance">
+    <h2>Conformance (Normative)</h2>
+
+    <p>In this specification, all sections not explicitly marked as normative are non-normative.</p>
+
+    <p>The keywords MUST, MUST NOT, REQUIRED, SHOULD, SHOULD NOT, RECOMMENDED, MAY, and OPTIONAL in this specification are to be interpreted as described in [[!RFC2119]] where they appear in uppercase.</p>
+</section>
+
+
 <section id="section-URIspaces">
     <h2>RDF Vocabulary URI and Namespace (Normative)</h2>
 
@@ -823,7 +831,7 @@
 [[!XML10]];
 </li>
 <li>for which encoding as UTF-8 
-[[!RFC-2279]] yields 
+[[!RFC2279]] yields 
 <a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/#def-exclusive-canonical-XML">
 exclusive
 Canonical XML </a> (with comments, with empty  
@@ -985,7 +993,7 @@
 </li>
 <li>and
         would produce a 
-valid URI character sequence (per RFC2396 [[!RFC-2396]], sections 2.1)
+valid URI character sequence (per RFC2396 [[!RFC2396]], sections 2.1)
 representing an absolute URI with optional 
 fragment identifier
  when subjected to the encoding described below. 
@@ -996,7 +1004,7 @@
 </p>
 <ol>
 <li>encoding the Unicode string as UTF-8
-[[!RFC-2279]], giving a sequence of octet values.
+[[!RFC2279]], giving a sequence of octet values.
 </li>
 <li>
 %-escaping octets that do not correspond to permitted US-ASCII characters.
@@ -1005,8 +1013,8 @@
 <p>
 The disallowed octets that must be %-escaped include all those that do not 
 correspond to US-ASCII characters, and the excluded characters listed in 
-Section 2.4 of [[!RFC-2396]], except for the number sign (#), percent sign (%), 
-and the square bracket characters re-allowed in [[!RFC-2732]].
+Section 2.4 of [[!RFC2396]], except for the number sign (#), percent sign (%), 
+and the square bracket characters re-allowed in [[!RFC2732]].
 </p>
 <p>
 Disallowed octets MUST be escaped with the URI escaping mechanism (that is, converted to %HH, 
@@ -1062,7 +1070,7 @@
 <p><dfn title="plain literal">Plain literals</dfn> have 
  a <a>lexical form</a> and optionally a 
 <dfn>language tag</dfn> as
-defined by [[!RFC-3066]], normalized to lowercase.</p>
+defined by [[!RFC3066]], normalized to lowercase.</p>
 
     <p><dfn title="typed literal">Typed literals</dfn> have a <a>lexical form</a>
     and a <dfn>datatype URI</dfn> being an <a title="URI reference">RDF URI reference</a>.</p>
@@ -1191,7 +1199,7 @@
 
     <p>RDF uses an <a title="URI reference">RDF URI
     Reference</a>, which may include a fragment identifier, as a
-    context free identifier for a resource. RFC 2396 [[!RFC-2396]] states that the meaning of a fragment
+    context free identifier for a resource. RFC 2396 [[!RFC2396]] states that the meaning of a fragment
     identifier depends on the MIME content-type of a document, i.e.
     is context dependent.</p>
     <p>These apparently conflicting views are reconciled by
@@ -1438,6 +1446,7 @@
   <h2>Changes since First Edition</h2>
 
   <ul>
+    <li>2011-05-25: Added Conformance section with RFC2119 reference</li>
     <li>2011-05-25: Updated all W3C references to latest editions, and Unicode from v3 to v4</li>
     <li>2011-05-24: Converted to ReSpec, changed metadata to reflect RDF 1.1</li>
   </ul>