diff -Nru xml2rfc-3.19.4/CHANGELOG.md xml2rfc-3.20.0/CHANGELOG.md
--- xml2rfc-3.19.4/CHANGELOG.md	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/CHANGELOG.md	2024-02-21 22:48:18.000000000 +0000
@@ -5,6 +5,19 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v3.19.4] - 2024-02-06
+
+### :bug: Bug Fixes
+- [`f319275`](https://github.com/ietf-tools/xml2rfc/commit/f319275b97bf9c0223d7b298404d7c00eb3b16cb) - revert: #1089 (Treat referencegroup entries similarly to reference entries) *(PR #1098 by @kesara)*
+  - :arrow_lower_right: *fixes issue #1097 opened by @ajeanmahoney*
+
+### :construction_worker: Build System
+- [`8125806`](https://github.com/ietf-tools/xml2rfc/commit/8125806f3764ffcbb3bffb68111022d913870765) - Add revert to version bump list. *(commit by [@kesara](https://github.com/kesara))*
+
+### :memo: Documentation Changes
+- [`4cdfbbf`](https://github.com/ietf-tools/xml2rfc/commit/4cdfbbfd691736ce81edbd6c676528062e84e4f5) - update CHANGELOG.md + py file versions for v3.19.3 [skip ci] *(commit by [@kesara](https://github.com/kesara))*
+
+
 ## [v3.19.3] - 2024-02-04
 ### :bug: Bug Fixes
 - [`1652d99`](https://github.com/ietf-tools/xml2rfc/commit/1652d99054928f9b218079db6788a2b5d0aa328a) - Silently pass when weasyprint is not installed *(PR [#1092](https://github.com/ietf-tools/xml2rfc/pull/1092) by [@kesara](https://github.com/kesara))*
@@ -2170,4 +2183,5 @@
 [v3.19.0]: https://github.com/ietf-tools/xml2rfc/compare/v3.18.2...v3.19.0
 [v3.19.1]: https://github.com/ietf-tools/xml2rfc/compare/v3.19.0...v3.19.1
 [v3.19.2]: https://github.com/ietf-tools/xml2rfc/compare/v3.19.1...v3.19.2
-[v3.19.3]: https://github.com/ietf-tools/xml2rfc/compare/v3.19.2...v3.19.3
\ No newline at end of file
+[v3.19.3]: https://github.com/ietf-tools/xml2rfc/compare/v3.19.2...v3.19.3
+[v3.19.4]: https://github.com/ietf-tools/xml2rfc/compare/v3.19.3...v3.19.4
diff -Nru xml2rfc-3.19.4/PKG-INFO xml2rfc-3.20.0/PKG-INFO
--- xml2rfc-3.19.4/PKG-INFO	2024-02-06 22:37:17.850702800 +0000
+++ xml2rfc-3.20.0/PKG-INFO	2024-02-21 22:48:53.622041200 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xml2rfc
-Version: 3.19.4
+Version: 3.20.0
 Summary: xml2rfc generates RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies.
 Home-page: https://github.com/ietf-tools/xml2rfc
 Download-URL: https://github.com/ietf-tools/xml2rfc/releases
diff -Nru xml2rfc-3.19.4/debian/changelog xml2rfc-3.20.0/debian/changelog
--- xml2rfc-3.19.4/debian/changelog	2024-02-07 15:18:31.000000000 +0000
+++ xml2rfc-3.20.0/debian/changelog	2024-02-26 14:09:17.000000000 +0000
@@ -1,3 +1,10 @@
+xml2rfc (3.20.0-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refresh patches
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 26 Feb 2024 09:09:17 -0500
+
 xml2rfc (3.19.4-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru xml2rfc-3.19.4/debian/patches/0002-Work-around-upstream-957.patch xml2rfc-3.20.0/debian/patches/0002-Work-around-upstream-957.patch
--- xml2rfc-3.19.4/debian/patches/0002-Work-around-upstream-957.patch	2024-02-07 15:17:18.000000000 +0000
+++ xml2rfc-3.20.0/debian/patches/0002-Work-around-upstream-957.patch	2024-02-26 14:09:17.000000000 +0000
@@ -16,10 +16,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/test.py b/test.py
-index c809e01..6b21f13 100644
+index 5086480..c812936 100644
 --- a/test.py
 +++ b/test.py
-@@ -507,7 +507,8 @@ class PdfWriterTests(unittest.TestCase):
+@@ -508,7 +508,8 @@ class PdfWriterTests(unittest.TestCase):
          for e in self.root.xpath('./middle//*'):
              if e.text and e.text.strip() and e.tag not in xml2rfc.util.unicode.unicode_content_tags and not xml2rfc.util.unicode.is_svg(e):
                  t =  norm(e.text.split(None, 1)[0])
diff -Nru xml2rfc-3.19.4/test.py xml2rfc-3.20.0/test.py
--- xml2rfc-3.19.4/test.py	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/test.py	2024-02-21 22:48:18.000000000 +0000
@@ -11,6 +11,7 @@
 from xml2rfc.boilerplate_rfc_7841 import boilerplate_rfc_status_of_memo
 from xml2rfc.walkpdf import xmldoc
 from xml2rfc.writers.base import default_options
+from xml2rfc.writers.text import MAX_WIDTH
 
 try:
     from xml2rfc import debug
@@ -635,6 +636,67 @@
         target = 'https://www.rfc-editor.org/info/rfc9280'
         self.assertEqual(target, rfc.xpath('./section/t/eref')[0].get('target'))
 
+class TextWriterTest(unittest.TestCase):
+    '''TextWriter tests'''
+
+    def setUp(self):
+        xml2rfc.log.quiet = True
+        path = 'tests/input/elements.xml'
+        self.parser = xml2rfc.XmlRfcParser(path,
+                                           quiet=True,
+                                           options=default_options,
+                                           **options_for_xmlrfcparser)
+        self.xmlrfc = self.parser.parse()
+        self.writer = xml2rfc.TextWriter(self.xmlrfc, quiet=True)
+
+    def test_render_reference(self):
+        # test annotations
+        reference = '''
+<references>
+  <reference anchor="REFTEST">
+    <front>
+      <title>Reference Test</title>
+      <author initials="J." surname="Doe" fullname="Jane Doe">
+        <organization>ACMI Corp.</organization>
+      </author>
+      <date month="February" year="2024"/>
+    </front>
+    <annotation>{annotation}</annotation>
+  </reference>
+</references>'''
+        self.writer.refname_mapping['REFTEST'] = 'REFTEST'
+
+        # single line annotation
+        annotation = 'foobar'
+        references = lxml.etree.fromstring(reference.format(annotation=annotation))
+        lines = self.writer.render_reference(references.getchildren()[0], width=60)
+        self.assertEqual(len(lines), 1)
+        self.assertIn(annotation, lines[0].text)
+
+        # multi line annotation
+        annotation = '''Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.
+               Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim.'''
+        references = lxml.etree.fromstring(reference.format(annotation=annotation))
+        lines = self.writer.render_reference(references.getchildren()[0], width=60)
+        self.assertGreater(len(lines), 1)
+        self.assertIn(annotation[:5], lines[0].text)
+
+        # single line annotation (larger than width and smaller than MAX_WIDTH)
+        annotation = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commo'
+        references = lxml.etree.fromstring(reference.format(annotation=annotation))
+        lines = self.writer.render_reference(references.getchildren()[0], width=len(annotation)-5)
+        self.assertGreater(MAX_WIDTH, len(annotation))
+        self.assertGreater(len(lines), 1)
+        self.assertIn(annotation[:5], lines[0].text)
+
+        # annotation with URL
+        url = 'https://example.org'
+        annotation = f'Example: <eref target="{url}" />'
+        references = lxml.etree.fromstring(reference.format(annotation=annotation))
+        lines = self.writer.render_reference(references.getchildren()[0], width=60)
+        self.assertEqual(len(lines), 2)
+        self.assertIn(url, lines[1].text)
+
 
 if __name__ == '__main__':
     unittest.main()
diff -Nru xml2rfc-3.19.4/tests/valid/docfile.html xml2rfc-3.20.0/tests/valid/docfile.html
--- xml2rfc-3.19.4/tests/valid/docfile.html	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/docfile.html	2024-02-21 22:48:18.000000000 +0000
@@ -4,15 +4,15 @@
 <meta charset="utf-8">
 <meta content="Cherokee,Common,Greek,Latin" name="scripts">
 <meta content="initial-scale=1.0" name="viewport">
-<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.19.3</title>
+<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.19.4</title>
 <meta content="xml2rfc(1)" name="author">
 <meta content="
        
        This document provides information about the XML schema implemented in this release of xml2rfc, and the individual elements of that schema.  The document is generated from the RNG schema file that is part of the xml2rfc distribution, so schema information in this document should always be in sync with the schema in actual use.  The textual descriptions depend on manual updates in order to reflect the implementation.
        
     " name="description">
-<meta content="xml2rfc 3.19.3" name="generator">
-<meta content="xml2rfc-docs-3.19.3" name="ietf.draft">
+<meta content="xml2rfc 3.19.4" name="generator">
+<meta content="xml2rfc-docs-3.19.4" name="ietf.draft">
 <link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
 <link href="xml2rfc.css" rel="stylesheet">
@@ -39,7 +39,7 @@
 <dd class="workgroup">xml2rfc(1)</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2024-02-06" class="published">6 February 2024</time>
+<time datetime="2024-02-19" class="published">19 February 2024</time>
     </dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
@@ -49,7 +49,7 @@
 </dd>
 </dl>
 </div>
-<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.19.3</h1>
+<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.19.4</h1>
 <section id="section-abstract">
       <h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
 <p id="section-abstract-1">
@@ -371,7 +371,7 @@
 <p id="section-1-5">
        The latest version of this documentation is available in HTML form at <span><a href="https://ietf-tools.github.io/xml2rfc/">https://ietf-tools.github.io/xml2rfc/</a></span>.<a href="#section-1-5" class="pilcrow">¶</a></p>
 <p id="section-1-6">
-            This documentation applies to xml2rfc version 3.19.3.<a href="#section-1-6" class="pilcrow">¶</a></p>
+            This documentation applies to xml2rfc version 3.19.4.<a href="#section-1-6" class="pilcrow">¶</a></p>
 </section>
 <section id="section-2">
       <h2 id="name-schema-version-3-elements">
@@ -4225,11 +4225,12 @@
 <dl class="references">
 <dt id="BCP14">[BCP14]</dt>
       <dd>
+<div class="refInstance">Best Current Practice 14, <span>&lt;<a href="https://www.rfc-editor.org/bcp/bcp14.txt">https://www.rfc-editor.org/bcp/bcp14.txt</a>&gt;</span>.<br><span>At the time of writing, this BCP comprises the following:</span>
+</div>
 <div class="refInstance" id="RFC2119">
-          <span class="refAuthor">Bradner, S.</span>, <span class="refTitle">"Key words for use in RFCs to Indicate Requirement Levels"</span>, <span class="seriesInfo">BCP 14</span>, <span class="seriesInfo">RFC 2119</span>, <time datetime="1997-03" class="refDate">March 1997</time>. </div>
+          <span class="refAuthor">Bradner, S.</span>, <span class="refTitle">"Key words for use in RFCs to Indicate Requirement Levels"</span>, <span class="seriesInfo">BCP 14</span>, <span class="seriesInfo">RFC 2119</span>, <span class="seriesInfo">DOI 10.17487/RFC2119</span>, <time datetime="1997-03" class="refDate">March 1997</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc2119">https://www.rfc-editor.org/info/rfc2119</a>&gt;</span>. </div>
 <div class="refInstance" id="RFC8174">
-          <span class="refAuthor">Leiba, B.</span>, <span class="refTitle">"Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words"</span>, <span class="seriesInfo">BCP 14</span>, <span class="seriesInfo">RFC 8174</span>, <time datetime="2017-05" class="refDate">May 2017</time>. </div>
-<span>&lt;<a href="https://www.rfc-editor.org/bcp/bcp14.txt">https://www.rfc-editor.org/bcp/bcp14.txt</a>&gt;</span>
+          <span class="refAuthor">Leiba, B.</span>, <span class="refTitle">"Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words"</span>, <span class="seriesInfo">BCP 14</span>, <span class="seriesInfo">RFC 8174</span>, <span class="seriesInfo">DOI 10.17487/RFC8174</span>, <time datetime="2017-05" class="refDate">May 2017</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc8174">https://www.rfc-editor.org/info/rfc8174</a>&gt;</span>. </div>
 </dd>
 <dd class="break"></dd>
 <dt id="IDGUIDE">[IDGUIDE]</dt>
@@ -6366,7 +6367,7 @@
 <p id="appendix-D-1">
 
             The following variables are available for use in an xml2rfc
-            manpage Jinja2 template, as of xml2rfc version 3.19.3:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
+            manpage Jinja2 template, as of xml2rfc version 3.19.4:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
 <span class="break"></span><dl class="dlNewline" id="appendix-D-2">
         <dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
         <dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>
diff -Nru xml2rfc-3.19.4/tests/valid/draft-miek-test.html xml2rfc-3.20.0/tests/valid/draft-miek-test.html
--- xml2rfc-3.19.4/tests/valid/draft-miek-test.html	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/draft-miek-test.html	2024-02-21 22:48:18.000000000 +0000
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 3.19.3" name="generator">
+<meta content="xml2rfc 3.19.4" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -26,7 +26,7 @@
 <meta content="Extensible Markup Language" name="keyword">
 <meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.19.3
+  xml2rfc 3.19.4
     Python 3.11.7
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
@@ -470,6 +470,10 @@
   margin-bottom: 1.25em;
 }
 
+.refSubseries {
+  margin-bottom: 1.25em;
+}
+
 .references .ascii {
   margin-bottom: 0.25em;
 }
diff -Nru xml2rfc-3.19.4/tests/valid/draft-template.html xml2rfc-3.20.0/tests/valid/draft-template.html
--- xml2rfc-3.19.4/tests/valid/draft-template.html	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/draft-template.html	2024-02-21 22:48:18.000000000 +0000
@@ -11,11 +11,11 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 3.19.3" name="generator">
+<meta content="xml2rfc 3.19.4" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.19.3
+  xml2rfc 3.19.4
     Python 3.11.7
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
@@ -459,6 +459,10 @@
   margin-bottom: 1.25em;
 }
 
+.refSubseries {
+  margin-bottom: 1.25em;
+}
+
 .references .ascii {
   margin-bottom: 0.25em;
 }
diff -Nru xml2rfc-3.19.4/tests/valid/draft-v3-features.text xml2rfc-3.20.0/tests/valid/draft-v3-features.text
--- xml2rfc-3.19.4/tests/valid/draft-v3-features.text	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/draft-v3-features.text	2024-02-21 22:48:18.000000000 +0000
@@ -1360,10 +1360,13 @@
               _here_, November 2014.  Due to a <displayreference>
               element, this should be listed as "[0REFTEST]".
 
-   [BCP45]    Eggert, L. and S. Harris, "IETF Discussion List Charter",
-              BCP 45, RFC 9245, June 2022.
-
-              <https://www.rfc-editor.org/info/bcp45>
+   [BCP45]    Best Current Practice 45,
+              <https://www.rfc-editor.org/info/bcp45>.
+              At the time of writing, this BCP comprises the following:
+
+              Eggert, L. and S. Harris, "IETF Discussion List Charter",
+              BCP 45, RFC 9245, DOI 10.17487/RFC9245, June 2022,
+              <https://www.rfc-editor.org/info/rfc9245>.
 
    [DUP]      Reschke, J., "Reference Duplicate Test", July 2016.
 
@@ -1385,23 +1388,29 @@
               RFC 7996, DOI 10.17487/RFC7996, December 2016,
               <https://www.rfc-editor.org/info/rfc7996>.
 
-   [STD78]    Schoenwaelder, J., "Simple Network Management Protocol
+   [STD78]    Internet Standard 78,
+              <https://www.rfc-editor.org/info/std78>.
+              At the time of writing, this STD comprises the following:
+
+              Schoenwaelder, J., "Simple Network Management Protocol
               (SNMP) Context EngineID Discovery", STD 78, RFC 5343,
-              September 2008.
+              DOI 10.17487/RFC5343, September 2008,
+              <https://www.rfc-editor.org/info/rfc5343>.
 
               Harrington, D. and J. Schoenwaelder, "Transport Subsystem
               for the Simple Network Management Protocol (SNMP)",
-              STD 78, RFC 5590, June 2009.
+              STD 78, RFC 5590, DOI 10.17487/RFC5590, June 2009,
+              <https://www.rfc-editor.org/info/rfc5590>.
 
               Harrington, D. and W. Hardaker, "Transport Security Model
               for the Simple Network Management Protocol (SNMP)",
-              STD 78, RFC 5591, June 2009.
+              STD 78, RFC 5591, DOI 10.17487/RFC5591, June 2009,
+              <https://www.rfc-editor.org/info/rfc5591>.
 
               Hardaker, W., "Transport Layer Security (TLS) Transport
               Model for the Simple Network Management Protocol (SNMP)",
-              STD 78, RFC 6353, July 2011.
-
-              <https://www.rfc-editor.org/info/std78>
+              STD 78, RFC 6353, DOI 10.17487/RFC6353, July 2011,
+              <https://www.rfc-editor.org/info/rfc6353>.
 
    [STPETER]  ᏚᎢᎵᎬᎢᎬᏒ Inc. (STPETER Inc.), "ᏚᎢᎵᎬᎢᎬᏒ's document".  A
               document where the author element specifies just an
diff -Nru xml2rfc-3.19.4/tests/valid/draft-v3-features.v3.html xml2rfc-3.20.0/tests/valid/draft-v3-features.v3.html
--- xml2rfc-3.19.4/tests/valid/draft-v3-features.v3.html	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/draft-v3-features.v3.html	2024-02-21 22:48:18.000000000 +0000
@@ -13,7 +13,7 @@
         This document tests features introduced in xml2rfc v3 vocabulary.
        
     " name="description">
-<meta content="xml2rfc 3.19.3" name="generator">
+<meta content="xml2rfc 3.19.4" name="generator">
 <meta content="draft-v3-features" name="ietf.draft">
 <link href="tests/input/draft-v3-features.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -4969,9 +4969,10 @@
 <dd class="break"></dd>
 <dt id="BCP45">[BCP45]</dt>
       <dd>
+<div class="refInstance">Best Current Practice 45, <span>&lt;<a href="https://www.rfc-editor.org/info/bcp45">https://www.rfc-editor.org/info/bcp45</a>&gt;</span>.<br><span>At the time of writing, this BCP comprises the following:</span>
+</div>
 <div class="refInstance" id="RFC9245">
-          <span class="refAuthor">Eggert, L.</span> and <span class="refAuthor">S. Harris</span>, <span class="refTitle">"IETF Discussion List Charter"</span>, <span class="seriesInfo">BCP 45</span>, <span class="seriesInfo">RFC 9245</span>, <time datetime="2022-06" class="refDate">June 2022</time>. </div>
-<span>&lt;<a href="https://www.rfc-editor.org/info/bcp45">https://www.rfc-editor.org/info/bcp45</a>&gt;</span>
+          <span class="refAuthor">Eggert, L.</span> and <span class="refAuthor">S. Harris</span>, <span class="refTitle">"IETF Discussion List Charter"</span>, <span class="seriesInfo">BCP 45</span>, <span class="seriesInfo">RFC 9245</span>, <span class="seriesInfo">DOI 10.17487/RFC9245</span>, <time datetime="2022-06" class="refDate">June 2022</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc9245">https://www.rfc-editor.org/info/rfc9245</a>&gt;</span>. </div>
 </dd>
 <dd class="break"></dd>
 <dt id="DUP">[DUP]</dt>
@@ -4998,15 +4999,16 @@
 <dd class="break"></dd>
 <dt id="STD78">[STD78]</dt>
       <dd>
+<div class="refInstance">Internet Standard 78, <span>&lt;<a href="https://www.rfc-editor.org/info/std78">https://www.rfc-editor.org/info/std78</a>&gt;</span>.<br><span>At the time of writing, this STD comprises the following:</span>
+</div>
 <div class="refInstance" id="RFC5343">
-          <span class="refAuthor">Schoenwaelder, J.</span>, <span class="refTitle">"Simple Network Management Protocol (SNMP) Context EngineID Discovery"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 5343</span>, <time datetime="2008-09" class="refDate">September 2008</time>. </div>
+          <span class="refAuthor">Schoenwaelder, J.</span>, <span class="refTitle">"Simple Network Management Protocol (SNMP) Context EngineID Discovery"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 5343</span>, <span class="seriesInfo">DOI 10.17487/RFC5343</span>, <time datetime="2008-09" class="refDate">September 2008</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc5343">https://www.rfc-editor.org/info/rfc5343</a>&gt;</span>. </div>
 <div class="refInstance" id="RFC5590">
-          <span class="refAuthor">Harrington, D.</span> and <span class="refAuthor">J. Schoenwaelder</span>, <span class="refTitle">"Transport Subsystem for the Simple Network Management Protocol (SNMP)"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 5590</span>, <time datetime="2009-06" class="refDate">June 2009</time>. </div>
+          <span class="refAuthor">Harrington, D.</span> and <span class="refAuthor">J. Schoenwaelder</span>, <span class="refTitle">"Transport Subsystem for the Simple Network Management Protocol (SNMP)"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 5590</span>, <span class="seriesInfo">DOI 10.17487/RFC5590</span>, <time datetime="2009-06" class="refDate">June 2009</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc5590">https://www.rfc-editor.org/info/rfc5590</a>&gt;</span>. </div>
 <div class="refInstance" id="RFC5591">
-          <span class="refAuthor">Harrington, D.</span> and <span class="refAuthor">W. Hardaker</span>, <span class="refTitle">"Transport Security Model for the Simple Network Management Protocol (SNMP)"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 5591</span>, <time datetime="2009-06" class="refDate">June 2009</time>. </div>
+          <span class="refAuthor">Harrington, D.</span> and <span class="refAuthor">W. Hardaker</span>, <span class="refTitle">"Transport Security Model for the Simple Network Management Protocol (SNMP)"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 5591</span>, <span class="seriesInfo">DOI 10.17487/RFC5591</span>, <time datetime="2009-06" class="refDate">June 2009</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc5591">https://www.rfc-editor.org/info/rfc5591</a>&gt;</span>. </div>
 <div class="refInstance" id="RFC6353">
-          <span class="refAuthor">Hardaker, W.</span>, <span class="refTitle">"Transport Layer Security (TLS) Transport Model for the Simple Network Management Protocol (SNMP)"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 6353</span>, <time datetime="2011-07" class="refDate">July 2011</time>. </div>
-<span>&lt;<a href="https://www.rfc-editor.org/info/std78">https://www.rfc-editor.org/info/std78</a>&gt;</span>
+          <span class="refAuthor">Hardaker, W.</span>, <span class="refTitle">"Transport Layer Security (TLS) Transport Model for the Simple Network Management Protocol (SNMP)"</span>, <span class="seriesInfo">STD 78</span>, <span class="seriesInfo">RFC 6353</span>, <span class="seriesInfo">DOI 10.17487/RFC6353</span>, <time datetime="2011-07" class="refDate">July 2011</time>, <span>&lt;<a href="https://www.rfc-editor.org/info/rfc6353">https://www.rfc-editor.org/info/rfc6353</a>&gt;</span>. </div>
 </dd>
 <dd class="break"></dd>
 <dt id="STPETER">[STPETER]</dt>
diff -Nru xml2rfc-3.19.4/tests/valid/indexes.pages.text xml2rfc-3.20.0/tests/valid/indexes.pages.text
--- xml2rfc-3.19.4/tests/valid/indexes.pages.text	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/indexes.pages.text	2024-02-21 22:48:18.000000000 +0000
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                          February 6, 2024
+Internet-Draft                                         February 19, 2024
 Intended status: Experimental                                           
-Expires: August 9, 2024
+Expires: August 22, 2024
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@
    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 August 9, 2024.
+   This Internet-Draft will expire on August 22, 2024.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 1]
+Person                   Expires August 22, 2024                [Page 1]
 
 Internet-Draft             xml2rfc index tests             February 2024
 
@@ -109,7 +109,7 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 2]
+Person                   Expires August 22, 2024                [Page 2]
 
 Internet-Draft             xml2rfc index tests             February 2024
 
@@ -165,4 +165,4 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 3]
+Person                   Expires August 22, 2024                [Page 3]
diff -Nru xml2rfc-3.19.4/tests/valid/indexes.prepped.xml xml2rfc-3.20.0/tests/valid/indexes.prepped.xml
--- xml2rfc-3.19.4/tests/valid/indexes.prepped.xml	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/indexes.prepped.xml	2024-02-21 22:48:18.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-02-06T20:51:50" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.19.3 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-02-19T00:20:48" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 3.19.4 -->
   
     
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="06" month="02" year="2024"/>
+    <date day="19" month="02" year="2024"/>
     <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 9 August 2024.
+        This Internet-Draft will expire on 22 August 2024.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff -Nru xml2rfc-3.19.4/tests/valid/indexes.text xml2rfc-3.20.0/tests/valid/indexes.text
--- xml2rfc-3.19.4/tests/valid/indexes.text	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/indexes.text	2024-02-21 22:48:18.000000000 +0000
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                          February 6, 2024
+Internet-Draft                                         February 19, 2024
 Intended status: Experimental                                           
-Expires: August 9, 2024
+Expires: August 22, 2024
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@
    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 August 9, 2024.
+   This Internet-Draft will expire on August 22, 2024.
 
 Copyright Notice
 
diff -Nru xml2rfc-3.19.4/tests/valid/indexes.v3.html xml2rfc-3.20.0/tests/valid/indexes.v3.html
--- xml2rfc-3.19.4/tests/valid/indexes.v3.html	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/indexes.v3.html	2024-02-21 22:48:18.000000000 +0000
@@ -6,7 +6,7 @@
 <meta content="initial-scale=1.0" name="viewport">
 <title>xml2rfc index tests</title>
 <meta content="Human Person" name="author">
-<meta content="xml2rfc 3.19.3" name="generator">
+<meta content="xml2rfc 3.19.4" name="generator">
 <meta content="indexes-00" name="ietf.draft">
 <link href="tests/input/indexes.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires August 9, 2024</td>
+<td class="center">Expires August 22, 2024</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="2024-02-06" class="published">February 6, 2024</time>
+<time datetime="2024-02-19" class="published">February 19, 2024</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="2024-08-09">August 9, 2024</time></dd>
+<dd class="expires"><time datetime="2024-08-22">August 22, 2024</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@
         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 August 9, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on August 22, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff -Nru xml2rfc-3.19.4/tests/valid/manpage.txt xml2rfc-3.20.0/tests/valid/manpage.txt
--- xml2rfc-3.19.4/tests/valid/manpage.txt	2024-02-06 22:36:40.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/manpage.txt	2024-02-21 22:48:18.000000000 +0000
@@ -1,10 +1,10 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                         6 February 2024
+                                                        19 February 2024
 
 
                   Xml2rfc Vocabulary Version 3 Schema
-                         xml2rfc release 3.19.3
-                          xml2rfc-docs-3.19.3
+                         xml2rfc release 3.19.4
+                          xml2rfc-docs-3.19.4
 
 Abstract
 
@@ -54,7 +54,7 @@
    The latest version of this documentation is available in HTML form at
    https://ietf-tools.github.io/xml2rfc/.
 
-   This documentation applies to xml2rfc version 3.19.3.
+   This documentation applies to xml2rfc version 3.19.4.
 
 2.  Schema Version 3 Elements
 
@@ -2642,13 +2642,18 @@
 
 4.  References
 
-   [BCP14]    Bradner, S., "Key words for use in RFCs to Indicate
-              Requirement Levels", BCP 14, RFC 2119, March 1997.
+   [BCP14]    Best Current Practice 14,
+              <https://www.rfc-editor.org/bcp/bcp14.txt>.
+              At the time of writing, this BCP comprises the following:
+
+              Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119,
+              DOI 10.17487/RFC2119, March 1997,
+              <https://www.rfc-editor.org/info/rfc2119>.
 
               Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC
-              2119 Key Words", BCP 14, RFC 8174, May 2017.
-
-              <https://www.rfc-editor.org/bcp/bcp14.txt>
+              2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174,
+              May 2017, <https://www.rfc-editor.org/info/rfc8174>.
 
    [IDGUIDE]  Housley, R., "Guidelines to Authors of Internet-Drafts",
               December 2010,
@@ -4319,7 +4324,7 @@
 Appendix D.  xml2rfc Documentation Template Variables
 
    The following variables are available for use in an xml2rfc manpage
-   Jinja2 template, as of xml2rfc version 3.19.3:
+   Jinja2 template, as of xml2rfc version 3.19.4:
 
    {{ bare_latin_tags }}:
 
diff -Nru xml2rfc-3.19.4/tests/valid/rfc7911.html xml2rfc-3.20.0/tests/valid/rfc7911.html
--- xml2rfc-3.19.4/tests/valid/rfc7911.html	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/rfc7911.html	2024-02-21 22:48:18.000000000 +0000
@@ -16,10 +16,10 @@
       that each path is identified by a Path Identifier in addition to the
       address prefix. 
     " name="description">
-<meta content="xml2rfc 3.19.3" name="generator">
+<meta content="xml2rfc 3.19.4" name="generator">
 <meta content="7911" name="rfc.number">
 <!-- Generator version information:
-  xml2rfc 3.19.3
+  xml2rfc 3.19.4
     Python 3.11.7
     ConfigArgParse 1.7
     google-i18n-address 3.1.0
@@ -463,6 +463,10 @@
   margin-bottom: 1.25em;
 }
 
+.refSubseries {
+  margin-bottom: 1.25em;
+}
+
 .references .ascii {
   margin-bottom: 0.25em;
 }
diff -Nru xml2rfc-3.19.4/tests/valid/sourcecode.pages.text xml2rfc-3.20.0/tests/valid/sourcecode.pages.text
--- xml2rfc-3.19.4/tests/valid/sourcecode.pages.text	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/sourcecode.pages.text	2024-02-21 22:48:18.000000000 +0000
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                          February 6, 2024
+Internet-Draft                                         February 19, 2024
 Intended status: Experimental                                           
-Expires: August 9, 2024
+Expires: August 22, 2024
 
 
                         xml2rfc sourcecode tests
@@ -26,7 +26,7 @@
    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 August 9, 2024.
+   This Internet-Draft will expire on August 22, 2024.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 1]
+Person                   Expires August 22, 2024                [Page 1]
 
 Internet-Draft          xml2rfc sourcecode tests           February 2024
 
@@ -109,7 +109,7 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 2]
+Person                   Expires August 22, 2024                [Page 2]
 
 Internet-Draft          xml2rfc sourcecode tests           February 2024
 
@@ -165,7 +165,7 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 3]
+Person                   Expires August 22, 2024                [Page 3]
 
 Internet-Draft          xml2rfc sourcecode tests           February 2024
 
@@ -221,4 +221,4 @@
 
 
 
-Person                   Expires August 9, 2024                 [Page 4]
+Person                   Expires August 22, 2024                [Page 4]
diff -Nru xml2rfc-3.19.4/tests/valid/sourcecode.prepped.xml xml2rfc-3.20.0/tests/valid/sourcecode.prepped.xml
--- xml2rfc-3.19.4/tests/valid/sourcecode.prepped.xml	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/sourcecode.prepped.xml	2024-02-21 22:48:18.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2024-02-06T20:51:57" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.19.3 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2024-02-19T00:20:55" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 3.19.4 -->
   
     
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="06" month="02" year="2024"/>
+    <date day="19" month="02" year="2024"/>
     <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 9 August 2024.
+        This Internet-Draft will expire on 22 August 2024.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff -Nru xml2rfc-3.19.4/tests/valid/sourcecode.text xml2rfc-3.20.0/tests/valid/sourcecode.text
--- xml2rfc-3.19.4/tests/valid/sourcecode.text	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/sourcecode.text	2024-02-21 22:48:18.000000000 +0000
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                          February 6, 2024
+Internet-Draft                                         February 19, 2024
 Intended status: Experimental                                           
-Expires: August 9, 2024
+Expires: August 22, 2024
 
 
                         xml2rfc sourcecode tests
@@ -26,7 +26,7 @@
    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 August 9, 2024.
+   This Internet-Draft will expire on August 22, 2024.
 
 Copyright Notice
 
diff -Nru xml2rfc-3.19.4/tests/valid/sourcecode.v3.html xml2rfc-3.20.0/tests/valid/sourcecode.v3.html
--- xml2rfc-3.19.4/tests/valid/sourcecode.v3.html	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/tests/valid/sourcecode.v3.html	2024-02-21 22:48:18.000000000 +0000
@@ -6,7 +6,7 @@
 <meta content="initial-scale=1.0" name="viewport">
 <title>xml2rfc sourcecode tests</title>
 <meta content="Human Person" name="author">
-<meta content="xml2rfc 3.19.3" name="generator">
+<meta content="xml2rfc 3.19.4" name="generator">
 <meta content="sourcecode-00" name="ietf.draft">
 <link href="tests/input/sourcecode.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires August 9, 2024</td>
+<td class="center">Expires August 22, 2024</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">sourcecode-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2024-02-06" class="published">February 6, 2024</time>
+<time datetime="2024-02-19" class="published">February 19, 2024</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="2024-08-09">August 9, 2024</time></dd>
+<dd class="expires"><time datetime="2024-08-22">August 22, 2024</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@
         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 August 9, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on August 22, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff -Nru xml2rfc-3.19.4/xml2rfc/__init__.py xml2rfc-3.20.0/xml2rfc/__init__.py
--- xml2rfc-3.19.4/xml2rfc/__init__.py	2024-02-06 22:37:11.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc/__init__.py	2024-02-21 22:48:47.000000000 +0000
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals, print_function, division
 
 # Static values
-__version__ = '3.19.4'
+__version__ = '3.20.0'
 NAME         = 'xml2rfc'
 VERSION      = [ int(i) if i.isdigit() else i for i in __version__.split('.') ]
 CACHES       = ['/var/cache/xml2rfc', '~/.cache/xml2rfc']  # Ordered by priority
diff -Nru xml2rfc-3.19.4/xml2rfc/data/xml2rfc.css xml2rfc-3.20.0/xml2rfc/data/xml2rfc.css
--- xml2rfc-3.19.4/xml2rfc/data/xml2rfc.css	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc/data/xml2rfc.css	2024-02-21 22:48:18.000000000 +0000
@@ -424,6 +424,10 @@
   margin-bottom: 1.25em;
 }
 
+.refSubseries {
+  margin-bottom: 1.25em;
+}
+
 .references .ascii {
   margin-bottom: 0.25em;
 }
diff -Nru xml2rfc-3.19.4/xml2rfc/writers/base.py xml2rfc-3.20.0/xml2rfc/writers/base.py
--- xml2rfc-3.19.4/xml2rfc/writers/base.py	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc/writers/base.py	2024-02-21 22:48:18.000000000 +0000
@@ -31,6 +31,12 @@
 from xml2rfc.utils import namespaces, find_duplicate_ids, slugify
 
 
+SUBSERIES = {
+        'STD': 'Internet Standard',
+        'BCP': 'Best Current Practice',
+        'FYI': 'For Your Information',
+}
+
 DEADLY_ERRORS = [
     'Element svg has extra content: script',
     'Did not expect element script there',
@@ -73,6 +79,7 @@
         'image_svg': False,
         'indent': 2,
         'info': False,
+        'info_base_url': 'https://www.rfc-editor.org/info/',
         'inline_version_info': True,
         'legacy': False,
         'legacy_date_format': False,
diff -Nru xml2rfc-3.19.4/xml2rfc/writers/html.py xml2rfc-3.20.0/xml2rfc/writers/html.py
--- xml2rfc-3.19.4/xml2rfc/writers/html.py	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc/writers/html.py	2024-02-21 22:48:18.000000000 +0000
@@ -29,7 +29,7 @@
     pass
 
 from xml2rfc import log, strings
-from xml2rfc.writers.base import default_options, BaseV3Writer, RfcWriterError
+from xml2rfc.writers.base import default_options, BaseV3Writer, RfcWriterError, SUBSERIES
 from xml2rfc.uniscripts import is_script
 from xml2rfc.util.date import extract_date, augment_date, format_date, format_date_iso, get_expiry_date
 from xml2rfc.util.name import ( full_author_name_expansion, short_author_role,
@@ -2158,18 +2158,14 @@
             self.render(inner, c)
         for ctag in ('title', 'refcontent', 'stream', 'seriesInfo', 'date', ):
             for c in x.iterdescendants(ctag):
-                if p.tag == 'referencegroup' and c.tag == 'seriesInfo' and c.get('name') == 'DOI':
-                    # Don't render DOI within a reference group
-                    continue              
                 if len(inner):
                     inner[-1].tail = ', '
                 self.render(inner, c)
-        if p.tag != 'referencegroup':
-            target = x.get('target')
-            if len(inner):
-                inner[-1].tail = ', '
-            if target:
-                inner.append( build.span('<', build.a(target, href=target), '>') )
+        target = x.get('target')
+        if len(inner):
+            inner[-1].tail = ', '
+        if target:
+            inner.append( build.span('<', build.a(target, href=target), '>') )
         if len(inner):
             inner[-1].tail = '. '
         for ctag in ('annotation', ):
@@ -2200,13 +2196,29 @@
     def render_referencegroup(self, h, x):
         dt = add.dt(h, x, '[%s]'%x.get('derivedAnchor'))
         dd = add.dd(h, None)
+        target = x.get('target')
+        subseries = False
         # workaround for weasyprint's unwillingness to break between <dd> and
         # <dt>: add an extra <dd> that is very prone to page breaks.  See CSS.
         add.dd(h, None, classes='break')
+        for series in x.xpath('.//seriesInfo'):
+            if series.get('name') in SUBSERIES.keys():
+                text = f"{SUBSERIES[series.get('name')]} {series.get('value')}"
+                subdiv = build.div(text, classes='refInstance')
+                if target:
+                    subdiv.text += ', '
+                    subdiv.append(build.span('<', build.a(target, href=target), '>'))
+                    subdiv[0].tail = '.'
+                else:
+                    subdiv.text += '.'
+                subdiv.append(build.br())
+                subdiv.append(build.span(f"At the time of writing, this {series.get('name')} comprises the following:"))
+                dd.append(subdiv)
+                subseries = True
+                break
         for c in x.getchildren():
             self.render(dd, c)
-        target = x.get('target')
-        if target:
+        if target and not subseries:
             dd.append( build.span('<', build.a(target, href=target), '>') )
         return dt, dd
 
diff -Nru xml2rfc-3.19.4/xml2rfc/writers/preptool.py xml2rfc-3.20.0/xml2rfc/writers/preptool.py
--- xml2rfc-3.19.4/xml2rfc/writers/preptool.py	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc/writers/preptool.py	2024-02-21 22:48:18.000000000 +0000
@@ -263,6 +263,7 @@
         './/boilerplate;insert_copyright_notice()', # 5.4.2.3.  "Copyright Notice" Insertion
         './/boilerplate//section',          # 5.2.7.  Section "toc" attribute
         './/reference;insert_target()',     # 5.4.3.  <reference> "target" Insertion
+        './/referencegroup;insert_target()',        # <referencegroup> "target" Insertion
         './/reference;insert_work_in_progress()',
         './/reference;sort_series_info()',  #         <reference> sort <seriesInfo>
         './/name;insert_slugified_name()',  # 5.4.4.  <name> Slugification
@@ -439,9 +440,9 @@
                     if (c.tag, a) in latinscript_attributes:
                         if not is_script(v, 'Latin'):
                             self.err(c, 'Found non-Latin-script content in <%s> attribute value %s="%s"' % (c.tag, a, v))
-                    else:
+                    if self.options.warn_bare_unicode:
                         if not isascii(v):
-                            self.err(c, 'Found non-ASCII content in <%s> attribute value %s="%s"' % (c.tag, a, v))
+                            self.warn(c, f'Found non-ASCII content in {c.tag} attribute value {a}="{v}" that should be inspected to ensure it is intentional.')
                 if not (c.tag, a) in space_attributes:
                     vv = v.strip()
                     if vv != v:
@@ -1216,6 +1217,24 @@
             front.insert(pos, s)
             pos += 1
 
+    def referencegroup_insert_target(self, e, p):
+        target_pattern = {
+            "BCP": os.path.join(self.options.info_base_url, 'bcp{value}'),
+            "STD": os.path.join(self.options.info_base_url, 'std{value}'),
+            "FYI": os.path.join(self.options.info_base_url, 'fyi{value}'),
+        }
+
+        if not e.get('target'):
+            for c in e.xpath('.//seriesInfo'):
+                series_name = c.get('name')
+                if series_name in target_pattern.keys():
+                    series_value=c.get('value')
+                    if series_value:
+                        e.set('target', target_pattern[series_name].format(value=series_value))
+                        break
+                    else:
+                        self.err(c, 'Expected a value= attribute value for <seriesInfo name="%s">, but found none' % (series_name, ))
+
     # 
     # 5.4.4.  <name> Slugification
     # 
diff -Nru xml2rfc-3.19.4/xml2rfc/writers/text.py xml2rfc-3.20.0/xml2rfc/writers/text.py
--- xml2rfc-3.19.4/xml2rfc/writers/text.py	2024-02-06 22:36:41.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc/writers/text.py	2024-02-21 22:48:18.000000000 +0000
@@ -22,7 +22,7 @@
 
 
 from xml2rfc import strings
-from xml2rfc.writers.base import default_options, BaseV3Writer, RfcWriterError
+from xml2rfc.writers.base import default_options, BaseV3Writer, RfcWriterError, SUBSERIES
 from xml2rfc import utils
 from xml2rfc.uniscripts import is_script
 from xml2rfc.util.date import extract_date, augment_date, get_expiry_date, format_date
@@ -36,6 +36,9 @@
 from xml2rfc.utils import justify_inline, clean_text
 
 
+MAX_WIDTH = 72
+SPLITTER_WIDTH = 67
+
 IndexItem   = namedtuple('indexitem', ['item', 'subitem', 'anchor', 'page', ])
 Joiner      = namedtuple('joiner', ['join', 'indent', 'hang', 'overlap', 'do_outdent'])
 # Joiner parts:
@@ -80,8 +83,8 @@
         self.beg  = beg                 # beginning line of block
         self.end  = end                 # ending line of block
 
-wrapper = utils.TextWrapper(width=72)
-splitter = utils.TextSplitter(width=67)
+wrapper = utils.TextWrapper(width=MAX_WIDTH)
+splitter = utils.TextSplitter(width=SPLITTER_WIDTH)
 seen = set()
 
 # This is not a complete list of whitespace characters, and isn't intended to be.  It's
@@ -299,7 +302,7 @@
             joiners = base_joiners
             if self.options.pagination:
                 self.add_pageno_placeholders()
-            lines = self.render(self.root, width=72, joiners=joiners)
+            lines = self.render(self.root, width=MAX_WIDTH, joiners=joiners)
 
             if self.options.pagination:
                 lines = findblocks(lines)
@@ -321,8 +324,8 @@
                             sys.stderr.write(("%3d %10s         [%4s] %s\n" % (i, tag,                           page, l.text)))
             for i, l in enumerate(lines):
                 length = len(l.text)
-                if length > 72:
-                    self.warn(l.elem, "Too long line found (L%s), %s characters longer than 72 characters: \n%s" %(i+1, length-72, l.text))
+                if length > MAX_WIDTH:
+                    self.warn(l.elem, f"Too long line found (L{i + 1}), {length - MAX_WIDTH} characters longer than {MAX_WIDTH} characters: \n{l.text}")
 
             text = ('\n'.join( l.text for l in lines )).rstrip(stripspace) + '\n'
 
@@ -505,7 +508,7 @@
             else:
                 pass
         # new toc, to be used to replace the old one
-        toclines = self.render(toc, width=72, joiners=base_joiners)
+        toclines = self.render(toc, width=MAX_WIDTH, joiners=base_joiners)
         if toc_start and toc_end:
             j = 2
             for i in range(toc_start+2, toc_end):
@@ -1811,7 +1814,7 @@
                 textwidth_l = textwidth(l)
                 textwidth_r = textwidth(r)
                 #assert textwidth_l+textwidth_r< 70
-                w = 72-textwidth_l-textwidth_r
+                w = MAX_WIDTH-textwidth_l-textwidth_r
                 lines.append(l+' '*w+r)
             return '\n'.join(lines).rstrip(stripspace)+'\n'
         #
@@ -1819,7 +1822,7 @@
             line = '%s%s%s' % (label, items, suffix)
             ll = len(left)
             lr = len(right)
-            width = 48 if ll >= lr else min(48, 72-4-len(right[ll]))
+            width = 48 if ll >= lr else min(48, MAX_WIDTH-4-len(right[ll]))
             wrapper = textwrap.TextWrapper(width=width, subsequent_indent=' '*len(label))
             return wrapper.wrap(line)
         #
@@ -2725,16 +2728,12 @@
         elements = []
         for ctag in ('title', 'refcontent', 'stream', 'seriesInfo', 'date',):
             for c in e.iterdescendants(ctag):
-                if p.tag == 'referencegroup' and c.tag == 'seriesInfo' and c.get('name') == 'DOI':
-                    # Don't render DOI within a reference group
-                    continue              
                 elements.append(c)
-        if p.tag != 'referencegroup':
-            target = e.get('target')
-            if target:
-                url = self.element('refcontent')
-                url.text = '<%s>' % target
-                elements.append(url)
+        target = e.get('target')
+        if target:
+            url = self.element('refcontent')
+            url.text = '<%s>' % target
+            elements.append(url)
         set_joiners(kwargs, {
             None:           Joiner(', ', 0, 0, False, False),
             'annotation':   Joiner('  ', 0, 0, False, False),
@@ -2746,7 +2745,8 @@
         text += '.'
         for ctag in ('annotation', ):
             for c in e.iterdescendants(ctag):
-                text = self.tjoin(text, c, width, **kwargs)
+                # use MAX_WIDTH here since text gets formatted later
+                text = self.tjoin(text, c, MAX_WIDTH, keep_url=True, **kwargs)
         text = fill(text, width=width, fix_sentence_endings=False, keep_url=True, **kwargs).lstrip(stripspace)
         
         text = indent(text, 11, 0)
@@ -2789,10 +2789,33 @@
         label = self.refname_mapping[e.get('anchor')]
         label = ('[%s]' % label).ljust(11)
         lines = []
+        target = e.get('target')
+        subseries = False
+        for series in e.xpath('.//seriesInfo'):
+            if series.get('name') in SUBSERIES.keys():
+                kwargs['joiners'].update({
+                    None:   Joiner(', ', 11, 0, False, False),
+                    't':    Joiner('\n', 11, 0, False, False),
+                })
+                text = f"{SUBSERIES[series.get('name')]} {series.get('value')}"
+                if target:
+                    url = self.element('refcontent')
+                    url.text = f'<{target}>.'
+                    text = self.tjoin(text, url, width, **kwargs)
+                else:
+                    text += '.'
+                subseries_width = width - 11
+                text = fill(text, width=subseries_width, fix_sentence_endings=False, keep_url=True, **kwargs).lstrip(stripspace)
+                text = indent(text, 11, 0)
+                lines = mklines(text, e)
+                t = self.element('t')
+                t.text = f"At the time of writing, this {series.get('name')} comprises the following:"
+                lines = self.ljoin(lines, t, width, **kwargs)
+                subseries = True
+                break
         for c in e.getchildren():
             lines = self.ljoin(lines, c, width, **kwargs)
-        target = e.get('target')
-        if target:
+        if target and not subseries:
             t = self.element('t')
             t.text = '<%s>' % target
             lines = self.ljoin(lines, t, width, **kwargs)
@@ -3957,7 +3980,7 @@
             Find the minimum column widths of regular cells
             """
             i = 0
-            splitter = utils.TextSplitter(width=67, hyphen_split=hyphen_split)
+            splitter = utils.TextSplitter(width=SPLITTER_WIDTH, hyphen_split=hyphen_split)
             for p in e.iterchildren(['thead', 'tbody', 'tfoot']):
                 for r in list(p.iterchildren('tr')):
                     j = 0
diff -Nru xml2rfc-3.19.4/xml2rfc.egg-info/PKG-INFO xml2rfc-3.20.0/xml2rfc.egg-info/PKG-INFO
--- xml2rfc-3.19.4/xml2rfc.egg-info/PKG-INFO	2024-02-06 22:37:17.000000000 +0000
+++ xml2rfc-3.20.0/xml2rfc.egg-info/PKG-INFO	2024-02-21 22:48:53.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xml2rfc
-Version: 3.19.4
+Version: 3.20.0
 Summary: xml2rfc generates RFCs and IETF drafts from document source in XML according to the IETF xml2rfc v2 and v3 vocabularies.
 Home-page: https://github.com/ietf-tools/xml2rfc
 Download-URL: https://github.com/ietf-tools/xml2rfc/releases