Rephrased

docs/odata-protocol/odata-protocol.html

@@ -1210,10 +1210,10 @@ <h3 id="913-response-code-202-accepted"><a id="ResponseCode202Accepted" href="#R
 <details open><summary>
 <h3 id="914-response-code-204-no-content"><a id="ResponseCode204NoContent" href="#ResponseCode204NoContent">9.1.4 Response Code <code>204 No Content</code></a></h3>
 </summary>
-<p>A request returns <code>204 No Content</code> if the requested resource has the <code>null</code> value and carries no control information <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#ControlInformation">OData-JSON, section 4.6</a> other than what the minimal metadata format <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#metadataminimalodatametadataminimal">OData-JSON, section 3.1.1</a> requires and no <a href="#VocabularyExtensibility">instance annotations</a>.</p>
-<p>It also returns <code>204 No Content</code> if the service applies a <a href="#Preferencereturnrepresentationandreturnminimal"><code>return=minimal</code></a> preference.</p>
-<p>In these cases, the response body MUST be empty.</p>
+<p>A request returns <code>204 No Content</code> if the requested resource has the <code>null</code> value and carries no control information <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#ControlInformation">OData-JSON, section 4.6</a> other than what the minimal metadata format <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#metadataminimalodatametadataminimal">OData-JSON, section 3.1.1</a> demands and no <a href="#VocabularyExtensibility">instance annotations</a>.</p>
 <p>If the requested resource has the <code>null</code> value but carries additional control information or instance annotations, the request returns <a href="#ResponseCode200OK"><code>200 OK</code></a> instead but omits the <a href="#ContextURL">context URL</a> from the representation of the response, which then consists of the other control information and instance annotations only.</p>
+<p>A request always returns <code>204 No Content</code> if the service applies a <a href="#Preferencereturnrepresentationandreturnminimal"><code>return=minimal</code></a> preference.</p>
+<p>With response code <code>204</code>, the response body MUST be empty.</p>
 <p>As defined in <a href="#rfc9110">RFC9110</a>, a <a href="#DataModification">Data Modification Request</a> that responds with <code>204 No Content</code> MAY include an <a href="#HeaderETag"><code>ETag</code></a> header with a value reflecting the result of the data modification if and only if the client can reasonably “know” the new representation of the resource without actually receiving it. For a <code>PUT</code> request this means that the response body of a corresponding <code>200 OK</code> or <code>201 Created</code> response would have been identical to the request body, i.e. no server-side modification of values sent in the request body, no server-calculated values etc. For a <code>PATCH</code> request this means that the response body of a corresponding <code>200 OK</code> or <code>201 Created</code> response would have consisted of all values sent in the request body, plus (for values not sent in the request body) server-side values corresponding to the <code>ETag</code> value sent in the <code>If-Match</code> header of the <code>PATCH</code> request, i.e. the previous values “known” to the client.</p>
 </details>
 <details open><summary>

docs/odata-protocol/odata-protocol.md

@@ -1828,18 +1828,18 @@ Requests](#AsynchronousBatchRequests).
 A request returns `204 No Content` if the requested resource has the
 `null` value and carries no control information [OData-JSON, section 4.6](https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#ControlInformation)
 other than what the minimal metadata format [OData-JSON, section 3.1.1](https://docs.oasis-open.org/odata/odata-json-format/v4.02/odata-json-format-v4.02.html#metadataminimalodatametadataminimal)
-requires and no [instance annotations](#VocabularyExtensibility).
-
-It also returns `204 No Content` if the service applies a
-[`return=minimal`](#Preferencereturnrepresentationandreturnminimal) preference.
-
-In these cases, the response body MUST be empty.
+demands and no [instance annotations](#VocabularyExtensibility).
 
 If the requested resource has the `null` value but carries additional control information
 or instance annotations, the request returns [`200 OK`](#ResponseCode200OK) instead but
 omits the [context URL](#ContextURL) from the representation of the response,
 which then consists of the other control information and instance annotations only.
 
+A request always returns `204 No Content` if the service applies a
+[`return=minimal`](#Preferencereturnrepresentationandreturnminimal) preference.
+
+With response code `204`, the response body MUST be empty.
+
 As defined in [RFC9110](#rfc9110), a [Data Modification
 Request](#DataModification) that responds with
 `204 No Content` MAY include an [`ETag`](#HeaderETag) header with a value reflecting

odata-protocol/8 Header Fields.md

@@ -932,18 +932,18 @@ Requests](#AsynchronousBatchRequests).
 A request returns `204 No Content` if the requested resource has the
 `null` value and carries no control information [#OData-JSON#ControlInformation]
 other than what the minimal metadata format [#OData-JSON#metadataminimalodatametadataminimal]
-requires and no [instance annotations](#VocabularyExtensibility).
-
-It also returns `204 No Content` if the service applies a
-[`return=minimal`](#Preferencereturnrepresentationandreturnminimal) preference.
-
-In these cases, the response body MUST be empty.
+demands and no [instance annotations](#VocabularyExtensibility).
 
 If the requested resource has the `null` value but carries additional control information
 or instance annotations, the request returns [`200 OK`](#ResponseCode200OK) instead but
 omits the [context URL](#ContextURL) from the representation of the response,
 which then consists of the other control information and instance annotations only.
 
+A request always returns `204 No Content` if the service applies a
+[`return=minimal`](#Preferencereturnrepresentationandreturnminimal) preference.
+
+With response code `204`, the response body MUST be empty.
+
 As defined in [RFC9110](#rfc9110), a [Data Modification
 Request](#DataModification) that responds with
 `204 No Content` MAY include an [`ETag`](#HeaderETag) header with a value reflecting