Explain "addressed via resource path"

docs/odata-csdl-json/odata-csdl-json.html

@@ -389,7 +389,7 @@ <h2 id="11-changes-from-earlier-versions"><a name="ChangesfromEarlierVersions" h
 <td>New path evaluation rules for annotations targeting annotations and external targeting via container</td>
 <td><a href="https://issues.oasis-open.org/browse/ODATA-1420">ODATA-1420</a></td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td><a href="#PrimitiveTypes">Section 3.3</a></td>
 <td>Allow stream-valued non-binding parameters</td>
 <td><a href="https://issues.oasis-open.org/browse/ODATA-1481">ODATA-1481</a></td>
@@ -2399,7 +2399,7 @@ <h3 id="1422-target"><a name="Target" href="#Target">14.2.2 Target</a></h3>
 </table>
 <p>All <a href="#QualifiedName">qualified names</a> used in a target path MUST be in scope.</p>
 <p>External targeting is possible for properties and navigation properties of singletons or entities in a particular entity set. These annotations override annotations on the properties or navigation properties targeted via the declaring structured type.</p>
-<p>External targeting is also possible for bound action and function overloads whose binding parameter is addressed via a certain path or has a certain type, as well as for parameters and return types thereof. The target path then consists of two path expressions from the table above separated by a forward slash. The first path expression references one of the following model elements:</p>
+<p>External targeting is also possible for bound action and function overloads whose binding parameter is addressed via a certain path or has a certain type, as well as for parameters and return types thereof. The targeting expression then consists of two path expressions from the table above separated by a forward slash. The first path expression references one of the following model elements:</p>
 <table>
 <thead>
 <tr class="header">
@@ -2418,19 +2418,19 @@ <h3 id="1422-target"><a name="Target" href="#Target">14.2.2 Target</a></h3>
 </tr>
 <tr class="odd">
 <td>Navigation Property via container</td>
-<td>addressed via the path</td>
+<td>addressed via the resource path to the navigation property</td>
 </tr>
 <tr class="even">
 <td>Property via container</td>
-<td>addressed via the path</td>
+<td>addressed via the resource path to the property</td>
 </tr>
 <tr class="odd">
 <td>Navigation Property via structured type</td>
-<td>addressed via the structured type</td>
+<td>addressed by a path that traverses the structured type</td>
 </tr>
 <tr class="even">
 <td>Property via structured type</td>
-<td>addressed via the structured type</td>
+<td>addressed by a path that traverses the structured type</td>
 </tr>
 <tr class="odd">
 <td>Complex Type</td>
@@ -2442,7 +2442,8 @@ <h3 id="1422-target"><a name="Target" href="#Target">14.2.2 Target</a></h3>
 </tr>
 </tbody>
 </table>
-<p>and the second path expression references one of the following model elements:</p>
+<p>A binding parameter is “addressed via a resource path” if the path expression addressing the binding parameter starts with the resource path, it may then continue with segments described in <a href="#ODataURL">OData-URL</a>, sections 4.6 through 4.12. If the given path addresses a collection, the binding parameter can also be a single instance of that collection (see <a href="#ODataURL">OData-URL</a>, sections 4.9 and 4.10).</p>
+<p>The second path expression references one of the following model elements:</p>
 <ul>
 <li>Action overload</li>
 <li>all overloads of an Action</li>

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

@@ -3875,7 +3875,7 @@ properties targeted via the declaring structured type.
 
 External targeting is also possible for bound action and function overloads
 whose binding parameter is addressed via a certain path or has a certain type,
-as well as for parameters and return types thereof. The target path then
+as well as for parameters and return types thereof. The targeting expression then
 consists of two path expressions from the table above separated by a forward
 slash. The first path expression references one of the following model
 elements:
@@ -3884,14 +3884,20 @@ Model element|means the binding parameter must be
 -------------|-----------------------------------
 Entity Set|an instance or collection of instances from the entity set
 Singleton|the singleton
-Navigation Property via container|addressed via the path
-Property via container|addressed via the path
-Navigation Property via structured type|addressed via the structured type
-Property via structured type|addressed via the structured type
+Navigation Property via container|addressed via the resource path to the navigation property
+Property via container|addressed via the resource path to the property
+Navigation Property via structured type|addressed by a path that traverses the structured type
+Property via structured type|addressed by a path that traverses the structured type
 Complex Type|an instance or collection of the type or a subtype thereof
 Entity Type|an instance or collection of the type or a subtype thereof
 
-and the second path expression references one of the following model elements:
+A binding parameter is "addressed via a resource path" if the path expression addressing the
+binding parameter starts with the resource path, it may then continue with segments
+described in [OData-URL](#ODataURL), sections 4.6 through 4.12. If the given path
+addresses a collection, the binding parameter can also be a single instance of that
+collection (see [OData-URL](#ODataURL), sections 4.9 and 4.10).
+
+The second path expression references one of the following model elements:
 - Action overload
 - all overloads of an Action
 - Function overload

docs/odata-csdl-xml/odata-csdl-xml.html

@@ -389,7 +389,7 @@ <h2 id="11-changes-from-earlier-versions"><a name="ChangesfromEarlierVersions" h
 <td>New path evaluation rules for annotations targeting annotations and external targeting via container</td>
 <td><a href="https://issues.oasis-open.org/browse/ODATA-1420">ODATA-1420</a></td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td><a href="#PrimitiveTypes">Section 3.3</a></td>
 <td>Allow stream-valued non-binding parameters</td>
 <td><a href="https://issues.oasis-open.org/browse/ODATA-1481">ODATA-1481</a></td>
@@ -2215,7 +2215,7 @@ <h3 id="1422-target"><a name="Target" href="#Target">14.2.2 Target</a></h3>
 </table>
 <p>All <a href="#QualifiedName">qualified names</a> used in a target path MUST be in scope.</p>
 <p>External targeting is possible for properties and navigation properties of singletons or entities in a particular entity set. These annotations override annotations on the properties or navigation properties targeted via the declaring structured type.</p>
-<p>External targeting is also possible for bound action and function overloads whose binding parameter is addressed via a certain path or has a certain type, as well as for parameters and return types thereof. The target path then consists of two path expressions from the table above separated by a forward slash. The first path expression references one of the following model elements:</p>
+<p>External targeting is also possible for bound action and function overloads whose binding parameter is addressed via a certain path or has a certain type, as well as for parameters and return types thereof. The targeting expression then consists of two path expressions from the table above separated by a forward slash. The first path expression references one of the following model elements:</p>
 <table>
 <thead>
 <tr class="header">
@@ -2234,19 +2234,19 @@ <h3 id="1422-target"><a name="Target" href="#Target">14.2.2 Target</a></h3>
 </tr>
 <tr class="odd">
 <td>Navigation Property via container</td>
-<td>addressed via the path</td>
+<td>addressed via the resource path to the navigation property</td>
 </tr>
 <tr class="even">
 <td>Property via container</td>
-<td>addressed via the path</td>
+<td>addressed via the resource path to the property</td>
 </tr>
 <tr class="odd">
 <td>Navigation Property via structured type</td>
-<td>addressed via the structured type</td>
+<td>addressed by a path that traverses the structured type</td>
 </tr>
 <tr class="even">
 <td>Property via structured type</td>
-<td>addressed via the structured type</td>
+<td>addressed by a path that traverses the structured type</td>
 </tr>
 <tr class="odd">
 <td>Complex Type</td>
@@ -2258,7 +2258,8 @@ <h3 id="1422-target"><a name="Target" href="#Target">14.2.2 Target</a></h3>
 </tr>
 </tbody>
 </table>
-<p>and the second path expression references one of the following model elements:</p>
+<p>A binding parameter is “addressed via a resource path” if the path expression addressing the binding parameter starts with the resource path, it may then continue with segments described in <a href="#ODataURL">OData-URL</a>, sections 4.6 through 4.12. If the given path addresses a collection, the binding parameter can also be a single instance of that collection (see <a href="#ODataURL">OData-URL</a>, sections 4.9 and 4.10).</p>
+<p>The second path expression references one of the following model elements:</p>
 <ul>
 <li>Action overload</li>
 <li>all overloads of an Action</li>

docs/odata-csdl-xml/odata-csdl-xml.md

@@ -3688,7 +3688,7 @@ properties targeted via the declaring structured type.
 
 External targeting is also possible for bound action and function overloads
 whose binding parameter is addressed via a certain path or has a certain type,
-as well as for parameters and return types thereof. The target path then
+as well as for parameters and return types thereof. The targeting expression then
 consists of two path expressions from the table above separated by a forward
 slash. The first path expression references one of the following model
 elements:
@@ -3697,14 +3697,20 @@ Model element|means the binding parameter must be
 -------------|-----------------------------------
 Entity Set|an instance or collection of instances from the entity set
 Singleton|the singleton
-Navigation Property via container|addressed via the path
-Property via container|addressed via the path
-Navigation Property via structured type|addressed via the structured type
-Property via structured type|addressed via the structured type
+Navigation Property via container|addressed via the resource path to the navigation property
+Property via container|addressed via the resource path to the property
+Navigation Property via structured type|addressed by a path that traverses the structured type
+Property via structured type|addressed by a path that traverses the structured type
 Complex Type|an instance or collection of the type or a subtype thereof
 Entity Type|an instance or collection of the type or a subtype thereof
 
-and the second path expression references one of the following model elements:
+A binding parameter is "addressed via a resource path" if the path expression addressing the
+binding parameter starts with the resource path, it may then continue with segments
+described in [OData-URL](#ODataURL), sections 4.6 through 4.12. If the given path
+addresses a collection, the binding parameter can also be a single instance of that
+collection (see [OData-URL](#ODataURL), sections 4.9 and 4.10).
+
+The second path expression references one of the following model elements:
 - Action overload
 - all overloads of an Action
 - Function overload

odata-csdl/14 Vocabulary and Annotation.md

@@ -676,7 +676,7 @@ properties targeted via the declaring structured type.
 
 External targeting is also possible for bound action and function overloads
 whose binding parameter is addressed via a certain path or has a certain type,
-as well as for parameters and return types thereof. The target path then
+as well as for parameters and return types thereof. The targeting expression then
 consists of two path expressions from the table above separated by a forward
 slash. The first path expression references one of the following model
 elements:
@@ -685,14 +685,20 @@ Model element|means the binding parameter must be
 -------------|-----------------------------------
 Entity Set|an instance or collection of instances from the entity set
 Singleton|the singleton
-Navigation Property via container|addressed via the path
-Property via container|addressed via the path
-Navigation Property via structured type|addressed via the structured type
-Property via structured type|addressed via the structured type
+Navigation Property via container|addressed via the resource path to the navigation property
+Property via container|addressed via the resource path to the property
+Navigation Property via structured type|addressed by a path that traverses the structured type
+Property via structured type|addressed by a path that traverses the structured type
 Complex Type|an instance or collection of the type or a subtype thereof
 Entity Type|an instance or collection of the type or a subtype thereof
 
-and the second path expression references one of the following model elements:
+A binding parameter is "addressed via a resource path" if the path expression addressing the
+binding parameter starts with the resource path, it may then continue with segments
+described in [OData-URL](#ODataURL), sections 4.6 through 4.12. If the given path
+addresses a collection, the binding parameter can also be a single instance of that
+collection (see [OData-URL](#ODataURL), sections 4.9 and 4.10).
+
+The second path expression references one of the following model elements:
 - Action overload
 - all overloads of an Action
 - Function overload