TC 2024-10-02

oasis-tcs · Oct 4, 2024 · b51af1a · b51af1a
1 parent 33b49a8
commit b51af1a
Show file tree

Hide file tree

Showing 11 changed files with 157 additions and 165 deletions.
diff --git a/docs/odata-csdl-json/styles/odata.css b/docs/odata-csdl-json/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/docs/odata-csdl-xml/styles/odata.css b/docs/odata-csdl-xml/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/docs/odata-data-aggregation-ext/styles/odata.css b/docs/odata-data-aggregation-ext/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/docs/odata-json-format/styles/odata.css b/docs/odata-json-format/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/docs/odata-protocol/odata-protocol.html b/docs/odata-protocol/odata-protocol.html
diff --git a/docs/odata-protocol/odata-protocol.md b/docs/odata-protocol/odata-protocol.md
@@ -4556,8 +4556,11 @@ non-containment navigation property can be replaced without changing either the
 old or the new targeted entity itself. The targeted entity can then only be
 specified by an entity reference (see [OData-JSON, section 14](https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#EntityReference)).
 
-The following JSON payload changes the last name and the manager of Suzanne Brown:
+The following JSON payload changes the last name and the manager of Suzanne Brown.
+The effect would be the same if the `@context` was omitted from the request.
 :::: side-by-side
+::::: caption
+Request
 ```json
 PUT http://host/service/Employees(7)?$expand=Manager
 Content-Type: application/json
@@ -4571,6 +4574,9 @@ Content-Type: application/json
   }
 }
 ```
+:::::
+::::: caption
+Response
 ```json
 {
   "@context": "$metadata#Employees/$entity",
@@ -4584,11 +4590,13 @@ Content-Type: application/json
   }
 }
 ```
+:::::
 ::::
 
 If the targeted entity in the payload contains some structural properties,
 `PUT` resets all its other structural properties. The following alternative
-payloads both reset the first and last names of the new manager:
+payload resets the first and last names of the new manager.
+The effect would be the same if the `@id` was omitted from the request.
 :::: side-by-side
 ```json
 {
@@ -4614,31 +4622,6 @@ payloads both reset the first and last names of the new manager:
 }
 ```
 ::::
-
-:::: side-by-side
-```json
-{
-  "FirstName": "Suzanne",
-  "LastName": "Brown-Johnson",
-  "Manager": {
-    "EmployeeID": 6
-  }
-}
-```
-```json
-{
-  "@context": "$metadata#Employees/$entity",
-  "EmployeeID": 7,
-  "FirstName": "Suzanne",
-  "LastName": "Brown-Johnson",
-  "Manager": {
-    "EmployeeID": 6,
-    "FirstName": null,
-    "LastName": null
-  }
-}
-```
-::::
 :::
 
 Clients MAY associate an id with individual nested entities in the

diff --git a/docs/odata-protocol/styles/odata.css b/docs/odata-protocol/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/docs/odata-temporal-ext/styles/odata.css b/docs/odata-temporal-ext/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/docs/odata-url-conventions/styles/odata.css b/docs/odata-url-conventions/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }

diff --git a/odata-protocol/11.4 Data Modification.md b/odata-protocol/11.4 Data Modification.md
@@ -553,8 +553,11 @@ non-containment navigation property can be replaced without changing either the
 old or the new targeted entity itself. The targeted entity can then only be
 specified by an entity reference (see [#OData-JSON#EntityReference]).
 
-The following JSON payload changes the last name and the manager of Suzanne Brown:
+The following JSON payload changes the last name and the manager of Suzanne Brown.
+The effect would be the same if the `@context` was omitted from the request.
 :::: side-by-side
+::::: caption
+Request
 ```json
 PUT http://host/service/Employees(7)?$expand=Manager
 Content-Type: application/json
@@ -568,6 +571,9 @@ Content-Type: application/json
   }
 }
 ```
+:::::
+::::: caption
+Response
 ```json
 {
   "@context": "$metadata#Employees/$entity",
@@ -581,11 +587,13 @@ Content-Type: application/json
   }
 }
 ```
+:::::
 ::::
 
 If the targeted entity in the payload contains some structural properties,
 `PUT` resets all its other structural properties. The following alternative
-payloads both reset the first and last names of the new manager:
+payload resets the first and last names of the new manager.
+The effect would be the same if the `@id` was omitted from the request.
 :::: side-by-side
 ```json
 {
@@ -611,31 +619,6 @@ payloads both reset the first and last names of the new manager:
 }
 ```
 ::::
-
-:::: side-by-side
-```json
-{
-  "FirstName": "Suzanne",
-  "LastName": "Brown-Johnson",
-  "Manager": {
-    "EmployeeID": 6
-  }
-}
-```
-```json
-{
-  "@context": "$metadata#Employees/$entity",
-  "EmployeeID": 7,
-  "FirstName": "Suzanne",
-  "LastName": "Brown-Johnson",
-  "Manager": {
-    "EmployeeID": 6,
-    "FirstName": null,
-    "LastName": null
-  }
-}
-```
-::::
 :::
 
 Clients MAY associate an id with individual nested entities in the

diff --git a/styles/odata.css b/styles/odata.css
@@ -171,6 +171,11 @@ td > code {
   margin-left: 40px;
 }
 
+.caption p {
+  margin-left: 40px;
+  margin-bottom: -1em;
+}
+
 .side-by-side {
   margin: -1em 0;
 }