Skip to content

Commit

Permalink
Updated text to avoid preferring the term "MPD" for a message specifi…
Browse files Browse the repository at this point in the history
…cation.

Closes #96.
  • Loading branch information
webb committed Dec 18, 2020
1 parent c993f7b commit 66b91c7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
4 changes: 2 additions & 2 deletions publish/niem-ndr.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions publish/niem-ndr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Table of Tables

* A detailed discussion of NIEM architecture and schema versioning.

* Aggregate artifacts that define information exchanges and models, including information exchange packages (IEPs) and their specifications, information exchange package descriptions (IEPDs) or other forms of information exchange specifications (IESs), as well as enterprise information exchange models (EIEMs), and other forms of model package descriptions (MPDs).
* Aggregate artifacts that define information exchanges and models, such as message specifications, information exchange package descriptions (IEPDs) and other forms of model package descriptions (MPDs), information exchange specifications (IESs), and enterprise information exchange models (EIEMs).

* Normative guidance for the location of [schema documents] or for schema assembly.

Expand Down Expand Up @@ -539,9 +539,9 @@ Rule 4-2. Schema marked as extension schema document must conform

Schema-validity may be assessed against a single set of schemas or against multiple sets of schemas.

Assessment against schemas may be directed by a Model Package Description (MPD), by other instructions, or by other tools.
Assessment against schemas may be directed by a message specification, such as an information exchange package description (IEPD), model package description (MPD), or information exchange specification, or by other instructions or tools.

Note that this specification does not require the [document element] of a [conformant instance XML document] to be a [conformant element information item]. Other specifications, such as the MPD specification, may add additional constraints to these in order to specify MPD-specific or exchange-specific conformance constraints.
Note that this specification does not require the [document element] of a [conformant instance XML document] to be a [conformant element information item]. Other specifications may add additional conformance constraints for elements within an exchange.

[Definition: conformant element information item]

Expand Down
13 changes: 3 additions & 10 deletions src/ndr-doc.xml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,7 @@
<li>
<p>A detailed discussion of NIEM architecture and schema versioning.</p>
</li>
<li><p>Aggregate artifacts that define information exchanges and models, including
information exchange packages (IEPs) and their specifications, information exchange package
descriptions (IEPDs) or other forms of information exchange specifications (IESs),
as well as enterprise information exchange models (EIEMs),
and other forms of model package descriptions (MPDs).</p></li>
<li><p>Aggregate artifacts that define information exchanges and models, such as message specifications, information exchange package descriptions (IEPDs) and other forms of model package descriptions (MPDs), information exchange specifications (IESs), and enterprise information exchange models (EIEMs).</p></li>
<li><p>Normative guidance for the location of <termRef term="schema document">schema documents</termRef>
or for schema assembly.</p></li>
</ul>
Expand Down Expand Up @@ -930,14 +926,11 @@
<p>Schema-validity may be assessed against a single set of schemas or against multiple sets of
schemas.</p>

<p>Assessment against schemas may be directed by a Model Package Description (MPD), by other instructions,
or by other tools.</p>
<p>Assessment against schemas may be directed by a message specification, such as an information exchange package description (IEPD), model package description (MPD), or information exchange specification, or by other instructions or tools.</p>

<p>Note that this specification does not require the <termRef>document element</termRef>
of a <termRef>conformant instance XML
document</termRef> to be a <termRef>conformant element information item</termRef>. Other specifications,
such as the MPD specification, may add additional constraints to these in order to specify MPD-specific
or exchange-specific conformance constraints.</p>
document</termRef> to be a <termRef>conformant element information item</termRef>. Other specifications may add additional conformance constraints for elements within an exchange.</p>

<definition term="conformant element information item">
<p>A <em>conformant element information item</em> is an element information item that satisfies all of
Expand Down

0 comments on commit 66b91c7

Please sign in to comment.