Merge branch 'main' into tools/allowed-property-values

oasis-tcs · Apr 10, 2024 · a11add2 · a11add2
2 parents faf4a2b + 352d47a
commit a11add2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/vocabularies/Org.OData.Capabilities.V1.json b/vocabularies/Org.OData.Capabilities.V1.json
@@ -738,7 +738,7 @@
             "none": 0,
             "[email protected]": "Single search term",
             "AND": 1,
-            "[email protected]": "Multiple search terms separated by `AND`",
+            "[email protected]": "Multiple search terms, optionally separated by `AND`",
             "OR": 2,
             "[email protected]": "Multiple search terms separated by `OR`",
             "NOT": 4,

diff --git a/vocabularies/Org.OData.Capabilities.V1.md b/vocabularies/Org.OData.Capabilities.V1.md
@@ -319,7 +319,7 @@ Property|Type|Description
 Flag Member|Value|Description
 :-----|----:|:----------
 [none](./Org.OData.Capabilities.V1.xml#L570:~:text=<EnumType%20Name="-,SearchExpressions,-")|0|Single search term
-[AND](./Org.OData.Capabilities.V1.xml#L573:~:text=<EnumType%20Name="-,SearchExpressions,-")|1|Multiple search terms separated by `AND`
+[AND](./Org.OData.Capabilities.V1.xml#L573:~:text=<EnumType%20Name="-,SearchExpressions,-")|1|Multiple search terms, optionally separated by `AND`
 [OR](./Org.OData.Capabilities.V1.xml#L576:~:text=<EnumType%20Name="-,SearchExpressions,-")|2|Multiple search terms separated by `OR`
 [NOT](./Org.OData.Capabilities.V1.xml#L579:~:text=<EnumType%20Name="-,SearchExpressions,-")|4|Search terms preceded by `NOT`
 [phrase](./Org.OData.Capabilities.V1.xml#L582:~:text=<EnumType%20Name="-,SearchExpressions,-")|8|Search phrases enclosed in double quotes

diff --git a/vocabularies/Org.OData.Capabilities.V1.xml b/vocabularies/Org.OData.Capabilities.V1.xml
@@ -571,7 +571,7 @@ supported:
           <Annotation Term="Core.Description" String="Single search term" />
         </Member>
         <Member Name="AND" Value="1">
-          <Annotation Term="Core.Description" String="Multiple search terms separated by `AND`" />
+          <Annotation Term="Core.Description" String="Multiple search terms, optionally separated by `AND`" />
         </Member>
         <Member Name="OR" Value="2">
           <Annotation Term="Core.Description" String="Multiple search terms separated by `OR`" />