Merge branch 'main' into 402/key-values-in-upserts-along-navigation-p…

…roperties

README.md

@@ -64,3 +64,4 @@ OData Version 4.02. Part 2: URL Conventions|Committee Specification Draft 01|[Sp
 OData JSON Format Version 4.02|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-json-format)|[OASIS](https://docs.oasis-open.org/odata/odata-json-format/v4.02/csd01/)
 OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-csdl-json) [Schemas](https://github.com/oasis-tcs/odata-csdl-schemas/tree/core/V4.02_CSD01/schemas)|[OASIS](https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/csd01/)
 OData Common Schema Definition Language (CSDL) XML Representation Version 4.02|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-csdl-xml) [Schemas](https://github.com/oasis-tcs/odata-csdl-schemas/tree/core/V4.02_CSD01/schemas)|[OASIS](https://docs.oasis-open.org/odata/odata-csdl-xml/v4.02/csd01/)
+OData Vocabularies Version 4.0|Committee Specification Draft 02|[Specification](https://github.com/oasis-tcs/odata-specs/tree/vocabularies/V4.0_CSD02/docs/odata-vocabularies) [Vocabularies](https://github.com/oasis-tcs/odata-vocabularies/tree/vocabularies/V4.0_CSD02/vocabularies)|[OASIS](https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/csd02/)

docs/odata-csdl-json/odata-csdl-json.md

@@ -62,9 +62,9 @@ This specification is related to:
 OData services are described by an Entity Model (EDM). The Common Schema Definition Language (CSDL) defines specific representations of the entity data model exposed by an OData service, using XML, JSON, and other formats. This document (OData CSDL JSON Representation) specifically defines the JSON representation of CSDL.
 
 #### 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.
+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://groups.oasis-open.org/communities/tc-community-home2?CommunityKey=e7cac2a9-2d18-4640-b94d-018dc7d3f0e2#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 "<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/.
+TC members should send comments on this specification to the TC's email list. Any individual may submit comments to the TC by sending email to Technical-Committee-Comments@oasis-open.org. Please use a Subject line like "Comment on OData CSDL".
 
 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).
 
@@ -4181,7 +4181,7 @@ Values are represented as GeoJSON, see [OData-JSON](#ODataJSON).
 ::: {.varjson .example}
 Example 58:
 ```json
-"Location": {"type": "Point", "coordinates": [142.1,64.1]}
+"Location": { "type": "Point", "coordinates": [142.1,64.1] }
 ```
 :::
 
@@ -4201,7 +4201,7 @@ and the media type of the stream as its value.
 ::: {.varjson .example}
 Example 59:
 ```json
-"JsonStream": {"foo":true,"bar":42},
+"JsonStream": { "foo":true,"bar":42 },
 "[email protected]": "application/json",
 
 "TextStream": "Hello World!",