Merge remote-tracking branch 'origin/prepare-standard' into OData-Data-Agg-v4.0/oasis-standard

Author: HeikoTheissen

docs/odata-data-aggregation-ext/odata-data-aggregation-ext.html

@@ -1623,7 +1623,7 @@ <h3 id="311-type-structure-and-context-url"><a id="TypeStructureandContextURL" h
 <li>Single- or collection-valued primitive properties addressed by a property path starting at a non-transient entity MUST keep their values from the addressed resource path collection throughout the transformation sequence. Likewise, single- or collection-valued navigation property paths starting at a non-transient entity MUST keep addressing the same non-transient entities as in the addressed resource path collection.</li>
 <li>Instances in an output set need not have all declared or dynamic properties that occurred in the input set.</li>
 <li>Instances in an output set can have dynamic properties that did not occur in the input set. The name for such a dynamic property is called an <em>alias</em>, it is a simple identifier (see <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html#SimpleIdentifier">OData-CSDL, section 15.2</a>). Aliases MUST differ from names of declared properties in the input type, from names of properties in the first input set, and from names of properties in the current input set. Aliases in one collection MUST also differ from each other.</li>
-<li>Instances in an output set can have applicable 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>.</li>
+<li>Instances in an output set that have all key properties of an entity also have the metadata associated with that entity, such as entity-id, read and edit URL (defined in <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html#ServiceModel">OData-Protocol, section 4</a>) and ETag (defined in <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html#UseofETagsforAvoidingUpdateConflicts">OData-Protocol, section 11.4.1.1</a>).</li>
 </ul>
 <p>Here is an overview of the structural changes made by different transformations:</p>
 <ul>
@@ -1953,7 +1953,6 @@ <h4 id="3231-simple-grouping"><a id="SimpleGrouping" href="#SimpleGrouping">3.2.
 </ul></li>
 <li>Return <span class="math inline">\(u\)</span>.</li>
 </ol>
-<p>Instances in the output set of <span class="math inline">\(\Pi_G(s)\)</span> that contain the key of an entity MAY retain that entity’s applicable 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>.</p>
 <div class="example">
 <p>Example 17:</p>
 <pre><code>GET /service/Sales?$apply=groupby((Customer/Country,Product/Name),

docs/odata-data-aggregation-ext/odata-data-aggregation-ext.md

@@ -1036,7 +1036,7 @@ The _structure_ of an instance that occurs in an input or output set is defined
 - Single- or collection-valued primitive properties addressed by a property path starting at a non-transient entity MUST keep their values from the addressed resource path collection throughout the transformation sequence. Likewise, single- or collection-valued navigation property paths starting at a non-transient entity MUST keep addressing the same non-transient entities as in the addressed resource path collection.
 - Instances in an output set need not have all declared or dynamic properties that occurred in the input set.
 - Instances in an output set can have dynamic properties that did not occur in the input set. The name for such a dynamic property is called an _alias_, it is a simple identifier (see [OData-CSDL, section 15.2](https://docs.oasis-open.org/odata/odata-csdl-json/v4.02/odata-csdl-json-v4.02.html#SimpleIdentifier)). Aliases MUST differ from names of declared properties in the input type, from names of properties in the first input set, and from names of properties in the current input set. Aliases in one collection MUST also differ from each other.
-- Instances in an output set can have applicable 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).
+- Instances in an output set that have all key properties of an entity also have the metadata associated with that entity, such as entity-id, read and edit URL (defined in [OData-Protocol, section 4](https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html#ServiceModel)) and ETag (defined in [OData-Protocol, section 11.4.1.1](https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html#UseofETagsforAvoidingUpdateConflicts)).
 
 Here is an overview of the structural changes made by different transformations:
 - During [aggregation](#BasicAggregation), many instances are replaced by one instance, properties that represent the aggregation level are retained, and others are replaced by dynamic properties holding the aggregate value of the many instances or a transformed copy of them.
@@ -1410,8 +1410,6 @@ The output set of the transformation $\Pi_G(s)$ is in one-to-one correspondence
    - Otherwise, the behavior is undefined. (Such cases never occur when $\Pi_G(s)$ is used in this document.)
 3. Return $u$.
 
-Instances in the output set of $\Pi_G(s)$ that contain the key of an entity MAY retain that entity's applicable 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).
-
 ::: example
 Example 17:
 ```

odata-data-aggregation-ext/3.1 Fundamentals of Input and Output Sets.md

@@ -42,7 +42,7 @@ The _structure_ of an instance that occurs in an input or output set is defined
 - Single- or collection-valued primitive properties addressed by a property path starting at a non-transient entity MUST keep their values from the addressed resource path collection throughout the transformation sequence. Likewise, single- or collection-valued navigation property paths starting at a non-transient entity MUST keep addressing the same non-transient entities as in the addressed resource path collection.
 - Instances in an output set need not have all declared or dynamic properties that occurred in the input set.
 - Instances in an output set can have dynamic properties that did not occur in the input set. The name for such a dynamic property is called an _alias_, it is a simple identifier (see [#OData-CSDL#SimpleIdentifier]). Aliases MUST differ from names of declared properties in the input type, from names of properties in the first input set, and from names of properties in the current input set. Aliases in one collection MUST also differ from each other.
-- Instances in an output set can have applicable control information [#OData-JSON#ControlInformation].
+- Instances in an output set that have all key properties of an entity also have the metadata associated with that entity, such as entity-id, read and edit URL (defined in [#OData-Protocol#ServiceModel]) and ETag (defined in [#OData-Protocol#UseofETagsforAvoidingUpdateConflicts]).
 
 Here is an overview of the structural changes made by different transformations:
 - During [aggregation](#BasicAggregation), many instances are replaced by one instance, properties that represent the aggregation level are retained, and others are replaced by dynamic properties holding the aggregate value of the many instances or a transformed copy of them.

odata-data-aggregation-ext/3.2 Basic Aggregation.md

@@ -303,8 +303,6 @@ The output set of the transformation $\Pi_G(s)$ is in one-to-one correspondence
    - Otherwise, the behavior is undefined. (Such cases never occur when $\Pi_G(s)$ is used in this document.)
 3. Return $u$.
 
-Instances in the output set of $\Pi_G(s)$ that contain the key of an entity MAY retain that entity's applicable control information [#OData-JSON#ControlInformation].
-
 ::: example
 Example ##ex:
 ```