Bring in more v3 syntax and update YANG module filename revision.

netmod-wg · Feb 21, 2021 · de44cc3 · de44cc3
1 parent 41db5c8
commit de44cc3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 33 deletions.
diff --git a/yang-semver/draft-ietf-netmod-yang-semver.txt b/yang-semver/draft-ietf-netmod-yang-semver.txt
@@ -766,7 +766,7 @@ Internet-Draft                 YANG Semver                 February 2021
 
    This YANG module contains the typedef for the YANG semantic version.
 
-   <CODE BEGINS> file "ietf-yang-semver@2019-09-06.yang"
+   <CODE BEGINS> file "ietf-yang-semver@2020-06-30.yang"
      module ietf-yang-semver {
        yang-version 1.1;
        namespace "urn:ietf:params:xml:ns:yang:ietf-yang-semver";
@@ -976,14 +976,6 @@ Internet-Draft                 YANG Semver                 February 2021
 
 10.1.  Normative References
 
-   [I-D.ietf-netmod-yang-module-versioning]
-              Wilton, R., Rahman, R., Lengyel, B., Clarke, J., Sterne,
-              J., Claise, B., and K. D'Souza, "Updated YANG Module
-              Revision Handling", Work in Progress, Internet-Draft,
-              draft-ietf-netmod-yang-module-versioning-01, 10 July 2020,
-              <https://tools.ietf.org/html/draft-ietf-netmod-yang-
-              module-versioning-01>.
-
    [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
               Requirement Levels", BCP 14, RFC 2119,
               DOI 10.17487/RFC2119, March 1997,
@@ -998,6 +990,14 @@ Internet-Draft                 YANG Semver                 February 2021
               DOI 10.17487/RFC8407, October 2018,
               <https://www.rfc-editor.org/info/rfc8407>.
 
+   [I-D.ietf-netmod-yang-module-versioning]
+              Wilton, R., Rahman, R., Lengyel, B., Clarke, J., Sterne,
+              J., Claise, B., and K. D'Souza, "Updated YANG Module
+              Revision Handling", Work in Progress, Internet-Draft,
+              draft-ietf-netmod-yang-module-versioning-01, 10 July 2020,
+              <https://tools.ietf.org/html/draft-ietf-netmod-yang-
+              module-versioning-01>.
+
 10.2.  Informative References
 
 
@@ -1024,27 +1024,27 @@ Internet-Draft                 YANG Semver                 February 2021
               <https://tools.ietf.org/html/draft-ietf-netmod-yang-
               packages-01>.
 
-   [IfTypeYang]
-              "iana-if-type YANG Module",
-              <https://www.iana.org/assignments/iana-if-type/iana-if-
-              type.xhtml>.
+   [RFC8342]  Bjorklund, M., Schoenwaelder, J., Shafer, P., Watsen, K.,
+              and R. Wilton, "Network Management Datastore Architecture
+              (NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018,
+              <https://www.rfc-editor.org/info/rfc8342>.
 
    [openconfigsemver]
               "Semantic Versioning for Openconfig Models",
               <http://www.openconfig.net/docs/semver/>.
 
-   [RFC8342]  Bjorklund, M., Schoenwaelder, J., Shafer, P., Watsen, K.,
-              and R. Wilton, "Network Management Datastore Architecture
-              (NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018,
-              <https://www.rfc-editor.org/info/rfc8342>.
+   [semver]   "Semantic Versioning 2.0.0", <https://www.semver.org>.
+
+   [IfTypeYang]
+              "iana-if-type YANG Module",
+              <https://www.iana.org/assignments/iana-if-type/iana-if-
+              type.xhtml>.
 
    [RoutingTypesYang]
               "iana-routing-types YANG Module",
               <https://www.iana.org/assignments/iana-routing-types/iana-
               routing-types.xhtml>.
 
-   [semver]   "Semantic Versioning 2.0.0", <https://www.semver.org>.
-
 Appendix A.  Example IETF Module Development
 
    Assume a new YANG module is being developed in the netmod working

diff --git a/yang-semver/draft-ietf-netmod-yang-semver.xml b/yang-semver/draft-ietf-netmod-yang-semver.xml
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE rfc SYSTEM "rfc2629.dtd" [ ]>
-<?xml-stylesheet type="text/xsl" href="rfc2629.xslt" ?>
-<?rfc toc="yes"?>
-<?rfc tocompact="yes"?>
-<?rfc tocdepth="4"?>
-<?rfc tocindent="yes"?>
-<?rfc symrefs="yes"?>
-<?rfc sortrefs="yes"?>
-<?rfc comments="yes"?>
-<?rfc inline="yes"?>
-<?rfc compact="yes"?>
-<?rfc subcompact="no"?>
+<!DOCTYPE rfc SYSTEM "rfc2629.dtd">
 <rfc updates="8407" category="std" ipr="trust200902" consensus="true" docName="draft-ietf-netmod-yang-semver-02"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
+  xml:lang="en" xmlns:xi="http://www.w3.org/2001/XInclude">
   <front>
     <title abbrev="YANG Semver">YANG Semantic Versioning</title>
 
@@ -649,7 +638,7 @@
 <figure>
 <artwork>
 <![CDATA[
-<CODE BEGINS> file "ietf-yang-semver@2019-09-06.yang"
+<CODE BEGINS> file "ietf-yang-semver@2020-06-30.yang"
   module ietf-yang-semver {
     yang-version 1.1;
     namespace "urn:ietf:params:xml:ns:yang:ietf-yang-semver";