Skip to content

Commit

Permalink
Merge branch 'main' into ODATA-1593
Browse files Browse the repository at this point in the history
  • Loading branch information
ralfhandl committed Nov 9, 2023
2 parents 72787ee + f8cbdd4 commit c214df7
Show file tree
Hide file tree
Showing 54 changed files with 3,780 additions and 3,602 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"asec",
"CSDL",
"ETag",
"matchespattern",
"odata",
"pandoc",
"subasec",
Expand Down
1,619 changes: 811 additions & 808 deletions docs/odata-csdl-json/odata-csdl-json.html

Large diffs are not rendered by default.

963 changes: 487 additions & 476 deletions docs/odata-csdl-json/odata-csdl-json.md

Large diffs are not rendered by default.

1,233 changes: 625 additions & 608 deletions docs/odata-csdl-xml/odata-csdl-xml.html

Large diffs are not rendered by default.

1,125 changes: 575 additions & 550 deletions docs/odata-csdl-xml/odata-csdl-xml.md

Large diffs are not rendered by default.

92 changes: 46 additions & 46 deletions docs/odata-data-aggregation-ext/odata-data-aggregation-ext.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/odata-data-aggregation-ext/odata-data-aggregation-ext.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ This specification adds basic grouping and aggregation functionality (e.g. sum,
#### Status:
This document was last revised or approved by the OASIS Open Data Protocol (OData) TC on the above date. The level of approval is also listed above. Check the "Latest stage" location noted above for possible later revisions of this document. Any other numbered Versions and other technical work produced by the Technical Committee (TC) are listed at https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=odata#technical.

TC members should send comments on this specification to the TC's email list. Others should send comments to the TC's public comment list, after subscribing to it by following the instructions at the "[Send A Comment](https://www.oasis-open.org/committees/comments/index.php?wg_abbrev=odata)" button on the TC's web page at https://www.oasis-open.org/committees/odata/.
TC members should send comments on this specification to the TC's email list. Others should send comments to the TC's public comment list, after subscribing to it by following the instructions at the "<a href="https://www.oasis-open.org/committees/comments/index.php?wg_abbrev=odata">Send A Comment</a>" button on the TC's web page at https://www.oasis-open.org/committees/odata/.

This specification is provided under the [RF on RAND Terms Mode](https://www.oasis-open.org/policies-guidelines/ipr/#RF-on-RAND-Mode) of the [OASIS IPR Policy](https://www.oasis-open.org/policies-guidelines/ipr/), the mode chosen when the Technical Committee was established. For information on whether any patents have been disclosed that may be essential to implementing this specification, and any offers of patent licensing terms, please refer to the Intellectual Property Rights section of the TC's web page (https://www.oasis-open.org/committees/odata/ipr.php).

Expand Down Expand Up @@ -256,7 +256,7 @@ All other text is normative unless otherwise labeled.
Here is a customized command line which will generate HTML from this markdown file (named `odata-data-aggregation-ext-v4.0-cs03.md`). Line breaks are added for readability only:

```
pandoc -f gfm+tex_math_dollars+fenced_divs
pandoc -f gfm+tex_math_dollars+fenced_divs+smart
-t html
-o odata-data-aggregation-ext-v4.0-cs03.html
-c styles/markdown-styles-v1.7.3b.css
Expand Down
170 changes: 85 additions & 85 deletions docs/odata-json-format/odata-json-format.html

Large diffs are not rendered by default.

112 changes: 59 additions & 53 deletions docs/odata-json-format/odata-json-format.md

Large diffs are not rendered by default.

269 changes: 137 additions & 132 deletions docs/odata-protocol/odata-protocol.html

Large diffs are not rendered by default.

214 changes: 124 additions & 90 deletions docs/odata-protocol/odata-protocol.md

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions docs/odata-temporal-ext/odata-temporal-ext.html

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs/odata-temporal-ext/odata-temporal-ext.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This specification defines how to represent and interact with time-dependent dat
#### Status:
This document was last revised or approved by the OASIS Open Data Protocol (OData) TC on the above date. The level of approval is also listed above. Check the "Latest stage" location noted above for possible later revisions of this document. Any other numbered Versions and other technical work produced by the Technical Committee (TC) are listed at https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=odata#technical.

TC members should send comments on this specification to the TC's email list. Others should send comments to the TC's public comment list, after subscribing to it by following the instructions at the "[Send A Comment](https://www.oasis-open.org/committees/comments/index.php?wg_abbrev=odata)" button on the TC's web page at https://www.oasis-open.org/committees/odata/.
TC members should send comments on this specification to the TC's email list. Others should send comments to the TC's public comment list, after subscribing to it by following the instructions at the "<a href="https://www.oasis-open.org/committees/comments/index.php?wg_abbrev=odata">Send A Comment</a>" button on the TC's web page at https://www.oasis-open.org/committees/odata/.

This specification is provided under the [RF on RAND Terms Mode](https://www.oasis-open.org/policies-guidelines/ipr/#RF-on-RAND-Mode) of the [OASIS IPR Policy](https://www.oasis-open.org/policies-guidelines/ipr/), the mode chosen when the Technical Committee was established. For information on whether any patents have been disclosed that may be essential to implementing this specification, and any offers of patent licensing terms, please refer to the Intellectual Property Rights section of the TC's web page (https://www.oasis-open.org/committees/odata/ipr.php).

Expand Down Expand Up @@ -296,7 +296,7 @@ All other text is normative unless otherwise labeled.
Here is a customized command line which will generate HTML from this markdown file (named `odata-temporal-ext-v4.0-csd04.md`). Line breaks are added for readability only:

```
pandoc -f gfm+tex_math_dollars+fenced_divs
pandoc -f gfm+tex_math_dollars+fenced_divs+smart
-t html
-o odata-temporal-ext-v4.0-csd04.html
-c styles/markdown-styles-v1.7.3b.css
Expand Down Expand Up @@ -1476,7 +1476,7 @@ applicable rule:
2. by a [`$at`](#QueryOptionat) value propagated along `$expand`
3. by [`$at`](#QueryOptionat) in the query option part of the request URL, which applies to every
segment of the resource path and paths that occur in system query options
4. by the default value "now" - the logic for determining this value is service-specific
4. by the default value "now" --- the logic for determining this value is service-specific

For entities in a [timeline entity set](#TimelineEntitySet)
the time interval for filtering time slices is determined by the first
Expand Down Expand Up @@ -1541,7 +1541,7 @@ Example 11: retrieve multiple employees at a past point in time
GET /api-1/Employees?$filter=contains(Name,'i')&$at=2012-01-01
```
results in one time slice for each employee matching the filter at the
specified point in time - note that E401 back then does not satisfy
specified point in time --- note that E401 back then does not satisfy
this condition
```json
{
Expand Down
Loading

0 comments on commit c214df7

Please sign in to comment.