Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into tools/multi-build
Browse files Browse the repository at this point in the history
  • Loading branch information
HeikoTheissen committed Sep 25, 2024
2 parents 1fe31c2 + e912f40 commit 7b338c0
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 65 deletions.
6 changes: 3 additions & 3 deletions docs/odata-csdl-json/odata-csdl-json.html
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ <h2 id="33-primitive-types"><a id="PrimitiveTypes" href="#PrimitiveTypes">3.3 Pr
<p><code>Edm.Date</code> and <code>Edm.DateTimeOffset</code> follow <a href="#XML-Schema2">XML-Schema-2</a> and use the proleptic Gregorian calendar, allowing the year <code>0000</code> (equivalent to 1 BCE) and negative years (year <code>-0001</code> being equivalent to 2 BCE etc.). The supported date range is service-specific and typically depends on the underlying persistency layer, e.g. SQL only supports years <code>0001</code> to <code>9999</code>.</p>
<p><code>Edm.Decimal</code> with a <a href="#Scale"><code>Scale</code></a> value of <code>floating</code>, <code>Edm.Double</code>, and <code>Edm.Single</code> allow the special numeric values <code>-INF</code>, <code>INF</code>, and <code>NaN</code>.</p>
<p><code>Edm.Stream</code> is a primitive type that can be used as a property of an <a href="#EntityType">entity type</a> or <a href="#ComplexType">complex type</a>, the underlying type for a <a href="#TypeDefinition">type definition</a>, or a binding or non-binding parameter or return type of an <a href="#Action">action</a> or <a href="#Function">function</a>. <code>Edm.Stream</code>, or a type definition whose underlying type is <code>Edm.Stream</code>, cannot be used in collections.</p>
<p>Some of these types allow facets, defined in section “<a href="#TypeFacets">Type Facets</a>.</p>
<p>Some of these types allow facets, defined in <a href="#TypeFacets">section 3.4</a>.</p>
<p>Representation of primitive type values within a URL is defined by the rule <code>primitiveLiteral</code> in <a href="#ODataABNF">OData-ABNF</a>. Representation within request and response bodies is format specific.</p>
</details>
<details open><summary>
Expand Down Expand Up @@ -961,7 +961,7 @@ <h2 id="36-built-in-types-for-defining-vocabulary-terms"><a id="BuiltInTypesford
<li><code>Edm.AnyPropertyPath</code> (<code>Edm.PropertyPath</code> or <code>Edm.NavigationPropertyPath</code>)</li>
<li><code>Edm.ModelElementPath</code> (any model element, including <code>Edm.AnnotationPath</code>, <code>Edm.NavigationPropertyPath</code>, and <code>Edm.PropertyPath</code>)</li>
</ul>
<p>as the type of a primitive term, or the type of a property of a complex type (recursively) that is exclusively used as the type of a term. See section “<a href="#PathExpressions">Path Expressions</a> for details.</p>
<p>as the type of a primitive term, or the type of a property of a complex type (recursively) that is exclusively used as the type of a term. See <a href="#PathExpressions">section 14.4.1</a> for details.</p>
</details>
<details open><summary>
<h2 id="37-annotations"><a id="Annotations" href="#Annotations">3.7 Annotations</a></h2>
Expand Down Expand Up @@ -2966,7 +2966,7 @@ <h4 id="14411-path-syntax"><a id="PathSyntax" href="#PathSyntax">14.4.1.1 Path S
<p>Example 60: absolute path to an entity set</p>
<pre><code>/My.Schema.MyEntityContainer/MyEntitySet</code></pre>
</div>
<p>Paths not starting with a forward slash are interpreted relative to the annotation target, following the rules specified in section “<a href="#PathEvaluation">Path Evaluation</a>.</p>
<p>Paths not starting with a forward slash are interpreted relative to the annotation target, following the rules specified in <a href="#PathEvaluation">section 14.4.1.2</a>.</p>
<div class="example">
<p>Example 61: relative path to a property</p>
<pre><code>Address/City</code></pre>
Expand Down
8 changes: 3 additions & 5 deletions docs/odata-csdl-json/odata-csdl-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,7 @@ parameter or return type of an [action](#Action) or
`Edm.Stream`, or a type definition whose
underlying type is `Edm.Stream`, cannot be used in collections.

Some of these types allow facets, defined in section
"[Type Facets](#TypeFacets)".
Some of these types allow facets, defined in [section 3.4](#TypeFacets).

Representation of primitive type values within a URL is defined by the rule `primitiveLiteral` in [OData-ABNF](#ODataABNF).
Representation within request and response bodies is format specific.
Expand Down Expand Up @@ -915,7 +914,7 @@ be used anywhere a corresponding concrete type can be used, except:

as the type of a primitive term, or the type of a property of a complex
type (recursively) that is exclusively used as the type of a term. See
section "[Path Expressions](#PathExpressions)" for details.
[section 14.4.1](#PathExpressions) for details.

## <a id="Annotations" href="#Annotations">3.7 Annotations</a>

Expand Down Expand Up @@ -4264,8 +4263,7 @@ Example 60: absolute path to an entity set
:::

Paths not starting with a forward slash are interpreted relative to the
annotation target, following the rules specified in section "[Path
Evaluation](#PathEvaluation)".
annotation target, following the rules specified in [section 14.4.1.2](#PathEvaluation).

::: example
Example 61: relative path to a property
Expand Down
6 changes: 3 additions & 3 deletions docs/odata-csdl-xml/odata-csdl-xml.html
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ <h2 id="33-primitive-types"><a id="PrimitiveTypes" href="#PrimitiveTypes">3.3 Pr
<p><code>Edm.Date</code> and <code>Edm.DateTimeOffset</code> follow <a href="#XML-Schema2">XML-Schema-2</a> and use the proleptic Gregorian calendar, allowing the year <code>0000</code> (equivalent to 1 BCE) and negative years (year <code>-0001</code> being equivalent to 2 BCE etc.). The supported date range is service-specific and typically depends on the underlying persistency layer, e.g. SQL only supports years <code>0001</code> to <code>9999</code>.</p>
<p><code>Edm.Decimal</code> with a <a href="#Scale"><code>Scale</code></a> value of <code>floating</code>, <code>Edm.Double</code>, and <code>Edm.Single</code> allow the special numeric values <code>-INF</code>, <code>INF</code>, and <code>NaN</code>.</p>
<p><code>Edm.Stream</code> is a primitive type that can be used as a property of an <a href="#EntityType">entity type</a> or <a href="#ComplexType">complex type</a>, the underlying type for a <a href="#TypeDefinition">type definition</a>, or a binding or non-binding parameter or return type of an <a href="#Action">action</a> or <a href="#Function">function</a>. <code>Edm.Stream</code>, or a type definition whose underlying type is <code>Edm.Stream</code>, cannot be used in collections.</p>
<p>Some of these types allow facets, defined in section “<a href="#TypeFacets">Type Facets</a>.</p>
<p>Some of these types allow facets, defined in <a href="#TypeFacets">section 3.4</a>.</p>
<p>Representation of primitive type values within a URL is defined by the rule <code>primitiveLiteral</code> in <a href="#ODataABNF">OData-ABNF</a>. Representation within request and response bodies is format specific.</p>
</details>
<details open><summary>
Expand Down Expand Up @@ -941,7 +941,7 @@ <h2 id="36-built-in-types-for-defining-vocabulary-terms"><a id="BuiltInTypesford
<li><code>Edm.AnyPropertyPath</code> (<code>Edm.PropertyPath</code> or <code>Edm.NavigationPropertyPath</code>)</li>
<li><code>Edm.ModelElementPath</code> (any model element, including <code>Edm.AnnotationPath</code>, <code>Edm.NavigationPropertyPath</code>, and <code>Edm.PropertyPath</code>)</li>
</ul>
<p>as the type of a primitive term, or the type of a property of a complex type (recursively) that is exclusively used as the type of a term. See section “<a href="#PathExpressions">Path Expressions</a> for details.</p>
<p>as the type of a primitive term, or the type of a property of a complex type (recursively) that is exclusively used as the type of a term. See <a href="#PathExpressions">section 14.4.1</a> for details.</p>
</details>
<details open><summary>
<h2 id="37-annotations"><a id="Annotations" href="#Annotations">3.7 Annotations</a></h2>
Expand Down Expand Up @@ -2859,7 +2859,7 @@ <h4 id="14411-path-syntax"><a id="PathSyntax" href="#PathSyntax">14.4.1.1 Path S
<p>Example 60: absolute path to an entity set</p>
<pre><code>/My.Schema.MyEntityContainer/MyEntitySet</code></pre>
</div>
<p>Paths not starting with a forward slash are interpreted relative to the annotation target, following the rules specified in section “<a href="#PathEvaluation">Path Evaluation</a>.</p>
<p>Paths not starting with a forward slash are interpreted relative to the annotation target, following the rules specified in <a href="#PathEvaluation">section 14.4.1.2</a>.</p>
<div class="example">
<p>Example 61: relative path to a property</p>
<pre><code>Address/City</code></pre>
Expand Down
8 changes: 3 additions & 5 deletions docs/odata-csdl-xml/odata-csdl-xml.md
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,7 @@ parameter or return type of an [action](#Action) or
`Edm.Stream`, or a type definition whose
underlying type is `Edm.Stream`, cannot be used in collections.

Some of these types allow facets, defined in section
"[Type Facets](#TypeFacets)".
Some of these types allow facets, defined in [section 3.4](#TypeFacets).

Representation of primitive type values within a URL is defined by the rule `primitiveLiteral` in [OData-ABNF](#ODataABNF).
Representation within request and response bodies is format specific.
Expand Down Expand Up @@ -847,7 +846,7 @@ be used anywhere a corresponding concrete type can be used, except:

as the type of a primitive term, or the type of a property of a complex
type (recursively) that is exclusively used as the type of a term. See
section "[Path Expressions](#PathExpressions)" for details.
[section 14.4.1](#PathExpressions) for details.

## <a id="Annotations" href="#Annotations">3.7 Annotations</a>

Expand Down Expand Up @@ -4195,8 +4194,7 @@ Example 60: absolute path to an entity set
:::

Paths not starting with a forward slash are interpreted relative to the
annotation target, following the rules specified in section "[Path
Evaluation](#PathEvaluation)".
annotation target, following the rules specified in [section 14.4.1.2](#PathEvaluation).

::: example
Example 61: relative path to a property
Expand Down
Loading

0 comments on commit 7b338c0

Please sign in to comment.