@matter/model 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251029-bd92894d4

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

@@ -36,7 +36,7 @@ Resource.add(
 
                         details: "This feature is for a device that is managed by a service associated with the device vendor and " +
                             "which imposes default access restrictions upon each new fabric added to it. This could arise, for " +
-                            "example, if the device is managed by a service provider under contract to an end-user, in such a way " +
+                            "example, if the device is managed by a service provider under contract to an end-user, in such away " +
                             "that the manager of the device does not unconditionally grant universal access to all of a device’s " +
                             "functionality, even for fabric administrators. For example, many Home Routers are managed by an " +
                             "Internet Service Provider (a service), and these services often have a policy that requires them to " +
@@ -71,11 +71,11 @@ Resource.add(
                             "review process may involve communication between external services and the user, and may take an " +
                             "unpredictable amount of time to complete since an end-user may need to visit some resources, such as " +
                             "a mobile application or web site. A FabricRestrictionReviewUpdate event will be generated by the " +
-                            "device within a predictable time period of the ReviewFabricRestrictionsResponse (see " +
-                            "ReviewFabricRestrictions for specification of this time period), and this event can be correlated " +
-                            "with the ReviewFabricRestrictionsResponse using a token provided in both. The device may provide " +
-                            "instructions or a Redirect URL in the FabricRestrictionReviewUpdate event in order to help the user " +
-                            "access the features required for managing per-fabric restrictions." +
+                            "device within a predictable time period of the ReviewFabricRestrictionsResponse (see Section " +
+                            "9.10.8.1, “ReviewFabricRestrictions Command” for specification of this time period), and this event " +
+                            "can be correlated with the ReviewFabricRestrictionsResponse using a token provided in both. The " +
+                            "device may provide instructions or a Redirect URL in the FabricRestrictionReviewUpdate event in " +
+                            "order to help the user access the features required for managing per-fabric restrictions." +
                             "\n" +
                             "See Section 6.6.2, “Model” for a description of how access control is impacted by the ARL attribute." +
                             "\n" +
@@ -377,7 +377,7 @@ Resource.add(
                             "    the contents of the value encoded with proper URL-encoded escaping." +
                             "\n" +
                             "  • If key MTcu is present, it shall have a value of \"_\" (i.e. MTcu=_). This is the \"callback URL " +
-                            "    (CallbackUrl) placeholder\"." +
+                            "    (Call backUrl) placeholder\"." +
                             "\n" +
                             "  • Any key whose name begins with MT not mentioned in the previous bullets shall be reserved for " +
                             "    future use by this specification. Manufacturers shall NOT include query keys starting with MT in " +
@@ -386,6 +386,8 @@ Resource.add(
                             "Any other element in the ARLRequestFlowUrl query field not covered by the above rules, as well as " +
                             "the fragment field (if present), shall remain including the order of query key/value pairs present." +
                             "\n" +
+                            "### Expansion of ARLRequestFlowUrl by client" +
+                            "\n" +
                             "Once the URL is obtained, it shall be expanded to form a final URL (ExpandedARLRequestFlowUrl) by " +
                             "proceeding with the following substitution algorithm on the original ARLRequestFlowUrl:" +
                             "\n" +
@@ -424,6 +426,8 @@ Resource.add(
                             "fragment field (if present), shall remain as provided by the client through embedding within the " +
                             "ExpandedARLRequestFlowUrl, including the order of query key/value pairs present." +
                             "\n" +
+                            "### Expansion of CallbackUrl by the manufacturer custom flow" +
+                            "\n" +
                             "Once the CallbackUrl is obtained by the manufacturer flow, it may be expanded to form a final " +
                             "ExpandedARLRequestCallbackUrl URL to be used by proceeding with the following substitution algorithm " +
                             "on the provided CallbackUrl:" +
@@ -545,16 +549,9 @@ Resource.add(
 
             {
                 tag: "datatype", name: "AccessControlEntryPrivilegeEnum", xref: "core§9.10.5.2",
-                details: "### Proxy View Value" +
-                    "\n" +
-                    "### This value implicitly grants View privileges",
 
                 children: [
-                    {
-                        tag: "field", name: "View",
-                        description: "Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)"
-                    },
-                    { tag: "field", name: "ProxyView", description: "Can read and observe all (as seen by a Proxy)" },
+                    { tag: "field", name: "View", description: "Can read and observe all (except Access Control Cluster)" },
 
                     {
                         tag: "field", name: "Operate",
@@ -574,7 +571,7 @@ Resource.add(
                         tag: "field", name: "Administer",
                         description: "Manage privileges, and can observe and modify the Access Control Cluster",
                         xref: "core§9.10.5.2.3",
-                        details: "This value implicitly grants Manage, Operate, Proxy View & View privileges"
+                        details: "This value implicitly grants Manage, Operate & View privileges"
                     }
                 ]
             },
@@ -659,6 +656,8 @@ Resource.add(
                             "\n" +
                             "### Subject ID shall be of type uint64 with semantics depending on the entry’s AuthMode as follows:" +
                             "\n" +
+                            "### Subject Semantics" +
+                            "\n" +
                             "An empty subjects list indicates a wildcard; that is, this entry shall grant access to any Node that " +
                             "successfully authenticates via AuthMode. The subjects list shall NOT be empty if the entry’s " +
                             "AuthMode is PASE." +
@@ -698,6 +697,8 @@ Resource.add(
                             "\n" +
                             "A target grants access based on the presence of fields as follows:" +
                             "\n" +
+                            "### Target Semantics" +
+                            "\n" +
                             "An empty targets list indicates a wildcard: that is, this entry shall grant access to all cluster " +
                             "instances on all endpoints on this Node."
                     }

package/src/standard/resources/account-login.resource.ts

@@ -54,14 +54,14 @@ Resource.add({
             tag: "command", name: "GetSetupPin", xref: "cluster§6.2.4.1",
 
             details: "The purpose of this command is to determine if the active user account of the given Content App " +
-                "matches the active user account of a given Commissionee, and when it does, return a Setup PIN code " +
-                "which can be used for password-authenticated session establishment (PASE) with the Commissionee." +
+                "matches the active user account of a given Commissionee, and when it does, return a Setup PIN which " +
+                "can be used for password-authenticated session establishment (PASE) with the Commissionee." +
                 "\n" +
                 "For example, a Video Player with a Content App Platform may invoke this command on one of its " +
                 "Content App endpoints to facilitate commissioning of a Phone App made by the same vendor as the " +
-                "Content App. If the accounts match, then the Content App may return a setup code that can be used by " +
-                "the Video Player to commission the Phone App without requiring the user to physically input a setup " +
-                "code." +
+                "Content App. If the accounts match, then the Content App may return a Setup PIN that can be used by " +
+                "the Video Player to commission the Phone App without requiring the user to physically input a Setup " +
+                "PIN." +
                 "\n" +
                 "The account match is determined by the Content App using a method which is outside the scope of this " +
                 "specification and will typically involve a central service which is in communication with both the " +
@@ -89,7 +89,7 @@ Resource.add({
                 "The Setup PIN is a character string so that it can accommodate different future formats, including " +
                 "alpha-numeric encodings. For a Commissionee it shall be populated with the Manual Pairing Code (see " +
                 "Manual Pairing Code section in [MatterCore]) encoded as a string (11 characters) or the Passcode " +
-                "portion of the Manual Pairing Code (when less than 11 characters) ." +
+                "portion of the Manual Pairing Code (when less than 11 characters)." +
                 "\n" +
                 "The server shall implement rate limiting to prevent brute force attacks. No more than 10 unique " +
                 "requests in a 10 minute period shall be allowed; a command response status of FAILURE should sent " +
@@ -108,15 +108,15 @@ Resource.add({
 
         {
             tag: "command", name: "GetSetupPinResponse", xref: "cluster§6.2.4.2",
-            details: "This message is sent in response to the GetSetupPIN command, and contains the Setup PIN code, or " +
-                "null when the account identified in the request does not match the active account of the running " +
-                "Content App.",
+            details: "This message is sent in response to the GetSetupPIN command, and contains the Setup PIN, or null " +
+                "when the account identified in the request does not match the active account of the running Content " +
+                "App.",
 
             children: [{
                 tag: "field", name: "SetupPin", xref: "cluster§6.2.4.2.1",
 
-                details: "This field shall provide the setup PIN code as a text string at least 8 characters in length or " +
-                    "empty string to indicate that the accounts do not match." +
+                details: "This field shall provide the Setup PIN as a text string at least 8 characters in length or empty " +
+                    "string to indicate that the accounts do not match." +
                     "\n" +
                     "> [!NOTE]" +
                     "\n" +
@@ -129,7 +129,7 @@ Resource.add({
             tag: "command", name: "Login", xref: "cluster§6.2.4.3",
 
             details: "The purpose of this command is to allow the Content App to assume the user account of a given " +
-                "Commissionee by leveraging the Setup PIN code input by the user during the commissioning process." +
+                "Commissionee by leveraging the Setup PIN input by the user during the commissioning process." +
                 "\n" +
                 "For example, a Video Player with a Content App Platform may invoke this command on one of its " +
                 "Content App endpoints after the commissioning has completed of a Phone App made by the same vendor " +
@@ -158,12 +158,12 @@ Resource.add({
                 "\n" +
                 "The Setup PIN for a Commissionee may be populated with the Manual Pairing Code encoded as a string " +
                 "of decimal numbers (11 characters) or the Passcode portion of the Manual Pairing Code encoded as a " +
-                "string of decimal numbers (8 characters) ." +
+                "string of decimal numbers (8 characters)." +
                 "\n" +
                 "The server shall implement rate limiting to prevent brute force attacks. No more than 10 unique " +
                 "requests in a 10 minute period shall be allowed; a command response status of FAILURE should sent " +
                 "for additional commands received within the 10 minute period. Because access to this command is " +
-                "limited to nodes with Admin-level access, and the user is involved when obtaining the SetupPIN, " +
+                "limited to nodes with Admin-level access, and the user is involved when obtaining the Setup PIN, " +
                 "there are in place multiple obstacles to successfully mounting a brute force attack. A Content App " +
                 "that supports this command shall ensure that the Temporary Account Identifier used by its clients is " +
                 "not valid for more than 10 minutes.",
@@ -177,11 +177,11 @@ Resource.add({
                 {
                     tag: "field", name: "SetupPin", xref: "cluster§6.2.4.3.2",
 
-                    details: "This field shall provide the setup PIN code as a text string at least 8 characters in length." +
+                    details: "This field shall provide the Setup PIN as a text string at least 8 characters in length." +
                         "\n" +
                         "> [!NOTE]" +
                         "\n" +
-                        "> Newer cluster clients should be aware that AccountLogin cluster version 1 specified an 11 digit " +
+                        "> Newer cluster clients should be aware that AccountLogin cluster revision 1 specified an 11 digit " +
                         "  minimum length."
                 },
 

package/src/standard/resources/actions.resource.ts

@@ -13,7 +13,9 @@ Resource.add(
         tag: "cluster", name: "Actions", classification: "application", pics: "ACT", xref: "core§9.14",
 
         details: "This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to " +
-            "expose" +
+            "expose logical grouping and actions." +
+            "\n" +
+            "Specifically this cluster provides:" +
             "\n" +
             "  • Information about logical grouping of endpoints on the Node (example: lights in a room)" +
             "\n" +
@@ -168,7 +170,10 @@ Resource.add(
 
             {
                 tag: "command", name: "InstantAction", xref: "core§9.14.6.1",
-                details: "This command triggers an action (state change) on the involved endpoints, in a \"fire and forget\" " +
+
+                details: "This command is used to trigger an instantaneous action." +
+                    "\n" +
+                    "This command triggers an action (state change) on the involved endpoints, in a \"fire and forget\" " +
                     "manner. Afterwards, the action’s state shall be Inactive." +
                     "\n" +
                     "Example: recall a scene on a number of lights."
@@ -177,7 +182,9 @@ Resource.add(
             {
                 tag: "command", name: "InstantActionWithTransition", xref: "core§9.14.6.2",
 
-                details: "It is recommended that, where possible (e.g., it is not possible for attributes with Boolean data " +
+                details: "This command is used to trigger an instantaneous action with a transition over a given time." +
+                    "\n" +
+                    "It is recommended that, where possible (e.g., it is not possible for attributes with Boolean data " +
                     "type), a gradual transition SHOULD take place from the old to the new state over this time period. " +
                     "However, the exact transition is manufacturer dependent." +
                     "\n" +
@@ -196,7 +203,9 @@ Resource.add(
             {
                 tag: "command", name: "StartAction", xref: "core§9.14.6.3",
 
-                details: "This command triggers the commencement of an action on the involved endpoints. Afterwards, the " +
+                details: "This command is used to trigger the commencement of an action." +
+                    "\n" +
+                    "This command triggers the commencement of an action on the involved endpoints. Afterwards, the " +
                     "action’s state shall be Active." +
                     "\n" +
                     "Example: start a dynamic lighting pattern (such as gradually rotating the colors around the " +
@@ -209,7 +218,9 @@ Resource.add(
             {
                 tag: "command", name: "StartActionWithDuration", xref: "core§9.14.6.4",
 
-                details: "This command triggers the commencement of an action on the involved endpoints, and shall change the " +
+                details: "This command is used to trigger the commencement of an action with a duration." +
+                    "\n" +
+                    "This command triggers the commencement of an action on the involved endpoints, and shall change the " +
                     "action’s state to Active. After the specified Duration, the action will stop, and the action’s state " +
                     "shall change to Inactive." +
                     "\n" +
@@ -224,7 +235,10 @@ Resource.add(
 
             {
                 tag: "command", name: "StopAction", xref: "core§9.14.6.5",
-                details: "This command stops the ongoing action on the involved endpoints. Afterwards, the action’s state " +
+
+                details: "This command is used to stop an action." +
+                    "\n" +
+                    "This command stops the ongoing action on the involved endpoints. Afterwards, the action’s state " +
                     "shall be Inactive." +
                     "\n" +
                     "Example: stop a dynamic lighting pattern which was previously started with StartAction."
@@ -232,7 +246,10 @@ Resource.add(
 
             {
                 tag: "command", name: "PauseAction", xref: "core§9.14.6.6",
-                details: "This command pauses an ongoing action, and shall change the action’s state to Paused." +
+
+                details: "This command is used to pause an action." +
+                    "\n" +
+                    "This command pauses an ongoing action, and shall change the action’s state to Paused." +
                     "\n" +
                     "Example: pause a dynamic lighting effect (the lights stay at their current color) which was " +
                     "previously started with StartAction."
@@ -241,7 +258,9 @@ Resource.add(
             {
                 tag: "command", name: "PauseActionWithDuration", xref: "core§9.14.6.7",
 
-                details: "This command pauses an ongoing action, and shall change the action’s state to Paused. After the " +
+                details: "This command is used to pause an action with a duration." +
+                    "\n" +
+                    "This command pauses an ongoing action, and shall change the action’s state to Paused. After the " +
                     "specified Duration, the ongoing action will be automatically resumed. which shall change the " +
                     "action’s state to Active." +
                     "\n" +
@@ -263,7 +282,9 @@ Resource.add(
             {
                 tag: "command", name: "ResumeAction", xref: "core§9.14.6.8",
 
-                details: "This command resumes a previously paused action, and shall change the action’s state to Active." +
+                details: "This command is used to resume an action." +
+                    "\n" +
+                    "This command resumes a previously paused action, and shall change the action’s state to Active." +
                     "\n" +
                     "The difference between ResumeAction and StartAction is that ResumeAction will continue the action " +
                     "from the state where it was paused, while StartAction will start the action from the beginning." +
@@ -274,7 +295,9 @@ Resource.add(
 
             {
                 tag: "command", name: "EnableAction", xref: "core§9.14.6.9",
-                details: "This command enables a certain action or automation. Afterwards, the action’s state shall be Active." +
+                details: "This command is used to enable an action." +
+                    "\n" +
+                    "This command enables a certain action or automation. Afterwards, the action’s state shall be Active." +
                     "\n" +
                     "Example: enable a motion sensor to control the lights in an area."
             },
@@ -282,7 +305,9 @@ Resource.add(
             {
                 tag: "command", name: "EnableActionWithDuration", xref: "core§9.14.6.10",
 
-                details: "This command enables a certain action or automation, and shall change the action’s state to be " +
+                details: "This command is used to enable an action with a duration." +
+                    "\n" +
+                    "This command enables a certain action or automation, and shall change the action’s state to be " +
                     "Active. After the specified Duration, the action or automation will stop, and the action’s state " +
                     "shall change to Disabled." +
                     "\n" +
@@ -298,7 +323,10 @@ Resource.add(
 
             {
                 tag: "command", name: "DisableAction", xref: "core§9.14.6.11",
-                details: "This command disables a certain action or automation, and shall change the action’s state to " +
+
+                details: "This command is used to disable an action." +
+                    "\n" +
+                    "This command disables a certain action or automation, and shall change the action’s state to " +
                     "Inactive." +
                     "\n" +
                     "Example: disable a motion sensor to no longer control the lights in an area."
@@ -307,9 +335,12 @@ Resource.add(
             {
                 tag: "command", name: "DisableActionWithDuration", xref: "core§9.14.6.12",
 
-                details: "This command disables a certain action or automation, and shall change the action’s state to " +
+                details: "This command is used to disable an action with a duration." +
+                    "\n" +
+                    "This command disables a certain action or automation, and shall change the action’s state to " +
                     "Disabled. After the specified Duration, the action or automation will re-start, and the action’s " +
-                    "state shall change to either Inactive or Active, depending on the actions (see examples 4 and 6)." +
+                    "state shall change to either Inactive or Active, depending on the actions (see Section 9.14.8.4, " +
+                    "“Example 4: Wake-up routine” and Section 9.14.8.6, “Example 6: Alarm system”)." +
                     "\n" +
                     "Example: disable a \"wakeup\" experience for a period of 1 week when going on holiday (to prevent them " +
                     "from turning on in the morning while you’re not at home). After this period, the wakeup experience " +
@@ -372,7 +403,8 @@ Resource.add(
                             "effect. A voice controller could use \"set\" (to map to InstantAction) or \"play\" (to map to " +
                             "StartAction) to trigger such actions." +
                             "\n" +
-                            "Example: see examples 1 and 2."
+                            "Example: see Section 9.14.8.1, “Example 1: Scene recall” and Section 9.14.8.2, “Example 2: Set " +
+                            "dynamic light effect”."
                     },
 
                     {
@@ -381,7 +413,7 @@ Resource.add(
                         details: "Indicates an action which involves a sequence of events/states of the associated endpoints, such as " +
                             "a wake-up experience." +
                             "\n" +
-                            "Example: see example 4."
+                            "Example: see Section 9.14.8.4, “Example 4: Wake-up routine”."
                     },
 
                     {
@@ -389,7 +421,9 @@ Resource.add(
                         description: "Control an automation (e.g. motion sensor controlling lights)",
                         xref: "core§9.14.4.2.3",
                         details: "Indications an automation (e.g. a motion sensor controlling lights, an alarm system) which can " +
-                            "bee.g. started, stopped, paused, resumed. Example: see example 3."
+                            "bee.g. started, stopped, paused, resumed." +
+                            "\n" +
+                            "Example: see Section 9.14.8.3, “Example 3: Pause sensor automation”."
                     },
 
                     {

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

@@ -19,7 +19,7 @@ Resource.add({
         "in Section 5.6.2, “Basic Commissioning Method (BCM)” and Enhanced Commissioning which shall be " +
         "supported and is described in Section 5.6.3, “Enhanced Commissioning Method (ECM)”." +
         "\n" +
-        "For the management of Operational Credentials and Trusted Root Certificates, the Node Operational " +
+        "For the management of Operational Credentials and Trusted Root Certificates, the Operational " +
         "Credentials cluster is used." +
         "\n" +
         "If the Administrator Commissioning Cluster server instance is present on an endpoint with the Root " +
@@ -63,7 +63,7 @@ Resource.add({
 
             details: "When the WindowStatus attribute is not set to WindowNotOpen, this attribute shall indicate the " +
                 "FabricIndex associated with the Fabric scoping of the Administrator that opened the window. This may " +
-                "be used to cross-reference in the Fabrics attribute of the Node Operational Credentials cluster." +
+                "be used to cross-reference in the Fabrics attribute of the Operational Credentials cluster." +
                 "\n" +
                 "If, during an open commissioning window, the fabric for the Administrator that opened the window is " +
                 "removed, then this attribute shall be set to null." +
@@ -131,21 +131,21 @@ Resource.add({
                 {
                     tag: "field", name: "PakePasscodeVerifier", xref: "core§11.19.8.1.2",
 
-                    details: "This field shall specify an ephemeral PAKE passcode verifier (see Section 3.10, “Password- " +
-                        "Authenticated Key Exchange (PAKE)”) computed by the existing Administrator to be used for this " +
-                        "commissioning. The field is concatenation of two values (w0 || L) shall be (CRYPTO_GROUP_SIZE_BYTES " +
-                        "+ CRYPTO_PUBLIC_KEY_SIZE_BYTES)-octets long as detailed in Crypto_PAKEValues_Responder. It shall be " +
-                        "derived from an ephemeral passcode (See PAKE). It shall be deleted by the Node at the end of " +
-                        "commissioning or expiration of the OpenCommissioningWindow command, and shall be deleted by the " +
-                        "existing Administrator after sending it to the Node(s)."
+                    details: "This field shall specify an ephemeral PAKE passcode verifier (see Section 3.10, " +
+                        "“Password-Authenticated Key Exchange (PAKE)”) computed by the existing Administrator to be used for " +
+                        "this commissioning. The field is concatenation of two values (w0 || L) shall be " +
+                        "(CRYPTO_GROUP_SIZE_BYTES + CRYPTO_PUBLIC_KEY_SIZE_BYTES)-octets long as detailed in " +
+                        "Crypto_PAKEValues_Responder. It shall be derived from an ephemeral passcode (See PAKE). It shall be " +
+                        "deleted by the Node at the end of commissioning or expiration of the OpenCommissioningWindow " +
+                        "command, and shall be deleted by the existing Administrator after sending it to the Node(s)."
                 },
 
                 {
                     tag: "field", name: "Discriminator", xref: "core§11.19.8.1.3",
-                    details: "This field shall be used by the Node as the long discriminator for DNS-SD advertisement (see " +
-                        "Commissioning Discriminator) for discovery by the new Administrator. The new Administrator can find " +
-                        "and filter DNS-SD records by long discriminator to locate and initiate commissioning with the " +
-                        "appropriate Node."
+                    details: "This field shall be used by the Node as the long discriminator for DNS-SD advertisement (see Section " +
+                        "4.3.1.5, “TXT key for discriminator (D)”) for discovery by the new Administrator. The new " +
+                        "Administrator can find and filter DNS-SD records by long discriminator to locate and initiate " +
+                        "commissioning with the appropriate Node."
                 },
 
                 {
@@ -166,10 +166,12 @@ Resource.add({
                         "constraints on the value shall match those specified in Section 3.9, “Password-Based Key Derivation " +
                         "Function (PBKDF)”, within the definition of the Crypto_PBKDFParameterSet." +
                         "\n" +
-                        "When a Node receives the Open Commissioning Window command, it shall begin advertising on DNS-SD as " +
+                        "When a Node receives the OpenCommissioningWindow command, it shall begin advertising on DNS-SD as " +
                         "described in Section 4.3.1, “Commissionable Node Discovery” and for a time period as described in " +
-                        "CommissioningTimeout. When the command is received by a ICD, it shall enter into active mode. The " +
-                        "ICD shall remain in Active Mode as long as one of these conditions is met:" +
+                        "CommissioningTimeout." +
+                        "\n" +
+                        "When the command is received by a ICD, it shall enter into active mode. The ICD shall remain in " +
+                        "Active Mode as long as one of these conditions is met:" +
                         "\n" +
                         "  • A commissioning window is open." +
                         "\n" +

package/src/standard/resources/alarm-base.resource.ts

@@ -53,7 +53,7 @@ Resource.add({
 
         {
             tag: "event", name: "Notify", xref: "cluster§1.15.8.1",
-            details: "This event shall be generated when one or more alarms change state, and shall have these fields:",
+            details: "This event shall be generated when one or more alarms change state.",
 
             children: [
                 {

package/src/standard/resources/application-launcher.resource.ts

@@ -36,8 +36,8 @@ Resource.add({
             tag: "attribute", name: "CatalogList", xref: "cluster§6.4.6.1",
 
             details: "This attribute shall specify the list of supported application catalogs, where each entry in the " +
-                "list is the CSA-issued vendor ID for the catalog. The DIAL registry (see [DIAL Registry]) shall use " +
-                "value 0x0000." +
+                "list is the Connectivity Standards Alliance-issued vendor ID for the catalog. The DIAL registry (see " +
+                "[DIAL Registry]) shall use value 0x0000." +
                 "\n" +
                 "It is expected that Content App Platform providers will have their own catalog vendor ID (set to " +
                 "their own Vendor ID) and will assign an ApplicationID to each Content App."
@@ -125,7 +125,9 @@ Resource.add({
                 "constraints if any. The Status attribute shall be updated to ActiveHidden or Stopped, depending on " +
                 "the action taken, on the Application Basic cluster of the Endpoint corresponding to the application " +
                 "on which the action was taken. The Status attribute shall be updated on any other application whose " +
-                "Status may have changed as a result of this command. This command returns a Launcher Response.",
+                "Status may have changed as a result of this command." +
+                "\n" +
+                "This command returns a Launcher Response.",
 
             children: [{
                 tag: "field", name: "Application", xref: "cluster§6.4.7.3.1",
@@ -169,8 +171,8 @@ Resource.add({
             children: [
                 {
                     tag: "field", name: "CatalogVendorId", xref: "cluster§6.4.5.2.1",
-                    details: "This field shall indicate the CSA-issued vendor ID for the catalog. The DIAL registry shall use " +
-                        "value 0x0000." +
+                    details: "This field shall indicate the Connectivity Standards Alliance-issued vendor ID for the catalog. The " +
+                        "DIAL registry shall use value 0x0000." +
                         "\n" +
                         "Content App Platform providers will have their own catalog vendor ID (set to their own Vendor ID) " +
                         "and will assign an ApplicationID to each Content App."

package/src/standard/resources/area-namespace.resource.ts

@@ -16,26 +16,39 @@ Resource.add({
     children: [
         { tag: "semanticTag", name: "Bathroom", description: "Also known as Restroom" },
         { tag: "semanticTag", name: "Boxroom", description: "A small room typically used for storage" },
+        {
+            tag: "semanticTag", name: "Closet",
+            description: "A small room for storing clothing, linens, and other items."
+        },
         {
             tag: "semanticTag", name: "Den",
             description: "A small, comfortable room for individual activities such as work or hobbies"
         },
         { tag: "semanticTag", name: "Ensuite", description: "A bathroom directly accessible from a bedroom" },
-        { tag: "semanticTag", name: "Guest Bathroom", description: "Also known as Guest Restroom" },
+        { tag: "semanticTag", name: "GuestBathroom", description: "Also known as Guest Restroom" },
+        {
+            tag: "semanticTag", name: "Reserved1",
+            description: "Deprecated: was Guest Restroom; use 0x26 Guest Bathroom"
+        },
+        { tag: "semanticTag", name: "GuestRoom", description: "Also known as Guest Bedroom" },
         {
-            tag: "semanticTag", name: "Hearth Room",
+            tag: "semanticTag", name: "HearthRoom",
             description: "A cozy room containing a fireplace or other point heat source"
         },
+        { tag: "semanticTag", name: "Reserved2", description: "Deprecated: was Larder; use 0x3D Pantry" },
         {
-            tag: "semanticTag", name: "Mud Room",
+            tag: "semanticTag", name: "MudRoom",
             description: "A space used to remove soiled garments prior to entering the domicile proper"
         },
         { tag: "semanticTag", name: "Pantry", description: "AKA a larder, a place where food is stored" },
+        { tag: "semanticTag", name: "PoolRoom", description: "A room centered around a pool/billiards table" },
+        { tag: "semanticTag", name: "Reserved3", description: "Deprecated: was Restroom; use 0x06 Bathroom" },
         { tag: "semanticTag", name: "Scullery", description: "A utility space for cleaning dishes and laundry" },
         {
             tag: "semanticTag", name: "Snug",
             description: "An informal space meant to be 'cozy', 'snug', relaxed, meant to share with family or friends"
         },
+        { tag: "semanticTag", name: "Ward", description: "The innermost area of a large home" },
         { tag: "semanticTag", name: "Toilet", description: "A room dedicated to a toilet; a water closet / WC" }
     ]
 });

package/src/standard/resources/basic-information.resource.ts

@@ -76,11 +76,10 @@ Resource.add({
 
         {
             tag: "attribute", name: "SoftwareVersion", xref: "core§11.1.5.10",
-            details: "This attribute shall contain the current version number for the software running on this Node. The " +
-                "version number can be compared using a total ordering to determine if a version is logically newer " +
-                "than another one. A larger value of SoftwareVersion is newer than a lower value, from the " +
-                "perspective of software updates (see Section 11.20.3.3, “Availability of Software Images”). Nodes " +
-                "may query this field to determine the currently running version of software on another given Node."
+            details: "This attribute shall contain the current version number for the software running on this Node. A " +
+                "larger value of SoftwareVersion is newer than a lower value, from the perspective of software " +
+                "updates (see Section 11.20.3.3, “Availability of Software Images”). Nodes may query this field to " +
+                "determine the currently running version of software on another given Node."
         },
 
         {
@@ -208,9 +207,7 @@ Resource.add({
             tag: "attribute", name: "SpecificationVersion", xref: "core§11.1.5.22",
 
             details: "This attribute shall contain the current version number for the specification version this Node was " +
-                "certified against. The version number can be compared using a total ordering to determine if a " +
-                "version is logically newer than another one. A larger value of SpecificationVersion is newer than a " +
-                "lower value." +
+                "certified against. A larger value of SpecificationVersion is newer than a lower value." +
                 "\n" +
                 "Nodes may query this field to determine the currently supported version of the specification on " +
                 "another given Node." +
@@ -218,18 +215,18 @@ Resource.add({
                 "The format of this number is segmented as its four component bytes. Bit positions for the fields are " +
                 "as follows:" +
                 "\n" +
-                "For example, a SpecificationVersion value of 0x0102AA00 is composed of 4 version components, " +
-                "representing a version 1.2.170.0." +
+                "For example, a SpecificationVersion value of 0x01040200 is composed of 4 version components, " +
+                "representing a version 1.4.2.0." +
                 "\n" +
                 "In the example above:" +
                 "\n" +
-                "  • Major version is the uppermost byte (0x01)." +
+                "  • Major version is the most significant byte (0x01)." +
                 "\n" +
-                "  • Minor version is the following byte (0x02)." +
+                "  • Minor version is the second most significant byte (0x04)." +
                 "\n" +
-                "  • Patch version is 170/0xAA." +
+                "  • Dot version is the third most significant byte (0x02)." +
                 "\n" +
-                "  • Reserved1 value is 0." +
+                "  • Reserved1 value is the least significant byte (0x00)." +
                 "\n" +
                 "The initial revision (1.0) of this specification (1.0) was 0x01000000. Matter Spring 2024 release " +
                 "(1.3) was 0x01030000." +
@@ -255,6 +252,12 @@ Resource.add({
                 "prior to Revision 3, clients shall assume a value of 1."
         },
 
+        {
+            tag: "attribute", name: "ConfigurationVersion", xref: "core§11.1.5.24",
+            details: "This attribute shall contain the current version number for the configuration of the Node. A larger " +
+                "value of ConfigurationVersion shall indicate a newer configuration than a lower value."
+        },
+
         {
             tag: "event", name: "StartUp", xref: "core§11.1.6.1",
             details: "The StartUp event shall be generated by a Node as soon as reasonable after completing a boot or " +
@@ -290,15 +293,13 @@ Resource.add({
 
             children: [{
                 tag: "field", name: "FabricIndex", xref: "core§11.1.6.3.1",
-                details: "This field shall contain the local Fabric Index of the fabric which the node is about to leave."
+                details: "This field shall contain the local fabric-index of the fabric which the node is about to leave."
             }]
         },
 
         {
             tag: "event", name: "ReachableChanged", xref: "core§11.1.6.4",
-            details: "This event shall be supported if and only if the Reachable attribute is supported." +
-                "\n" +
-                "This event (when supported) shall be generated when there is a change in the Reachable attribute." +
+            details: "This event (when supported) shall be generated when there is a change in the Reachable attribute." +
                 "\n" +
                 "Its main use case is in the derived Bridged Device Basic Information cluster.",
             children: [{

package/src/standard/resources/basic-video-player.resource.ts

@@ -24,9 +24,9 @@ Resource.add({
         "such as a DVD Player, or a device that provides input to another device like a TV or computer " +
         "monitor." +
         "\n" +
-        "Please see Video Player Architecture for additional Basic Video Player requirements relating to " +
-        "Video Player device endpoint composition, commissioning, feature representation in clusters, and UI " +
-        "context.",
+        "See Section 10.1, “Video Player Architecture” for additional Basic Video Player requirements " +
+        "relating to Video Player device endpoint composition, commissioning, feature representation in " +
+        "clusters, and UI context.",
 
     children: [
         { tag: "requirement", name: "OnOff", xref: "device§10.2.4" },