Skip to content

Commit

Permalink
Merge branch 'main' into tools/allowed-property-values
Browse files Browse the repository at this point in the history
  • Loading branch information
HeikoTheissen authored Apr 10, 2024
2 parents faf4a2b + 352d47a commit a11add2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion vocabularies/Org.OData.Capabilities.V1.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion vocabularies/Org.OData.Capabilities.V1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vocabularies/Org.OData.Capabilities.V1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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`" />
Expand Down

0 comments on commit a11add2

Please sign in to comment.