@matter/model 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251027-17770fb28

package/src/standard/resources/fan-control.resource.ts

@@ -25,10 +25,10 @@ Resource.add({
                         "that legacy client implementations are capable of determining, from the server, the number of speeds " +
                         "supported between 1, 2, or 3, and whether automatic speed control is supported." +
                         "\n" +
-                        "The MultiSpeed feature includes new attributes that support a running fan speed value from 0 to " +
-                        "SpeedMax, which has a maximum of 100." +
+                        "The MultiSpeed feature includes attributes that support a running fan speed value from 0 to " +
+                        "SpeedMax." +
                         "\n" +
-                        "See Section 4.4.6.6.1 for more details."
+                        "See Section 4.4.6.6.1, “Speed Rules” for more details."
                 },
 
                 { tag: "field", name: "AUT", details: "Automatic mode supported for fan speed" },
@@ -42,86 +42,126 @@ Resource.add({
         {
             tag: "attribute", name: "FanMode", xref: "cluster§4.4.6.1",
 
-            details: "Indicates the current speed mode of the fan. This attribute may be written by the client to request " +
-                "a different fan mode. A server shall return INVALID_IN_STATE to indicate that the fan is not in a " +
-                "state where the FanMode can be changed to the requested value. A server may have FanMode values that " +
-                "it can never be set to. For example, where this cluster appears on the same or another endpoint as " +
-                "other clusters with a system dependency, for example the Thermostat cluster, attempting to set the " +
-                "FanMode attribute of this cluster to Off may not be allowed by the system." +
+            details: "Indicates the current speed mode of the fan." +
                 "\n" +
-                "This attribute shall be set to one of the values in FanModeEnum." +
+                "This attribute shall be set to one of the values in FanModeEnum supported by the server as indicated " +
+                "in the FanModeSequence attribute. The Low value shall be supported if and only if the " +
+                "FanModeSequence attribute value is less than 4. The Medium value shall be supported if and only if " +
+                "the FanModeSequence attribute value is 0 or 2." +
                 "\n" +
-                "When the FanMode attribute is successfully written to, the PercentSetting and SpeedSetting (if " +
-                "present) attributes shall be set to appropriate values, as defined by the Section 4.4.6.3.1 and " +
-                "Section 4.4.6.6.1 respectively, unless otherwise specified below." +
+                "This attribute may be written by a client to request a different fan mode. The server shall return " +
+                "INVALID_IN_STATE to indicate that the fan is not in a state where this attribute can be changed to " +
+                "the requested value." +
                 "\n" +
-                "When the FanMode attribute is set to any given mode, the PercentCurrent and SpeedCurrent (if " +
-                "present) shall indicate the actual currently operating fan speed, unless otherwise specified below."
+                "The server may have values that this attribute can never be set to or that will be ignored by the " +
+                "server. For example, where this cluster appears on the same or another endpoint as other clusters " +
+                "with a system dependency, for example the Thermostat cluster, attempting to set this attribute to " +
+                "Off may not be allowed by the system." +
+                "\n" +
+                "If an attempt is made to set this attribute to a value not supported by the server as indicated in " +
+                "the FanModeSequence attribute, the server shall respond with CONSTRAINT_ERROR." +
+                "\n" +
+                "When this attribute is successfully written to, the PercentSetting and SpeedSetting (if present) " +
+                "attributes shall be set to appropriate values, as defined by Section 4.4.6.3.1, “Percent Rules” and " +
+                "Section 4.4.6.6.1, “Speed Rules” respectively, unless otherwise specified below." +
+                "\n" +
+                "When this attribute is set to any valid value, the PercentCurrent and SpeedCurrent (if present) " +
+                "attributes shall indicate the actual currently operating fan speed, unless otherwise specified " +
+                "below."
         },
 
         {
             tag: "attribute", name: "FanModeSequence", xref: "cluster§4.4.6.2",
-            details: "This attribute indicates the fan speed ranges that shall be supported."
+            details: "This attribute indicates the fan speed ranges that shall be supported by the server."
         },
 
         {
             tag: "attribute", name: "PercentSetting", xref: "cluster§4.4.6.3",
 
-            details: "Indicates the speed setting for the fan. This attribute may be written by the client to indicate a " +
-                "new fan speed. If the client writes null to this attribute, the attribute value shall NOT change. A " +
-                "server shall return INVALID_IN_STATE to indicate that the fan is not in a state where the " +
-                "PercentSetting can be changed to the requested value." +
+            details: "Indicates the speed setting for the fan with a value of 0 indicating that the fan is off and a value " +
+                "of 100 indicating that the fan is set to run at its maximum speed. If the FanMode attribute is set " +
+                "to Auto, the value of this attribute shall be set to null." +
+                "\n" +
+                "This attribute may be written to by a client to indicate a new fan speed. If a client writes null to " +
+                "this attribute, the attribute value shall NOT change. If the fan is in a state where this attribute " +
+                "cannot be changed to the requested value, the server shall return INVALID_IN_STATE." +
                 "\n" +
-                "If this is successfully written to 0, the server shall set the FanMode attribute value to Off."
+                "When this attribute is successfully written, the server shall set the value of the FanMode and " +
+                "SpeedSetting (if present) attributes to values that abide by the mapping requirements listed below."
         },
 
         {
             tag: "attribute", name: "PercentCurrent", xref: "cluster§4.4.6.4",
+
             details: "Indicates the actual currently operating fan speed, or zero to indicate that the fan is off. There " +
                 "may be a temporary mismatch between the value of this attribute and the value of the PercentSetting " +
-                "attribute due to other system requirements that would not allow the fan to operate at the requested " +
-                "setting. See Section 4.4.6.3.1 for more details."
+                "attribute due to other system requirements or constraints that would not allow the fan to operate at " +
+                "the requested setting." +
+                "\n" +
+                "For example, if the value of this attribute is currently 50%, and the PercentSetting attribute is " +
+                "newly set to 25%, the value of this attribute may stay above 25% for a period necessary to dissipate " +
+                "internal heat, maintain product operational safety, etc." +
+                "\n" +
+                "When the value of the FanMode attribute is AUTO, the value of this attribute may vary across the " +
+                "range over time." +
+                "\n" +
+                "See Section 4.4.6.3.1, “Percent Rules” for more details."
         },
 
         {
             tag: "attribute", name: "SpeedMax", xref: "cluster§4.4.6.5",
-            details: "Indicates that the fan has one speed (value of 1) or the maximum speed, if the fan is capable of " +
-                "multiple speeds."
+            details: "Indicates the maximum value to which the SpeedSetting attribute can be set."
         },
 
         {
             tag: "attribute", name: "SpeedSetting", xref: "cluster§4.4.6.6",
 
-            details: "Indicates the speed setting for the fan. This attribute may be written by the client to indicate a " +
-                "new fan speed. If the client writes null to this attribute, the attribute value shall NOT change. A " +
-                "server shall return INVALID_IN_STATE to indicate that the fan is not in a state where the " +
-                "SpeedSetting can be changed to the requested value." +
+            details: "Indicates the speed setting for the fan. This attribute may be written by a client to indicate a new " +
+                "fan speed. If the FanMode attribute is set to Auto, the value of this attribute shall be set to " +
+                "null." +
                 "\n" +
-                "If this is successfully written to 0, the server shall set the FanMode attribute value to Off. " +
-                "Please see the Section 4.4.6.6.1 for details on other values."
+                "The server shall support all values between 0 and SpeedMax." +
+                "\n" +
+                "If a client writes null to this attribute, the attribute value shall NOT change. If the fan is in a " +
+                "state where this attribute cannot be changed to the requested value, the server shall return " +
+                "INVALID_IN_STATE." +
+                "\n" +
+                "When this attribute is successfully written to, the server shall set the value of the FanMode and " +
+                "PercentSetting attributes to values that abide by the mapping requirements listed below."
         },
 
         {
             tag: "attribute", name: "SpeedCurrent", xref: "cluster§4.4.6.7",
+
             details: "Indicates the actual currently operating fan speed, or zero to indicate that the fan is off. There " +
                 "may be a temporary mismatch between the value of this attribute and the value of the SpeedSetting " +
-                "attribute due to other system requirements that would not allow the fan to operate at the requested " +
-                "setting."
+                "attribute due to other system requirements or constraints that would not allow the fan to operate at " +
+                "the requested setting." +
+                "\n" +
+                "For example, if the value of this attribute is currently 5, and the SpeedSetting attribute is newly " +
+                "set to 2, the value of this attribute may stay above 2 for a period necessary to dissipate internal " +
+                "heat, maintain product operational safety, etc." +
+                "\n" +
+                "When the value of the FanMode attribute is AUTO, the value of this attribute may vary across the " +
+                "range over time." +
+                "\n" +
+                "See Section 4.4.6.6.1, “Speed Rules” for more details."
         },
 
         {
             tag: "attribute", name: "RockSupport", xref: "cluster§4.4.6.8",
-            details: "This attribute is a bitmap that indicates what rocking motions the server supports."
+            details: "This attribute is a bitmap that indicates the rocking motions that are supported by the server. If " +
+                "this attribute is supported by the server, at least one bit shall be set in this attribute."
         },
 
         {
             tag: "attribute", name: "RockSetting", xref: "cluster§4.4.6.9",
 
-            details: "This attribute is a bitmap that indicates the current active fan rocking motion settings. Each bit " +
+            details: "This attribute is a bitmap that indicates the currently active fan rocking motion setting. Each bit " +
                 "shall only be set to 1, if the corresponding bit in the RockSupport attribute is set to 1, otherwise " +
                 "a status code of CONSTRAINT_ERROR shall be returned." +
                 "\n" +
-                "If a combination of supported bits is set by the client, and the server does not support the " +
+                "If a combination of supported bits is set by a client, and the server does not support the " +
                 "combination, the lowest supported single bit in the combination shall be set and active, and all " +
                 "other bits shall indicate zero." +
                 "\n" +
@@ -131,8 +171,8 @@ Resource.add({
 
         {
             tag: "attribute", name: "WindSupport", xref: "cluster§4.4.6.10",
-            details: "This attribute is a bitmap that indicates what wind modes the server supports. At least one wind " +
-                "mode bit shall be set."
+            details: "This attribute is a bitmap that indicates what wind modes are supported by the server. If this " +
+                "attribute is supported by the server, at least one bit shall be set in this attribute."
         },
 
         {
@@ -142,7 +182,7 @@ Resource.add({
                 "shall only be set to 1, if the corresponding bit in the WindSupport attribute is set to 1, otherwise " +
                 "a status code of CONSTRAINT_ERROR shall be returned." +
                 "\n" +
-                "If a combination of supported bits is set by the client, and the server does not support the " +
+                "If a combination of supported bits is set by a client, and the server does not support the " +
                 "combination, the lowest supported single bit in the combination shall be set and active, and all " +
                 "other bits shall indicate zero." +
                 "\n" +
@@ -152,7 +192,7 @@ Resource.add({
 
         {
             tag: "attribute", name: "AirflowDirection", xref: "cluster§4.4.6.12",
-            details: "Indicates the current airflow direction of the fan. This attribute may be written by the client to " +
+            details: "Indicates the current airflow direction of the fan. This attribute may be written by a client to " +
                 "indicate a new airflow direction for the fan. This attribute shall be set to one of the values in " +
                 "the AirflowDirectionEnum table."
         },
@@ -160,25 +200,39 @@ Resource.add({
         {
             tag: "command", name: "Step", xref: "cluster§4.4.7.1",
 
-            details: "This command speeds up or slows down the fan, in steps, without the client having to know the fan " +
-                "speed. This command supports, for example, a user operated wall switch, where the user provides the " +
-                "feedback or control to stop sending this command when the proper speed is reached. The step speed " +
-                "values are implementation specific. How many step speeds are implemented is implementation specific." +
+            details: "This command indirectly changes the speed-oriented attributes of the fan in steps rather than using " +
+                "the speed-oriented attributes, FanMode, PercentSetting, or SpeedSetting, directly. This command " +
+                "supports, for example, a user-operated and wall-mounted toggle switch that can be used to increase " +
+                "or decrease the speed of the fan by pressing the toggle switch up or down until the desired fan " +
+                "speed is reached. How this command is interpreted by the server and how it affects the values of the " +
+                "speed-oriented attributes is implementation specific." +
+                "\n" +
+                "For example, a fan supports this command, and the value of the FanModeSequence attribute is 0. The " +
+                "current value of the FanMode attribute is 2, or Medium. This command is received with the Direction " +
+                "field set to Increase. As per it’s specific implementation, the server reacts to the command by " +
+                "setting the value of the FanMode attribute to 3, or High, which in turn sets the PercentSetting and " +
+                "SpeedSetting (if present) attributes to appropriate values, as defined by Section 4.4.6.3.1, " +
+                "“Percent Rules” and Section 4.4.6.6.1, “Speed Rules” respectively." +
                 "\n" +
                 "This command supports these fields:",
 
             children: [
                 {
                     tag: "field", name: "Direction", xref: "cluster§4.4.7.1.1",
-                    details: "This field shall indicate whether the fan speed increases or decreases to the next step value."
+                    details: "This field shall indicate whether the speed-oriented attributes increase or decrease to the next " +
+                        "step value."
                 },
                 {
                     tag: "field", name: "Wrap", xref: "cluster§4.4.7.1.2",
-                    details: "This field shall indicate if the fan speed wraps between highest and lowest step value."
+                    details: "This field shall indicate if the speed-oriented attributes wrap between highest and lowest step " +
+                        "value."
                 },
+
                 {
                     tag: "field", name: "LowestOff", xref: "cluster§4.4.7.1.3",
-                    details: "This field shall indicate that the fan being off (speed value 0) is included as a step value."
+                    details: "This field shall indicate that the fan being off" +
+                        "\n" +
+                        "= 0) is included as a step value."
                 }
             ]
         },
@@ -194,9 +248,18 @@ Resource.add({
 
         {
             tag: "datatype", name: "WindBitmap", xref: "cluster§4.4.5.2",
+
             children: [
-                { tag: "field", name: "SleepWind", description: "Indicate sleep wind" },
-                { tag: "field", name: "NaturalWind", description: "Indicate natural wind" }
+                {
+                    tag: "field", name: "SleepWind", description: "Indicate sleep wind", xref: "cluster§4.4.5.2.1",
+                    details: "The fan speed, based on current settings, shall gradually slow down to a final minimum speed. For " +
+                        "this process, the sequence, speeds and duration are MS."
+                },
+                {
+                    tag: "field", name: "NaturalWind", description: "Indicate natural wind", xref: "cluster§4.4.5.2.2",
+                    details: "The fan speed shall vary to emulate natural wind. For this setting, the sequence, speeds and " +
+                        "duration are MS."
+                }
             ]
         },
 
@@ -221,21 +284,8 @@ Resource.add({
 
             children: [
                 { tag: "field", name: "Off", description: "Fan is off" },
-
-                {
-                    tag: "field", name: "Low", description: "Fan using low speed", xref: "cluster§4.4.5.5.1",
-                    details: "If the fan supports 2 or more speeds, the Low value shall be supported." +
-                        "\n" +
-                        "The Low value shall be supported if and only if the FanModeSequence attribute value is less than 4."
-                },
-
-                {
-                    tag: "field", name: "Medium", description: "Fan using medium speed", xref: "cluster§4.4.5.5.2",
-                    details: "If the fan supports 3 or more speeds, the Medium value shall be supported." +
-                        "\n" +
-                        "The Medium value shall be supported if and only if the FanModeSequence attribute value is 0 or 2."
-                },
-
+                { tag: "field", name: "Low", description: "Fan using low speed" },
+                { tag: "field", name: "Medium", description: "Fan using medium speed" },
                 { tag: "field", name: "High", description: "Fan using high speed" },
                 { tag: "field", name: "Auto", description: "Fan is using auto mode" },
                 { tag: "field", name: "Smart", description: "Fan is using smart mode" }

package/src/standard/resources/feature-map.resource.ts

@@ -33,7 +33,7 @@ Resource.add({
         "\n" +
         "Feature sets are revision controlled as part of a cluster using the ClusterRevision attribute. The " +
         "cluster specification is the independent element that is revision controlled. A remote application " +
-        "reading the FeatureMap and ClusterRevision Attribute will then know exactly what features are " +
+        "reading the FeatureMap and ClusterRevision attribute will then know exactly what features are " +
         "supported in the cluster instance." +
         "\n" +
         "Each feature set shall be well defined within the cluster specification. Each feature shall be " +
@@ -49,5 +49,5 @@ Resource.add({
         "For a cluster whose definition which does not define a FeatureMap, the server shall set this " +
         "attribute to 0 (zero)." +
         "\n" +
-        "Please see Feature Conformance for details on conformance."
+        "See Section 7.3.16, “Feature Conformance” for details on conformance."
 });

package/src/standard/resources/general-commissioning.resource.ts

@@ -44,8 +44,9 @@ Resource.add({
 
         {
             tag: "attribute", name: "BasicCommissioningInfo", xref: "core§11.10.6.2",
-            details: "This attribute shall describe critical parameters needed at the beginning of commissioning flow. See " +
-                "BasicCommissioningInfo for more information."
+            details: "This attribute shall describe critical parameters needed at the beginning of commissioning flow." +
+                "\n" +
+                "See Section 11.10.5.3, “BasicCommissioningInfo Type” for more information."
         },
 
         {
@@ -75,9 +76,9 @@ Resource.add({
 
         {
             tag: "attribute", name: "SupportsConcurrentConnection", xref: "core§11.10.6.5",
-            details: "This attribute shall indicate whether this device supports \"concurrent connection flow\" " +
-                "commissioning mode (see Section 5.5, “Commissioning Flows”). If false, the device only supports " +
-                "\"non-concurrent connection flow\" mode."
+            details: "Indicates whether this device supports \"concurrent connection flow\" commissioning mode (see Section " +
+                "5.5, “Commissioning Flows”). If false, the device only supports \"non-concurrent connection flow\" " +
+                "mode."
         },
 
         {
@@ -89,7 +90,8 @@ Resource.add({
                 "When Custom Commissioning Flow is used to obtain user consent (e. g. because the Commissioner does " +
                 "not support the TC feature), the manufacturer-provided means for obtaining user consent shall ensure " +
                 "that this attribute is set to a value which is greater than or equal to TCMinRequiredVersion before " +
-                "returning the user back to the originating Commissioner (see Enhanced Setup Flow)."
+                "returning the user back to the originating Commissioner (see Section 5.7.4, “Enhanced Setup Flow " +
+                "(ESF)”)."
         },
 
         {
@@ -125,7 +127,7 @@ Resource.add({
                 "mandatory terms accepted." +
                 "\n" +
                 "This attribute may be present and False in the case where no terms and conditions are currently " +
-                "mandatory to accept for CommissioningComplete to succeed." +
+                "mandatory to accept for CommissioningComplete command to succeed." +
                 "\n" +
                 "This attribute may appear, or become True after commissioning (e.g. due to a firmware update) to " +
                 "indicate that new Terms & Conditions are available that the user must accept." +
@@ -135,13 +137,13 @@ Resource.add({
                 "When Custom Commissioning Flow is used to obtain user consent (e.g. because the Commissioner does " +
                 "not support the TC feature), the manufacturer-provided means for obtaining user consent shall ensure " +
                 "that this attribute is set to False before returning the user back to the original Commissioner (see " +
-                "Enhanced Setup Flow)."
+                "Section 5.7.4, “Enhanced Setup Flow (ESF)”)."
         },
 
         {
             tag: "attribute", name: "TcUpdateDeadline", xref: "core§11.10.6.10",
             details: "Indicates the System Time in seconds when any functionality limitations will begin due to a lack of " +
-                "acceptance of updated Terms and Conditions, as described in Section 5.7.4.5, “Presenting Updated " +
+                "acceptance of updated Terms and Conditions, as described in Section 5.7.4.6, “Presenting Updated " +
                 "Terms and Conditions”." +
                 "\n" +
                 "A null value indicates that there is no pending deadline for updated TC acceptance."
@@ -150,7 +152,9 @@ Resource.add({
         {
             tag: "command", name: "ArmFailSafe", xref: "core§11.10.7.2",
 
-            details: "Success or failure of this command shall be communicated by the ArmFailSafeResponse command, unless " +
+            details: "This command is used to arm or disarm the fail-safe timer." +
+                "\n" +
+                "Success or failure of this command shall be communicated by the ArmFailSafeResponse command, unless " +
                 "some data model validations caused a failure status code to be issued during the processing of the " +
                 "command." +
                 "\n" +
@@ -203,9 +207,9 @@ Resource.add({
                 "\n" +
                 "  • Whether an AddNOC command or UpdateNOC command has taken place." +
                 "\n" +
-                "  • A Fabric Index for the fabric-scoping of the context, starting at the accessing fabric index for " +
-                "    the ArmFailSafe command, and updated with the Fabric Index associated with an AddNOC command or " +
-                "    an UpdateNOC command being invoked successfully during the ongoing Fail-Safe timer period." +
+                "  • A fabric-index for the fabric-scoping of the context, starting at the accessing fabric index for " +
+                "    the ArmFailSafe command, and updated with the Fabric Index associated with an AddNOC or an " +
+                "    UpdateNOC command being invoked successfully during the ongoing Fail-Safe timer period." +
                 "\n" +
                 "  • The operational credentials associated with any Fabric whose configuration is affected by the " +
                 "    UpdateNOC command." +
@@ -246,8 +250,9 @@ Resource.add({
                 "     6.6.2.9, “Bootstrapping of the Access Control Cluster”) at the Server." +
                 "\n" +
                 "  3. If an AddNOC or UpdateNOC command has been successfully invoked, terminate all CASE sessions " +
-                "     associated with the Fabric whose Fabric Index is recorded in the Fail-Safe context (see " +
-                "     ArmFailSafe) by clearing any associated Secure Session Context at the Server." +
+                "     associated with the Fabric whose Fabric Index is recorded in the Fail-Safe context (see Section " +
+                "     11.10.7.2, “ArmFailSafe Command”) by clearing any associated Secure Session Context at the " +
+                "     Server." +
                 "\n" +
                 "  4. Reset the configuration of all Network Commissioning Networks attribute to their state prior to " +
                 "     the Fail-Safe being armed." +
@@ -257,7 +262,7 @@ Resource.add({
                 "     the Fabric Index that was the subject of the UpdateNOC command." +
                 "\n" +
                 "  6. If an AddNOC command had been successfully invoked, achieve the equivalent effect of invoking " +
-                "     the RemoveFabric command against the Fabric Index stored in the Fail-Safe Context for the " +
+                "     the RemoveFabric command against the fabric-index stored in the Fail-Safe Context for the " +
                 "     Fabric Index that was the subject of the AddNOC command. This shall remove all associations to " +
                 "     that Fabric including all fabric-scoped data, and may possibly factory-reset the device " +
                 "     depending on current device state. This shall only apply to Fabrics added during the fail-safe " +
@@ -265,8 +270,8 @@ Resource.add({
                 "\n" +
                 "  7. If the CSRRequest command had been successfully invoked, but no AddNOC or UpdateNOC command had " +
                 "     been successfully invoked, then the new operational key pair temporarily generated for the " +
-                "     purposes of NOC addition or update (see Node Operational CSR Procedure) shall be removed as it " +
-                "     is no longer needed." +
+                "     purposes of NOC addition or update (see Section 6.4.6.1, “Node Operational Certificate Signing " +
+                "     Request (NOCSR) Procedure”) shall be removed as it is no longer needed." +
                 "\n" +
                 "  8. Remove any RCACs added by the AddTrustedRootCertificate command that are not currently " +
                 "     referenced by any entry in the Fabrics attribute." +
@@ -279,6 +284,7 @@ Resource.add({
 
         {
             tag: "command", name: "ArmFailSafeResponse", xref: "core§11.10.7.3",
+            details: "This command is used to report the result of the ArmFailSafe command.",
 
             children: [
                 {
@@ -296,7 +302,9 @@ Resource.add({
         {
             tag: "command", name: "SetRegulatoryConfig", xref: "core§11.10.7.4",
 
-            details: "This shall add or update the regulatory configuration in the RegulatoryConfig Attribute to the value " +
+            details: "This command is used to set the regulatory configuration for the device." +
+                "\n" +
+                "This shall add or update the regulatory configuration in the RegulatoryConfig Attribute to the value " +
                 "provided in the NewRegulatoryConfig field." +
                 "\n" +
                 "Success or failure of this command shall be communicated by the SetRegulatoryConfigResponse command, " +
@@ -330,6 +338,7 @@ Resource.add({
 
         {
             tag: "command", name: "SetRegulatoryConfigResponse", xref: "core§11.10.7.5",
+            details: "This command is used to report the result of the SetRegulatoryConfig command.",
 
             children: [
                 {
@@ -347,7 +356,7 @@ Resource.add({
         {
             tag: "command", name: "CommissioningComplete", xref: "core§11.10.7.6",
 
-            details: "This command has no data." +
+            details: "This command is used to indicate that the commissioning process is complete." +
                 "\n" +
                 "Success or failure of this command shall be communicated by the CommissioningCompleteResponse " +
                 "command, unless some data model validations caused a failure status code to be issued during the " +
@@ -367,8 +376,7 @@ Resource.add({
                 "\n" +
                 "If Terms and Conditions are required, then an ErrorCode of TCAcknowledgementsNotReceived shall be " +
                 "responded to the invoker if the user acknowledgements to the required Terms and Conditions have not " +
-                "been provided. If the TCAcceptedVersion for the provided acknowledgements is less than " +
-                "TCMinRequiredVersion, then an ErrorCode of TCMinVersionNotMet shall be responded to the invoker." +
+                "been provided." +
                 "\n" +
                 "This command is fabric-scoped, so cannot be issued over a session that does not have an associated " +
                 "fabric, i.e. over PASE session prior to an AddNOC command. In addition, this command is only " +
@@ -411,6 +419,7 @@ Resource.add({
 
         {
             tag: "command", name: "CommissioningCompleteResponse", xref: "core§11.10.7.7",
+            details: "This command is used to report the result of the CommissioningComplete command.",
 
             children: [
                 {
@@ -427,8 +436,8 @@ Resource.add({
 
         {
             tag: "command", name: "SetTcAcknowledgements", xref: "core§11.10.7.8",
-            details: "This command sets the user acknowledgements received in the Enhanced Setup Flow Terms & Conditions " +
-                "into the node.",
+            details: "This command is used to set the user acknowledgements received in the Enhanced Setup Flow Terms & " +
+                "Conditions into the node.",
 
             children: [
                 {
@@ -467,7 +476,7 @@ Resource.add({
 
         {
             tag: "command", name: "SetTcAcknowledgementsResponse", xref: "core§11.10.7.9",
-            details: "This command is used to convey the result from SetTCAcknowledgements.",
+            details: "This command is used to report the result of the SetTCAcknowledgements command.",
             children: [{
                 tag: "field", name: "ErrorCode", xref: "core§11.10.7.9.1",
                 details: "This field shall contain the result of the operation, based on the behavior specified in the " +
@@ -487,15 +496,15 @@ Resource.add({
                 },
                 {
                     tag: "field", name: "InvalidAuthentication",
-                    description: "Executed CommissioningComplet e outside CASE session."
+                    description: "Executed CommissioningComplete outside CASE session."
                 },
                 {
                     tag: "field", name: "NoFailSafe",
-                    description: "Executed CommissioningComplet e when there was no active Fail-Safe context."
+                    description: "Executed CommissioningComplete when there was no active Fail-Safe context."
                 },
                 {
                     tag: "field", name: "BusyWithOtherAdmin",
-                    description: "Attempting to arm fail-safe or execute CommissioningComplet e from a fabric different than the one associated with the current fail-safe context."
+                    description: "Attempting to arm fail-safe or execute CommissioningComplete from a fabric different than the one associated with the current fail-safe context."
                 },
                 {
                     tag: "field", name: "RequiredTcNotAccepted",
@@ -503,7 +512,7 @@ Resource.add({
                 },
                 {
                     tag: "field", name: "TcAcknowledgementsNotReceived",
-                    description: "No acknowledgements from the user for the TC features were received."
+                    description: "No or insufficient acknowledgements from the user for the TC features were received."
                 },
                 {
                     tag: "field", name: "TcMinVersionNotMet",

package/src/standard/resources/general-diagnostics.resource.ts

@@ -50,7 +50,7 @@ Resource.add({
                 "since the Node’s last reboot. This attribute SHOULD be incremented to account for the periods of " +
                 "time that a Node is in a low-power or sleep state. This attribute shall only be reset upon a device " +
                 "reboot. This attribute shall be based on the same System Time source as those used to fulfill any " +
-                "usage of the system-us and system-ms data types within the server."
+                "usage of the systime-us and systime-ms data types within the server."
         },
 
         {
@@ -110,10 +110,11 @@ Resource.add({
 
             details: "The TestEventTriggersEnabled attribute shall indicate whether the Node has any TestEventTrigger " +
                 "configured. When this attribute is true, the Node has been configured with one or more test event " +
-                "triggers by virtue of the internally programmed EnableKey value (see TestEventTrigger) being set to " +
-                "a non-zero value. This attribute can be used by Administrators to detect if a device was " +
-                "inadvertently commissioned with test event trigger mode enabled, and take appropriate action (e.g. " +
-                "warn the user and/or offer to remove all fabrics on the Node)."
+                "triggers by virtue of the internally programmed EnableKey value (see Section 11.12.7.1, " +
+                "“TestEventTrigger Command”) being set to a non-zero value. This attribute can be used by " +
+                "Administrators to detect if a device was inadvertently commissioned with test event trigger mode " +
+                "enabled, and take appropriate action (e.g. warn the user and/or offer to remove all fabrics on the " +
+                "Node)."
         },
 
         { tag: "attribute", name: "DoNotUse", xref: "core§11.12.6" },
@@ -221,7 +222,8 @@ Resource.add({
                         "Connectivity Standards Alliance, in conjunction with certification test cases documentation." +
                         "\n" +
                         "Values of EventTrigger in the range 0xFFFF_FFFF_0000_0000 through 0xFFFF_FFFF_FFFF_FFFF are reserved " +
-                        "for testing use by manufacturers and will not appear in CSA certification test literature." +
+                        "for testing use by manufacturers and will not appear in the Connectivity Standards Alliance " +
+                        "certification test literature." +
                         "\n" +
                         "If the value of EventTrigger received is not supported by the receiving Node, this command shall " +
                         "fail with a status code of INVALID_COMMAND." +
@@ -263,7 +265,7 @@ Resource.add({
             children: [
                 {
                     tag: "field", name: "SystemTimeMs", xref: "core§11.12.7.3.1",
-                    details: "This shall indicate the current System Time in milliseconds (type system-ms), with the value taken " +
+                    details: "This shall indicate the current System Time in milliseconds (type systime-ms), with the value taken " +
                         "at the time of processing of the TimeSnapshot command that generated this response." +
                         "\n" +
                         "The value shall be taken from the same clock which populates the Timestamp field in events when " +
@@ -318,11 +320,10 @@ Resource.add({
                         "\n" +
                         "  • The EnableKey field does not match the a-priori value configured on the device." +
                         "\n" +
-                        "  • The TestEventTriggersEnabled field is currently false." +
-                        "\n" +
-                        "Otherwise, the server shall respond with a PayloadTestResponse command with a Payload field value " +
-                        "containing Count instances of the Value byte. If the response is too large to send, the server shall " +
-                        "fail the command and respond with a response status of RESOURCE_EXHAUSTED." +
+                        "  • The TestEventTriggersEnabled field is currently false. Otherwise, the server shall respond with " +
+                        "    a PayloadTestResponse command with a Payload field value containing Count instances of the Value " +
+                        "    byte. If the response is too large to send, the server shall fail the command and respond with a " +
+                        "    response status of RESOURCE_EXHAUSTED." +
                         "\n" +
                         "For example:" +
                         "\n" +
@@ -411,7 +412,7 @@ Resource.add({
                 },
                 {
                     tag: "field", name: "ThreadFault",
-                    description: "The Node has encountered a fault with its 802.15.4 radio."
+                    description: "The Node has encountered a fault with its802.15.4 radio."
                 },
                 { tag: "field", name: "NfcFault", description: "The Node has encountered a fault with its NFC radio." },
                 { tag: "field", name: "BleFault", description: "The Node has encountered a fault with its BLE radio." },

package/src/standard/resources/generated-command-list.resource.ts

@@ -18,7 +18,7 @@ Resource.add({
         "\n" +
         "This attribute shall be a list of the command IDs for server generated commands." +
         "\n" +
-        "For each command in this list that is a response to a client command request, the request command " +
+        "For each command in this list that is a response to a client request command, the request command " +
         "shall be indicated in the AcceptedCommandList attribute." +
         "\n" +
         "If any attribute on a server supports atomic writes, this attribute shall contain the command ID for " +