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-1571 #66

Merged
merged 6 commits into from
Jan 10, 2024
Merged

ODATA-1571 #66

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b5d495
ODATA-1571
HeikoTheissen Jul 31, 2023
eeb658e
Merge remote-tracking branch 'origin/main' into ODATA-1571
HeikoTheissen Sep 13, 2023
81c444a
Merge branch 'main' into ODATA-1571
ralfhandl Oct 26, 2023
aa284ce
Merge branch 'main' into ODATA-1571
HeikoTheissen Nov 9, 2023
d722b87
Change history
HeikoTheissen Nov 16, 2023
7cc7ea4
Merge remote-tracking branch 'origin/main' into ODATA-1571
HeikoTheissen Dec 4, 2023
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
2 changes: 1 addition & 1 deletion 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 @@ -1629,7 +1629,7 @@ <h1 id="13-entity-container"><a name="EntityContainer" href="#EntityContainer">1
<p>A <a href="#FunctionImport"><em>function import</em></a> or an <a href="#ActionImport"><em>action import</em></a> is used to expose a function or action defined in an entity model as a top level resource.</p>
<div class="varxml rep">
<h3 id="-element-edmentitycontainer"><a name="ElementedmEntityContainer24" href="#ElementedmEntityContainer24"> Element <code>edm:EntityContainer</code></a></h3>
<p>The <code>edm:EntityContainer</code> MUST contain one or more <a href="#EntitySet"><code>edm:EntitySet</code></a>, <a href="#Singleton"><code>edm:Singleton</code></a>, <a href="#ActionImport"><code>edm:ActionImport</code></a>, or <a href="#FunctionImport"><code>edm:FunctionImport</code></a> elements.</p>
<p>The <code>edm:EntityContainer</code> MAY contain <a href="#EntitySet"><code>edm:EntitySet</code></a>, <a href="#Singleton"><code>edm:Singleton</code></a>, <a href="#ActionImport"><code>edm:ActionImport</code></a>, and <a href="#FunctionImport"><code>edm:FunctionImport</code></a> elements.</p>
<p>It MAY contain <a href="#Annotation"><code>edm:Annotation</code></a> elements.</p>
<h3 id="-attribute-name-11"><a name="AttributeName24.1" href="#AttributeName24.1"> Attribute <code>Name</code></a></h3>
<p>The value of <code>Name</code> is the entity container’s name.</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 @@ -2873,9 +2873,9 @@ in an entity model as a top level resource.
::: {.varxml .rep}
### <a name="ElementedmEntityContainer24" href="#ElementedmEntityContainer24"> Element `edm:EntityContainer`</a>

The `edm:EntityContainer` MUST contain one or more
The `edm:EntityContainer` MAY contain
[`edm:EntitySet`](#EntitySet), [`edm:Singleton`](#Singleton),
[`edm:ActionImport`](#ActionImport), or
[`edm:ActionImport`](#ActionImport), and
[`edm:FunctionImport`](#FunctionImport) elements.

It MAY contain [`edm:Annotation`](#Annotation) elements.
Expand Down
4 changes: 2 additions & 2 deletions odata-csdl/13 Entity Container.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ action imports, and function imports.
::: {.varxml .rep}
### ##isec Element `edm:EntityContainer`

The `edm:EntityContainer` MUST contain one or more
The `edm:EntityContainer` MAY contain
[`edm:EntitySet`](#EntitySet), [`edm:Singleton`](#Singleton),
[`edm:ActionImport`](#ActionImport), or
[`edm:ActionImport`](#ActionImport), and
[`edm:FunctionImport`](#FunctionImport) elements.

It MAY contain [`edm:Annotation`](#Annotation) elements.
Expand Down