fix: Use bib.ietf.org for citations (#799)

ietf-tools · Jun 21, 2022 · d5f8a1c · d5f8a1c
1 parent 79fd4d9
commit d5f8a1c
Show file tree

Hide file tree

Showing 19 changed files with 106 additions and 104 deletions.
diff --git a/tests/valid/draft-miek-test.v2v3.xml b/tests/valid/draft-miek-test.v2v3.xml
@@ -6,7 +6,7 @@
   <!ENTITY wj     "&#8288;">
 ]>
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" ipr="trust200902" category="info" docName="draft-gieben-writing-rfcs-pandoc-02" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" symRefs="true" sortRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.12.3 -->
+  <!-- xml2rfc v2v3 conversion 3.12.10 -->
   <!--generate a table of contents -->
    <!--use anchors instead of numbers for references -->
    <!--alphabetize the references -->
@@ -867,8 +867,8 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
     </references>
     <!--This document was prepared using Pandoc2rfc https://github.com/miekg/pandoc2rfc -->

diff --git a/tests/valid/draft-miek-test.v3add-xinclude.xml b/tests/valid/draft-miek-test.v3add-xinclude.xml
@@ -867,13 +867,13 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
       <references>
         <name>Informative References (by reference)</name>
         <!-- bibxml reference -->
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
         <reference anchor="ISO.8327.1990" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-misc/reference.ISO.8327.1990.xml">
 <front>
 <title>Information processing systems - Open Systems Interconnection - Basic connection oriented session protocol specification</title>

diff --git a/tests/valid/draft-template.v2v3.xml b/tests/valid/draft-template.v2v3.xml
@@ -35,7 +35,7 @@
 <?rfc multiple-initials="yes" ?>
 <!-- end of list of popular I-D processing instructions -->
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.12.1 -->
+  <!-- xml2rfc v2v3 conversion 3.12.10 -->
   <?v3xml2rfc silence=".*[Pp]ostal address" ?>
   <?v3xml2rfc silence="The document date .*? is more than 3 days away from today's date" ?>
   <?v3xml2rfc silence="Found SVG with width or height specified" ?>
@@ -451,7 +451,7 @@ main(int argc, char *argv[])
       <references>
         <name>Normative References</name>
         <!--?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml"?-->
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
         <reference anchor="min_ref">
           <!-- the following is the minimum to make xml2rfc happy -->
 
@@ -468,8 +468,8 @@ main(int argc, char *argv[])
         <name>Informative References</name>
         <!-- Here we use entities that we defined at the beginning. -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2629.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2629.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml"/>
         <xi:include href="https://datatracker.ietf.org/doc/bibxml3/draft-narten-iana-considerations-rfc2434bis.xml"/>
         <!-- Reference with query argument -->
       <reference anchor="JUPITER" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml?anchor=JUPITER">

diff --git a/tests/valid/draft-template.v3add-xinclude.xml b/tests/valid/draft-template.v3add-xinclude.xml
@@ -867,13 +867,13 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
       <references>
         <name>Informative References (by reference)</name>
         <!-- bibxml reference -->
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
         <reference anchor="ISO.8327.1990" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-misc/reference.ISO.8327.1990.xml">
 <front>
 <title>Information processing systems - Open Systems Interconnection - Basic connection oriented session protocol specification</title>

diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 16, 2022
+Internet-Draft                                             June 20, 2022
 Intended status: Experimental                                           
-Expires: December 18, 2022
+Expires: December 22, 2022
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 18, 2022.
+   This Internet-Draft will expire on December 22, 2022.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires December 18, 2022               [Page 1]
+Person                  Expires December 22, 2022               [Page 1]
 
 Internet-Draft             xml2rfc index tests                 June 2022
 
@@ -109,7 +109,7 @@ Index
 
 
 
-Person                  Expires December 18, 2022               [Page 2]
+Person                  Expires December 22, 2022               [Page 2]
 
 Internet-Draft             xml2rfc index tests                 June 2022
 
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                  Expires December 18, 2022               [Page 3]
+Person                  Expires December 22, 2022               [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-16T04:34:05" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-20T23:09:07" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.12.10 -->
 
 
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="16" month="06" year="2022"/>
+    <date day="20" month="06" year="2022"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 18 December 2022.
+        This Internet-Draft will expire on 22 December 2022.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">

diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 16, 2022
+Internet-Draft                                             June 20, 2022
 Intended status: Experimental                                           
-Expires: December 18, 2022
+Expires: December 22, 2022
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 18, 2022.
+   This Internet-Draft will expire on December 22, 2022.
 
 Copyright Notice
 

diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires December 18, 2022</td>
+<td class="center">Expires December 22, 2022</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">indexes-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2022-06-16" class="published">June 16, 2022</time>
+<time datetime="2022-06-20" class="published">June 20, 2022</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2022-12-18">December 18, 2022</time></dd>
+<dd class="expires"><time datetime="2022-12-22">December 22, 2022</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-status-of-this-memo">
         time. It is inappropriate to use Internet-Drafts as reference
         material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on December 18, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on December 22, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">

diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
@@ -1,5 +1,5 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                            16 June 2022
+                                                            20 June 2022
 
 
                   Xml2rfc Vocabulary Version 3 Schema