remove redundant word -grouping from names of groupings. close #119

mcr · mcr · commit ac84b245a121 · 2026-03-12T19:38:21.000-04:00
diff --git a/ietf-voucher-request.yang b/ietf-voucher-request.yang
@@ -83,11 +83,11 @@ module ietf-voucher-request {
        (BRSKI)";
   }
 
-  grouping voucher-request-grouping {
+  grouping voucher-request {
     description
       "Grouping to allow reuse/extensions in future work.";
 
-    uses vch:voucher-artifact-grouping {
+    uses vch:voucher-artifact {
       refine "last-renewal-date" {
         description "A last-renewal-date field
                      is not valid in a voucher request, and
@@ -257,7 +257,7 @@ module ietf-voucher-request {
 
   // Top-level statement: called "voucher" to match RFC8995
   sx:structure voucher {
-    uses voucher-request-grouping;
+    uses voucher-request;
   }
 
 }
diff --git a/ietf-voucher.yang b/ietf-voucher.yang
@@ -77,7 +77,7 @@ module ietf-voucher {
       "RFC 8366: Voucher Profile for Bootstrapping Protocols";
   }
 
-  grouping voucher-artifact-grouping {
+  grouping voucher-artifact {
     description
       "Grouping to allow reuse/extensions in future work.";
 
@@ -329,7 +329,7 @@ module ietf-voucher {
 
   // Top-level statement
   sx:structure voucher {
-    uses voucher-artifact-grouping;
+    uses voucher-artifact;
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ module ietf-voucher-request {`
`83`	`83`	`(BRSKI)";`
`84`	`84`	`}`
`85`	`85`
`86`		`- grouping voucher-request-grouping {`
	`86`	`+ grouping voucher-request {`
`87`	`87`	`description`
`88`	`88`	`"Grouping to allow reuse/extensions in future work.";`
`89`	`89`
`90`		`- uses vch:voucher-artifact-grouping {`
	`90`	`+ uses vch:voucher-artifact {`
`91`	`91`	`refine "last-renewal-date" {`
`92`	`92`	`description "A last-renewal-date field`
`93`	`93`	`is not valid in a voucher request, and`
`@@ -257,7 +257,7 @@ module ietf-voucher-request {`
`257`	`257`
`258`	`258`	`// Top-level statement: called "voucher" to match RFC8995`
`259`	`259`	`sx:structure voucher {`
`260`		`- uses voucher-request-grouping;`
	`260`	`+ uses voucher-request;`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ module ietf-voucher {`
`77`	`77`	`"RFC 8366: Voucher Profile for Bootstrapping Protocols";`
`78`	`78`	`}`
`79`	`79`
`80`		`- grouping voucher-artifact-grouping {`
	`80`	`+ grouping voucher-artifact {`
`81`	`81`	`description`
`82`	`82`	`"Grouping to allow reuse/extensions in future work.";`
`83`	`83`
`@@ -329,7 +329,7 @@ module ietf-voucher {`
`329`	`329`
`330`	`330`	`// Top-level statement`
`331`	`331`	`sx:structure voucher {`
`332`		`- uses voucher-artifact-grouping;`
	`332`	`+ uses voucher-artifact;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`}`