diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html index dd6c22e4c..7f82e9ef0 100644 --- a/docs/odata-csdl-json/odata-csdl-json.html +++ b/docs/odata-csdl-json/odata-csdl-json.html @@ -729,7 +729,7 @@

}

4.2 Included Schema

-

A reference MAY include zero or more schemas from the referenced document.

+

A reference MAY include zero or more schemas from the referenced document.

The included schemas are identified via their namespace. The same namespace MUST NOT be included more than once, even if it is declared in more than one referenced document.

When including a schema, a simple identifier 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 display might be assigned to the namespace org.example.vocabularies.display. An alias-qualified name is resolved to a fully qualified name by examining aliases for included schemas and schemas defined within the document.

@@ -782,7 +782,7 @@

$Alias

}

4.3 Included Annotations

-

In addition to including whole schemas with all model constructs defined within that schema, annotations can be included with more flexibility.

+

In addition to including whole schemas with all model constructs defined within that schema, a reference may include annotations.

Annotations are selectively included by specifying the namespace 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.

In addition, the qualifier 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.

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.

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md index 77cc71f29..c7c94f5d2 100644 --- a/docs/odata-csdl-json/odata-csdl-json.md +++ b/docs/odata-csdl-json/odata-csdl-json.md @@ -783,7 +783,7 @@ Example 3: references to other CSDL documents ## 4.2 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). @@ -878,7 +878,7 @@ vocabulary terms ## 4.3 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 diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html index 17b75a4ed..1c615ca11 100644 --- a/docs/odata-csdl-xml/odata-csdl-xml.html +++ b/docs/odata-csdl-xml/odata-csdl-xml.html @@ -723,7 +723,7 @@

Attri </edmx:Edmx>

4.2 Included Schema

-

A reference MAY include zero or more schemas from the referenced document.

+

A reference MAY include zero or more schemas from the referenced document.

The included schemas are identified via their namespace. The same namespace MUST NOT be included more than once, even if it is declared in more than one referenced document.

When including a schema, a simple identifier 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 display might be assigned to the namespace org.example.vocabularies.display. An alias-qualified name is resolved to a fully qualified name by examining aliases for included schemas and schemas defined within the document.

@@ -761,7 +761,7 @@

</edmx:Edmx>

4.3 Included Annotations

-

In addition to including whole schemas with all model constructs defined within that schema, annotations can be included with more flexibility.

+

In addition to including whole schemas with all model constructs defined within that schema, a reference may include annotations.

Annotations are selectively included by specifying the namespace 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.

In addition, the qualifier 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.

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.

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md index f7f703d90..87b570eeb 100644 --- a/docs/odata-csdl-xml/odata-csdl-xml.md +++ b/docs/odata-csdl-xml/odata-csdl-xml.md @@ -735,7 +735,7 @@ Example 3: references to other CSDL documents ## 4.2 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). @@ -818,7 +818,7 @@ vocabulary terms ## 4.3 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 diff --git a/odata-csdl/4 CSDL Document.md b/odata-csdl/4 CSDL Document.md index fdf4d3cec..041468fb0 100644 --- a/odata-csdl/4 CSDL Document.md +++ b/odata-csdl/4 CSDL Document.md @@ -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). @@ -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