Align description with AppliesTo

AppliesTo already includes Collection
oasis-tcs · Apr 3, 2024 · fac2855 · fac2855
1 parent 91af436
commit fac2855
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/vocabularies/Org.OData.Capabilities.V1.json b/vocabularies/Org.OData.Capabilities.V1.json
@@ -203,7 +203,6 @@
             "$Type": "Capabilities.CountRestrictionsType",
             "$AppliesTo": [
                 "EntitySet",
-                "Singleton",
                 "Collection"
             ],
             "@Core.AppliesViaContainer": true,
@@ -214,7 +213,7 @@
             "Countable": {
                 "$Type": "Edm.Boolean",
                 "$DefaultValue": true,
-                "@Core.Description": "Entities can be counted (only valid if targeting an entity set)"
+                "@Core.Description": "Entities can be counted (only valid if targeting a collection)"
             }
         },
         "CountRestrictionsType": {

diff --git a/vocabularies/Org.OData.Capabilities.V1.md b/vocabularies/Org.OData.Capabilities.V1.md
@@ -154,15 +154,15 @@ Property|Type|Description
 
 Property|Type|Description
 :-------|:---|:----------
-[Countable](./Org.OData.Capabilities.V1.xml#L217:~:text=<ComplexType%20Name="-,CountRestrictionsBase,-")|Boolean|Entities can be counted (only valid if targeting an entity set)
+[Countable](./Org.OData.Capabilities.V1.xml#L217:~:text=<ComplexType%20Name="-,CountRestrictionsBase,-")|Boolean|Entities can be counted (only valid if targeting a collection)
 
 <a name="CountRestrictionsType"></a>
 ## [CountRestrictionsType](./Org.OData.Capabilities.V1.xml#L221:~:text=<ComplexType%20Name="-,CountRestrictionsType,-"): [CountRestrictionsBase](#CountRestrictionsBase)
 
 
 Property|Type|Description
 :-------|:---|:----------
-[*Countable*](./Org.OData.Capabilities.V1.xml#L217:~:text=<ComplexType%20Name="-,CountRestrictionsBase,-")|Boolean|Entities can be counted (only valid if targeting an entity set)
+[*Countable*](./Org.OData.Capabilities.V1.xml#L217:~:text=<ComplexType%20Name="-,CountRestrictionsBase,-")|Boolean|Entities can be counted (only valid if targeting a collection)
 [NonCountableProperties](./Org.OData.Capabilities.V1.xml#L222:~:text=<ComplexType%20Name="-,CountRestrictionsType,-")|\[PropertyPath\]|Members of these collection properties cannot be counted
 [NonCountableNavigationProperties](./Org.OData.Capabilities.V1.xml#L225:~:text=<ComplexType%20Name="-,CountRestrictionsType,-")|\[NavigationPropertyPath\]|Members of these navigation properties cannot be counted
 

diff --git a/vocabularies/Org.OData.Capabilities.V1.xml b/vocabularies/Org.OData.Capabilities.V1.xml
@@ -209,13 +209,13 @@ supported:
 
       <!--Query Capabilities -->
 
-      <Term Name="CountRestrictions" Type="Capabilities.CountRestrictionsType" Nullable="false" AppliesTo="EntitySet Singleton Collection">
+      <Term Name="CountRestrictions" Type="Capabilities.CountRestrictionsType" Nullable="false" AppliesTo="EntitySet Collection">
         <Annotation Term="Core.AppliesViaContainer" />
         <Annotation Term="Core.Description" String="Restrictions on /$count path suffix and $count=true system query option" />
       </Term>
       <ComplexType Name="CountRestrictionsBase">
         <Property Name="Countable" Type="Edm.Boolean" Nullable="false" DefaultValue="true">
-          <Annotation Term="Core.Description" String="Entities can be counted (only valid if targeting an entity set)" />
+          <Annotation Term="Core.Description" String="Entities can be counted (only valid if targeting a collection)" />
         </Property>
       </ComplexType>
       <ComplexType Name="CountRestrictionsType" BaseType="Capabilities.CountRestrictionsBase">