Skip to content

Commit

Permalink
Merge pull request #150 from mjakubicek/master
Browse files Browse the repository at this point in the history 
editorial changes in response to #134
  • Loading branch information
@mjakubicek
mjakubicek authored Sep 6, 2024
2 parents bb66139 + 0e50ada commit 39c0786
Showing 1 changed file with 102 additions and 12 deletions.
114 changes: 102 additions & 12 deletions dmlex-v1.0/specification/dmlex.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@
<para>Informative copies of third party schemas are provided:</para>
<para><ulink url="&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/">&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/</ulink></para>
</legalnotice>
<legalnotice role="related">
<!-- <legalnotice role="related">
<title>Related Work</title>
<!-- Model content for replaced specifications in the future
Model content for replaced specifications in the future
<para>This specification replaces or supersedes:</para>
<itemizedlist spacing="compact">
Expand All @@ -132,10 +132,9 @@
05 August 2014. OASIS Standard. <ulink url="http://docs.oasis-open.org/xliff/xliff-core/v2.0/os/xliff-core-v2.0-os.html">http://docs.oasis-open.org/xliff/xliff-core/v&pversion;/os/xliff-core-v&pversion;-os.html</ulink></para>
</listitem>
</itemizedlist>
-->
<para>This specification is related to:</para>
<itemizedlist spacing="compact">
<!-- model content for related specifications in case there are any later on
model content for related specifications in case there are any later on
<listitem>
<para><emphasis>JLIFF Version &version;</emphasis>. Edited by Robert van Engelen and David
Filip. &pubdate;. OASIS &standard;. <ulink url="&this-loc;/&name;-&stage;.html"
Expand All @@ -150,12 +149,12 @@
url="http://docs.oasis-open.org/xliff/xliff-core/v2.1/os/xliff-core-v2.1-os.html"
>http://docs.oasis-open.org/xliff/xliff-core/v2.1/os/xliff-core-v2.1-os.html</ulink></para>
</listitem>
-->
<listitem>
<para><emphasis>No related specifications.</emphasis></para>
</listitem>
</itemizedlist>
</legalnotice>
</legalnotice>-->
<legalnotice id="namespaces" role="namespaces">
<title>Declared namespaces</title>
<para>This specification declares one or more namespaces. Namespace isn't considered an XML
Expand Down Expand Up @@ -264,9 +263,9 @@
<para>Copyright © OASIS Open &pubyear;.</para>
<para>All Rights Reserved.Distributed under the terms of the OASIS <ulink
url="https://www.oasis-open.org/policies-guidelines/ipr/"
>IPR Policy</ulink>).</para>
>IPR Policy</ulink>.</para>
<para>The name "OASIS" is a trademark of <ulink url="https://www.oasis-open.org/"
>OASIS</ulink>), the owner and developer of this specification, and
>OASIS</ulink>, the owner and developer of this specification, and
should be used only to refer to the organization and its official outputs.</para>
<para>For complete copyright information please see the <link linkend="full-notices">full Notices</link> section in an Appendix
below.</para>
Expand Down Expand Up @@ -773,10 +772,8 @@
<citetitle><ulink url="http://www.w3.org/2001/xml.xsd"
>http://www.w3.org/2001/xml.xsd</ulink></citetitle> [<edition><ulink
url="http://www.w3.org/2009/01/xml.xsd"
>http://www.w3.org/2009/01/xml.xsd</ulink>]</edition>. at <edition><ulink
url="&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/w3c/xml.xsd"
>&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/w3c/xml.xsd</ulink></edition>
in this distribution</bibliomixed>
>http://www.w3.org/2009/01/xml.xsd</ulink>]</edition>.
</bibliomixed>
<bibliomixed id="XMLCatalogs"><abbrev>XML Catalogs</abbrev> Norman Walsh, <title>XML
Catalogs</title>, <citetitle>
<ulink url="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
Expand Down Expand Up @@ -849,7 +846,100 @@
</listitem>
</itemizedlist>

<!--
<orderedlist>
<listitem id="CoreSchema">
<para><firstterm>DMLex Core</firstterm> <link linkend="XMLSchema">[XML Schema]</link>,</para>
<para><ulink url="&this-loc;/schemas/dmlex&-cschversion;.xsd"
>&this-loc;/schemas/dmllex-&cschversion;.xsd</ulink></para>
</listitem>
<listitem id="DMLexCatalog">
<para><link linkend="XMLCatalogs">[XML Catalog]</link> of <firstterm>DMLex-defined</firstterm> XML Schemas,</para>
<para><ulink url="&this-loc;/schemas/catalog.xml"
>&this-loc;/schemas/catalog.xml</ulink></para>
</listitem>
<listitem id="NVDL">
<para>Master <link linkend="NVDL">[NVDL]</link> file governing validation of all <firstterm>DMLex-defined</firstterm>
namespaces by XML Schemas, Schematron Schemas and other rules if and as required,</para>
<para><ulink url="&this-loc;/schemas/advanced_validation.nvdl.xml"
>&this-loc;/schemas/advanced_validation.nvdl</ulink></para>
</listitem>
<listitem id="CoreSchematron">
<para><firstterm>DMLex Core</firstterm> <link linkend="Schematron">[Schematron]</link> Schema, </para>
<para><ulink url="&this-loc;/schemas/dmlex-&cschversion;.sch"
>&this-loc;/schemas/dmlex-&cschversion;.sch</ulink></para>
</listitem>
<listitem>
<para>XML and Schematron Schemas of <firstterm>DMLex Modules</firstterm> are referenced
from those modules.</para>
</listitem>
</orderedlist>
<warning>
<para>NVDL is not capable of discerning Schemtaron Warnings from Schematron Errors.
Therefore all Schematron Warnings will be reported as Errors when initiating the
validation from the NVDL schema. Also most of the existing Schematron implementations are
not capable of discerning Warnings from Errors, thus implementers are encouraged to re-use
the provided Schematron schemas in custom made validation services that can make this
distinction. Currently, the Warning/Error distinction is only important when evaluating
adherence to Processing Requirements for [ELABORATE].</para>
</warning>
</para>
-->
<!-- <para>[Relax NG schemas of <firstterm>DMLex Core and Modules</firstterm> are provided. Although the Relax NG schemas are intended as normative validation artifacts, the XML Schema 1.0 [add normative reference] schemas and Schematron [add normative reference] schemas have precedence in case of conflicting validation results.]
[This is only relevant if Relax NG is provided.]</para>-->
<!-- <xi:include href="core/tree.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>-->
<!-- LEXIDMA TC may decide to include the schema listings
<xi:include href="core/catalog.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="core/schema.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-->
<!-- language for potential inclusion of support schemas such as the xml namespace schema
<section>
<title>Support Schemas</title>
<para>Third party support schemas that are normatively referenced from this specification or
from the machine readable artifacts that are a part of this multipart product are distributed
along with the <firstterm>DMLex-defined</firstterm> schemas in a subfolder named
<code>informativeCopiesOf3rdPartySchemas</code> and further subdivided in folders according to the
owner/maintainer of the schema.</para>
<warning>
<para>Schema copies in this sub-folder are provided solely for implementers convenience and are NOT a part of the OASIS multipart product.
These schemas belong to their respective owners and their use is governed by their owners' respective IPR policies.
The support schemas are organized in folders per owner/maintainer.
It is the implementer's sole responsibility to ensure that their local copies of all schemas are the appropriate up to date versions.</para></warning>
<para>Currently the only included third party support schema is
<ulink url="http://www.w3.org/2001/xml.xsd">http://www.w3.org/2001/xml.xsd</ulink> [<ulink url="http://www.w3.org/2009/01/xml.xsd">http://www.w3.org/2009/01/xml.xsd</ulink>] at <ulink
url="&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/w3c/xml.xsd"
>&this-loc;/schemas/informativeCopiesOf3rdPartySchemas/w3c/xml.xsd</ulink> in this distribution.</para>
</section>-->
</appendix>
<!--
<appendix role="normative | informative" id="SecurityPrivacy">
<title>Security and privacy considerations</title>
<note>
<para>OASIS strongly recommends that Technical Committees consider issues that might affect
safety, security, privacy, and/or data protection in implementations of their work products
and document these for implementers and adopters. For some purposes, you may find it
required, e.g. if you apply for IANA registration.</para>
<para>While it may not be immediately obvious how your work product might make systems
vulnerable to attack, most work products, because they involve communications between
systems, message formats, or system settings, open potential channels for exploit. For
example, IETF [<link linkend="rfc3552">RFC 3552</link>] lists “eavesdropping, replay,
message insertion, deletion, modification, and man-in-the-middle” as well as potential
denial of service attacks as threats that must be considered and, if appropriate, addressed
in IETF RFCs.</para>
<para>In addition to considering and describing foreseeable risks, this section should include
guidance on how implementers and adopters can protect against these risks.</para>
<para>We encourage editors and TC members concerned with this subject to read Guidelines for
Writing RFC Text on Security Considerations, IETF [<link linkend="rfc3552">RFC 3552</link>],
for more information.</para>
</note>
</appendix>-->
<appendix role="normative" id="diagram_uml">
<title>DMLex UML diagram</title>
<graphic fileref="dmlex_uml.svg" contentwidth="16cm"/>
Expand Down

0 comments on commit 39c0786

Please sign in to comment.