Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ODATA-1371 #74

Merged
merged 1 commit into from
Aug 30, 2023
Merged

ODATA-1371 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/odata-csdl-json/odata-csdl-json.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ <h3 id="-reference-object"><a name="ReferenceObject2" href="#ReferenceObject2">
<span id="cb4-15"><a href="#cb4-15" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
</div>
<h2 id="42-included-schema"><a name="IncludedSchema" href="#IncludedSchema">4.2 Included Schema</a></h2>
<p>A reference MAY include zero or more schemas from the referenced document.</p>
<p>A <a href="#Reference">reference</a> MAY include zero or more schemas from the referenced document.</p>
<p>The included schemas are identified via their <a href="#Namespace">namespace</a>. The same namespace MUST NOT be included more than once, even if it is declared in more than one referenced document.</p>
<p>When including a schema, a <a href="#SimpleIdentifier">simple identifier</a> value MAY be specified as an alias for the schema that is used in qualified names instead of the namespace. For example, an alias of <code>display</code> might be assigned to the namespace <code>org.example.vocabularies.display</code>. An alias-qualified name is resolved to a fully qualified name by examining aliases for included schemas and schemas defined within the document.</p>
<div class="varjson rep">
Expand Down Expand Up @@ -782,7 +782,7 @@ <h3 id="-alias"><a name="Alias2.3" href="#Alias2.3"> <code>$Alias</code></a></h3
<span id="cb5-31"><a href="#cb5-31" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
</div>
<h2 id="43-included-annotations"><a name="IncludedAnnotations" href="#IncludedAnnotations">4.3 Included Annotations</a></h2>
<p>In addition to including whole schemas with all model constructs defined within that schema, annotations can be included with more flexibility.</p>
<p>In addition to including whole schemas with all model constructs defined within that schema, a <a href="#Reference">reference</a> may include annotations.</p>
<p>Annotations are selectively included by specifying the <a href="#Namespace">namespace</a> of the annotations' term. Consumers can opt not to inspect the referenced document if none of the term namespaces is of interest for the consumer.</p>
<p>In addition, the <a href="#Qualifier">qualifier</a> of annotations to be included MAY be specified. For instance, a service author might want to supply a different set of annotations for various device form factors. If a qualifier is specified, only those annotations from the specified term namespace with the specified qualifier (applied to a model element of the target namespace, if present) SHOULD be included. If no qualifier is specified, all annotations within the referenced document from the specified term namespace (taking into account the target namespace, if present) SHOULD be included.</p>
<p>The qualifier also provides consumers insight about what qualifiers are present in the referenced document. If the consumer is not interested in that particular qualifier, the consumer can opt not to inspect the referenced document.</p>
Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-json/odata-csdl-json.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ Example 3: references to other CSDL documents

## <a name="IncludedSchema" href="#IncludedSchema">4.2 Included Schema</a>

A reference MAY include zero or more schemas from the referenced
A [reference](#Reference) MAY include zero or more schemas from the referenced
document.

The included schemas are identified via their [namespace](#Namespace).
Expand Down Expand Up @@ -878,7 +878,7 @@ vocabulary terms
## <a name="IncludedAnnotations" href="#IncludedAnnotations">4.3 Included Annotations</a>

In addition to including whole schemas with all model constructs defined
within that schema, annotations can be included with more flexibility.
within that schema, a [reference](#Reference) may include annotations.

Annotations are selectively included by specifying the
[namespace](#Namespace) of the annotations' term. Consumers can opt not
Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-xml/odata-csdl-xml.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ <h3 id="-attribute-uri"><a name="AttributeUri3.1" href="#AttributeUri3.1"> Attri
<span id="cb4-14"><a href="#cb4-14" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">edmx:Edmx</span>&gt;</span></code></pre></div>
</div>
<h2 id="42-included-schema"><a name="IncludedSchema" href="#IncludedSchema">4.2 Included Schema</a></h2>
<p>A reference MAY include zero or more schemas from the referenced document.</p>
<p>A <a href="#Reference">reference</a> MAY include zero or more schemas from the referenced document.</p>
<p>The included schemas are identified via their <a href="#Namespace">namespace</a>. The same namespace MUST NOT be included more than once, even if it is declared in more than one referenced document.</p>
<p>When including a schema, a <a href="#SimpleIdentifier">simple identifier</a> value MAY be specified as an alias for the schema that is used in qualified names instead of the namespace. For example, an alias of <code>display</code> might be assigned to the namespace <code>org.example.vocabularies.display</code>. An alias-qualified name is resolved to a fully qualified name by examining aliases for included schemas and schemas defined within the document.</p>
<div class="varxml rep">
Expand Down Expand Up @@ -761,7 +761,7 @@ <h3 id="-attribute-alias"><a name="AttributeAlias4.2" href="#AttributeAlias4.2">
<span id="cb5-16"><a href="#cb5-16" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">edmx:Edmx</span>&gt;</span></code></pre></div>
</div>
<h2 id="43-included-annotations"><a name="IncludedAnnotations" href="#IncludedAnnotations">4.3 Included Annotations</a></h2>
<p>In addition to including whole schemas with all model constructs defined within that schema, annotations can be included with more flexibility.</p>
<p>In addition to including whole schemas with all model constructs defined within that schema, a <a href="#Reference">reference</a> may include annotations.</p>
<p>Annotations are selectively included by specifying the <a href="#Namespace">namespace</a> of the annotations' term. Consumers can opt not to inspect the referenced document if none of the term namespaces is of interest for the consumer.</p>
<p>In addition, the <a href="#Qualifier">qualifier</a> of annotations to be included MAY be specified. For instance, a service author might want to supply a different set of annotations for various device form factors. If a qualifier is specified, only those annotations from the specified term namespace with the specified qualifier (applied to a model element of the target namespace, if present) SHOULD be included. If no qualifier is specified, all annotations within the referenced document from the specified term namespace (taking into account the target namespace, if present) SHOULD be included.</p>
<p>The qualifier also provides consumers insight about what qualifiers are present in the referenced document. If the consumer is not interested in that particular qualifier, the consumer can opt not to inspect the referenced document.</p>
Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-xml/odata-csdl-xml.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ Example 3: references to other CSDL documents

## <a name="IncludedSchema" href="#IncludedSchema">4.2 Included Schema</a>

A reference MAY include zero or more schemas from the referenced
A [reference](#Reference) MAY include zero or more schemas from the referenced
document.

The included schemas are identified via their [namespace](#Namespace).
Expand Down Expand Up @@ -818,7 +818,7 @@ vocabulary terms
## <a name="IncludedAnnotations" href="#IncludedAnnotations">4.3 Included Annotations</a>

In addition to including whole schemas with all model constructs defined
within that schema, annotations can be included with more flexibility.
within that schema, a [reference](#Reference) may include annotations.

Annotations are selectively included by specifying the
[namespace](#Namespace) of the annotations' term. Consumers can opt not
Expand Down
4 changes: 2 additions & 2 deletions odata-csdl/4 CSDL Document.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ Example ##ex: references to other CSDL documents

## ##subsec Included Schema

A reference MAY include zero or more schemas from the referenced
A [reference](#Reference) MAY include zero or more schemas from the referenced
document.

The included schemas are identified via their [namespace](#Namespace).
Expand Down Expand Up @@ -328,7 +328,7 @@ vocabulary terms
## ##subsec Included Annotations

In addition to including whole schemas with all model constructs defined
within that schema, annotations can be included with more flexibility.
within that schema, a [reference](#Reference) may include annotations.

Annotations are selectively included by specifying the
[namespace](#Namespace) of the annotations' term. Consumers can opt not
Expand Down