Merge branch 'main' into ODATA-1584

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

@@ -1078,7 +1078,7 @@ <h2 id="64-media-entity-type"><a name="MediaEntityType" href="#MediaEntityType">
 <p>Media entity types MAY specify a list of acceptable media types using an annotation with term <a href="https://github.com/oasis-tcs/odata-vocabularies/blob/master/vocabularies/Org.OData.Core.V1.md#AcceptableMediaTypes"><code>Core.AcceptableMediaTypes</code></a>, see <a href="#ODataVocCore">OData-VocCore</a>.</p>
 <section id="-hasstream" class="varjson rep">
 <h3><a name="HasStream5.4" href="#HasStream5.4"> <code>$HasStream</code></a></h3>
-<p>The value of <code>$HasStream </code>is one of the Boolean literals <code>true</code> or <code>false</code>. Absence of the member means <code>false</code>.</p>
+<p>The value of <code>$HasStream</code> is one of the Boolean literals <code>true</code> or <code>false</code>. Absence of the member means <code>false</code>.</p>
 </section>
 <h2 id="65-key"><a name="Key" href="#Key">6.5 Key</a></h2>
 <p>An entity is uniquely identified within an entity set by its key. A key MAY be specified if the entity type does not specify a <a href="#DerivedEntityType">base type</a> that already has a key declared.</p>
@@ -2666,7 +2666,7 @@ <h4 id="14413-annotation-path"><a name="AnnotationPath" href="#AnnotationPath">1
 <span id="cb76-5"><a href="#cb76-5" aria-hidden="true" tabindex="-1"></a><span class="ot">]</span></span></code></pre></div>
 </div>
 <h4 id="14414-model-element-path"><a name="ModelElementPath" href="#ModelElementPath">14.4.1.4 Model Element Path</a></h4>
-<p>The model element path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in type</a><code> Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a>.</p>
+<p>The model element path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in type</a> <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a>.</p>
 <p>The value of the model element path expression is the path itself, not the instance(s) identified by the path.</p>
 <div class="varjson rep">
 <p>Model element path expressions are represented as a string containing a path.</p>
@@ -2676,7 +2676,7 @@ <h4 id="14414-model-element-path"><a name="ModelElementPath" href="#ModelElement
 <div class="sourceCode" id="cb77"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb77-1"><a href="#cb77-1" aria-hidden="true" tabindex="-1"></a><span class="er">&quot;@org.example.MyFavoriteModelElement&quot;:</span> <span class="er">&quot;/self.someAction&quot;</span></span></code></pre></div>
 </div>
 <h4 id="14415-navigation-property-path"><a name="NavigationPropertyPath" href="#NavigationPropertyPath">14.4.1.5 Navigation Property Path</a></h4>
-<p>The navigation property path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.NavigationPropertyPath, Edm.AnyPropertyPath, or Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
+<p>The navigation property path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.NavigationPropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
 <ul>
 <li>A non-null path MUST resolve to a model element whose type is an entity type, or a collection of entity types, e.g. a navigation property.</li>
 </ul>
@@ -2696,7 +2696,7 @@ <h4 id="14415-navigation-property-path"><a name="NavigationPropertyPath" href="#
 <span id="cb78-8"><a href="#cb78-8" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <h4 id="14416-property-path"><a name="PropertyPath" href="#PropertyPath">14.4.1.6 Property Path</a></h4>
-<p>The property path expression provides a value for terms or term properties that specify one of the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.PropertyPath, Edm.AnyPropertyPath, or Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
+<p>The property path expression provides a value for terms or term properties that specify one of the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.PropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
 <ul>
 <li>A non-null path MUST resolve to a model element whose type is a primitive or complex type, an enumeration type, a type definition, or a collection of one of these types.</li>
 </ul>
@@ -2857,7 +2857,7 @@ <h3 id="-eq--ne--gt--ge--lt--le--has-and--in"><a name="Eq21.5" href="#Eq21.5"> <
 <span id="cb81-89"><a href="#cb81-89" aria-hidden="true" tabindex="-1"></a>      <span class="st">&quot;S&quot;</span></span>
 <span id="cb81-90"><a href="#cb81-90" aria-hidden="true" tabindex="-1"></a>    <span class="ot">]</span></span>
 <span id="cb81-91"><a href="#cb81-91" aria-hidden="true" tabindex="-1"></a>  <span class="ot">]</span></span>
-<span id="cb81-92"><a href="#cb81-92" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span> <span class="er">```</span></span></code></pre></div>
+<span id="cb81-92"><a href="#cb81-92" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <h3 id="1443-arithmetic-operators"><a name="ArithmeticOperators" href="#ArithmeticOperators">14.4.3 Arithmetic Operators</a></h3>
 <p>Annotations MAY use the following arithmetic expressions which evaluate to a numeric value. These expressions MAY be combined, and they MAY be used anywhere instead of a numeric expression of the appropriate type. The semantics and evaluation rules for each arithmetic expression is identical to the corresponding arithmetic operator defined in <a href="#ODataURL">OData-URL</a>.</p>
@@ -3047,7 +3047,7 @@ <h4 id="14443-function-odatamatchespattern"><a name="FunctionodatamatchesPattern
 <span id="cb85-9"><a href="#cb85-9" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <h4 id="14444-function-odatauriencode"><a name="FunctionodatauriEncode" href="#FunctionodatauriEncode">14.4.4.4 Function <code>odata.uriEncode</code></a></h4>
-<p>The <code>odata.uriEncode </code>client-side function takes one argument of primitive type and returns the URL-encoded OData literal that can be used as a key value in OData URLs or in the query part of OData URLs.</p>
+<p>The <code>odata.uriEncode</code> client-side function takes one argument of primitive type and returns the URL-encoded OData literal that can be used as a key value in OData URLs or in the query part of OData URLs.</p>
 <p>Note: string literals are surrounded by single quotes as required by the paren-style key syntax.</p>
 <div class="varjson example">
 <p>Example 78:</p>
@@ -3563,7 +3563,7 @@ <h2 id="162-annotations-for-products-and-categories-example"><a name="Annotation
 <span id="cb99-46"><a href="#cb99-46" aria-hidden="true" tabindex="-1"></a>      <span class="fu">}</span></span>
 <span id="cb99-47"><a href="#cb99-47" aria-hidden="true" tabindex="-1"></a>    <span class="fu">}</span></span>
 <span id="cb99-48"><a href="#cb99-48" aria-hidden="true" tabindex="-1"></a>  <span class="fu">}</span></span>
-<span id="cb99-49"><a href="#cb99-49" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span> <span class="er">```</span></span></code></pre></div>
+<span id="cb99-49"><a href="#cb99-49" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <hr />
 <h1 id="17-conformance"><a name="Conformance" href="#Conformance">17 Conformance</a></h1>

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

@@ -1497,7 +1497,7 @@ see [OData-VocCore](#ODataVocCore).
 ::: {.varjson .rep}
 ### <a name="HasStream5.4" href="#HasStream5.4"> `$HasStream`</a>
 
-The value of `$HasStream `is one of the Boolean literals `true` or
+The value of `$HasStream` is one of the Boolean literals `true` or
 `false`. Absence of the member means `false`.
 :::
 
@@ -4502,7 +4502,7 @@ Example 68:
 
 The model element path expression provides a value for terms or term
 properties that specify the [built-in
-type](#BuiltInTypesfordefiningVocabularyTerms)` Edm.ModelElementPath`. Its
+type](#BuiltInTypesfordefiningVocabularyTerms) `Edm.ModelElementPath`. Its
 argument is a [model path](#PathExpressions).
 
 The value of the model element path expression is the path itself, not
@@ -4527,7 +4527,7 @@ Example 69:
 The navigation property path expression provides a value for terms or
 term properties that specify the [built-in
 types](#BuiltInTypesfordefiningVocabularyTerms)
-`Edm.NavigationPropertyPath, Edm.AnyPropertyPath, or Edm.ModelElementPath`.
+`Edm.NavigationPropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`.
 Its argument is a [model path](#PathExpressions) with the following
 restriction:
 - A non-null path MUST resolve to a model
@@ -4563,7 +4563,7 @@ Example 70:
 The property path expression provides a value for terms or term
 properties that specify one of the [built-in
 types](#BuiltInTypesfordefiningVocabularyTerms)
-`Edm.PropertyPath, Edm.AnyPropertyPath, or Edm.ModelElementPath`. Its
+`Edm.PropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`. Its
 argument is a [model path](#PathExpressions) with the following
 restriction:
 - A non-null path MUST resolve to a model
@@ -4778,7 +4778,8 @@ Example 73:
       "S"
     ]
   ]
-} ```
+}
+```
 :::
 
 
@@ -5047,7 +5048,7 @@ Example 77: all non-empty `FirstName` values not containing the letters
 
 #### <a name="FunctionodatauriEncode" href="#FunctionodatauriEncode">14.4.4.4 Function `odata.uriEncode`</a>
 
-The `odata.uriEncode `client-side function takes one argument of
+The `odata.uriEncode` client-side function takes one argument of
 primitive type and returns the URL-encoded OData literal that can be
 used as a key value in OData URLs or in the query part of OData URLs.
 
@@ -5814,7 +5815,8 @@ Example 91:
       }
     }
   }
-} ```
+}
+```
 :::
 
 

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

@@ -773,7 +773,7 @@ <h3 id="-element-edmxedmx"><a name="ElementedmxEdmx2" href="#ElementedmxEdmx2">
 <p>The <code>edmx:Edmx</code> element is the root element of a CSDL XML document. It MUST contain the <code>Version</code> attribute and it MUST contain exactly one <code>edmx:DataServices</code> element.</p>
 <p>It MAY contain <a href="#Reference"><code>edmx:Reference</code></a> elements to reference other CSDL documents.</p>
 <h3 id="-attribute-version"><a name="AttributeVersion2.1" href="#AttributeVersion2.1"> Attribute <code>Version</code></a></h3>
-<p>The <code>Version</code> attribute specifies the OData protocol version of the service. For OData 4.0 responses the value of this attribute MUST be <code>4.0</code>. For OData 4.01 responses the value of this attribute MUST be <code>4.01</code>. Services MUST return an OData 4.0 response if the request was made with an <code>OData-MaxVersion </code>header with a value of <code>4.0</code>.</p>
+<p>The <code>Version</code> attribute specifies the OData protocol version of the service. For OData 4.0 responses the value of this attribute MUST be <code>4.0</code>. For OData 4.01 responses the value of this attribute MUST be <code>4.01</code>. Services MUST return an OData 4.0 response if the request was made with an <code>OData-MaxVersion</code> header with a value of <code>4.0</code>.</p>
 <h3 id="-element-edmxdataservices"><a name="ElementedmxDataServices3" href="#ElementedmxDataServices3"> Element <code>edmx:DataServices</code></a></h3>
 <p>The <code>edmx:DataServices</code> element MUST contain one or more <a href="#Schema"><code>edm:Schema</code></a> elements which define the schemas exposed by the OData service.</p>
 </div>
@@ -1743,7 +1743,7 @@ <h3 id="-attribute-target-1"><a name="AttributeTarget27.2" href="#AttributeTarge
 <span id="cb37-4"><a href="#cb37-4" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">EntitySet</span>&gt;</span></code></pre></div>
 </div>
 <div class="varxml example">
-<p>Example 37: binding <code>Supplier</code> on <code>Products</code> contained within <code>Categories – binding applies to all suppliers of all products of all categories</code></p>
+<p>Example 37: binding <code>Supplier</code> on <code>Products</code> contained within <code>Categories</code> – binding applies to all suppliers of all products of all categories</p>
 <div class="sourceCode" id="cb38"><pre class="sourceCode xml"><code class="sourceCode xml"><span id="cb38-1"><a href="#cb38-1" aria-hidden="true" tabindex="-1"></a>&lt;<span class="kw">EntitySet</span><span class="ot"> Name=</span><span class="st">&quot;Categories&quot;</span><span class="ot"> EntityType=</span><span class="st">&quot;self.Category&quot;</span>&gt;</span>
 <span id="cb38-2"><a href="#cb38-2" aria-hidden="true" tabindex="-1"></a>  &lt;<span class="kw">NavigationPropertyBinding</span><span class="ot"> Path=</span><span class="st">&quot;Products/Supplier&quot;</span></span>
 <span id="cb38-3"><a href="#cb38-3" aria-hidden="true" tabindex="-1"></a><span class="ot">                             Target=</span><span class="st">&quot;Suppliers&quot;</span> /&gt;</span>
@@ -2532,7 +2532,7 @@ <h3><a name="ExpressionedmAnnotationPath44" href="#ExpressionedmAnnotationPath44
 <span id="cb73-9"><a href="#cb73-9" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">Annotation</span>&gt;</span></code></pre></div>
 </div>
 <h4 id="14414-model-element-path"><a name="ModelElementPath" href="#ModelElementPath">14.4.1.4 Model Element Path</a></h4>
-<p>The model element path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in type</a><code> Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a>.</p>
+<p>The model element path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in type</a> <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a>.</p>
 <p>The value of the model element path expression is the path itself, not the instance(s) identified by the path.</p>
 <section id="-expression-edmmodelelementpath" class="varxml rep">
 <h3><a name="ExpressionedmModelElementPath45" href="#ExpressionedmModelElementPath45"> Expression <code>edm:ModelElementPath</code></a></h3>
@@ -2548,7 +2548,7 @@ <h3><a name="ExpressionedmModelElementPath45" href="#ExpressionedmModelElementPa
 <span id="cb74-6"><a href="#cb74-6" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">Annotation</span>&gt;</span></code></pre></div>
 </div>
 <h4 id="14415-navigation-property-path"><a name="NavigationPropertyPath" href="#NavigationPropertyPath">14.4.1.5 Navigation Property Path</a></h4>
-<p>The navigation property path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.NavigationPropertyPath, Edm.AnyPropertyPath, or Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
+<p>The navigation property path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.NavigationPropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
 <ul>
 <li>A non-null path MUST resolve to a model element whose type is an entity type, or a collection of entity types, e.g. a navigation property.</li>
 </ul>
@@ -2573,7 +2573,7 @@ <h3><a name="ExpressionedmNavigationPropertyPath46" href="#ExpressionedmNavigati
 <span id="cb75-12"><a href="#cb75-12" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">Annotation</span>&gt;</span></code></pre></div>
 </div>
 <h4 id="14416-property-path"><a name="PropertyPath" href="#PropertyPath">14.4.1.6 Property Path</a></h4>
-<p>The property path expression provides a value for terms or term properties that specify one of the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.PropertyPath, Edm.AnyPropertyPath, or Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
+<p>The property path expression provides a value for terms or term properties that specify one of the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.PropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
 <ul>
 <li>A non-null path MUST resolve to a model element whose type is a primitive or complex type, an enumeration type, a type definition, or a collection of one of these types.</li>
 </ul>
@@ -2825,7 +2825,7 @@ <h4 id="14443-function-odatamatchespattern"><a name="FunctionodatamatchesPattern
 <span id="cb82-4"><a href="#cb82-4" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">Apply</span>&gt;</span></code></pre></div>
 </div>
 <h4 id="14444-function-odatauriencode"><a name="FunctionodatauriEncode" href="#FunctionodatauriEncode">14.4.4.4 Function <code>odata.uriEncode</code></a></h4>
-<p>The <code>odata.uriEncode </code>client-side function takes one argument of primitive type and returns the URL-encoded OData literal that can be used as a key value in OData URLs or in the query part of OData URLs.</p>
+<p>The <code>odata.uriEncode</code> client-side function takes one argument of primitive type and returns the URL-encoded OData literal that can be used as a key value in OData URLs or in the query part of OData URLs.</p>
 <p>Note: string literals are surrounded by single quotes as required by the paren-style key syntax.</p>
 <div class="varxml example">
 <p>Example 78:</p>