fix reference to X.690

draft-ymbk-sidrops-6486bis.xml

@@ -28,7 +28,7 @@
     <address>
       <postal>
         <street>6 Cordelia St</street>
-      	<city>South Brisbane</street>
+        <city>South Brisbane</city>
         <code>QLD 4101</code>
         <country>Australia</country>
       </postal>
@@ -38,12 +38,13 @@
 
   <author fullname="Stephen Kent" initials="S." surname="Kent">
     <organization >Independent</organization>
+    <address>
      <email>kkent@alum.mit.edu</email>
     </address>
   </author>
 
   <author fullname="Matt Lepinski" initials="M." surname="Lepinski">
-    <organization abbrev"NCF">New College Florida</organization>
+    <organization>New College Florida</organization>
     <address>
       <postal>
         <street>5800 Bay Shore Rd.</street>
@@ -129,8 +130,6 @@
       Origination Authorizations (ROAs).
     </t>
 
-  </section>
-
     <section title="Requirements Language">
 
       <t>
@@ -145,6 +144,8 @@
 
     </section>
 
+  </section>
+
   <section title="Manifest Scope" anchor="sect-2">
 
     <t>
@@ -238,7 +239,8 @@
       </t>
 
       <figure>
-	<artwork><![CDATA[
+        <artwork>
+          <![CDATA[
       id-smime OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840)
                                 rsadsi(113549) pkcs(1) pkcs9(9) 16 }
 
@@ -254,12 +256,13 @@
       
       <t>
         The content of a manifest is ASN.1 encoded using the
-        Distinguished Encoding Rules (DER) [X.690].  The content of a
+        Distinguished Encoding Rules (DER) <xref target="X.690"/>.  The
-        manifest is defined as follows:
+        content of a manifest is defined as follows:
       </t>
 
       <figure>
-	<artwork><![CDATA[
+        <artwork>
+          <![CDATA[
        Manifest ::= SEQUENCE {
         version     [0] INTEGER DEFAULT 0,
         manifestNumber  INTEGER (0..MAX),
@@ -652,10 +655,14 @@
             entries SHOULD be disregarded in the context of this
             manifest.  If there is no other current manifest that
             describes these objects within that other manifest's scope,
-	    then see <xref target="sect-6.2"/>.<list style="hanging"
+            then see <xref target="sect-6.2"/>.
-	    hangIndent="3"><t hangText="For each signed object, if all
+
-	    of the following conditions hold:">
+            <list style="hanging" hangIndent="3">
+
+              <t hangText="For each signed object, if all of the following
+                 conditions hold:">
                  <vspace blankLines="0"/>
+
                  <list style="symbols">
 
                    <t>
@@ -668,10 +675,10 @@
                    </t>
 
                    <t>
-		the manifests for every certificate on the certification
+                     the manifests for every certificate on the
-		path used to validate the signed object and the
+                     certification path used to validate the signed
-		associated publication points pass all of the above
+                     object and the associated publication points pass
-		checks;
+                     all of the above checks;
                    </t>
 
                  </list>
@@ -679,6 +686,7 @@
 
             </list>
           </t>
+
         </list>
       </t>
 
@@ -1013,7 +1021,7 @@
         <![CDATA[
         Name: Manifest
         OID: 1.2.840.113549.1.9.16.1.26
-	Reference: [RFC6486] (this document)
+        Reference: [TBD] (this document)
         ]]>
       </artwork>
     </figure>
@@ -1054,32 +1062,38 @@
 <back>
   
   <references title="Normative References">
-    <?rfc include="reference.RFC2119;
+    <?rfc include="reference.RFC.2119"?>
-    <?rfc include="reference.RFC5280;
+    <?rfc include="reference.RFC.5280"?>
-    <?rfc include="reference.RFC6481;
+    <?rfc include="reference.RFC.6481"?>
-    <?rfc include="reference.RFC6485;
+    <?rfc include="reference.RFC.6485"?>
-    <?rfc include="reference.RFC6487;
+    <?rfc include="reference.RFC.6487"?>
-    <?rfc include="reference.RFC6488;
+    <?rfc include="reference.RFC.6488"?>
-    <reference>
+    <?rfc include="reference.RFC.8174"?>
+    <reference anchor="X.690">
     <front>
+    <title>ASN.1 encoding rules: Specification of basic encoding Rules (BER), Canonical encoding rules (CER) and Distinguished encoding rules (DER)</title>
+    <author>
+      <organization>International International Telephone and Telegraph Consultative Committee</organization>
+     </author>
+    <date month="July" year="2002" />
+    </front>
+    <seriesInfo name="CCITT" value="Recommendation X.690" />
+    </reference>
         <!--
-   rfc6486.xml.txt(910): Warning: Failed parsing a reference.  Are all elements
+   <reference>
-   separated by commas (not periods, not just spaces)?:
    [X.690]   ITU-T Recommendation X.690 (2002) | ISO/IEC 8825-1:2002,
              Information technology - ASN.1 encoding rules:
              Specification of Basic Encoding Rules (BER), Canonical
              Encoding Rules (CER) and Distinguished Encoding Rules
              (DER).
         -->
-    </front>
+  </references>
-
-  </reference>
 
   <references title="Informative References">
-    <?rfc include="reference.RFC3370;
+    <?rfc include="reference.RFC.3370"?>
-    <?rfc include="reference.RFC3779;
+    <?rfc include="reference.RFC.3779"?>
-    <?rfc include="reference.RFC6480;
+    <?rfc include="reference.RFC.6480"?>
-    <?rfc include="reference.RFC6489;
+    <?rfc include="reference.RFC.6489"?>
     </references>
 
   <section title="ASN.1 Module" anchor="sect-a">
@@ -1089,13 +1103,7 @@
         <![CDATA[
         RPKIManifest { iso(1) member-body(2) us(840) rsadsi(113549)
                        pkcs(1) pkcs9(9) smime(16) mod(0) 60 }
-      ]]>
-    </artwork>
-  </figure>
 
-  <figure>
-    <artwork>
-      <![CDATA[
         DEFINITIONS EXPLICIT TAGS ::=
 
         BEGIN
@@ -1138,4 +1146,3 @@
 </back>
 
 </rfc>
-