ODATA-1570 (#108)

Co-authored-by: Heiko Theißen <[email protected]>
oasis-tcs · Nov 15, 2023 · a7bdb21 · a7bdb21
1 parent 114ef11
commit a7bdb21
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -363,7 +363,7 @@ <h1 id="table-of-contents">Table of Contents</h1>
 </div>
 <hr />
 <h1 id="1-introduction"><a name="Introduction" href="#Introduction">1 Introduction</a></h1>
-<p>OData services are described in terms of an <a href="#EntityModel">Entity Model</a>. The Common Schema Definition Language (CSDL) defines a representation of the entity model exposed by an OData service using the Extensible Markup Language (XML) 1.1 (Second Edition) <a href="#XML-11">XML-1.1</a> with further building blocks from the W3C XML Schema Definition Language (XSD) 1.1 as described in <a href="#XML-Schema1">XML-Schema-1</a> and <a href="#XML-Schema2">XML-Schema-2</a>.</p>
+<p>OData services are described in terms of an <a href="#EntityModel">Entity Model</a>. The Common Schema Definition Language (CSDL) defines a representation of the entity model exposed by an OData service using the Extensible Markup Language (XML) 1.0 (Fifth Edition) <a href="#XML-10">XML-1.0</a> with further building blocks from the W3C XML Schema Definition Language (XSD) 1.1 as described in <a href="#XML-Schema1">XML-Schema-1</a> and <a href="#XML-Schema2">XML-Schema-2</a>.</p>
 <h2 id="11-changes-from-earlier-versions"><a name="ChangesfromEarlierVersions" href="#ChangesfromEarlierVersions">1.1 Changes from Earlier Versions</a></h2>
 <table>
 <thead>
@@ -423,7 +423,7 @@ <h3>Representation-Specific Headline</h3>
 <!-- Lines between the next and the closing : belong to the XML variant only. -->
 
 <h1 id="2-xml-representation"><a name="XMLRepresentation" href="#XMLRepresentation">2 XML Representation</a></h1>
-<p>OData CSDL XML is a full representation of the OData Common Schema Definition Language in the Extensible Markup Language (XML) 1.1 (Second Edition) <a href="#XML-11">XML-1.1</a> with further building blocks from the W3C XML Schema Definition Language (XSD) 1.1 as described in <a href="#XML-Schema1">XML-Schema-1</a> and <a href="#XML-Schema2">XML-Schema-2</a>.</p>
+<p>OData CSDL XML is a full representation of the OData Common Schema Definition Language in the Extensible Markup Language (XML) 1.0 (Fifth Edition) <a href="#XML-10">XML-1.0</a> with further building blocks from the W3C XML Schema Definition Language (XSD) 1.1 as described in <a href="#XML-Schema1">XML-Schema-1</a> and <a href="#XML-Schema2">XML-Schema-2</a>.</p>
 <p>It is an alternative to the CSDL JSON representation defined in <a href="#ODataCSDL">OData-CSDLJSON</a> and neither adds nor removes features.</p>
 <h2 id="21-requesting-the-xml-representation"><a name="RequestingtheXMLRepresentation" href="#RequestingtheXMLRepresentation">2.1 Requesting the XML Representation</a></h2>
 <p>The OData CSDL XML representation can be requested using the <code>$format</code> query option in the request URL with the media type <code>application/xml</code>, optionally followed by media type parameters, or the case-insensitive abbreviation <code>xml</code> which MUST NOT be followed by media type parameters.</p>
@@ -3291,9 +3291,9 @@ <h6 id="rfc6570"><a name="rfc6570">[RFC6570]</a></h6>
 <h6 id="rfc8174"><a name="rfc8174">[RFC8174]</a></h6>
 <p><em>Leiba, B., “Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words”, BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017</em>.<br />
 <a href="https://www.rfc-editor.org/info/rfc8174">https://www.rfc-editor.org/info/rfc8174</a>.</p>
-<h6 id="xml-11"><a name="XML-11">[XML-1.1]</a></h6>
-<p><em>Extensible Markup Language (XML) 1.1 (Second Edition)</em>. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.<br />
-<a href="http://www.w3.org/TR/2006/REC-xml11-20060816">http://www.w3.org/TR/2006/REC-xml11-20060816</a>. Latest version available at <a href="http://www.w3.org/TR/xml11/">http://www.w3.org/TR/xml11/</a>.</p>
+<h6 id="xml-10"><a name="XML-10">[XML-1.0]</a></h6>
+<p><em>Extensible Markup Language (XML) 1.0 (Fifth Edition)</em>. T. Bray, J. Paoli, C. M. Sperberg-McQueen, E. Maler, F. Yergeau, Editors, W3C Recommendation, 26 November 2008.<br />
+<a href="http://www.w3.org/TR/2008/REC-xml-20081126/">http://www.w3.org/TR/2008/REC-xml-20081126/</a>. Latest version available at <a href="http://www.w3.org/TR/xml/">http://www.w3.org/TR/xml/</a>.</p>
 <h6 id="xml-base"><a name="XML-Base">[XML-Base]</a></h6>
 <p><em>XML Base (Second Edition)</em>. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.<br />
 <a href="http://www.w3.org/TR/2009/REC-xmlbase-20090128/">http://www.w3.org/TR/2009/REC-xmlbase-20090128/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>.</p>

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -247,8 +247,8 @@ For complete copyright information please see the full Notices section in an App
 OData services are described in terms of an [Entity
 Model](#EntityModel). The Common Schema Definition Language (CSDL)
 defines a representation of the entity model exposed by an OData
-service using the Extensible Markup Language (XML) 1.1 (Second Edition)
-[XML-1.1](#XML-11) with further building blocks from the W3C XML
+service using the Extensible Markup Language (XML) 1.0 (Fifth Edition)
+[XML-1.0](#XML-10) with further building blocks from the W3C XML
 Schema Definition Language (XSD) 1.1 as described in
 [XML-Schema-1](#XML-Schema1) and
 [XML-Schema-2](#XML-Schema2).
@@ -323,8 +323,8 @@ This uses pandoc 3.1.2 from https://github.com/jgm/pandoc/releases/tag/3.1.2.
 # <a name="XMLRepresentation" href="#XMLRepresentation">2 XML Representation</a>
 
 OData CSDL XML is a full representation of the OData Common Schema
-Definition Language in the Extensible Markup Language (XML) 1.1 (Second
-Edition) [XML-1.1](#XML-11) with further building blocks from the
+Definition Language in the Extensible Markup Language (XML) 1.0 (Fifth
+Edition) [XML-1.0](#XML-10) with further building blocks from the
 W3C XML Schema Definition Language (XSD) 1.1 as described in
 [XML-Schema-1](#XML-Schema1) and
 [XML-Schema-2](#XML-Schema2).
@@ -5644,9 +5644,9 @@ _Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14,
 https://www.rfc-editor.org/info/rfc8174.
 
 
-###### <a name="XML-11">[XML-1.1]</a>
-_Extensible Markup Language (XML) 1.1 (Second Edition)_. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.  
-http://www.w3.org/TR/2006/REC-xml11-20060816. Latest version available at http://www.w3.org/TR/xml11/.
+###### <a name="XML-10">[XML-1.0]</a>
+_Extensible Markup Language (XML) 1.0 (Fifth Edition)_. T. Bray, J. Paoli, C. M. Sperberg-McQueen, E. Maler, F. Yergeau, Editors, W3C Recommendation, 26 November 2008.  
+http://www.w3.org/TR/2008/REC-xml-20081126/. Latest version available at http://www.w3.org/TR/xml/.
 
 ###### <a name="XML-Base">[XML-Base]</a>
 _XML Base (Second Edition)_. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.  

diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
@@ -18,8 +18,8 @@ modifications made necessary to fully cover OData CSDL Version 4.01.
 OData services are described in terms of an [Entity
 Model](#EntityModel). The Common Schema Definition Language (CSDL)
 defines a representation of the entity model exposed by an OData
-service using the Extensible Markup Language (XML) 1.1 (Second Edition)
-[XML-1.1](#XML-11) with further building blocks from the W3C XML
+service using the Extensible Markup Language (XML) 1.0 (Fifth Edition)
+[XML-1.0](#XML-10) with further building blocks from the W3C XML
 Schema Definition Language (XSD) 1.1 as described in
 [XML-Schema-1](#XML-Schema1) and
 [XML-Schema-2](#XML-Schema2).
@@ -258,8 +258,8 @@ this specification document take precedence.
 # ##sec XML Representation
 
 OData CSDL XML is a full representation of the OData Common Schema
-Definition Language in the Extensible Markup Language (XML) 1.1 (Second
-Edition) [XML-1.1](#XML-11) with further building blocks from the
+Definition Language in the Extensible Markup Language (XML) 1.0 (Fifth
+Edition) [XML-1.0](#XML-10) with further building blocks from the
 W3C XML Schema Definition Language (XSD) 1.1 as described in
 [XML-Schema-1](#XML-Schema1) and
 [XML-Schema-2](#XML-Schema2).

diff --git a/odata-csdl/Appendix.md b/odata-csdl/Appendix.md
@@ -105,9 +105,9 @@ https://www.rfc-editor.org/info/rfc8259.
 :
 
 : varxml
-###### <a name="XML-11">[XML-1.1]</a>
-_Extensible Markup Language (XML) 1.1 (Second Edition)_. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.  
-http://www.w3.org/TR/2006/REC-xml11-20060816. Latest version available at http://www.w3.org/TR/xml11/.
+###### <a name="XML-10">[XML-1.0]</a>
+_Extensible Markup Language (XML) 1.0 (Fifth Edition)_. T. Bray, J. Paoli, C. M. Sperberg-McQueen, E. Maler, F. Yergeau, Editors, W3C Recommendation, 26 November 2008.  
+http://www.w3.org/TR/2008/REC-xml-20081126/. Latest version available at http://www.w3.org/TR/xml/.
 
 ###### <a name="XML-Base">[XML-Base]</a>
 _XML Base (Second Edition)_. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.