diff --git a/specification/DITA-1.3-specification-subjectScheme.ditamap b/specification/DITA-1.3-specification-subjectScheme.ditamap index c899779b..46575fa4 100644 --- a/specification/DITA-1.3-specification-subjectScheme.ditamap +++ b/specification/DITA-1.3-specification-subjectScheme.ditamap @@ -2,246 +2,9 @@ - - - - AI 14: Coverage of constraints, conref, and compatibility - - - - - RFC-2119 terminology - - - - - - XML grammars - - - - - DITA 1.2 errata - - - - - DITA 1.3 - - - - - Review #1 - - - - - Review #2 - - - - - Targeted review - - - - - Targeted review - - - - - 62: table accessibility - - - - - 13001: Same topic URI reference syntax - - - - - 13004: Scoped keys - - - - - 13008: Add @appid to resourceid element - - - - - 13010: sort-as element - - - - - 13023: div element - - - - - 13027: draft-comment in more places - - - - - 13029: Allow text in more places - - - - - 13031: Additions to highlighting domain - - - - - 13035: XML-mention and markup domain - - - - - 13041: Facility for key-based, cross-deliverable referencing - - - - - 13044: Extend content model of data - - - - - 13056: Expanded syntax for filtering attributes - - - - - 13059: Mechanism for overriding default cascading rules for metadata - - - - - 13059a: Branch filtering - - - - - 13060: Enhancements to resourceid element - - - - - 13061: ux-window element - - - - - 13078: orient and rotate attributes - - - - - 13086: steptroubleshooting element - - - - - 13089: learningObjectMap and learningGroupMap - - - - - 13090: Change the @style attribute in DITAVAL files to NMTOKENS - - - - - 13092: Allow ph in indexterm - - - - - 13096: tasktroubleshooting element - - - - - 13097: Troubleshooting topic - - - - - 13098: trouble value for @type attribute - - - - - 13102: Release management domain - - - - - 13103: deliveryTarget attribute - - - - - 13104: @keyref for <object> and <param> - - - - - 13105: Allow <data> within lists - - - - - 13106: New base domain and specializations for question/answer - interactions - - - - - 13107: Default values for format, type, and scope attributes - - - - - 13111: MathML and equation domains - - - - - 13112: RelaxNG support - - - - - 13114: Add @rev to title element - - - - - 13116: Add <cite> to <title> and other elements - - - - - 13117: Add <xref> to <shortdesc> - - - - - 13119: SVG domain - - - - - 13121: Reuse a structural specialization as a domain - - - - + + + @@ -253,7 +16,6 @@ - @@ -272,12 +34,6 @@ - - - - - - @@ -300,10 +56,6 @@ - - - - diff --git a/specification/README.md b/specification/README.md deleted file mode 100644 index c547c64e..00000000 --- a/specification/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# The OASIS DITA 1.3 specification is delivered in four parts. - -Each part is built from DITA source, with content reused across the parts. -DITAVAL documents are used to conditionally process each map in order to generate -the final specification. This document describes which map and which DITAVAL -document is used to generate the parts. - -## Darwin Information Typing Architecture (DITA) Part 0: Overview. - -Part 0 is built using the following root map: -`dita-1.3-specification-overview.ditamap` - -Part 0 is built using the following DITAVAL document: -`resources/DITA1.3-spec-overview.ditaval` - -## Darwin Information Typing Architecture (DITA) Part 1: Base Edition. - -This edition contains topic and map; it is designed for implementers and users who need only the most fundamental pieces of the DITA framework. - -Part 1 is built using the following root map: -`dita-1.3-specification-base.ditamap` - -Part 1 is built using the following DITAVAL document: -`resources/DITA1.3-spec-base.ditaval` - -## Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition. - -This edition contains the base architecture plus the technical-content specializations; it is designed for authors who use information typing and document complex applications and devices. - -Part 2 is built using the following root map: -`dita-1.3-specification-technicalContent.ditamap` - -Part 2 is built using the following DITAVAL document: -`resources/DITA1.3-spec-technicalContent.ditaval` - - -## Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition. - -This edition contains the base architecture, technical content, and the learning and training specializations. It is designed for implementers who want all OASIS-approved specializations, as well as users who develop learning and training materials. - -Part 3 is built using the following root map: -`dita-1.3-specification-learningTraining.ditamap` - -Part 3 is built using the following DITAVAL document: -`resources/DITA1.3-spec-learningTraining.ditaval` - diff --git a/specification/archSpec/archSpec-learningTraining.ditamap b/specification/archSpec/archSpec-learningTraining.ditamap index 3b4d5571..ce732a54 100644 --- a/specification/archSpec/archSpec-learningTraining.ditamap +++ b/specification/archSpec/archSpec-learningTraining.ditamap @@ -9,7 +9,7 @@ - - + + diff --git a/specification/archSpec/archSpec-technicalContent.ditamap b/specification/archSpec/archSpec-technicalContent.ditamap index 68a663d8..7f827cb5 100644 --- a/specification/archSpec/archSpec-technicalContent.ditamap +++ b/specification/archSpec/archSpec-technicalContent.ditamap @@ -15,7 +15,7 @@ + navtitle="Troubleshooting topic" /> @@ -26,11 +26,11 @@ + navtitle="MathML and equation domains" /> + navtitle="Release management domain" /> + /> diff --git a/specification/archSpec/base/branch-filtering.ditamap b/specification/archSpec/base/branch-filtering.ditamap index 80fdadca..dfa9d684 100644 --- a/specification/archSpec/base/branch-filtering.ditamap +++ b/specification/archSpec/base/branch-filtering.ditamap @@ -2,30 +2,30 @@ Branch filtering - - - - - + + + + + - + - - - - - - - - diff --git a/specification/archSpec/base/chunkingdetails.dita b/specification/archSpec/base/chunkingdetails.dita index 8e5eca19..2bf2f04b 100644 --- a/specification/archSpec/base/chunkingdetails.dita +++ b/specification/archSpec/base/chunkingdetails.dita @@ -4,7 +4,7 @@ Using the <xmlatt>chunk</xmlatt> attribute The specification defines tokens for the chunk attribute that cover - the most common chunking scenarios. These tokens can be used to + the most common chunking scenarios. These tokens can be used to override whatever default chunking behavior is set by a processor. Chunking is necessarily format specific, with chunked output required for some and not supported for other rendered formats. Chunking is also implementation specific with some implementations supporting some, @@ -102,7 +102,7 @@ chunk attribute does not cascade from container elements, meaning that the chunk value on one topicref is not passed to its children. A default by-xxx policy for an entire map can be established by setting the chunk + >can be established by setting the chunk attribute on the map element, which will apply to any topicref that does not specify its own by-xxx policy.

When no chunk attribute values are specified or @@ -140,8 +140,8 @@

Implementation-specific tokens and future considerations

-

For example: “acme:level2” could be a token for the Acme DITA Toolkit that requests the - “level2” chunking method.

+

For example: acme:level2 could be a token for the Acme DITA Toolkit that requests the + level2 chunking method.

 diff --git a/specification/archSpec/base/chunkingexamples.dita b/specification/archSpec/base/chunkingexamples.dita index b84c7bdb..0cf567c7 100644 --- a/specification/archSpec/base/chunkingexamples.dita +++ b/specification/archSpec/base/chunkingexamples.dita @@ -10,7 +10,7 @@

In the examples below, an extension of ".xxxx" is used in place of the actual extensions that will vary by output format. For example, when the output format is HTML, the - extension might actually be ".html", but this is not + extension might actually be ".html", but this is not required.

The examples below assume the existence of the following files:

    diff --git a/specification/archSpec/base/classification-maps.dita b/specification/archSpec/base/classification-maps.dita index 530e0bb4..b433cf61 100644 --- a/specification/archSpec/base/classification-maps.dita +++ b/specification/archSpec/base/classification-maps.dita @@ -6,7 +6,7 @@ available.

    The classification domain provides elements that enable map authors to indicate information -about the subject matter of DITA topics. The subjects are defined in +about the subject matter of DITA topics. The subjects are defined in subjectScheme maps, and the map authors reference the subjects using the keyref attribute.

     diff --git a/specification/archSpec/base/coding-requirements.ditamap b/specification/archSpec/base/coding-requirements.ditamap index 6d97305d..7178d576 100644 --- a/specification/archSpec/base/coding-requirements.ditamap +++ b/specification/archSpec/base/coding-requirements.ditamap @@ -4,7 +4,7 @@ Coding requirements for grammar files - + diff --git a/specification/archSpec/base/conref.ditamap b/specification/archSpec/base/conref.ditamap index 8807d0eb..b4cb6a86 100644 --- a/specification/archSpec/base/conref.ditamap +++ b/specification/archSpec/base/conref.ditamap @@ -3,19 +3,26 @@ Content reference (conref) - - - - + + + + - - + + - + + + + + + + + @@ -26,15 +33,15 @@ - + - + - + @@ -42,7 +49,7 @@ - + diff --git a/specification/archSpec/base/constraint-rules.dita b/specification/archSpec/base/constraint-rules.dita index 681827ba..fb4551be 100644 --- a/specification/archSpec/base/constraint-rules.dita +++ b/specification/archSpec/base/constraint-rules.dita @@ -53,7 +53,7 @@
    Structural constraints
    -

    Each constraint module can constrain elements from only one +

    Each constraint module can constrain elements from only one vocabulary module. For example, a single constraint module that constrains refsyn from reference.mod and constrains context from task.mod is not allowed. diff --git a/specification/archSpec/base/constraints-conref-compatibility.dita b/specification/archSpec/base/constraints-conref-compatibility.dita index 859f07d7..a4c5dc59 100644 --- a/specification/archSpec/base/constraints-conref-compatibility.dita +++ b/specification/archSpec/base/constraints-conref-compatibility.dita @@ -46,7 +46,7 @@

    The following table contains scenarios where conref pull occurs between constrained and unconstrained document instances. It assumes that the processor is not configured to treat all constraints as strong constraints.

    - + Values of domains attribute in document type that contains the referencing element @@ -104,7 +104,7 @@

    The following table contains scenarios where conref push occurs between constrained and unconstrained document instances. It assumes that the processor has not been configured to treat all constraints as strong constraints.

    - + Values of domains attribute in document type that contains the referencing element diff --git a/specification/archSpec/base/definition-of-ditamaps.dita b/specification/archSpec/base/definition-of-ditamaps.dita index 3bac854b..7f999dab 100644 --- a/specification/archSpec/base/definition-of-ditamaps.dita +++ b/specification/archSpec/base/definition-of-ditamaps.dita @@ -47,7 +47,7 @@ maps represent formal units of instruction and assessment. reflecting well-defined requirements.

    DITA maps establish relationships through the nesting of topicref elements and the application of the collection-type - attribute. Relationship tables also can be + attribute. Relationship tables also can be used to associate topics with each other based on membership in the same row; for example, task topics can be associated with supporting concept and reference topics by placing each group in cells of the same row. During diff --git a/specification/archSpec/base/ditamap-elements.dita b/specification/archSpec/base/ditamap-elements.dita index 9a3f242d..9ccf8c7d 100644 --- a/specification/archSpec/base/ditamap-elements.dita +++ b/specification/archSpec/base/ditamap-elements.dita @@ -1,7 +1,8 @@ -DITA map elements - A DITA map describes the relationships among a set of DITA topics. The DITA map and + + DITA map elements + A DITA map describes the relationships among a set of DITA topics. The DITA map and map-group domain elements organize topics into hierarchies, groups, and relationships; they also define keys. @@ -11,7 +12,6 @@ -

    A DITA map is composed of the following elements:

    @@ -32,8 +32,8 @@ navigation, and parent/child links. Hierarchies can be annotated using the collection-type attribute to define a particular type of relationship, such as a set of choices, a sequence, or a family. These collection types - can affect link generation, and they might be interpreted - differently for different outputs.

    + can affect link generation, and they might be interpreted differently for + different outputs.

     @@ -96,7 +96,7 @@ make?--> topicmeta element. Metadata typically is applied to an element and its descendants. - +
    ux-window
    The ux-window element enables authors to define windowing information for the display of output topics that are appropriate to the delivery @@ -141,8 +141,8 @@ make?-->
    topicsetref
    -
    Enables authors to reference a navigation branch that is defined in another DITA - map.
    +
    Enables authors to reference a navigation branch that is defined in the current map or in another DITA map.
    anchorref
    @@ -150,5 +150,5 @@ make?--> anchor.     - - + + diff --git a/specification/archSpec/base/document-type-shells.dita b/specification/archSpec/base/document-type-shells.dita index 3aea07a4..679c73f2 100644 --- a/specification/archSpec/base/document-type-shells.dita +++ b/specification/archSpec/base/document-type-shells.dita @@ -24,8 +24,8 @@ Document type shell - Diagram showing a typical architecture of a + > + Diagram showing a typical architecture of a DITA document type shell. At the top left a DITA document file named 'myTopic.dita' refers to a document type of 'myTopic'. An arrow from this file points to a Document-type shell file named 'myTopic.dtd'. Arrows point to diff --git a/specification/archSpec/base/dtd-coding-overview.dita b/specification/archSpec/base/dtd-coding-overview.dita index 3d72761b..860bde30 100644 --- a/specification/archSpec/base/dtd-coding-overview.dita +++ b/specification/archSpec/base/dtd-coding-overview.dita @@ -3,8 +3,8 @@ DTD: Overview of coding requirements DITA coding practices for DTDs rely heavily on entities to implement specialization and - constrraints. As such, an understanding of entities is critical when working with DTD - document-type shells, vocabulary modules, or constraint modules. + constraints. As such, an understanding of entities is critical when + working with DTD document-type shells, vocabulary modules, or constraint modules.

    Entities can be defined multiple times within a single document type, but only the first definition is effective. How entities work shapes DTD coding practices. The following list diff --git a/specification/archSpec/base/dtd-coding-structural-modules.dita b/specification/archSpec/base/dtd-coding-structural-modules.dita index 09f8da4e..f9ff651f 100644 --- a/specification/archSpec/base/dtd-coding-structural-modules.dita +++ b/specification/archSpec/base/dtd-coding-structural-modules.dita @@ -86,7 +86,7 @@ -

    In rare cases, it might not be desirable to control topic +

    In rare cases, it might not be desirable to control topic nesting with a parameter entity. For example:

    • If a specialized topic type should never allow any nested topics, regardless of context, diff --git a/specification/archSpec/base/example-contraints-correct-machinery-task-constraint.dita b/specification/archSpec/base/example-contraints-correct-machinery-task-constraint.dita new file mode 100644 index 00000000..5f530a1a --- /dev/null +++ b/specification/archSpec/base/example-contraints-correct-machinery-task-constraint.dita @@ -0,0 +1,52 @@ + + + + Example: Correct the constraint for the machinery task + For DITA 1.3, the OASIS DITA TC failed to update the constraint for the machinery task. + In this scenario, an information architect corrects that oversight; she makes the (new for DITA + 1.3) tasktroubleshooting element available in the body of the machinery + task. + + + This example assumes that the information architect has already implemented her own + document-type shell for the machinery task information type. +
        +
      1. She makes a copy of the machineryTaskbodyConstraint.mod file and + renames it correctedMachineryTaskbodyConstraint.mod.
        2. +
      2. She modifies the correctedMachineryTaskbodyConstraint.mod file to + declare the entity for the tasktroubleshooting element and make it + available at the correct place within the task body. (Her modifications are highlighted in bold + below.)<!ENTITY taskbody-constraints + "(topic task+taskreq-d machineryTaskbody-c)" +> +<!ENTITY % prelreqs "prelreqs"> +<!ENTITY % context "context"> +<!ENTITY % section "section"> +<!ENTITY % steps "steps"> +<!ENTITY % steps-unordered "steps-unordered"> +<!ENTITY % steps-informal "steps-informal"> +<!ENTITY % result "result"> +<!ENTITY % tasktroubleshooting "tasktroubleshooting"> +<!ENTITY % example "example"> +<!ENTITY % closereqs "closereqs"> + + +<!ENTITY % taskbody.content + "((%prelreqs; | + %context; | + %section;)*, + (%steps; | + %steps-unordered; | + %steps-informal;)?, + (%result;)?, + (%tasktroubleshooting;)?, + (%example;)*, + (%closereqs;)?)"
        3. +
      3. She updates her company-specific document-type shell to integrate the updated + constraint.
        4. +
      4. After updating the catalog.xml file to include the new constraints + file, her work is done.
        5. +
      +       +       +       diff --git a/specification/archSpec/base/example-multiple-ditavalref.dita b/specification/archSpec/base/example-multiple-ditavalref.dita index 05d0e7db..285fefff 100644 --- a/specification/archSpec/base/example-multiple-ditavalref.dita +++ b/specification/archSpec/base/example-multiple-ditavalref.dita @@ -31,6 +31,7 @@ </ditavalmeta> </ditavalref> <topicref href="do-stuff.dita"> + <!-- more topics and nested branches --> <topicref href="mac-specific-stuff.dita" platform="mac"/> </topicref> <!-- End of installing branch --> diff --git a/specification/archSpec/base/example-nested-key-scopes.dita b/specification/archSpec/base/example-nested-key-scopes.dita index 3e8f7e40..bcf575be 100644 --- a/specification/archSpec/base/example-nested-key-scopes.dita +++ b/specification/archSpec/base/example-nested-key-scopes.dita @@ -12,36 +12,36 @@ <map> <title>Root map</title> <!-- Root scope --> - <keydef keys="a" href="topic-1.dita"/> + <keydef keys="a" href="topic-1.dita"/> <!-- Key scope A --> <topicgroup keyscope="A"> - <keydef keys="b" href="topic-2.dita"/> + <keydef keys="b" href="topic-2.dita"/> <!-- Key scope A-1 --> <topicgroup keyscope="A-1"> - <keydef keys="c" href="topic-3.dita"/> + <keydef keys="c" href="topic-3.dita"/> </topicgroup> <!-- Key scope A-2 --> <topicgroup keyscope="A-2"> - <keydef keys="d" href="topic-4.dita"/> + <keydef keys="d" href="topic-4.dita"/> </topicgroup> </topicgroup> <!-- Key scope B --> <topicgroup keyscope="B"> - <keydef keys="a" href="topic-5.dita"/> - <keydef keys="e" href="topic-6.dita"/> + <keydef keys="a" href="topic-5.dita"/> + <keydef keys="e" href="topic-6.dita"/> <!-- Key scope B-1 --> <topicgroup keyscope="B-1"> - <keydef keys="f" href="topic-7.dita"/> + <keydef keys="f" href="topic-7.dita"/> </topicgroup> <!-- Key scope B-2 --> <topicgroup keyscope="B-2"> - <keydef keys="g" href="topic-8.dita"/> + <keydef keys="g" href="topic-8.dita"/> </topicgroup> </topicgroup> </map> @@ -51,8 +51,8 @@ Graphical representation of the key scopes - Tree structure diagram showing example + > + Tree structure diagram showing example references to key scope names relative to other key scopes. The tree has a root node labeled 'Root' with two children 'A' and 'B', which in turn have children 'A-1', 'A-2', 'B-1', and 'B-2'. Every node has a list of one or more key scope @@ -125,7 +125,7 @@ a - "a", defined in the root map: + "a", defined in the root map: topic-1.dita @@ -133,7 +133,7 @@ d "d", as defined in the immediate key scope: + >: topic-4.dita @@ -141,7 +141,7 @@ A-2.d "d", as defined in the immediate key scope: + >: topic-4.dita @@ -156,7 +156,7 @@ "A-1.c", as defined in key scope A-1. This key name is available because it exists in the parent scope, key scope A. - The key name resolves to + The key name resolves to topic-3.dita @@ -165,7 +165,7 @@ "A-1.c", as defined in key scope A-1. This key name is available because it exists in the root key scope. - The key name resolves to + The key name resolves to topic-3.dita @@ -191,7 +191,7 @@ e "e", defined in the immediate key scope: + >: topic-6.dita @@ -202,7 +202,7 @@ root key scope. (While a key definition for "a" exists in the immediate key scope, it is overridden by the key definition that occurs in the parent key scope.) - The key name resolves to + The key name resolves to topic-1.dita @@ -212,7 +212,7 @@

      "a", as defined in the immediate key scope. Because the key reference uses the scope-qualified names, it resolves to the key "a" in scope B. The key name resolves to + >The key name resolves to topic-5.dita

      @@ -228,7 +228,7 @@ B-2.g - "g", as defined in key scope B-2: + "g", as defined in key scope B-2: topic-8.dita. diff --git a/specification/archSpec/base/example-setting-condproc-values.dita b/specification/archSpec/base/example-setting-condproc-values.dita index 3d12b58c..4148d6e2 100644 --- a/specification/archSpec/base/example-setting-condproc-values.dita +++ b/specification/archSpec/base/example-setting-condproc-values.dita @@ -2,7 +2,7 @@ Example: Setting conditional processing values and groups - Conditional processing attributes can be used to classify content + Conditional processing attributes can be used to classify content using either individual values or using groups. diff --git a/specification/archSpec/base/example-subjectScheme-filtering.dita b/specification/archSpec/base/example-subjectScheme-filtering.dita index 9092eb66..f33ba522 100644 --- a/specification/archSpec/base/example-subjectScheme-filtering.dita +++ b/specification/archSpec/base/example-subjectScheme-filtering.dita @@ -72,7 +72,7 @@ to conserve space. Best practises for translate include using <navtitle>. --> action="include" or action="flag" Excluded. This is an error condition, because if all "linux" content - is excluded, "redhat" also is excluded. Applications can + is excluded, "redhat" also is excluded. Applications can recover by generating an error message. Excluded. diff --git a/specification/archSpec/base/examples-constraints.ditamap b/specification/archSpec/base/examples-constraints.ditamap index 2a86dacd..0d3e94f3 100644 --- a/specification/archSpec/base/examples-constraints.ditamap +++ b/specification/archSpec/base/examples-constraints.ditamap @@ -8,5 +8,6 @@ + diff --git a/specification/archSpec/base/filtering.dita b/specification/archSpec/base/filtering.dita index 3e6eb37c..19fbf8f4 100644 --- a/specification/archSpec/base/filtering.dita +++ b/specification/archSpec/base/filtering.dita @@ -21,7 +21,7 @@ each attribute independently:

      1. For each attribute:
          -
        • If the attribute is empty, or contains only empty groups, it is equivalent +
        • If the attribute is empty, or contains only empty groups, it is equivalent to omitting the attribute from the element. If evaluated for the purposes of filtering, the attribute is treated as "include", because an omitted attribute cannot evaluate to "exclude".
        • If the attribute value does not contain any groups, then if any token in the attribute diff --git a/specification/archSpec/base/generalization-attributes.dita b/specification/archSpec/base/generalization-attributes.dita index 804b3ac8..186b3374 100644 --- a/specification/archSpec/base/generalization-attributes.dita +++ b/specification/archSpec/base/generalization-attributes.dita @@ -33,7 +33,7 @@ The audience, platform, product, and otherprops attributes allow grouped values that reuse the generalized syntax described here; however, these attributes are not specialized or specializeable. For - these attributes, it can be typical to author or edit the + these attributes, it can be typical to author or edit the grouped values directly.

          A single element MUST NOT contain both generalized and specialized values for the same attribute. For example, the following diff --git a/specification/archSpec/base/generalization.ditamap b/specification/archSpec/base/generalization.ditamap index f01bad5d..698bfa0b 100644 --- a/specification/archSpec/base/generalization.ditamap +++ b/specification/archSpec/base/generalization.ditamap @@ -8,6 +8,6 @@ + /> diff --git a/specification/archSpec/base/information-typing.dita b/specification/archSpec/base/information-typing.dita index 2b27ffde..d5436245 100644 --- a/specification/archSpec/base/information-typing.dita +++ b/specification/archSpec/base/information-typing.dita @@ -15,7 +15,7 @@ - The specializations of + The specializations of topic, such concept, task, reference, and learningContent are not included in the DITA 1.3 base diff --git a/specification/archSpec/base/key-based-addressing.ditamap b/specification/archSpec/base/key-based-addressing.ditamap index a8e76f66..3da421f5 100644 --- a/specification/archSpec/base/key-based-addressing.ditamap +++ b/specification/archSpec/base/key-based-addressing.ditamap @@ -7,7 +7,7 @@ - + diff --git a/specification/archSpec/base/keyScopes.dita b/specification/archSpec/base/keyScopes.dita index 6eacd415..9ca9e0bd 100644 --- a/specification/archSpec/base/keyScopes.dita +++ b/specification/archSpec/base/keyScopes.dita @@ -7,7 +7,8 @@

          A key scope is defined by a map or topicref element that specifies the keyscope attribute. The keyscope - attribute specifies the names of the scope, separated by spaces.

          + attribute specifies the names of the scope, separated by spaces. The + legal characters for a key scope name are the same as those for keys.

          A key scope includes the following components:

          • The scope-defining element
            • diff --git a/specification/archSpec/base/keys-core-concepts.dita b/specification/archSpec/base/keys-core-concepts.dita index 264cc2cd..4db35e21 100644 --- a/specification/archSpec/base/keys-core-concepts.dita +++ b/specification/archSpec/base/keys-core-concepts.dita @@ -100,7 +100,7 @@ immediately within that scope. Key references in child scopes are resolved using the key spaces that are associated with those child scopes.

            A key scope is associated with exactly one key space. That key space contains all key - definitions that are located directly within the scope; it might also contain definitions that exist in other scopes. Specifically, the key space associated with a key scope is comprised of the following key definitions, in order of precedence:

            @@ -131,7 +131,7 @@ in the shallowest map that contains that key definition. This allows higher-level map authors to override keys defined in referenced submaps.

            A key definition that specifies more than one key name in its keys - attribute might be the effective definition for some of its + attribute might be the effective definition for some of its keys but not for others.

            Within a key scope, keys do not have to be defined before they are referenced. The key space is effective for the entire scope, so the order of key definitions and key references diff --git a/specification/archSpec/base/metadata-in-maps-and-topics.dita b/specification/archSpec/base/metadata-in-maps-and-topics.dita index 8247e1a1..0d7b24f2 100644 --- a/specification/archSpec/base/metadata-in-maps-and-topics.dita +++ b/specification/archSpec/base/metadata-in-maps-and-topics.dita @@ -24,9 +24,9 @@ that are referenced in the reltable column.

            A map can override or supplement everything about a topic except its primary title and body content. All the metadata elements that are available in a topic also are - available in a map. In addition, a map can provide + available in a map. In addition, a map can provide alternate titles and a short description. The alternate titles can override their - equivalent titles in the topic. The short + equivalent titles in the topic. The short description in the map MAY override the short description in the topic if the topicref element specifies a copy-to attribute.

            diff --git a/specification/archSpec/base/metadata.ditamap b/specification/archSpec/base/metadata.ditamap index 2c5cc648..285cb0d7 100644 --- a/specification/archSpec/base/metadata.ditamap +++ b/specification/archSpec/base/metadata.ditamap @@ -17,12 +17,12 @@ navtitle="Cascading of attributes and metadata in a DITA map"/> - - - - + + + + + /> diff --git a/specification/archSpec/base/processing-keyref-for-text.dita b/specification/archSpec/base/processing-keyref-for-text.dita index 75dc263b..35f1fde6 100644 --- a/specification/archSpec/base/processing-keyref-for-text.dita +++ b/specification/archSpec/base/processing-keyref-for-text.dita @@ -105,12 +105,12 @@

            When the effective content for a key reference element results in invalid elements, those elements SHOULD be generalized to produce a valid result. For example, linktext in the key - definition might use a domain specialization of + definition might use a domain specialization of keyword that is not valid in the key reference context, in which case the specialized element should be generalized to keyword. If the generalized content is also not valid, a text equivalent should be used instead. For example, linktext - might include ph or a + might include ph or a specialized ph in the key definition, but neither of those are valid as the effective content for a keyword. In that case, the text content of the ph should be used.

            diff --git a/specification/archSpec/base/processing.ditamap b/specification/archSpec/base/processing.ditamap index c78ceacd..2f2db79b 100644 --- a/specification/archSpec/base/processing.ditamap +++ b/specification/archSpec/base/processing.ditamap @@ -18,7 +18,7 @@ - + diff --git a/specification/archSpec/base/reconciling-topic-and-map-metadata.dita b/specification/archSpec/base/reconciling-topic-and-map-metadata.dita index fa16779d..5e4d198a 100644 --- a/specification/archSpec/base/reconciling-topic-and-map-metadata.dita +++ b/specification/archSpec/base/reconciling-topic-and-map-metadata.dita @@ -164,7 +164,7 @@ created based on this occurrence in the map searchtitle Replace the one in the topic. If multiple searchtitle - elements are specified for a single target, processors can choose to issue a warning. No No stated purpose diff --git a/specification/archSpec/base/relax-ng-coding-attribute-domains.dita b/specification/archSpec/base/relax-ng-coding-attribute-domains.dita index 5c463e5e..dbba3f88 100644 --- a/specification/archSpec/base/relax-ng-coding-attribute-domains.dita +++ b/specification/archSpec/base/relax-ng-coding-attribute-domains.dita @@ -39,7 +39,7 @@
            Attribute declaration pattern
            -
            The specialized attribute is declared in a pattern named The specialized attribute is declared in a pattern named domainName-d-attribute. The attribute must be defined as optional. For example, the deliveryTarget specialization of props is defined as follows:<define name="deliveryTargetAtt-d-attribute"> diff --git a/specification/archSpec/base/relax-ng-coding-constraint-modules.dita b/specification/archSpec/base/relax-ng-coding-constraint-modules.dita index cd36aa5f..75670c7f 100644 --- a/specification/archSpec/base/relax-ng-coding-constraint-modules.dita +++ b/specification/archSpec/base/relax-ng-coding-constraint-modules.dita @@ -45,9 +45,9 @@ can be used per vocabulary module (otherwise the module being constrained would be imported multiple times). If multiple constraints are combined for a single vocabulary module, they must be implemented in one of the following ways:
              -
            • The constraints can be combined into a single module. For +
            • The constraints can be combined into a single module. For example, when combining separate constraints for section and - shortdesc, a single module can + shortdesc, a single module can be defined as follows:<include href="topicMod.rng"> <define name="section.content"> @@ -58,7 +58,7 @@ </define> </include>
              • -
            • Constraints can be chained so that each constraint imports +
            • Constraints can be chained so that each constraint imports another, until the final constraint imports the base vocabulary module. For example, when combining separate constraints for section, shortdesc, and li from the base diff --git a/specification/archSpec/base/relax-ng-coding-requirements.ditamap b/specification/archSpec/base/relax-ng-coding-requirements.ditamap index 7e168d0c..063f2612 100644 --- a/specification/archSpec/base/relax-ng-coding-requirements.ditamap +++ b/specification/archSpec/base/relax-ng-coding-requirements.ditamap @@ -4,11 +4,11 @@ RELAX NG coding requirements - - - - - + + + + + diff --git a/specification/archSpec/base/relax-ng-coding-structural-modules.dita b/specification/archSpec/base/relax-ng-coding-structural-modules.dita index 1fb2eaac..d3b9809e 100644 --- a/specification/archSpec/base/relax-ng-coding-structural-modules.dita +++ b/specification/archSpec/base/relax-ng-coding-structural-modules.dita @@ -91,7 +91,7 @@ </div>
             -

            In rare cases, it might not be desirable to control topic +

            In rare cases, it might not be desirable to control topic nesting with the info-types pattern. For example:

            • If a specialized topic type should never allow any nested topics, regardless of context, diff --git a/specification/archSpec/base/specialization-class-attribute.dita b/specification/archSpec/base/specialization-class-attribute.dita index fa019543..91ba66e2 100644 --- a/specification/archSpec/base/specialization-class-attribute.dita +++ b/specification/archSpec/base/specialization-class-attribute.dita @@ -1,9 +1,7 @@ - + <xmlatt>class</xmlatt> attribute rules and syntax The specialization hierarchy of each DITA element is declared as the value of the class attribute. The class attribute provides a mapping from @@ -14,13 +12,12 @@

              The class attribute tells a processor what general classes of elements the current element belongs to. DITA scopes elements by module type (for example topic type, domain type, or map type) instead of document type, which lets document type developers - combine multiple module types in a single document without - complicating transformation logic.

              + combine multiple module types in a single document without complicating + transformation logic.

              The sequence of values in the class attribute is important because it tells processors which value is the most general and which is most specific. - This sequence is what enables both specialization aware processing and - generalization.

              + This + sequence is what enables both specialization aware processing and generalization.

              Syntax

              Values for the class attribute have the following syntax requirements:

                @@ -29,13 +26,14 @@ that are defined in domain modules.
              • A sequence of one or more tokens of the form "modulename/typename", with - each taoken separated by one or more spaces, where modulename is the - short name of the vocabulary module and typename is the element type - name. Tokens are ordered left to right from most general to most specialized.

                These - tokens provide a mapping for every structural type or domain in the ancestry of the - specialized element. The specialization hierarchy for a given element type must - reflect any intermediate modules between the base type and the specialization type, - even those in which no element renaming occurs.

                • + each token separated by one or more spaces, where + modulename is the short name of the vocabulary module and + typename is the element type name. Tokens are ordered left to right + from most general to most specialized.

                These tokens provide a mapping for every + structural type or domain in the ancestry of the specialized element. The + specialization hierarchy for a given element type must reflect any intermediate + modules between the base type and the specialization type, even those in which no + element renaming occurs.

              • At least one trailing space character (" "). The trailing space ensures that string matches on the tokens can always include a leading and trailing space in order to reliably match full tokens.
                • @@ -43,21 +41,21 @@
              Rules -

              When the class attribute is declared in an XML - grammar, it MUST be declared - with a default value. In order to support generalization round-tripping (generalizing - specialized content into a generic form and then returning it to the specialized form) the - default value MUST NOT be fixed. This - allows a generalization process to overwrite the default values that are defined by a - general document type with specialized values taken from the document being generalized.

              -

              A vocabulary module MUST NOT change - the class attribute for elements that it does not specialize, but simply +

              When the class attribute is declared in an XML grammar, it MUST be declared with a default value. In order to support + generalization round-tripping (generalizing specialized content into a generic form and then + returning it to the specialized form) the default value MUST + NOT be fixed. This allows a generalization process to overwrite the default values + that are defined by a general document type with specialized values taken from the document + being generalized.

              +

              A vocabulary module MUST NOT change the + class attribute for elements that it does not specialize, but simply reuses by reference from more generic levels. For example, if task, bctask, and guitask use the p element without specializing it, they MUST NOT declare mappings for it.

              -

              Authors SHOULD NOT modify the - class attribute.

              +

              Authors SHOULD NOT modify the class + attribute.

              Example: DTD declaration for <xmlatt>class</xmlatt> attribute for the diff --git a/specification/archSpec/base/specialization-including-non-dita-content.dita b/specification/archSpec/base/specialization-including-non-dita-content.dita index a8f6393e..fc775109 100644 --- a/specification/archSpec/base/specialization-including-non-dita-content.dita +++ b/specification/archSpec/base/specialization-including-non-dita-content.dita @@ -72,7 +72,7 @@ stroke:rgb(0,0,100);stroke-width:2"/> is declared. This establishes the default namespace prefix to be used for the SVG content embedded with this domain. The namespace can be overridden in a document-type shell by declaring the parameter entity before the reference to the - <filepath>svgDomain.ent</filepath> file. Other foreign domains <ph rev="public-review-1" + <filepath>svgDomain.ent</filepath> file. Other foreign domains <ph >might</ph> need similar entities when required by the new vocabulary.</p> <p>For more information, see the <filepath>svgDomain.mod</filepath> file that is shipped with the OASIS DITA distributions. For an example of including the SVG domain in a document type diff --git a/specification/archSpec/base/specialization-overview.dita b/specification/archSpec/base/specialization-overview.dita index 27edacdd..07f58e01 100644 --- a/specification/archSpec/base/specialization-overview.dita +++ b/specification/archSpec/base/specialization-overview.dita @@ -55,7 +55,7 @@ shells.</dd> </dlentry> </dl> - <p>Each type of specialization module represents an “is a” hierarchy, in object-oriented terms, + <p>Each type of specialization module represents an <q>is a</q> hierarchy, in object-oriented terms, with each structural type or domain being a subclass of its parent. For example, a specialization of task is still a task, and a specialization of the user interface domain is still part of the user interface domain. A given domain can be used with any map or topic type. In addition, diff --git a/specification/archSpec/base/specialization.ditamap b/specification/archSpec/base/specialization.ditamap index c46c86b2..49f3b3ed 100644 --- a/specification/archSpec/base/specialization.ditamap +++ b/specification/archSpec/base/specialization.ditamap @@ -11,6 +11,6 @@ <topicref href="specialization-class-attribute.dita"/> <topicref href="specialization-domains-attribute.dita"/> <topicref href="specialization-including-non-dita-content.dita"/> - <topicref href="specialization-sharing-elements-across-modules.dita" rev="DITA1.3 proposal-13121"/> + <topicref href="specialization-sharing-elements-across-modules.dita" /> </topicref> </map> diff --git a/specification/archSpec/base/subject-scheme-maps.ditamap b/specification/archSpec/base/subject-scheme-maps.ditamap index f10763d3..407ea4ed 100644 --- a/specification/archSpec/base/subject-scheme-maps.ditamap +++ b/specification/archSpec/base/subject-scheme-maps.ditamap @@ -4,18 +4,17 @@ <title>Subject scheme maps - - - - - - + + + + + + - + diff --git a/specification/archSpec/base/topiccontent.dita b/specification/archSpec/base/topiccontent.dita index 56b0ebb2..ef85877e 100644 --- a/specification/archSpec/base/topiccontent.dita +++ b/specification/archSpec/base/topiccontent.dita @@ -27,9 +27,9 @@ built on the same common structures.               block-level elements like titles and paragraphs and phrase-level elements like API names or text. It is recommend that sections have titles, whether they are entered directly into the title element or rendered using a fixed or default title. -
              Either body divisions or untitled sections or examples can be +
              Either body divisions or untitled sections or examples can be used to delimit arbitrary structures within a topic body. However, body divisions can nest, but sections and examples cannot contain sections.
              + >can nest, but sections and examples cannot contain sections.
              sectiondiv
              The sectiondiv element enables the arbitrary grouping of content within diff --git a/specification/archSpec/base/topicorientation.dita b/specification/archSpec/base/topicorientation.dita index dc8a74ef..7ea0d99a 100644 --- a/specification/archSpec/base/topicorientation.dita +++ b/specification/archSpec/base/topicorientation.dita @@ -35,7 +35,7 @@ navigation. Internal links lead a reader through a sequence of choices as he or she navigates through a website. DITA supports the separation of navigation from content by assembling independent topics into DITA - maps. Nonetheless, writers might want to + maps. Nonetheless, writers might want to provide links within a topic to additional topics or external resources. DITA does not prohibit such linking within individual topics. The DITA relationship table enables links between topics and to external content. diff --git a/specification/archSpec/base/topicover.dita b/specification/archSpec/base/topicover.dita index 4a334a10..9016d3c2 100644 --- a/specification/archSpec/base/topicover.dita +++ b/specification/archSpec/base/topicover.dita @@ -5,7 +5,7 @@ DITA topics DITA topics are the basic units of DITA content and the basic units of reuse. Each topic contains a single subject. Topics might be of specific specialized information types, such as task, - concept, or reference, or they might be generic, that is, without + >might be of specific specialized information types, such as task, + concept, or reference, or they might be generic, that is, without a specified information type. diff --git a/specification/archSpec/base/topicstructure.dita b/specification/archSpec/base/topicstructure.dita index ea568c5a..fbf0a9ea 100644 --- a/specification/archSpec/base/topicstructure.dita +++ b/specification/archSpec/base/topicstructure.dita @@ -34,7 +34,7 @@ related links, and nested topics.
              Short description or abstract
              A short description of the topic or a longer abstract with an embedded short description. - The short description might be used both in topic content + The short description might be used both in topic content (as the first paragraph), in generated summaries that include the topic, and in links to the topic. Alternatively, the abstract lets you create more complex introductory content and uses an embedded short description element to define the part of the abstract that @@ -57,14 +57,14 @@ related links, and nested topics.
              Related links connect to other topics. When an author creates a link as part of a topic, the topic becomes dependent on the other topic being available. To reduce dependencies between topics and thereby increase the reusability of each topic, authors can use DITA maps to define and manage links between + >can use DITA maps to define and manage links between topics, instead of embedding links directly in each related topic.
              Nested topics
              Topics can be defined inside other topics. However, nesting requires special care because it can result in complex documents that are less usable and less reusable. Nesting might be appropriate for information that is first + >might be appropriate for information that is first converted from desktop publishing or word processing files or for topics that are unusable independent from their parent or sibling topics.
              The rules for topic nesting can be configured in a document-type shells. For example, the @@ -73,9 +73,9 @@ related links, and nested topics. nest or disallow topic nesting entirely. In addition, the chunk attribute enables topics to be equally re-usable regardless of whether they are separate or nested. The standard DITA configuration for ditabase document-type documents allows - unrestricted topic nesting and can be used for holding + unrestricted topic nesting and can be used for holding sets of otherwise unrelated topics that hold re-usable content. It can also be used to convert DITA topics from non-DITA + >can also be used to convert DITA topics from non-DITA legacy source without first determining how individual topics should be organized into separate XML documents.
               diff --git a/specification/archSpec/base/translation-and-localization-attributes.dita b/specification/archSpec/base/translation-and-localization-attributes.dita index 5c5428f2..ef49d13f 100644 --- a/specification/archSpec/base/translation-and-localization-attributes.dita +++ b/specification/archSpec/base/translation-and-localization-attributes.dita @@ -19,9 +19,9 @@
              translate
              Determines whether the element requires translation. A default value can often be inferred from the element type. For example, apiname - might be untranslated by default, whereas + might be untranslated by default, whereas p - might be translated by default.
              + might be translated by default.
              dir
              diff --git a/specification/archSpec/base/uri-based-addressing.dita b/specification/archSpec/base/uri-based-addressing.dita index 73ca7529..12a6faa5 100644 --- a/specification/archSpec/base/uri-based-addressing.dita +++ b/specification/archSpec/base/uri-based-addressing.dita @@ -39,16 +39,16 @@

              When addressing elements within maps, URI references can include a fragment identifier that includes the ID of the map element, for example, filename.ditamap#mapId or #mapId. The same-topic, URI-reference fragment identifier of a period - (.) can not be used in URI references to elements within + (.) can not be used in URI references to elements within maps.

              Addressing topics using a URI -

              When addressing a DITA topic element, URI references can +

              When addressing a DITA topic element, URI references can include a fragment identifier that includes the ID of the topic element (filename.dita#topicId or #topicId). When addressing the DITA topic element that contains the URI reference, the URI reference might include the same topic fragment identifier of "." + >might include the same topic fragment identifier of "." (#.).

              Topics always can be addressed by a URI reference whose fragment identifier consists of the topic ID. For the purposes of linking, a reference to a topic-containing document addresses diff --git a/specification/archSpec/base/usage-of-conditional-processing-attributes.dita b/specification/archSpec/base/usage-of-conditional-processing-attributes.dita index 5910ea72..d8db6fcd 100644 --- a/specification/archSpec/base/usage-of-conditional-processing-attributes.dita +++ b/specification/archSpec/base/usage-of-conditional-processing-attributes.dita @@ -7,9 +7,9 @@ values.

              For example, the string values within product in <p - product="basic deluxe"> indicate that the paragraph applies to the “basic” product - and to the “deluxe” product.

              -

              Groups organize classification metadata into subcategories. This is + product="basic deluxe"> indicate that the paragraph applies to the basic product + and to the deluxe product.

              +

              Groups organize classification metadata into subcategories. This is intended to support situations where a predefined metadata attribute applies to multiple specialized subcategories. For example, the product attribute can be used to classify an element based on both related databases and related application servers. Using diff --git a/specification/archSpec/base/using-keys-to-address-keys-across-scopes.dita b/specification/archSpec/base/using-keys-to-address-keys-across-scopes.dita index 2d98fee5..fc95d9d5 100644 --- a/specification/archSpec/base/using-keys-to-address-keys-across-scopes.dita +++ b/specification/archSpec/base/using-keys-to-address-keys-across-scopes.dita @@ -61,8 +61,8 @@ A key scope hierarchy - Tree structure diagram showing a key scope + id="image_3BFFE5D941FD4EB6BD976801585C893A" > + Tree structure diagram showing a key scope hierarchy. The leftmost node is labeled 'Root'. There are two child nodes of Root labeled 'A' and 'B'. Node A has two children labeled 'A-1' and 'A-2'. Node B has two children labeled 'B-1' and 'B-2'. diff --git a/specification/archSpec/learningTraining/lc-spec-Overview-assumptions.dita b/specification/archSpec/learningTraining/lc-spec-Overview-assumptions.dita index 92c1b4b4..f4d13c6e 100644 --- a/specification/archSpec/learningTraining/lc-spec-Overview-assumptions.dita +++ b/specification/archSpec/learningTraining/lc-spec-Overview-assumptions.dita @@ -62,8 +62,8 @@ topic types to support them.

              - Box diagram that shows the relationship + id="image_112D527732CD4A0BA50547852144CE55" scale="70" > + Box diagram that shows the relationship between learning and training objects and the DITA-defined learning types that represent them. The Learning objects box shows instructional objects Overview, Content, Summary, and Assessments; the Content object is expanded in another @@ -108,8 +108,8 @@ and delivering specialized learning content with DITA. - Labeled flowchart-style diagram; across + > + Labeled flowchart-style diagram; across the middle horizontally are four primary stages of the flowchart with arrows from stage to stage. Across the top and bottom are 5 numbered labels, pointing to locations in the 4 stages, with text explaining what happens at each stage. diff --git a/specification/archSpec/technicalContent/TroubleshootingElements.dita b/specification/archSpec/technicalContent/TroubleshootingElements.dita index d3727591..db73ac70 100644 --- a/specification/archSpec/technicalContent/TroubleshootingElements.dita +++ b/specification/archSpec/technicalContent/TroubleshootingElements.dita @@ -39,7 +39,7 @@ <cmd>Select <uicontrol>Shut Down</uicontrol> from the <uicontrol>File</uicontrol> Menu.</cmd> <steptroubleshooting>If a problem with the computer prevents you from choosing - Shut Down—for example, if the computer “freezes” so that the pointer does + Shut Down—for example, if the computer freezes so that the pointer does not respond to the trackpad—you can turn off the computer by holding down the Control, Option, Command, and Power On keys at the same time. </steptroubleshooting> diff --git a/specification/archSpec/technicalContent/dita-concept-topic.dita b/specification/archSpec/technicalContent/dita-concept-topic.dita index 9c448f72..91f06a1f 100644 --- a/specification/archSpec/technicalContent/dita-concept-topic.dita +++ b/specification/archSpec/technicalContent/dita-concept-topic.dita @@ -9,9 +9,9 @@ The purpose of the concept information type

              Concepts provide background that helps readers understand essential information about a product, a task, a process, or any other - conceptual or descriptive information. A concept might be an extended definition of a major abstraction such as a process - or function. Conceptual information might explain the + or function. Conceptual information might explain the nature and components of a product and describe how it fits into a category of products. Conceptual information helps readers to map their knowledge and understanding to the tasks they need to perform and to provide other essential @@ -43,7 +43,7 @@ unlimited number of subdivisions in the form of sections and examples. However, once an author decides to incorporate a section or example in the conbody, only additional sections or examples are - allowed. Sections and examples can not nest, meaning + allowed. Sections and examples can not nest, meaning that only one level of subdivision is permitted in the concept topic.

              @@ -55,7 +55,7 @@
              Represents an organizational division in a concept topic. Sections organize subsets of information within a larger topic. You can only include a simple list of peer sections in a topic; sections cannot be nested. A section can have an optional title.
              + >can have an optional title.
              example @@ -69,7 +69,7 @@

              Following is an example of a simple concept topic. Note - that once an example is used, it can be followed only + that once an example is used, it can be followed only by another example or by a section.

              <concept id="concept"> <title>Bird Songs</title> diff --git a/specification/archSpec/technicalContent/dita-generic-task-topic.dita b/specification/archSpec/technicalContent/dita-generic-task-topic.dita index e9c7529a..50d1263c 100644 --- a/specification/archSpec/technicalContent/dita-generic-task-topic.dita +++ b/specification/archSpec/technicalContent/dita-generic-task-topic.dita @@ -1,146 +1,125 @@ - - General task topic - The general-task document type was introduced in DITA 1.2. It provides a less-strict + + General task topic + The general-task document type was introduced in DITA 1.2. It provides a less-strict content model for task-oriented information than was available previously. Some organizations might prefer the general-task content model over the strict task model, as it can facilitate the migration of legacy content that does not follow the strict-task topic model. The general-task document type serves as the base for the strict-task and machine-industry-task document types. It also can be used to create new document types or - specializations. - -
              - The purpose of the general task information type -

              Like the DITA strict task document type, the general task document and information types - contain the essential building blocks to provide procedural information. Both task - information types answer the "How do I?" question by providing step-by-step + specializations. + +

              + The purpose of the general task information type +

              Like the DITA strict task document type, the general task document and information + types contain the essential building blocks to provide procedural information. Both + task information types answer the "How do I?" question by providing step-by-step instructions that detail the requirements that must be fulfilled, the actions that must be performed, and the order in which the actions must be performed. Both task topics include sections for describing the context, prerequisites, expected results, - and other aspects of a task.

              -

              The general task information type is specifically - designed to accommodate task specializations that differ from the DITA task - information type. It might also be used for the - conversion of loosely structured tasks from other sources into DITA before they are - restructured to follow the more restrictive DITA task model.

              -
              -
              - The structure of the general task topic -

              The - task element is the top-level element for the general - task topic. The general task topic contains a title - and a taskbody with optional alternative titles - (titlealts), a short description or - abstract, a prolog, and - related-links. -

              -

              The following elements are - described here because they are introduced as part of the general task model. - All other elements are described in the strict task topic. -

              -
              - -
              section -
              -
              Represents an organizational division in a task topic. Sections organize subsets of - information within the larger topic. Sections cannot be nested. A section can - have an optional title.
              -               - -
              steps-informal -
              -
              Describes procedural task information that would not normally be ordered as + and other aspects of a task.

              +

              The general task information type is + specifically designed to accommodate task specializations that differ from the DITA + task information type. It might also be used for the conversion of loosely + structured tasks from other sources into DITA before they are restructured to follow + the more restrictive DITA task model.

              +
              +
              + The structure of the general task topic +

              The task element is + the top-level element for the general task topic. The general task topic contains a + title and a taskbody with + optional alternative titles (titlealts), a short + description or abstract, a prolog, + and related-links.

              +

              The following elements are described here + because they are introduced as part of the general task model. All other elements + are described in the strict task topic.

              +
              + +
              section +
              +
              Represents an organizational division in a task topic. Sections organize + subsets of information within the larger topic. Sections cannot be + nested. A section can have an optional + title.
              +               + +
              steps-informal +
              +
              Describes procedural task information that would not normally be ordered as steps, such as a group of general procedures - that might all be applied in a particular - situation. Instead of step, the + that might all be applied in a particular situation. Instead of + step, the steps-informal element uses ol and ul elements, which are less strictly defined than the step - element. When converting legacy content, it might be simpler to convert numbered lists to - ol elements than to - step elements.
              -               -
              -
              -
              - Comparison of general and strict task -

              The following table compares - the structures of general and strict task: -

              - - - - - - - General taskbody - - Strict taskbody constraint - - - - - - prerequisite (optional, in any order, any number) - - prerequisite (optional, one only, must precede context) - - - - context (optional, in any order, any number) - - context (optional, one only, must follow prerequisite) - - - - section (optional, in any order, any number) - - (not defined for strict taskbody) - - - - steps - - steps - - - - steps-unordered - - steps-unordered - - - - steps-informal - - (not defined for strict taskbody) - - - - result (optional, one only, precedes example) - - result (optional, one only, precedes example) - - - - example (optional, any number, precedes post-req) - - example (optional, one only, precedes post-req) - - - - post-requisite (optional, any number) - - post-requisite (optional, one only) - - - - -
              -
              - - - + element. When converting legacy content, it might be simpler to + convert numbered lists to ol elements than to + step elements. + + +
              +
              + Comparison of general and strict task +

              The following table compares the structures + of general and strict task:

              + + + + + + + General taskbody + Strict taskbody constraint + + + + + prerequisite (optional, in any order, any number) + prerequisite (optional, one only, must precede context) + + + context (optional, in any order, any number) + context (optional, one only, must follow prerequisite) + + + section (optional, in any order, any number) + (not defined for strict taskbody) + + + steps + steps + + + steps-unordered + steps-unordered + + + steps-informal + (not defined for strict taskbody) + + + result (optional, one only, precedes example) + result (optional, one only, precedes example) + + + tasktroubleshooting (optional, one only) + tasktroubleshooting (optional, one only) + + + example (optional, any number, precedes post-req) + example (optional, one only, precedes post-req) + + + post-requisite (optional, any number) + post-requisite (optional, one only) + + + +
              +
              + +               +               diff --git a/specification/archSpec/technicalContent/dita-glossary-topic.dita b/specification/archSpec/technicalContent/dita-glossary-topic.dita index 86724d36..5406068f 100644 --- a/specification/archSpec/technicalContent/dita-glossary-topic.dita +++ b/specification/archSpec/technicalContent/dita-glossary-topic.dita @@ -4,7 +4,7 @@ Glossary entry topic Each glossary entry glossentry topic defines a single sense of one term. Besides identifying the term and providing a definition, the topic accommodates basic - terminology information, such as part of speech. A glossentry topic might also include acronyms and acronym expansions. Glossentry topics can be assembled by authors or processes to create glossaries for various purposes, including books, websites, or other projects. @@ -34,7 +34,7 @@

              The top-level element for a DITA glossentry topic is the glossentry element. Every glossentry topic contains a glossterm and a glossdef element and optional related-links.

              -

              Where a term has multiple definitions, best practices call for +

              Where a term has multiple definitions, best practices call for the writer to create multiple glossentry topics with the same term in the glossterm element but different definitions in the glossdef element. A process can collate and group glossentry @@ -52,7 +52,7 @@ type

            • referencing the glossentry topics from a map
            • using an automated process
              • -
            For example, an automated process might assemble +
          For example, an automated process might assemble glossentry topics from a repository based on the term markup in a particular collection of topics.

          - diff --git a/specification/archSpec/technicalContent/dita-reference-topic.dita b/specification/archSpec/technicalContent/dita-reference-topic.dita index 20b78910..f3beb95d 100644 --- a/specification/archSpec/technicalContent/dita-reference-topic.dita +++ b/specification/archSpec/technicalContent/dita-reference-topic.dita @@ -9,7 +9,7 @@ Purpose of the reference topic

          Reference topics provide data that supports users as they perform a task. Reference topics might provide lists and tables that include product specifications, parts - lists, and other data that is often “looked up” rather than memorized. A reference + lists, and other data that is often looked up rather than memorized. A reference topic also can describe commands in a programming language or required tools for a series of maintenance tasks.

          Reference topics provide quick access to fact-based information. In technical @@ -27,17 +27,17 @@ the reference topic. Reference topics limit the body to tables (both simple and complex), property lists, syntax sections, generic sections, and examples.

          All of the elements of refbody are optional; they can appear in any sequence and number.

          + >can appear in any sequence and number.

          Limitations on the reference body

          The refbody provides for an unlimited number of subdivisions in the form of sections, examples, syntax sections, property lists, and tables. Simple - and complex tables can appear within sections, - examples, and syntax sections. They cannot appear + and complex tables can appear within sections, + examples, and syntax sections. They cannot appear within the property list or simple or complex table sections. Sections, examples, - syntax sections, table subdivisions, and property lists cannot nest; only one level of subdivision is permitted in the reference topic.

          @@ -50,7 +50,7 @@
          Represents an organizational division in a reference topic. Sections organize subsets of information within a larger topic. You can only include a simple list of peer sections in a topic; sections cannot be nested. A section might have an optional title.
          + >might have an optional title.
          refsyn diff --git a/specification/archSpec/technicalContent/dita-task-topic.dita b/specification/archSpec/technicalContent/dita-task-topic.dita index eef354ce..a1a1a509 100644 --- a/specification/archSpec/technicalContent/dita-task-topic.dita +++ b/specification/archSpec/technicalContent/dita-task-topic.dita @@ -1,73 +1,67 @@ - - Task topic (strict task) - The strict task-document type supports the development of instructions for the + + Task topic (strict task) + The strict task-document type supports the development of instructions for the completion of a procedure. The strict-task document type is built using the general-task information type combined with the strict taskbody constraint. See the reference below to ensure that you have the correct task document type when you update to DITA 1.3 from DITA - 1.0 or DITA 1.1 - -
          - The purpose of the standard task information type -

          Tasks are the essential - building blocks to provide procedural information. A task information type - answers the "How do I?" question by providing precise step-by-step instructions - detailing the requirements that must be fulfilled, the actions that must be - performed, and the order in which the actions must be performed. The - task topic includes sections for describing the - context, prerequisites, expected results, and other aspects of a task. -

          -
          -
          - The structure of the <xmlelement>task</xmlelement> topic -

          The - task element is the top-level element for the strict - task topic. The strict task document type contains a - title and a taskbody with - optional alternative titles (titlealts), a short - description or abstract, a - prolog, and related-links. -

          -

          The - taskbody element is the main body element inside a - strict task document type. The strict task body has a constrained structure, - with these optional elements in the following order: -

          -
          - -
          prereq -
          -
          Describes information that the user needs to know or do before starting the immediate task. - This section can occur only once.
          -           - -
          context -
          -
          Provides background information for the task. This information helps the users understand - the purpose of the task and what they will gain by completing the task - correctly. This section should be brief and does not replace or recreate a - concept topic on the same subject, although the context section might include some conceptual information. - This section can occur only once.
          -           - -
          steps -
          -
          Provides the main content of the task topic. A task consists of a - series of steps that accomplish the task. The steps - element must have one or more step elements, which - provide the specifics about each step in the task. The - steps element can occur only once.

          + +

          + The purpose of the standard task information type +

          Tasks are the essential building blocks to + provide procedural information. A task information type answers the "How do I?" + question by providing precise step-by-step instructions detailing the requirements + that must be fulfilled, the actions that must be performed, and the order in which + the actions must be performed. The task topic includes + sections for describing the context, prerequisites, expected results, and other + aspects of a task.

          +
          +
          + The structure of the <xmlelement>task</xmlelement> topic +

          The task element is + the top-level element for the strict task topic. The strict task document type + contains a title and a taskbody + with optional alternative titles (titlealts), a short + description or abstract, a prolog, + and related-links.

          +

          The taskbody element + is the main body element inside a strict task document type. The strict task body + has a constrained structure, with these optional elements in the following order:

          +
          + +
          prereq +
          +
          Describes information that the user needs to know or do before starting the + immediate task. This section can occur only once.
          +           + +
          context +
          +
          Provides background information for the task. This information helps the + users understand the purpose of the task and what they will gain by + completing the task correctly. This section should be brief and does not + replace or recreate a concept topic on the same subject, although the + context section might include some conceptual information. This + section can occur only once.
          +           + +
          steps +
          +
          Provides the main content of the task topic. A task + consists of a series of steps that accomplish the task. The + steps element must have one or more + step elements, which provide the specifics + about each step in the task. The steps element + can occur only once.

          The step element represents an action that a user must follow to accomplish a task. Each step in a task must contain a command cmd element which describes the particular action the user must perform to accomplish the - overall task. The step element can also contain information - info, substeps + overall task. The step element can + also contain information info, substeps substeps, tutorial information tutorialinfo, a step example stepxmp, choices @@ -75,41 +69,42 @@ stepresult, or troubleshooting steptroubleshooting, although these are optional.

          -
          -           - -
          steps-unordered -
          -
          Provides alternative content for the - task topic, allowing for a single step in a procedure - or a set of commands that need not be performed in a specific order. -
          -           - -
          result -
          -
          Describes the expected outcome for the task as a whole. -
          -           - -
          example -
          -
          Provides an example that illustrates or supports the task. -
          -           - -
          postreq -
          -
          Describes steps or tasks that the user should do after the - successful completion of the current task. It is often supported by links to - the next task or tasks in the related-links section. -
          -           -
          -
          - Here is an example - of a task topic: - <task id="birdhousebuilding"> +
          +           + +
          steps-unordered +
          +
          Provides alternative content for the task topic, + allowing for a single step in a procedure or a set of commands that need not + be performed in a specific order.
          +           + +
          result +
          +
          Describes the expected outcome for the task as a whole.
          +           + +
          tasktroubleshooting
          +
          Describes actions that a user might take if the task does not produce the + expected results.
          +           + +
          example +
          +
          Provides an example that illustrates or supports the task.
          +           + +
          postreq +
          +
          Describes steps or tasks that the user should do after the successful + completion of the current task. It is often supported by links to the next + task or tasks in the related-links section.
          +           +
          +
          + Here is an + example of a task topic: + <task id="birdhousebuilding"> <title>Building a bird house</title> <shortdesc>Building a birdhouse is a perfect activity for adults to share with their children or grandchildren. @@ -133,15 +128,14 @@ <postreq>Now find a good place to mount it.</postreq> </taskbody> </task> - -
          - Maintaining specializations using the strict task model -

          Organizations that have created specializations based - on the DITA 1.0 and 1.1 strict task model can review + +

          + Maintaining specializations using the strict task model +

          Organizations that have created + specializations based on the DITA 1.0 and 1.1 strict task model can review the recommendations in - for information about how to maintain their - specializations.

          -
          - - - + for information about how to maintain their specializations.

          +
          + +           +           diff --git a/specification/archSpec/technicalContent/dita-troubleshooting-topic.dita b/specification/archSpec/technicalContent/dita-troubleshooting-topic.dita index 6391f809..f191aa7c 100644 --- a/specification/archSpec/technicalContent/dita-troubleshooting-topic.dita +++ b/specification/archSpec/technicalContent/dita-troubleshooting-topic.dita @@ -52,7 +52,7 @@
          This optional element is the first child of troublebody, and it describes a condition or symptom that is associated with an undesirable state in a system, a product, or a service. In cases where the topic title - fully explains the condition, do not use this + fully explains the condition, do not use this element.
           diff --git a/specification/archSpec/technicalContent/releaseManagement-domain.dita b/specification/archSpec/technicalContent/releaseManagement-domain.dita index 43f33e09..919dcef8 100644 --- a/specification/archSpec/technicalContent/releaseManagement-domain.dita +++ b/specification/archSpec/technicalContent/releaseManagement-domain.dita @@ -21,8 +21,8 @@ Release management elements - Tree structure diagram showing the + > + Tree structure diagram showing the elements available in the release management domain, their relationships to each other, and where they can be used in a DITA topic. The change-historylist element can appear in the prolog and can contain change-items. The following diff --git a/specification/archSpec/technicalContent/xNALDomain.dita b/specification/archSpec/technicalContent/xNALDomain.dita index 7c9f3188..8213e0f9 100644 --- a/specification/archSpec/technicalContent/xNALDomain.dita +++ b/specification/archSpec/technicalContent/xNALDomain.dita @@ -28,7 +28,7 @@ Verification, etc.), Customer Data Warehouses, Postal services, etc.

          However, any party for its own purposes and - applications can use xNAL grammar or parts of it.

          + applications can use xNAL grammar or parts of it.

          The DITA xNAL specialization is based on the OASIS extensible Name and Address Language metadata elements. Due diff --git a/specification/archSpec/technicalContent/xnaldetails.dita b/specification/archSpec/technicalContent/xnaldetails.dita index f0f034c2..a8d3faa8 100644 --- a/specification/archSpec/technicalContent/xnaldetails.dita +++ b/specification/archSpec/technicalContent/xnaldetails.dita @@ -16,7 +16,7 @@

          While the elements share element names, and the expectation is that content written using this type of metadata is be straightforward to transform, the element name + >is be straightforward to transform, the element name pairs do not share content models. The difference in content models reflects the different purposes of the two standards. The purpose of the name and address elements in DITA is to identify persons or organizations associated with the creation of a document; diff --git a/specification/base-relationship-tables.ditamap b/specification/base-relationship-tables.ditamap index 5cfeae50..f912fd43 100644 --- a/specification/base-relationship-tables.ditamap +++ b/specification/base-relationship-tables.ditamap @@ -60,7 +60,7 @@ - + diff --git a/specification/common/conref-attribute.dita b/specification/common/conref-attribute.dita index 32ab49c6..2898039e 100644 --- a/specification/common/conref-attribute.dita +++ b/specification/common/conref-attribute.dita @@ -29,7 +29,7 @@ space-delimited set of values, with optional groups of space delimited properties.

          If the value is not specified locally, the value might cascade from + >might cascade from another element in the map (for cascade rules, see ).

          This attribute is defined @@ -171,7 +171,7 @@

          type
          Defines the type of a note. For example, if the note is a tip, the word Tip - might be used to + might be used to draw the reader's attention to it. See callout
          Specifies what character is used for the footnote link, for example a number or an alpha - character. The attribute can also specify a short string of characters. When no callout value is specified, footnotes are typically @@ -345,7 +345,7 @@ /> for detailed information on supported values and processing implications. If no href is specified, processors can choose to generate + >can choose to generate an appropriate listing for this element. All of the book listings operate in a similar manner; for example, <toc @@ -443,7 +443,7 @@
          printonly
          Only include the topic when rendering the DITA content in a print-oriented context; the topic is not appropriate for other + >is not appropriate for other contexts, such as when rendering as HTML. @@ -642,7 +642,7 @@ of map.-->
          lockmeta
          -
          +

          By default, metadata in the map supplements or overrides metadata that is specified at the topic level, unless the lockmeta @@ -708,7 +708,7 @@ of map.-->

          Defines an ID by which the element can be referenced.
          + >can be referenced.

        In addition, processors might support other + >might support other proprietary tokens for different types of styling. Such tokens SHOULD have a processor-specific prefix to diff --git a/specification/common/conref-cover-pages.dita b/specification/common/conref-cover-pages.dita index b403ee4f..a977841d 100644 --- a/specification/common/conref-cover-pages.dita +++ b/specification/common/conref-cover-pages.dita @@ -54,6 +54,31 @@ product="part-0"/>Editions.

        +
        Abstract

        The Darwin Information Typing Architecture (DITA) 1.3 specification defines both a) a set @@ -64,14 +89,14 @@ Status

        This document was last revised or approved by the OASIS Darwin Information Typing Architecture (DITA) TC on the above date. The level of approval is also listed above. Check - the “Latest version” location noted above for possible later revisions of this document. Any + the Latest version location noted above for possible later revisions of this document. Any other numbered Versions and other technical work produced by the Technical Committee (TC) are listed at .

        TC members should send comments on this specification to the TC’s email list. Others should send comments to the TC’s public comment list, after subscribing to it by following the - instructions at the “Send A Comment” button on the TC’s web page at Send A Comment button on the TC’s web page at .

        For information on whether any patents have been disclosed that may be essential to implementing this specification, and any offers of patent licensing terms, please refer to diff --git a/specification/common/conref-examples.dita b/specification/common/conref-examples.dita index e308e6ca..014dd454 100644 --- a/specification/common/conref-examples.dita +++ b/specification/common/conref-examples.dita @@ -45,7 +45,7 @@ Example -

        In this example the “Server setup” label doesn't classify content but, when selected, is +

        In this example the Server setup label doesn't classify content but, when selected, is equivalent to the union of its child subjects. That is, the heading covers content about planning for any application, installing for any application, any task for web servers, or any task for database servers.

        diff --git a/specification/common/conref-file.dita b/specification/common/conref-file.dita index 3af76d2b..cb226584 100644 --- a/specification/common/conref-file.dita +++ b/specification/common/conref-file.dita @@ -96,7 +96,7 @@ The anchor element provides an integration point that another map can reference in order to insert its navigation into the referenced map's navigation tree. For those familiar with Eclipse help systems, this serves the same purpose as the anchor element in that system. It might not be supported for all output formats. -The navref element represents a pointer to another map which is preserved +The navref element represents a pointer to another map which is preserved as a transcluding link in the result deliverable rather than resolved when the deliverable is produced. Output formats that support such linking can integrate the referenced resource when displaying the referencing map to an end user.
        @@ -209,7 +209,7 @@ to alert more birds to the presence of your bird feeder.</shortdesc>

        Many publishing systems for which DITA is used as a source format do not have a way to dynamically resolve content references; those systems will not see any benefit from this element. When DITA is used for those systems, - behaviors related to this element are ignored.

        + behaviors related to this element are ignored.

        The identifiers listed below are declared by the OASIS DITA Technical Committee for the modules that are shipped with DITA 1.3. Values that use a version number of 1.3 refer specifically diff --git a/specification/conformance/conformance.dita b/specification/conformance/conformance.dita index 831c2e05..a4948682 100644 --- a/specification/conformance/conformance.dita +++ b/specification/conformance/conformance.dita @@ -56,10 +56,10 @@ values.

    -

    If using non-DITA-conforming grammar files for conforming DITA +

    If using non-DITA-conforming grammar files for conforming DITA documents, those grammar files MUST NOT - be structured in a way that affects the ability of processors + be structured in a way that affects the ability of processors to process those documents. The use of non-conforming document types or schemas might impede interchange or interoperation of those documents with tools that expect or require the use of conforming DITA document types or schemas.

    @@ -125,7 +125,7 @@ editor that includes the ability to generate print versions of DITA documents represents both a final-form processor and an editing processor. Likewise, a content or component management system might tightly integrate final-form DITA processors. Each processor type - might have different conformance requirements, even though + might have different conformance requirements, even though the processors are part of a single product or package.

    For processors that produce final form output, all features that are relevant to the type of processing that the processor performs -Content models: Base editionFor each element in the base edition, this section presents the content model and a list - of parent elements that can contain that element. \ No newline at end of file +Content models for base packageFor each element in the base package, this section +presents the content model and a list of parent elements that can contain that element. \ No newline at end of file diff --git a/specification/contentmodels/cmbasea.dita b/specification/contentmodels/cmbasea.dita index cbe90dea..f60bc079 100644 --- a/specification/contentmodels/cmbasea.dita +++ b/specification/contentmodels/cmbasea.dita @@ -1,35 +1,59 @@ -A elementsContent models for elements beginning with "a".

    Content models for <ph><xref keyref="abstract" type="reference"><xmlelement>abstract</xmlelement><desc>abstract element reference topic</desc></xref></ph>In this document typeabstract containsBase topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | shortdesc | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typeabstract is contained byBase topic +A elementsContent models for elements beginning with "a".
    Content models for <ph><xref keyref="abstract" type="reference"><xmlelement>abstract</xmlelement><desc>abstract element reference topic</desc></xref></ph>In this document typeabstract containsBase topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | shortdesc | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typeabstract is contained byBase topic topic -
    Content models for <ph><xref keyref="alt" type="reference"><xmlelement>alt</xmlelement><desc>alt element reference topic</desc></xref></ph>In this document typealt containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | draft-comment | required-cleanup | ph | b | i | line-through | overline | sup | sub | tt | u)*In this document typealt is contained byBase map, Base topic +
    Content models for <ph><xref keyref="alt" type="reference"><xmlelement>alt</xmlelement><desc>alt element reference topic</desc></xref></ph>In this document typealt containsBase map, Base topic(text data | b | data | data-about | draft-comment | foreign | i | keyword | line-through | overline | ph | required-cleanup | sort-as | sub | sup | term | text | tt | u | unknown)*In this document typealt is contained byBase map, Base topic hazardsymbol, image -
    Content models for <ph><xref keyref="anchor" type="reference"><xmlelement>anchor</xmlelement><desc>anchor element reference topic</desc></xref></ph>In this document typeanchor containsBase mapEMPTYIn this document typeanchor is contained byBase map +
    Content models for <ph><xref keyref="anchor" type="reference"><xmlelement>anchor</xmlelement><desc>anchor element reference topic</desc></xref></ph>In this document typeanchor containsBase mapEMPTYIn this document typeanchor is contained byBase map foreign, keydef, map, required-cleanup, topicgroup, topichead, topicref, topicset, unknown -
    Content models for <ph><xref keyref="anchorid" type="reference"><xmlelement>anchorid</xmlelement><desc>anchorid element reference topic</desc></xref></ph>In this document typeanchorid containsBase mapEMPTYIn this document typeanchorid is contained byBase map +
    Content models for <ph><xref keyref="anchorid" type="reference"><xmlelement>anchorid</xmlelement><desc>anchorid element reference topic</desc></xref></ph>In this document typeanchorid containsBase mapEMPTYIn this document typeanchorid is contained byBase map exportanchors -
    Content models for <ph><xref keyref="anchorkey" type="reference"><xmlelement>anchorkey</xmlelement><desc>anchorkey element reference topic</desc></xref></ph>In this document typeanchorkey containsBase mapEMPTYIn this document typeanchorkey is contained byBase map +
    Content models for <ph><xref keyref="anchorkey" type="reference"><xmlelement>anchorkey</xmlelement><desc>anchorkey element reference topic</desc></xref></ph>In this document typeanchorkey containsBase mapEMPTYIn this document typeanchorkey is contained byBase map exportanchors -
    Content models for <ph><xref keyref="anchorref" type="reference"><xmlelement>anchorref</xmlelement><desc>anchorref element reference topic</desc></xref></ph>In this document typeanchorref containsBase map - topicmeta?, (data | sort-as | data-about | topicref | anchorref | keydef | mapref | topicgroup | topichead | topicset | topicsetref | ditavalref)*In this document typeanchorref is contained byBase map +
    Content models for <ph><xref keyref="anchorref" type="reference"><xmlelement>anchorref</xmlelement><desc>anchorref element reference topic</desc></xref></ph>In this document typeanchorref containsBase map + topicmeta?, (anchorref | data | data-about | ditavalref | keydef | mapref | sort-as | topicgroup | topichead | topicref | topicset | topicsetref)*In this document typeanchorref is contained byBase map anchorref, keydef, map, relcell, relcolspec, topicgroup, topichead, topicref, topicset, topicsetref -
    Content models for <ph><xref keyref="area" type="reference"><xmlelement>area</xmlelement><desc>area element reference topic</desc></xref></ph>In this document typearea containsBase map, Base topic +
    Content models for <ph><xref keyref="area" type="reference"><xmlelement>area</xmlelement><desc>area element reference topic</desc></xref></ph>In this document typearea containsBase map, Base topic shape, coords, xref In this document typearea is contained byBase map, Base topic imagemap
    -Content models for <ph><xref type="reference" keyref="attributedef" +<title>Content models for <ph><xref keyref="attributedef" type="reference" ><xmlelement>attributedef</xmlelement><desc>attributedef element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    -
    -
    Content models for <ph><xref keyref="audience" type="reference"><xmlelement>audience</xmlelement><desc>audience element reference topic</desc></xref></ph>In this document typeaudience containsBase map, Base topicEMPTYIn this document typeaudience is contained byBase map + + +In this document type +attributedef contains + + +Subject scheme +(data | sort-as | data-about)* + + + + +In this document type +attributedef is contained by + + +Subject scheme + +enumerationdef + + + +
    Content models for <ph><xref keyref="audience" type="reference"><xmlelement>audience</xmlelement><desc>audience element reference topic</desc></xref></ph>In this document typeaudience containsBase map, Base topicEMPTYIn this document typeaudience is contained byBase map metadata, topicmeta Base topic metadata -
    Content models for <ph><xref keyref="author" type="reference"><xmlelement>author</xmlelement><desc>author element reference topic</desc></xref></ph>In this document typeauthor containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typeauthor is contained byBase map +
    Content models for <ph><xref keyref="author" type="reference"><xmlelement>author</xmlelement><desc>author element reference topic</desc></xref></ph>In this document typeauthor containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typeauthor is contained byBase map topicmeta Base topic prolog diff --git a/specification/contentmodels/cmbaseb.dita b/specification/contentmodels/cmbaseb.dita index 46d82d72..b436d5c4 100644 --- a/specification/contentmodels/cmbaseb.dita +++ b/specification/contentmodels/cmbaseb.dita @@ -1,18 +1,18 @@ -B elementsContent models for elements beginning with "b".
    Content models for <ph><xref keyref="b" type="reference"><xmlelement>b</xmlelement><desc>b element reference topic</desc></xref></ph>In this document typeb containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typeb is contained byBase map +B elementsContent models for elements beginning with "b".
    Content models for <ph><xref keyref="b" type="reference"><xmlelement>b</xmlelement><desc>b element reference topic</desc></xref></ph>In this document typeb containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown | xref)*In this document typeb is contained byBase map alt, b, cite, consequence, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, figgroup, fn, howtoavoid, i, index-see, index-see-also, indexterm, itemgroup, li, line-through, lines, linktext, lq, navtitle, note, overline, p, ph, pre, q, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref Base topic abstract, alt, b, bodydiv, cite, consequence, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, figgroup, fn, howtoavoid, i, index-see, index-see-also, indexterm, itemgroup, li, line-through, lines, linkinfo, linktext, lq, navtitle, note, overline, p, ph, pre, q, searchtitle, section, sectiondiv, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref -
    Content models for <ph><xref keyref="body" type="reference"><xmlelement>body</xmlelement><desc>body element reference topic</desc></xref></ph>In this document typebody containsBase topic(dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup | bodydiv | example | section)*In this document typebody is contained byBase topic +
    Content models for <ph><xref keyref="body" type="reference"><xmlelement>body</xmlelement><desc>body element reference topic</desc></xref></ph>In this document typebody containsBase topic(bodydiv | data | data-about | div | dl | draft-comment | example | fig | foreign | hazardstatement | image | imagemap | lines | lq | note | object | ol | p | pre | required-cleanup | section | simpletable | sl | sort-as | table | ul | unknown)*In this document typebody is contained byBase topic topic -
    Content models for <ph><xref keyref="bodydiv" type="reference"><xmlelement>bodydiv</xmlelement><desc>bodydiv element reference topic</desc></xref></ph>In this document typebodydiv containsBase topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | draft-comment | fn | indextermref | indexterm | required-cleanup | bodydiv | section)*In this document typebodydiv is contained byBase topic +
    Content models for <ph><xref keyref="bodydiv" type="reference"><xmlelement>bodydiv</xmlelement><desc>bodydiv element reference topic</desc></xref></ph>In this document typebodydiv containsBase topic(text data | b | bodydiv | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | section | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typebodydiv is contained byBase topic body, bodydiv -
    Content models for <ph><xref keyref="boolean" type="reference"><xmlelement>boolean</xmlelement><desc>boolean element reference topic</desc></xref></ph>In this document typeboolean containsBase map, Base topicEMPTYIn this document typeboolean is contained byBase map +
    Content models for <ph><xref keyref="boolean" type="reference"><xmlelement>boolean</xmlelement><desc>boolean element reference topic</desc></xref></ph>In this document typeboolean containsBase map, Base topicEMPTYIn this document typeboolean is contained byBase map b, cite, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, figgroup, fn, howtoavoid, i, itemgroup, li, line-through, lines, lq, note, overline, p, ph, pre, q, shortdesc, sli, stentry, sub, sup, title, tt, u, xref Base topic abstract, b, bodydiv, cite, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, figgroup, fn, howtoavoid, i, itemgroup, li, line-through, lines, linkinfo, lq, note, overline, p, ph, pre, q, section, sectiondiv, shortdesc, sli, stentry, sub, sup, title, tt, u, xref -
    Content models for <ph><xref keyref="brand" type="reference"><xmlelement>brand</xmlelement><desc>brand element reference topic</desc></xref></ph>In this document typebrand containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typebrand is contained byBase map, Base topic +
    Content models for <ph><xref keyref="brand" type="reference"><xmlelement>brand</xmlelement><desc>brand element reference topic</desc></xref></ph>In this document typebrand containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typebrand is contained byBase map, Base topic prodinfo
    \ No newline at end of file diff --git a/specification/contentmodels/cmbasec.dita b/specification/contentmodels/cmbasec.dita index 2e513e11..d8de4c7d 100644 --- a/specification/contentmodels/cmbasec.dita +++ b/specification/contentmodels/cmbasec.dita @@ -1,35 +1,35 @@ -C elementsContent models for elements beginning with "c".
    Content models for <ph><xref keyref="category" type="reference"><xmlelement>category</xmlelement><desc>category element reference topic</desc></xref></ph>In this document typecategory containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typecategory is contained byBase map +C elementsContent models for elements beginning with "c".
    Content models for <ph><xref keyref="category" type="reference"><xmlelement>category</xmlelement><desc>category element reference topic</desc></xref></ph>In this document typecategory containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typecategory is contained byBase map metadata, topicmeta Base topic metadata -
    Content models for <ph><xref keyref="cite" type="reference"><xmlelement>cite</xmlelement><desc>cite element reference topic</desc></xref></ph>In this document typecite containsBase map, Base topic(text data | boolean | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typecite is contained byBase map +
    Content models for <ph><xref keyref="cite" type="reference"><xmlelement>cite</xmlelement><desc>cite element reference topic</desc></xref></ph>In this document typecite containsBase map, Base topic(text data | b | boolean | data | data-about | draft-comment | foreign | i | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown)*In this document typecite is contained byBase map b, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, figgroup, fn, howtoavoid, i, itemgroup, li, line-through, lines, lq, note, overline, p, ph, pre, q, shortdesc, sli, stentry, sub, sup, title, tt, u, xref Base topic abstract, b, bodydiv, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, figgroup, fn, howtoavoid, i, itemgroup, li, line-through, lines, linkinfo, lq, note, overline, p, ph, pre, q, section, sectiondiv, shortdesc, sli, stentry, sub, sup, title, tt, u, xref -
    Content models for <ph><xref keyref="colspec" type="reference"><xmlelement>colspec</xmlelement><desc>colspec element reference topic</desc></xref></ph>In this document typecolspec containsBase map, Base topicEMPTYIn this document typecolspec is contained byBase map, Base topic +
    Content models for <ph><xref keyref="colspec" type="reference"><xmlelement>colspec</xmlelement><desc>colspec element reference topic</desc></xref></ph>In this document typecolspec containsBase map, Base topicEMPTYIn this document typecolspec is contained byBase map, Base topic tgroup -
    Content models for <ph><xref keyref="component" type="reference"><xmlelement>component</xmlelement><desc>component element reference topic</desc></xref></ph>In this document typecomponent containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typecomponent is contained byBase map, Base topic +
    Content models for <ph><xref keyref="component" type="reference"><xmlelement>component</xmlelement><desc>component element reference topic</desc></xref></ph>In this document typecomponent containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typecomponent is contained byBase map, Base topic prodinfo -
    Content models for <ph><xref keyref="consequence" type="reference"><xmlelement>consequence</xmlelement><desc>consequence element reference topic</desc></xref></ph>In this document typeconsequence containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | ph | b | i | line-through | overline | sup | sub | tt | u | tm)*In this document typeconsequence is contained byBase map, Base topic +
    Content models for <ph><xref keyref="consequence" type="reference"><xmlelement>consequence</xmlelement><desc>consequence element reference topic</desc></xref></ph>In this document typeconsequence containsBase map, Base topic(text data | b | data | data-about | foreign | i | keyword | line-through | overline | ph | sort-as | sub | sup | term | text | tm | tt | u | unknown)*In this document typeconsequence is contained byBase map, Base topic messagepanel -
    Content models for <ph><xref keyref="coords" type="reference"><xmlelement>coords</xmlelement><desc>coords element reference topic</desc></xref></ph>In this document typecoords containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typecoords is contained byBase map, Base topic +
    Content models for <ph><xref keyref="coords" type="reference"><xmlelement>coords</xmlelement><desc>coords element reference topic</desc></xref></ph>In this document typecoords containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typecoords is contained byBase map, Base topic area -
    Content models for <ph><xref keyref="copyrholder" type="reference"><xmlelement>copyrholder</xmlelement><desc>copyrholder element reference topic</desc></xref></ph>In this document typecopyrholder containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typecopyrholder is contained byBase map, Base topic +
    Content models for <ph><xref keyref="copyrholder" type="reference"><xmlelement>copyrholder</xmlelement><desc>copyrholder element reference topic</desc></xref></ph>In this document typecopyrholder containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typecopyrholder is contained byBase map, Base topic copyright -
    Content models for <ph><xref keyref="copyryear" type="reference"><xmlelement>copyryear</xmlelement><desc>copyryear element reference topic</desc></xref></ph>In this document typecopyryear containsBase map, Base topicEMPTYIn this document typecopyryear is contained byBase map, Base topic +
    Content models for <ph><xref keyref="copyryear" type="reference"><xmlelement>copyryear</xmlelement><desc>copyryear element reference topic</desc></xref></ph>In this document typecopyryear containsBase map, Base topicEMPTYIn this document typecopyryear is contained byBase map, Base topic copyright -
    Content models for <ph><xref keyref="created" type="reference"><xmlelement>created</xmlelement><desc>created element reference topic</desc></xref></ph>In this document typecreated containsBase map, Base topicEMPTYIn this document typecreated is contained byBase map, Base topic +
    Content models for <ph><xref keyref="created" type="reference"><xmlelement>created</xmlelement><desc>created element reference topic</desc></xref></ph>In this document typecreated containsBase map, Base topicEMPTYIn this document typecreated is contained byBase map, Base topic critdates -
    Content models for <ph><xref keyref="critdates" type="reference"><xmlelement>critdates</xmlelement><desc>critdates element reference topic</desc></xref></ph>In this document typecritdates containsBase map, Base topic +
    Content models for <ph><xref keyref="critdates" type="reference"><xmlelement>critdates</xmlelement><desc>critdates element reference topic</desc></xref></ph>In this document typecritdates containsBase map, Base topic created?, revised*In this document typecritdates is contained byBase map topicmeta Base topic diff --git a/specification/contentmodels/cmbased.dita b/specification/contentmodels/cmbased.dita index 7c0573ba..436f8d64 100644 --- a/specification/contentmodels/cmbased.dita +++ b/specification/contentmodels/cmbased.dita @@ -1,69 +1,91 @@ -D elementsContent models for elements beginning with "d".
    Content models for <ph><xref keyref="data" type="reference"><xmlelement>data</xmlelement><desc>data element reference topic</desc></xref></ph>In this document typedata containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | image | object | required-cleanup | title)*In this document typedata is contained byBase map +D elementsContent models for elements beginning with "d".
    Content models for <ph><xref keyref="data" type="reference"><xmlelement>data</xmlelement><desc>data element reference topic</desc></xref></ph>In this document typedata containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | image | keyword | line-through | object | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | title | tm | tt | u | unknown | xref)*In this document typedata is contained byBase map alt, anchorref, author, b, brand, category, cite, component, consequence, coords, copyrholder, data, data-about, dd, ddhd, desc, div, dl, draft-comment, dt, dthd, entry, featnum, fig, figgroup, fn, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, keydef, li, line-through, lines, linktext, lq, map, mapref, messagepanel, metadata, navtitle, note, ol, overline, p, ph, platform, pre, prodname, prognum, publisher, q, relcell, resourceid, searchtitle, series, shortdesc, sl, sli, source, stentry, sub, sup, title, topicgroup, topichead, topicmeta, topicref, topicset, topicsetref, tt, typeofhazard, u, ul, xref Base topic abstract, alt, author, b, body, bodydiv, brand, category, cite, component, consequence, coords, copyrholder, data, data-about, dd, ddhd, desc, div, dl, draft-comment, dt, dthd, entry, example, featnum, fig, figgroup, fn, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, li, line-through, lines, linkinfo, linktext, lq, messagepanel, metadata, navtitle, note, ol, overline, p, ph, platform, pre, prodname, prognum, prolog, publisher, q, resourceid, searchtitle, section, sectiondiv, series, shortdesc, sl, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, ul, xref -
    Content models for <ph><xref keyref="data-about" type="reference"><xmlelement>data-about</xmlelement><desc>data-about element reference topic</desc></xref></ph>In this document typedata-about containsBase map, Base topic - data, sort-as, (data | sort-as | data-about)*In this document typedata-about is contained byBase map +
    Content models for <ph><xref keyref="data-about" type="reference"><xmlelement>data-about</xmlelement><desc>data-about element reference topic</desc></xref></ph>In this document typedata-about containsBase map, Base topic(data | data-about | sort-as)*In this document typedata-about is contained byBase map alt, anchorref, author, b, brand, category, cite, component, consequence, coords, copyrholder, data, data-about, dd, ddhd, desc, div, dl, draft-comment, dt, dthd, entry, featnum, fig, figgroup, fn, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, keydef, li, line-through, lines, linktext, lq, map, mapref, messagepanel, metadata, navtitle, note, ol, overline, p, ph, platform, pre, prodname, prognum, publisher, q, relcell, resourceid, searchtitle, series, shortdesc, sl, sli, source, stentry, sub, sup, title, topicgroup, topichead, topicmeta, topicref, topicset, topicsetref, tt, typeofhazard, u, ul, xref Base topic abstract, alt, author, b, body, bodydiv, brand, category, cite, component, consequence, coords, copyrholder, data, data-about, dd, ddhd, desc, div, dl, draft-comment, dt, dthd, entry, example, featnum, fig, figgroup, fn, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, li, line-through, lines, linkinfo, linktext, lq, messagepanel, metadata, navtitle, note, ol, overline, p, ph, platform, pre, prodname, prognum, prolog, publisher, q, resourceid, searchtitle, section, sectiondiv, series, shortdesc, sl, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, ul, xref -
    Content models for <ph><xref keyref="dd" type="reference"><xmlelement>dd</xmlelement><desc>dd element reference topic</desc></xref></ph>In this document typedd containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | itemgroup | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typedd is contained byBase map, Base topic +
    Content models for <ph><xref keyref="dd" type="reference"><xmlelement>dd</xmlelement><desc>dd element reference topic</desc></xref></ph>In this document typedd containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | itemgroup | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typedd is contained byBase map, Base topic dlentry -
    Content models for <ph><xref keyref="ddhd" type="reference"><xmlelement>ddhd</xmlelement><desc>ddhd element reference topic</desc></xref></ph>In this document typeddhd containsBase map, Base topic(text data | boolean | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | state | cite | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup | image)*In this document typeddhd is contained byBase map, Base topic +
    Content models for <ph><xref keyref="ddhd" type="reference"><xmlelement>ddhd</xmlelement><desc>ddhd element reference topic</desc></xref></ph>In this document typeddhd containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | image | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown)*In this document typeddhd is contained byBase map, Base topic dlhead
    -Content models for <ph><xref type="reference" keyref="defaultSubject" +<title>Content models for <ph><xref keyref="defaultSubject" type="reference" ><xmlelement>defaultSubject</xmlelement><desc>defaultSubject element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    -
    -
    Content models for <ph><xref keyref="desc" type="reference"><xmlelement>desc</xmlelement><desc>desc element reference topic</desc></xref></ph>In this document typedesc containsBase map, Base topic(text data | dl | div | image | lines | lq | note | hazardstatement | ol | p | pre | sl | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typedesc is contained byBase map + + +In this document type +defaultSubject contains + + +Subject scheme +(data | +sort-as +| data-about)* + + + + +In this document type +defaultSubject is contained by + + +Subject scheme + +enumerationdef + + + +
    Content models for <ph><xref keyref="desc" type="reference"><xmlelement>desc</xmlelement><desc>desc element reference topic</desc></xref></ph>In this document typedesc containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | foreign | hazardstatement | i | image | keyword | line-through | lines | lq | note | ol | overline | p | ph | pre | q | required-cleanup | sl | sort-as | state | sub | sup | term | text | tm | tt | u | ul | unknown | xref)*In this document typedesc is contained byBase map fig, object, table, xref Base topic fig, link, linklist, object, table, xref -
    -
    +
    Content models for <ph><xref type="reference" keyref="dita" ><xmlelement>dita</xmlelement><desc>dita element reference topic</desc></xref></ph>

    None of the document type shells distributed with the base package use this element.

    -
    -
    Content models for <ph><xref keyref="ditavalmeta" type="reference"><xmlelement>ditavalmeta</xmlelement><desc>ditavalmeta element reference topic</desc></xref></ph>In this document typeditavalmeta containsBase map(navtitle?, (dvrResourcePrefix?, dvrResourceSuffix?, dvrKeyscopePrefix?, dvrKeyscopeSuffix?dvrResourceSuffix?, dvrKeyscopePrefix?, dvrKeyscopeSuffix?dvrKeyscopePrefix?, dvrKeyscopeSuffix?dvrKeyscopeSuffix?)(dvrResourcePrefix?, dvrResourceSuffix?, dvrKeyscopePrefix?, dvrKeyscopeSuffix?dvrResourceSuffix?, dvrKeyscopePrefix?, dvrKeyscopeSuffix?dvrKeyscopePrefix?, dvrKeyscopeSuffix?dvrKeyscopeSuffix?))In this document typeditavalmeta is contained byBase map +
    Content models for <ph><xref keyref="ditavalmeta" type="reference"><xmlelement>ditavalmeta</xmlelement><desc>ditavalmeta element reference topic</desc></xref></ph>In this document typeditavalmeta containsBase map(navtitle?, (dvrResourcePrefix?, dvrResourceSuffix?, dvrKeyscopePrefix?, dvrKeyscopeSuffix?))In this document typeditavalmeta is contained byBase map ditavalref -
    Content models for <ph><xref keyref="ditavalref" type="reference"><xmlelement>ditavalref</xmlelement><desc>ditavalref element reference topic</desc></xref></ph>In this document typeditavalref containsBase map(ditavalmeta)*In this document typeditavalref is contained byBase map +
    Content models for <ph><xref keyref="ditavalref" type="reference"><xmlelement>ditavalref</xmlelement><desc>ditavalref element reference topic</desc></xref></ph>In this document typeditavalref containsBase map + ditavalmeta*In this document typeditavalref is contained byBase map anchorref, keydef, map, relcell, relcolspec, topicgroup, topichead, topicref, topicset, topicsetref -
    Content models for <ph><xref keyref="div" type="reference"><xmlelement>div</xmlelement><desc>div element reference topic</desc></xref></ph>In this document typediv containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typediv is contained byBase map +
    Content models for <ph><xref keyref="div" type="reference"><xmlelement>div</xmlelement><desc>div element reference topic</desc></xref></ph>In this document typediv containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typediv is contained byBase map dd, desc, div, draft-comment, entry, fig, figgroup, fn, itemgroup, li, lq, note, p, stentry Base topic abstract, body, bodydiv, dd, desc, div, draft-comment, entry, example, fig, figgroup, fn, itemgroup, li, linkinfo, lq, note, p, section, sectiondiv, stentry -
    Content models for <ph><xref keyref="dl" type="reference"><xmlelement>dl</xmlelement><desc>dl element reference topic</desc></xref></ph>In this document typedl containsBase map, Base topic(data | sort-as | data-about)*, dlhead?, dlentry+In this document typedl is contained byBase map +
    Content models for <ph><xref keyref="dl" type="reference"><xmlelement>dl</xmlelement><desc>dl element reference topic</desc></xref></ph>In this document typedl containsBase map, Base topic(data | data-about | sort-as)*, dlhead?, dlentry+In this document typedl is contained byBase map dd, desc, div, draft-comment, entry, fig, figgroup, fn, itemgroup, li, lq, note, p, stentry Base topic abstract, body, bodydiv, dd, desc, div, draft-comment, entry, example, fig, figgroup, fn, itemgroup, li, linkinfo, lq, note, p, section, sectiondiv, stentry -
    Content models for <ph><xref keyref="dlentry" type="reference"><xmlelement>dlentry</xmlelement><desc>dlentry element reference topic</desc></xref></ph>In this document typedlentry containsBase map, Base topic +
    Content models for <ph><xref keyref="dlentry" type="reference"><xmlelement>dlentry</xmlelement><desc>dlentry element reference topic</desc></xref></ph>In this document typedlentry containsBase map, Base topic dt+, dd+In this document typedlentry is contained byBase map, Base topic dl -
    Content models for <ph><xref keyref="dlhead" type="reference"><xmlelement>dlhead</xmlelement><desc>dlhead element reference topic</desc></xref></ph>In this document typedlhead containsBase map, Base topic +
    Content models for <ph><xref keyref="dlhead" type="reference"><xmlelement>dlhead</xmlelement><desc>dlhead element reference topic</desc></xref></ph>In this document typedlhead containsBase map, Base topic dthd?, ddhd?In this document typedlhead is contained byBase map, Base topic dl -
    Content models for <ph><xref keyref="draft-comment" type="reference"><xmlelement>draft-comment</xmlelement><desc>draft-comment element reference topic</desc></xref></ph>In this document typedraft-comment containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown)*In this document typedraft-comment is contained byBase map +
    Content models for <ph><xref keyref="draft-comment" type="reference"><xmlelement>draft-comment</xmlelement><desc>draft-comment element reference topic</desc></xref></ph>In this document typedraft-comment containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | fig | foreign | hazardstatement | i | image | imagemap | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typedraft-comment is contained byBase map alt, b, cite, data, dd, ddhd, desc, div, dt, dthd, entry, figgroup, fn, i, itemgroup, keyword, li, line-through, lines, lq, navtitle, note, overline, p, ph, pre, q, shortdesc, sli, stentry, sub, sup, term, title, tt, u, xref Base topic abstract, alt, b, body, bodydiv, cite, data, dd, ddhd, desc, div, dt, dthd, entry, example, figgroup, fn, i, itemgroup, keyword, li, line-through, lines, linkinfo, lq, navtitle, note, overline, p, ph, pre, q, section, sectiondiv, shortdesc, sli, stentry, sub, sup, term, title, tt, u, xref -
    Content models for <ph><xref keyref="dt" type="reference"><xmlelement>dt</xmlelement><desc>dt element reference topic</desc></xref></ph>In this document typedt containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup | image)*In this document typedt is contained byBase map, Base topic +
    Content models for <ph><xref keyref="dt" type="reference"><xmlelement>dt</xmlelement><desc>dt element reference topic</desc></xref></ph>In this document typedt containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | image | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown | xref)*In this document typedt is contained byBase map, Base topic dlentry -
    Content models for <ph><xref keyref="dthd" type="reference"><xmlelement>dthd</xmlelement><desc>dthd element reference topic</desc></xref></ph>In this document typedthd containsBase map, Base topic(text data | boolean | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | state | cite | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup | image)*In this document typedthd is contained byBase map, Base topic +
    Content models for <ph><xref keyref="dthd" type="reference"><xmlelement>dthd</xmlelement><desc>dthd element reference topic</desc></xref></ph>In this document typedthd containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | image | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown)*In this document typedthd is contained byBase map, Base topic dlhead -
    Content models for <ph><xref keyref="dvrKeyscopePrefix" type="reference"><xmlelement>dvrKeyscopePrefix</xmlelement><desc>dvrKeyscopePrefix element reference topic</desc></xref></ph>In this document typedvrKeyscopePrefix containsBase map(text data | text)*In this document typedvrKeyscopePrefix is contained byBase map +
    Content models for <ph><xref keyref="dvrKeyscopePrefix" type="reference"><xmlelement>dvrKeyscopePrefix</xmlelement><desc>dvrKeyscopePrefix element reference topic</desc></xref></ph>In this document typedvrKeyscopePrefix containsBase map(text data | text)*In this document typedvrKeyscopePrefix is contained byBase map ditavalmeta -
    Content models for <ph><xref keyref="dvrKeyscopeSuffix" type="reference"><xmlelement>dvrKeyscopeSuffix</xmlelement><desc>dvrKeyscopeSuffix element reference topic</desc></xref></ph>In this document typedvrKeyscopeSuffix containsBase map(text data | text)*In this document typedvrKeyscopeSuffix is contained byBase map +
    Content models for <ph><xref keyref="dvrKeyscopeSuffix" type="reference"><xmlelement>dvrKeyscopeSuffix</xmlelement><desc>dvrKeyscopeSuffix element reference topic</desc></xref></ph>In this document typedvrKeyscopeSuffix containsBase map(text data | text)*In this document typedvrKeyscopeSuffix is contained byBase map ditavalmeta -
    Content models for <ph><xref keyref="dvrResourcePrefix" type="reference"><xmlelement>dvrResourcePrefix</xmlelement><desc>dvrResourcePrefix element reference topic</desc></xref></ph>In this document typedvrResourcePrefix containsBase map(text data | text)*In this document typedvrResourcePrefix is contained byBase map +
    Content models for <ph><xref keyref="dvrResourcePrefix" type="reference"><xmlelement>dvrResourcePrefix</xmlelement><desc>dvrResourcePrefix element reference topic</desc></xref></ph>In this document typedvrResourcePrefix containsBase map(text data | text)*In this document typedvrResourcePrefix is contained byBase map ditavalmeta -
    Content models for <ph><xref keyref="dvrResourceSuffix" type="reference"><xmlelement>dvrResourceSuffix</xmlelement><desc>dvrResourceSuffix element reference topic</desc></xref></ph>In this document typedvrResourceSuffix containsBase map(text data | text)*In this document typedvrResourceSuffix is contained byBase map +
    Content models for <ph><xref keyref="dvrResourceSuffix" type="reference"><xmlelement>dvrResourceSuffix</xmlelement><desc>dvrResourceSuffix element reference topic</desc></xref></ph>In this document typedvrResourceSuffix containsBase map(text data | text)*In this document typedvrResourceSuffix is contained byBase map ditavalmeta
    diff --git a/specification/contentmodels/cmbasee.dita b/specification/contentmodels/cmbasee.dita index 569eacc9..682b8911 100644 --- a/specification/contentmodels/cmbasee.dita +++ b/specification/contentmodels/cmbasee.dita @@ -3,21 +3,77 @@ PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd"> E elementsContent models for elements beginning with "e".
    -Content models for <ph><xref type="reference" keyref="elementdef" +<title>Content models for <ph><xref keyref="elementdef" type="reference" ><xmlelement>elementdef</xmlelement><desc>elementdef element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    -
    -
    Content models for <ph><xref keyref="entry" type="reference"><xmlelement>entry</xmlelement><desc>entry element reference topic</desc></xref></ph>In this document typeentry containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | sl | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typeentry is contained byBase map, Base topic + + +In this document type +elementdef contains + + +Subject scheme +(data | sort-as | data-about)* + + + + +In this document type +elementdef is contained by + + +Subject scheme + +enumerationdef + + + +
    Content models for <ph><xref keyref="entry" type="reference"><xmlelement>entry</xmlelement><desc>entry element reference topic</desc></xref></ph>In this document typeentry containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | sl | sort-as | state | sub | sup | term | text | tm | tt | u | ul | unknown | xref)*In this document typeentry is contained byBase map, Base topic row
    -Content models for <ph><xref type="reference" keyref="enumerationdef" +<title>Content models for <ph><xref keyref="enumerationdef" type="reference" ><xmlelement>enumerationdef</xmlelement><desc>enumerationdef element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    -
    Content models for <ph><xref keyref="example" type="reference"><xmlelement>example</xmlelement><desc>example element reference topic</desc></xref></ph>In this document typeexample containsBase topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | title | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typeexample is contained byBase topic + + +In this document type +enumerationdef contains + + +Subject scheme + +elementdef?, +attributedef, subjectdef+, defaultSubject?, (data | sort-as | data-about)* + + + + +In this document type +enumerationdef is contained by + + +Subject scheme + +subjectScheme + + + +
    Content models for <ph><xref keyref="example" type="reference"><xmlelement>example</xmlelement><desc>example element reference topic</desc></xref></ph>In this document typeexample containsBase topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | simpletable | sl | sort-as | state | sub | sup | table | term | text | title | tm | tt | u | ul | unknown | xref)*In this document typeexample is contained byBase topic body -
    Content models for <ph><xref keyref="exportanchors" type="reference"><xmlelement>exportanchors</xmlelement><desc>exportanchors element reference topic</desc></xref></ph>In this document typeexportanchors containsBase map(anchorid | anchorkey)*In this document typeexportanchors is contained byBase map +
    Content models for <ph><xref keyref="exportanchors" type="reference"><xmlelement>exportanchors</xmlelement><desc>exportanchors element reference topic</desc></xref></ph>In this document typeexportanchors containsBase map(anchorid | anchorkey)*In this document typeexportanchors is contained byBase map metadata, topicmeta
    diff --git a/specification/contentmodels/cmbasef.dita b/specification/contentmodels/cmbasef.dita index 67f950c5..e1cb0092 100644 --- a/specification/contentmodels/cmbasef.dita +++ b/specification/contentmodels/cmbasef.dita @@ -1,21 +1,21 @@ -F elementsContent models for elements beginning with "f".
    Content models for <ph><xref keyref="featnum" type="reference"><xmlelement>featnum</xmlelement><desc>featnum element reference topic</desc></xref></ph>In this document typefeatnum containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typefeatnum is contained byBase map, Base topic +F elementsContent models for elements beginning with "f".
    Content models for <ph><xref keyref="featnum" type="reference"><xmlelement>featnum</xmlelement><desc>featnum element reference topic</desc></xref></ph>In this document typefeatnum containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typefeatnum is contained byBase map, Base topic prodinfo -
    Content models for <ph><xref keyref="fig" type="reference"><xmlelement>fig</xmlelement><desc>fig element reference topic</desc></xref></ph>In this document typefig containsBase map, Base topic - title?, desc?, (figgroup | dl | div | image | lines | lq | note | hazardstatement | object | ol | p | pre | sl | ul | data | sort-as | data-about | fn | foreign | unknown | simpletable | xref)*In this document typefig is contained byBase map +
    Content models for <ph><xref keyref="fig" type="reference"><xmlelement>fig</xmlelement><desc>fig element reference topic</desc></xref></ph>In this document typefig containsBase map, Base topic + title?, desc?, (data | data-about | div | dl | figgroup | fn | foreign | hazardstatement | image | lines | lq | note | object | ol | p | pre | simpletable | sl | sort-as | ul | unknown | xref)*In this document typefig is contained byBase map dd, div, draft-comment, entry, fn, itemgroup, li, lq, note, p, stentry Base topic abstract, body, bodydiv, dd, div, draft-comment, entry, example, fn, itemgroup, li, lq, note, p, section, sectiondiv, stentry -
    Content models for <ph><xref keyref="figgroup" type="reference"><xmlelement>figgroup</xmlelement><desc>figgroup element reference topic</desc></xref></ph>In this document typefiggroup containsBase map, Base topic - title?, (figgroup | dl | div | image | lines | lq | note | hazardstatement | object | ol | p | pre | sl | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | fn | foreign | unknown | required-cleanup)*In this document typefiggroup is contained byBase map, Base topic +
    Content models for <ph><xref keyref="figgroup" type="reference"><xmlelement>figgroup</xmlelement><desc>figgroup element reference topic</desc></xref></ph>In this document typefiggroup containsBase map, Base topic + title?, (b | boolean | cite | data | data-about | div | dl | draft-comment | figgroup | fn | foreign | hazardstatement | i | image | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | sl | sort-as | state | sub | sup | term | text | tm | tt | u | ul | unknown | xref)*In this document typefiggroup is contained byBase map, Base topic fig, figgroup -
    Content models for <ph><xref keyref="fn" type="reference"><xmlelement>fn</xmlelement><desc>fn element reference topic</desc></xref></ph>In this document typefn containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | sl | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typefn is contained byBase map +
    Content models for <ph><xref keyref="fn" type="reference"><xmlelement>fn</xmlelement><desc>fn element reference topic</desc></xref></ph>In this document typefn containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | foreign | hazardstatement | i | image | imagemap | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | sl | sort-as | state | sub | sup | term | text | tm | tt | u | ul | unknown | xref)*In this document typefn is contained byBase map dd, div, entry, fig, figgroup, itemgroup, li, lines, lq, note, p, ph, pre, sli, stentry Base topic abstract, bodydiv, dd, div, entry, example, fig, figgroup, itemgroup, li, lines, lq, note, p, ph, pre, section, sectiondiv, sli, stentry -
    Content models for <ph><xref keyref="foreign" type="reference"><xmlelement>foreign</xmlelement><desc>foreign element reference topic</desc></xref></ph>In this document typeforeign containsBase map, Base topicAny defined elementIn this document typeforeign is contained byBase map +
    Content models for <ph><xref keyref="foreign" type="reference"><xmlelement>foreign</xmlelement><desc>foreign element reference topic</desc></xref></ph>In this document typeforeign containsBase map, Base topicAny defined elementIn this document typeforeign is contained byBase map alt, author, b, brand, category, cite, component, consequence, coords, copyrholder, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, featnum, fig, figgroup, fn, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, li, line-through, lines, linktext, lq, metadata, navtitle, note, object, overline, p, ph, platform, pre, prodname, prognum, publisher, q, searchtitle, series, shortdesc, sli, source, stentry, sub, sup, title, topicmeta, tt, typeofhazard, u, xref Base topic abstract, alt, author, b, body, bodydiv, brand, category, cite, component, consequence, coords, copyrholder, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, featnum, fig, figgroup, fn, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, li, line-through, lines, linkinfo, linktext, lq, metadata, navtitle, note, object, overline, p, ph, platform, pre, prodname, prognum, prolog, publisher, q, searchtitle, section, sectiondiv, series, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref diff --git a/specification/contentmodels/cmbaseh.dita b/specification/contentmodels/cmbaseh.dita index 0e9d2176..f54498a3 100644 --- a/specification/contentmodels/cmbaseh.dita +++ b/specification/contentmodels/cmbaseh.dita @@ -3,43 +3,245 @@ PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd"> H elementsContent models for elements beginning with "h".
    -Content models for <ph><xref type="reference" keyref="hasInstance" +<title>Content models for <ph><xref keyref="hasInstance" type="reference" ><xmlelement>hasInstance</xmlelement><desc>hasInstance element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    + + +In this document type +hasInstance contains + + +Subject scheme + +topicmeta?, (data | sort-as | data-about +| subjectdef | subjectHead | topicref | +anchorref | keydef | mapref | topicgroup | topichead | +topicset | topicsetref)* + + + + +In this document type +hasInstance is contained by + + +Subject scheme + +subjectScheme, subjectdef + + +
    -Content models for <ph><xref type="reference" keyref="hasKind" -><xmlelement>hasKind</xmlelement><desc>hasKind element reference -topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    +Content models for <ph><xref keyref="hasKind" type="reference" +><xmlelement>hasKind</xmlelement><desc>hasKind element reference topic</desc></xref></ph> + + +In this document type +hasKind contains + + +Subject scheme + +topicmeta?, (data | sort-as | data-about +| subjectdef | subjectHead | topicref | +anchorref | keydef | mapref | topicgroup | topichead | +topicset | topicsetref)* + + + + +In this document type +hasKind is contained by + + +Subject scheme + +subjectScheme, subjectdef + + +
    -Content models for <ph><xref type="reference" keyref="hasNarrower" +<title>Content models for <ph><xref keyref="hasNarrower" type="reference" ><xmlelement>hasNarrower</xmlelement><desc>hasNarrower element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    + + +In this document type +hasNarrower contains + + +Subject scheme + +topicmeta?, (data | sort-as | data-about +| subjectdef | subjectHead | topicref | +anchorref | keydef | mapref | topicgroup | topichead | +topicset | topicsetref)* + + + + +In this document type +hasNarrower is contained by + + +Subject scheme + +subjectScheme, subjectdef + + +
    -Content models for <ph><xref type="reference" keyref="hasPart" -><xmlelement>hasPart</xmlelement><desc>hasPart element reference -topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    +Content models for <ph><xref keyref="hasPart" type="reference" +><xmlelement>hasPart</xmlelement><desc>hasPart element reference topic</desc></xref></ph> + + +In this document type +hasPart contains + + +Subject scheme + +topicmeta?, (data | sort-as | data-about +| subjectdef | subjectHead | topicref | +anchorref | keydef | mapref | topicgroup | topichead | +topicset | topicsetref)* + + + + +In this document type +hasPart is contained by + + +Subject scheme + +subjectScheme, subjectdef + + +
    -Content models for <ph><xref type="reference" keyref="hasRelated" +<title>Content models for <ph><xref keyref="hasRelated" type="reference" ><xmlelement>hasRelated</xmlelement><desc>hasRelated element reference topic</desc></xref></ph> -

    None of the document type shells distributed with the base package use this element.

    -
    -
    Content models for <ph><xref keyref="hazardstatement" type="reference"><xmlelement>hazardstatement</xmlelement><desc>hazardstatement element reference topic</desc></xref></ph>In this document typehazardstatement containsBase map, Base topic + + +In this document type +hasRelated contains + + +Subject scheme + +topicmeta?, (data | sort-as | data-about +| subjectdef | subjectHead | topicref | +anchorref | keydef | mapref | topicgroup | topichead | +topicset | topicsetref)* + + + + +In this document type +hasRelated is contained by + + +Subject scheme + +subjectScheme, subjectdef + + + +
    Content models for <ph><xref keyref="hazardstatement" type="reference"><xmlelement>hazardstatement</xmlelement><desc>hazardstatement element reference topic</desc></xref></ph>In this document typehazardstatement containsBase map, Base topic messagepanel+, hazardsymbol*In this document typehazardstatement is contained byBase map dd, desc, div, draft-comment, entry, fig, figgroup, fn, itemgroup, li, lq, p, stentry Base topic abstract, body, bodydiv, dd, desc, div, draft-comment, entry, example, fig, figgroup, fn, itemgroup, li, linkinfo, lq, p, section, sectiondiv, stentry -
    Content models for <ph><xref keyref="hazardsymbol" type="reference"><xmlelement>hazardsymbol</xmlelement><desc>hazardsymbol element reference topic</desc></xref></ph>In this document typehazardsymbol containsBase map, Base topic +
    Content models for <ph><xref keyref="hazardsymbol" type="reference"><xmlelement>hazardsymbol</xmlelement><desc>hazardsymbol element reference topic</desc></xref></ph>In this document typehazardsymbol containsBase map, Base topic alt?, longdescref?In this document typehazardsymbol is contained byBase map, Base topic hazardstatement -
    Content models for <ph><xref keyref="howtoavoid" type="reference"><xmlelement>howtoavoid</xmlelement><desc>howtoavoid element reference topic</desc></xref></ph>In this document typehowtoavoid containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | sl | simpletable)*In this document typehowtoavoid is contained byBase map, Base topic +
    Content models for <ph><xref keyref="howtoavoid" type="reference"><xmlelement>howtoavoid</xmlelement><desc>howtoavoid element reference topic</desc></xref></ph>In this document typehowtoavoid containsBase map, Base topic(text data | b | boolean | cite | i | keyword | line-through | overline | ph | q | simpletable | sl | state | sub | sup | term | text | tm | tt | u | xref)*In this document typehowtoavoid is contained byBase map, Base topic messagepanel
    diff --git a/specification/contentmodels/cmbasei.dita b/specification/contentmodels/cmbasei.dita index fd9849f2..b1446809 100644 --- a/specification/contentmodels/cmbasei.dita +++ b/specification/contentmodels/cmbasei.dita @@ -1,36 +1,36 @@ -I elementsContent models for elements beginning with "i".
    Content models for <ph><xref keyref="i" type="reference"><xmlelement>i</xmlelement><desc>i element reference topic</desc></xref></ph>In this document typei containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typei is contained byBase map +I elementsContent models for elements beginning with "i".
    Content models for <ph><xref keyref="i" type="reference"><xmlelement>i</xmlelement><desc>i element reference topic</desc></xref></ph>In this document typei containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown | xref)*In this document typei is contained byBase map alt, b, cite, consequence, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, figgroup, fn, howtoavoid, i, index-see, index-see-also, indexterm, itemgroup, li, line-through, lines, linktext, lq, navtitle, note, overline, p, ph, pre, q, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref Base topic abstract, alt, b, bodydiv, cite, consequence, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, figgroup, fn, howtoavoid, i, index-see, index-see-also, indexterm, itemgroup, li, line-through, lines, linkinfo, linktext, lq, navtitle, note, overline, p, ph, pre, q, searchtitle, section, sectiondiv, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref -
    Content models for <ph><xref keyref="image" type="reference"><xmlelement>image</xmlelement><desc>image element reference topic</desc></xref></ph>In this document typeimage containsBase map, Base topic +
    Content models for <ph><xref keyref="image" type="reference"><xmlelement>image</xmlelement><desc>image element reference topic</desc></xref></ph>In this document typeimage containsBase map, Base topic alt?, longdescref?In this document typeimage is contained byBase map data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, fig, figgroup, fn, imagemap, itemgroup, li, lq, note, p, ph, shortdesc, sli, stentry, title, xref Base topic abstract, body, bodydiv, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, fig, figgroup, fn, imagemap, itemgroup, li, linkinfo, lq, note, p, ph, section, sectiondiv, shortdesc, sli, stentry, title, xref -
    Content models for <ph><xref keyref="imagemap" type="reference"><xmlelement>imagemap</xmlelement><desc>imagemap element reference topic</desc></xref></ph>In this document typeimagemap containsBase map, Base topic +
    Content models for <ph><xref keyref="imagemap" type="reference"><xmlelement>imagemap</xmlelement><desc>imagemap element reference topic</desc></xref></ph>In this document typeimagemap containsBase map, Base topic image, area+In this document typeimagemap is contained byBase map dd, div, draft-comment, entry, fn, itemgroup, li, lq, note, p, stentry Base topic abstract, body, bodydiv, dd, div, draft-comment, entry, example, fn, itemgroup, li, lq, note, p, section, sectiondiv, stentry -
    Content models for <ph><xref keyref="index-base" type="reference"><xmlelement>index-base</xmlelement><desc>index-base element reference topic</desc></xref></ph>In this document typeindex-base containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | indexterm)*In this document typeindex-base is contained byBase map, Base topic +
    Content models for <ph><xref keyref="index-base" type="reference"><xmlelement>index-base</xmlelement><desc>index-base element reference topic</desc></xref></ph>In this document typeindex-base containsBase map, Base topic(text data | data | data-about | foreign | indexterm | keyword | sort-as | term | text | unknown)*In this document typeindex-base is contained byBase map, Base topic indexterm -
    Content models for <ph><xref keyref="index-see" type="reference"><xmlelement>index-see</xmlelement><desc>index-see element reference topic</desc></xref></ph>In this document typeindex-see containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | ph | b | i | line-through | overline | sup | sub | tt | u | indexterm)*In this document typeindex-see is contained byBase map, Base topic +
    Content models for <ph><xref keyref="index-see" type="reference"><xmlelement>index-see</xmlelement><desc>index-see element reference topic</desc></xref></ph>In this document typeindex-see containsBase map, Base topic(text data | b | data | data-about | foreign | i | indexterm | keyword | line-through | overline | ph | sort-as | sub | sup | term | text | tt | u | unknown)*In this document typeindex-see is contained byBase map, Base topic indexterm -
    Content models for <ph><xref keyref="index-see-also" type="reference"><xmlelement>index-see-also</xmlelement><desc>index-see-also element reference topic</desc></xref></ph>In this document typeindex-see-also containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | ph | b | i | line-through | overline | sup | sub | tt | u | indexterm)*In this document typeindex-see-also is contained byBase map, Base topic +
    Content models for <ph><xref keyref="index-see-also" type="reference"><xmlelement>index-see-also</xmlelement><desc>index-see-also element reference topic</desc></xref></ph>In this document typeindex-see-also containsBase map, Base topic(text data | b | data | data-about | foreign | i | indexterm | keyword | line-through | overline | ph | sort-as | sub | sup | term | text | tt | u | unknown)*In this document typeindex-see-also is contained byBase map, Base topic indexterm -
    Content models for <ph><xref keyref="index-sort-as" type="reference"><xmlelement>index-sort-as</xmlelement><desc>index-sort-as element reference topic</desc></xref></ph>In this document typeindex-sort-as containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text)*In this document typeindex-sort-as is contained byBase map, Base topic +
    Content models for <ph><xref keyref="index-sort-as" type="reference"><xmlelement>index-sort-as</xmlelement><desc>index-sort-as element reference topic</desc></xref></ph>In this document typeindex-sort-as containsBase map, Base topic(text data | data | data-about | foreign | keyword | sort-as | term | text | unknown)*In this document typeindex-sort-as is contained byBase map, Base topic indexterm -
    Content models for <ph><xref keyref="indexterm" type="reference"><xmlelement>indexterm</xmlelement><desc>indexterm element reference topic</desc></xref></ph>In this document typeindexterm containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | ph | b | i | line-through | overline | sup | sub | tt | u | indexterm | index-base | index-see | index-see-also | index-sort-as)*In this document typeindexterm is contained byBase map +
    Content models for <ph><xref keyref="indexterm" type="reference"><xmlelement>indexterm</xmlelement><desc>indexterm element reference topic</desc></xref></ph>In this document typeindexterm containsBase map, Base topic(text data | b | data | data-about | foreign | i | index-base | index-see | index-see-also | index-sort-as | indexterm | keyword | line-through | overline | ph | sort-as | sub | sup | term | text | tt | u | unknown)*In this document typeindexterm is contained byBase map dd, div, entry, index-base, index-see, index-see-also, indexterm, itemgroup, keywords, li, lines, lq, note, p, ph, pre, sli, stentry Base topic abstract, bodydiv, dd, div, entry, example, index-base, index-see, index-see-also, indexterm, itemgroup, keywords, li, lines, lq, note, p, ph, pre, section, sectiondiv, sli, stentry -
    Content models for <ph><xref keyref="indextermref" type="reference"><xmlelement>indextermref</xmlelement><desc>indextermref element reference topic</desc></xref></ph>In this document typeindextermref containsBase map, Base topicEMPTYIn this document typeindextermref is contained byBase map +
    Content models for <ph><xref keyref="indextermref" type="reference"><xmlelement>indextermref</xmlelement><desc>indextermref element reference topic</desc></xref></ph>In this document typeindextermref containsBase map, Base topicEMPTYIn this document typeindextermref is contained byBase map dd, div, entry, itemgroup, li, lines, lq, note, p, ph, pre, sli, stentry Base topic abstract, bodydiv, dd, div, entry, example, itemgroup, li, lines, lq, note, p, ph, pre, section, sectiondiv, sli, stentry -
    Content models for <ph><xref keyref="itemgroup" type="reference"><xmlelement>itemgroup</xmlelement><desc>itemgroup element reference topic</desc></xref></ph>In this document typeitemgroup containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typeitemgroup is contained byBase map, Base topic +
    Content models for <ph><xref keyref="itemgroup" type="reference"><xmlelement>itemgroup</xmlelement><desc>itemgroup element reference topic</desc></xref></ph>In this document typeitemgroup containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typeitemgroup is contained byBase map, Base topic dd, li
    \ No newline at end of file diff --git a/specification/contentmodels/cmbasek.dita b/specification/contentmodels/cmbasek.dita index c7020fe2..193db376 100644 --- a/specification/contentmodels/cmbasek.dita +++ b/specification/contentmodels/cmbasek.dita @@ -1,14 +1,14 @@ -K elementsContent models for elements beginning with "k".
    Content models for <ph><xref keyref="keydef" type="reference"><xmlelement>keydef</xmlelement><desc>keydef element reference topic</desc></xref></ph>In this document typekeydef containsBase map - topicmeta?, (anchor | data | sort-as | data-about | navref | topicref | anchorref | keydef | mapref | topicgroup | topichead | topicset | topicsetref | ditavalref)*In this document typekeydef is contained byBase map +K elementsContent models for elements beginning with "k".
    Content models for <ph><xref keyref="keydef" type="reference"><xmlelement>keydef</xmlelement><desc>keydef element reference topic</desc></xref></ph>In this document typekeydef containsBase map + topicmeta?, (anchor | anchorref | data | data-about | ditavalref | keydef | mapref | navref | sort-as | topicgroup | topichead | topicref | topicset | topicsetref)*In this document typekeydef is contained byBase map anchorref, keydef, map, relcell, relcolspec, topicgroup, topichead, topicref, topicset, topicsetref -
    Content models for <ph><xref keyref="keyword" type="reference"><xmlelement>keyword</xmlelement><desc>keyword element reference topic</desc></xref></ph>In this document typekeyword containsBase map, Base topic(text data | draft-comment | required-cleanup | text | tm)*In this document typekeyword is contained byBase map +
    Content models for <ph><xref keyref="keyword" type="reference"><xmlelement>keyword</xmlelement><desc>keyword element reference topic</desc></xref></ph>In this document typekeyword containsBase map, Base topic(text data | draft-comment | required-cleanup | text | tm)*In this document typekeyword is contained byBase map alt, author, b, brand, category, cite, component, consequence, coords, copyrholder, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, featnum, figgroup, fn, howtoavoid, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, keywords, li, line-through, lines, linktext, lq, navtitle, note, overline, p, ph, platform, pre, prodname, prognum, publisher, q, searchtitle, series, shortdesc, sli, sort-as, source, stentry, sub, sup, title, tt, typeofhazard, u, xref Base topic abstract, alt, author, b, bodydiv, brand, category, cite, component, consequence, coords, copyrholder, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, featnum, figgroup, fn, howtoavoid, i, index-base, index-see, index-see-also, index-sort-as, indexterm, itemgroup, keywords, li, line-through, lines, linkinfo, linktext, lq, navtitle, note, overline, p, ph, platform, pre, prodname, prognum, publisher, q, searchtitle, section, sectiondiv, series, shortdesc, sli, sort-as, source, stentry, sub, sup, title, tt, typeofhazard, u, xref -
    Content models for <ph><xref keyref="keywords" type="reference"><xmlelement>keywords</xmlelement><desc>keywords element reference topic</desc></xref></ph>In this document typekeywords containsBase map, Base topic(indexterm | keyword)*In this document typekeywords is contained byBase map +
    Content models for <ph><xref keyref="keywords" type="reference"><xmlelement>keywords</xmlelement><desc>keywords element reference topic</desc></xref></ph>In this document typekeywords containsBase map, Base topic(indexterm | keyword)*In this document typekeywords is contained byBase map metadata, topicmeta Base topic metadata diff --git a/specification/contentmodels/cmbasel.dita b/specification/contentmodels/cmbasel.dita index 0c8aeeef..df2f4aaf 100644 --- a/specification/contentmodels/cmbasel.dita +++ b/specification/contentmodels/cmbasel.dita @@ -1,35 +1,35 @@ -L elementsContent models for elements beginning with "l".
    Content models for <ph><xref keyref="li" type="reference"><xmlelement>li</xmlelement><desc>li element reference topic</desc></xref></ph>In this document typeli containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | lq | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | itemgroup | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typeli is contained byBase map, Base topic +L elementsContent models for elements beginning with "l".
    Content models for <ph><xref keyref="li" type="reference"><xmlelement>li</xmlelement><desc>li element reference topic</desc></xref></ph>In this document typeli containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | itemgroup | keyword | line-through | lines | lq | note | object | ol | overline | p | ph | pre | q | required-cleanup | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typeli is contained byBase map, Base topic ol, ul -
    Content models for <ph><xref keyref="line-through" type="reference"><xmlelement>line-through</xmlelement><desc>line-through element reference topic</desc></xref></ph>In this document typeline-through containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typeline-through is contained byBase map +
    Content models for <ph><xref keyref="line-through" type="reference"><xmlelement>line-through</xmlelement><desc>line-through element reference topic</desc></xref></ph>In this document typeline-through containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | foreign | i | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown | xref)*In this document typeline-through is contained byBase map alt, b, cite, consequence, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, figgroup, fn, howtoavoid, i, index-see, index-see-also, indexterm, itemgroup, li, line-through, lines, linktext, lq, navtitle, note, overline, p, ph, pre, q, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref Base topic abstract, alt, b, bodydiv, cite, consequence, data, dd, ddhd, desc, div, draft-comment, dt, dthd, entry, example, figgroup, fn, howtoavoid, i, index-see, index-see-also, indexterm, itemgroup, li, line-through, lines, linkinfo, linktext, lq, navtitle, note, overline, p, ph, pre, q, searchtitle, section, sectiondiv, shortdesc, sli, source, stentry, sub, sup, title, tt, typeofhazard, u, xref -
    Content models for <ph><xref keyref="lines" type="reference"><xmlelement>lines</xmlelement><desc>lines element reference topic</desc></xref></ph>In this document typelines containsBase map, Base topic(text data | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typelines is contained byBase map +
    Content models for <ph><xref keyref="lines" type="reference"><xmlelement>lines</xmlelement><desc>lines element reference topic</desc></xref></ph>In this document typelines containsBase map, Base topic(text data | b | boolean | cite | data | data-about | draft-comment | fn | foreign | i | indexterm | indextermref | keyword | line-through | overline | ph | q | required-cleanup | sort-as | state | sub | sup | term | text | tm | tt | u | unknown | xref)*In this document typelines is contained byBase map dd, desc, div, draft-comment, entry, fig, figgroup, fn, itemgroup, li, lq, note, p, stentry Base topic abstract, body, bodydiv, dd, desc, div, draft-comment, entry, example, fig, figgroup, fn, itemgroup, li, linkinfo, lq, note, p, section, sectiondiv, stentry -
    Content models for <ph><xref keyref="linkinfo" type="reference"><xmlelement>linkinfo</xmlelement><desc>linkinfo element reference topic</desc></xref></ph>In this document typelinkinfo containsBase topic(text data | dl | div | image | lines | lq | note | hazardstatement | ol | p | pre | sl | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | draft-comment | foreign | unknown | required-cleanup)*In this document typelinkinfo is contained byBase topic +
    Content models for <ph><xref keyref="linkinfo" type="reference"><xmlelement>linkinfo</xmlelement><desc>linkinfo element reference topic</desc></xref></ph>In this document typelinkinfo containsBase topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | foreign | hazardstatement | i | image | keyword | line-through | lines | lq | note | ol | overline | p | ph | pre | q | required-cleanup | sl | sort-as | state | sub | sup | term | text | tm | tt | u | ul | unknown | xref)*In this document typelinkinfo is contained byBase topic linklist -
    Content models for <ph><xref keyref="linkpool" type="reference"><xmlelement>linkpool</xmlelement><desc>linkpool element reference topic</desc></xref></ph>In this document typelinkpool containsBase topic(linkpool | link)*In this document typelinkpool is contained byBase topic +
    Content models for <ph><xref keyref="linkpool" type="reference"><xmlelement>linkpool</xmlelement><desc>linkpool element reference topic</desc></xref></ph>In this document typelinkpool containsBase topic(link | linkpool)*In this document typelinkpool is contained byBase topic linkpool, related-links -
    Content models for <ph><xref keyref="linktext" type="reference"><xmlelement>linktext</xmlelement><desc>linktext element reference topic</desc></xref></ph>In this document typelinktext containsBase map, Base topic(text data | data | sort-as | data-about | foreign | unknown | keyword | term | text | ph | b | i | line-through | overline | sup | sub | tt | u)*In this document typelinktext is contained byBase map +
    Content models for <ph><xref keyref="linktext" type="reference"><xmlelement>linktext</xmlelement><desc>linktext element reference topic</desc></xref></ph>In this document typelinktext containsBase map, Base topic(text data | b | data | data-about | foreign | i | keyword | line-through | overline | ph | sort-as | sub | sup | term | text | tt | u | unknown)*In this document typelinktext is contained byBase map topicmeta Base topic link -
    Content models for <ph><xref keyref="longdescref" type="reference"><xmlelement>longdescref</xmlelement><desc>longdescref element reference topic</desc></xref></ph>In this document typelongdescref containsBase map, Base topicEMPTYIn this document typelongdescref is contained byBase map, Base topic +
    Content models for <ph><xref keyref="longdescref" type="reference"><xmlelement>longdescref</xmlelement><desc>longdescref element reference topic</desc></xref></ph>In this document typelongdescref containsBase map, Base topicEMPTYIn this document typelongdescref is contained byBase map, Base topic hazardsymbol, image, object -
    Content models for <ph><xref keyref="longquoteref" type="reference"><xmlelement>longquoteref</xmlelement><desc>longquoteref element reference topic</desc></xref></ph>In this document typelongquoteref containsBase map, Base topicEMPTYIn this document typelongquoteref is contained byBase map, Base topic +
    Content models for <ph><xref keyref="longquoteref" type="reference"><xmlelement>longquoteref</xmlelement><desc>longquoteref element reference topic</desc></xref></ph>In this document typelongquoteref containsBase map, Base topicEMPTYIn this document typelongquoteref is contained byBase map, Base topic lq -
    Content models for <ph><xref keyref="lq" type="reference"><xmlelement>lq</xmlelement><desc>lq element reference topic</desc></xref></ph>In this document typelq containsBase map, Base topic(text data | dl | div | fig | imagemap | image | lines | note | hazardstatement | object | ol | p | pre | simpletable | sl | table | ul | boolean | cite | keyword | ph | b | i | line-through | overline | sup | sub | tt | u | q | term | text | tm | xref | state | data | sort-as | data-about | foreign | unknown | longquoteref | draft-comment | fn | indextermref | indexterm | required-cleanup)*In this document typelq is contained byBase map +
    Content models for <ph><xref keyref="lq" type="reference"><xmlelement>lq</xmlelement><desc>lq element reference topic</desc></xref></ph>In this document typelq containsBase map, Base topic(text data | b | boolean | cite | data | data-about | div | dl | draft-comment | fig | fn | foreign | hazardstatement | i | image | imagemap | indexterm | indextermref | keyword | line-through | lines | longquoteref | note | object | ol | overline | p | ph | pre | q | required-cleanup | simpletable | sl | sort-as | state | sub | sup | table | term | text | tm | tt | u | ul | unknown | xref)*In this document typelq is contained byBase map dd, desc, div, draft-comment, entry, fig, figgroup, fn, itemgroup, li, note, p, stentry Base topic abstract, body, bodydiv, dd, desc, div, draft-comment, entry, example, fig, figgroup, fn, itemgroup, li, linkinfo, note, p, section, sectiondiv, stentry diff --git a/specification/contentmodels/cmbasem.dita b/specification/contentmodels/cmbasem.dita index aa1a9de2..a509e18e 100644 --- a/specification/contentmodels/cmbasem.dita +++ b/specification/contentmodels/cmbasem.dita @@ -1,18 +1,17 @@ -M elementsContent models for elements beginning with "m".
    Content models for <ph><xref keyref="map" type="reference"><xmlelement>map</xmlelement><desc>map element reference topic</desc></xref></ph>In this document typemap containsBase map - title?, topicmeta?, (anchor | data | sort-as | data-about | navref | reltable | topicref | anchorref | keydef | mapref | topicgroup | topichead | topicset | topicsetref | ditavalref)*In this document typemap is contained byBase map +M elementsContent models for elements beginning with "m".
    Content models for <ph><xref keyref="map" type="reference"><xmlelement>map</xmlelement><desc>map element reference topic</desc></xref></ph>In this document typemap containsBase map + title?, topicmeta?, (anchor | anchorref | data | data-about | ditavalref | keydef | mapref | navref | reltable | sort-as | topicgroup | topichead | topicref | topicset | topicsetref)*In this document typemap is contained byBase map foreign, required-cleanup, unknown -
    Content models for <ph><xref keyref="mapref" type="reference"><xmlelement>mapref</xmlelement><desc>mapref element reference topic</desc></xref></ph>In this document typemapref containsBase map - topicmeta?, (data | sort-as | data-about)*In this document typemapref is contained byBase map +
    Content models for <ph><xref keyref="mapref" type="reference"><xmlelement>mapref</xmlelement><desc>mapref element reference topic</desc></xref></ph>In this document typemapref containsBase map + topicmeta?, (data | data-about | sort-as)*In this document typemapref is contained byBase map anchorref, keydef, map, relcell, relcolspec, topicgroup, topichead, topicref, topicset, topicsetref -
    Content models for <ph><xref keyref="messagepanel" type="reference"><xmlelement>messagepanel</xmlelement><desc>messagepanel element reference topic</desc></xref></ph>In this document typemessagepanel containsBase map, Base topic(data | sort-as | data-about)*, typeofhazard, consequence*, howtoavoid+In this document typemessagepanel is contained byBase map, Base topic +
    Content models for <ph><xref keyref="messagepanel" type="reference"><xmlelement>messagepanel</xmlelement><desc>messagepanel element reference topic</desc></xref></ph>In this document typemessagepanel containsBase map, Base topic(data | data-about | sort-as)*, typeofhazard, consequence*, howtoavoid+In this document typemessagepanel is contained byBase map, Base topic hazardstatement -
    Content models for <ph><xref keyref="metadata" type="reference"><xmlelement>metadata</xmlelement><desc>metadata element reference topic</desc></xref></ph>In this document typemetadata containsBase map - audience*, category*, keywords, exportanchors - exportanchors*, prodinfo*, othermeta*, (data | sort-as | data-about | foreign | unknown)*Base topic - audience*, category*, keywords*, prodinfo*, othermeta*, (data | sort-as | data-about | foreign | unknown)*In this document typemetadata is contained byBase map +
    Content models for <ph><xref keyref="metadata" type="reference"><xmlelement>metadata</xmlelement><desc>metadata element reference topic</desc></xref></ph>In this document typemetadata containsBase map + audience*, category*, (exportanchors | keywords)*, prodinfo*, othermeta*, (data | data-about | foreign | sort-as | unknown)*Base topic + audience*, category*, keywords*, prodinfo*, othermeta*, (data | data-about | foreign | sort-as | unknown)*In this document typemetadata is contained byBase map topicmeta Base topic prolog diff --git a/specification/contentmodels/cmbasen.dita b/specification/contentmodels/cmbasen.dita index 74450385..1cc2e5b9 100644 --- a/specification/contentmodels/cmbasen.dita +++ b/specification/contentmodels/cmbasen.dita @@ -1,13 +1,13 @@ -N elementsContent models for elements beginning with "n".

The details of footnote processing and styling are implementation and/or stylesheet - dependent. For example, a tool that renders DITA as PDF might + dependent. For example, a tool that renders DITA as PDF might lack support for the callout attribute, or footnotes might be collected as endnotes for certain types of + >might be collected as endnotes for certain types of publications.

Inheritance

- @@ -56,7 +56,7 @@ topic/fn

following:The memory storage capacity of the computer is 2 GB<fn>A GB (gigabyte) is equal to 1000 million bytes</fn> with error correcting support.might produce output similar to the following: + >might produce output similar to the following:

The memory storage capacity of the computer is 2 GB1 with error correcting support.

......

@@ -68,7 +68,7 @@ topic/fn

follows:The memory storage capacity of the computer is 2 GB<fn callout="#">A GB (gigabyte) is equal to 1000 million bytes</fn> with error correcting support.That - DITA markup might produce output similar to the following: + DITA markup might produce output similar to the following:

The memory storage capacity of the computer is 2 GB# with error correcting support.

......

@@ -82,7 +82,7 @@ topic/fn

At my house, I have a dog<xref href="#topic/reuse-fn" type="fn"/>, a cat<xref href="#topic/reuse-fn" type="fn"/>, and a llama<xref href="#topic/reuse-fn" type="fn"/>.and - might produce output similar to the following: + might produce output similar to the following:

I like pets. At my house, I have a dog1, a cat1, and a llama1.

......

diff --git a/specification/langRef/base/foreign.dita b/specification/langRef/base/foreign.dita index 603e22cf..a6c2388c 100644 --- a/specification/langRef/base/foreign.dita +++ b/specification/langRef/base/foreign.dita @@ -6,10 +6,10 @@ <xmlelement>foreign</xmlelement> The foreign element allows the introduction of non-DITA content, for example, MathML, SVG, or Rich Text Format (RTF). The foreign - element or a specialization can contain more than one type of + element or a specialization can contain more than one type of non-DITA content or a mix of DITA and non-DITA content. Specialization of the foreign element generally is implemented as a domain, but architects - looking for more control over the content can implement foreign + looking for more control over the content can implement foreign vocabularies as structural specializations. @@ -32,10 +32,10 @@ be valid wherever the foreign specialization is valid.
  • If no desc, object, or image element is found within an instance of the - foreign element, the base processing foreign element, the base processing can emit a warning about the absence of processable content.
  • The base processing for object - might emit the content of foreign + might emit the content of foreign as a file at the location specified by the data attribute of the object element. The object element should have a data attribute or a foreign sub-element but not diff --git a/specification/langRef/base/hazardstatement.dita b/specification/langRef/base/hazardstatement.dita index 42864553..976de301 100644 --- a/specification/langRef/base/hazardstatement.dita +++ b/specification/langRef/base/hazardstatement.dita @@ -40,7 +40,7 @@ id="codeblock_E20D4F1784044B9986E2C0977F219A49" xml:space="preserve"><hazards </hazardstatement>

    Caution: Indicates a potentially hazardous situation which, if not - avoided, might result in minor or moderate injury. + avoided, might result in minor or moderate injury. <hazardstatement type="caution"> <messagepanel> <typeofhazard>Lifting Hazard.</typeofhazard> @@ -50,7 +50,7 @@ id="codeblock_E20D4F1784044B9986E2C0977F219A49" xml:space="preserve"><hazards <hazardsymbol href="heavy.png"/> </hazardstatement>

    Notice: Indicates a potential situation which, if not avoided, might result in property damage or in an undesirable + >might result in property damage or in an undesirable result or state. <hazardstatement type="notice"> <messagepanel> diff --git a/specification/langRef/base/image.dita b/specification/langRef/base/image.dita index acc20bce..5a0056f5 100644 --- a/specification/langRef/base/image.dita +++ b/specification/langRef/base/image.dita @@ -16,10 +16,10 @@

    The image element has an optional placement - attribute that indicates whether the included graphic or artwork is rendered inline (a button or icon) or on a separate line for a larger image. There also are attributes that indicate the size to which the included graphic or artwork - is scaled.

    + is scaled.

    An image element specifies an href attribute, a keyref attribute, or both. When both keyref and href are specified, the href is used as a fallback when the key reference cannot be diff --git a/specification/langRef/base/imagemap.dita b/specification/langRef/base/imagemap.dita index 0a7cb4af..b6ceeee4 100644 --- a/specification/langRef/base/imagemap.dita +++ b/specification/langRef/base/imagemap.dita @@ -68,8 +68,8 @@

    The areas defined correspond to this graphic image with the areas visible: - Diagram showing a graphic image annotated to show the + id="image_445FC20D011A400F8D51CD6C31A3E1F4" > + Diagram showing a graphic image annotated to show the areas of an imagemap. Each area is indicated with a bordered region on the image. To the right of the image there is a list correlating the areas of the imagemap to the targets of their respective links. diff --git a/specification/langRef/base/index-base.dita b/specification/langRef/base/index-base.dita index 7c6e15a6..b9d44a13 100644 --- a/specification/langRef/base/index-base.dita +++ b/specification/langRef/base/index-base.dita @@ -25,7 +25,7 @@ topic/index-base

    Example

    The index-see-also element is specialized from index-base; see for an example of how index-base - can be used with specialization.

     + can be used with specialization.

    Attributes

    The following attributes are available on this element: and

    This element gives an author the flexibility to sort an index entry in an index differently from how its text normally would be sorted. The common use for this is to disregard insignificant leading text, such as punctuation or words - like "the" or "a". For example, the author might want <data> to be sorted under the letter D rather than the left angle bracket (<). An - author might want to include such an + author might want to include such an entry under both the punctuation heading and the letter D, in which case there can be two index entry directives differentiated only by the sort order.

    @@ -63,8 +63,8 @@ level in which it occurs.

    It is an error if there is more than one index-sort-as child for a given indexterm. An implementationmight give an error message, and - might recover from this error + >might give an error message, and + might recover from this error condition by ignoring all but the last index-sort-as.

    diff --git a/specification/langRef/base/indexterm.dita b/specification/langRef/base/indexterm.dita index 0245e2ef..45090b51 100644 --- a/specification/langRef/base/indexterm.dita +++ b/specification/langRef/base/indexterm.dita @@ -33,14 +33,14 @@ within indexterm elements that do contain indexterm children are ignored.) In the case of this error condition, an implementation MAY give an error message, - and might recover by treating all such + and might recover by treating all such index-see elements as index-see-also elements.

    The index-see and index-see-also elements are domain specializations of the index-base element, and are discussed in detail with the indexing domain.

    The start and end attribute on indexterm can be used in cases where one wants to index an - extended discussion that might continue over a number of + extended discussion that might continue over a number of pages. The start of a range is indicated by an indexterm with a start attribute. The end of a range is indicated with an indexterm with an end attribute whose value @@ -52,13 +52,13 @@ ancestors; however, an implementation should be able to handle an end-of-range indexterm that is nested within one or more indexterm elements.

    The start and end attributes are defined as CDATA, although it is a best practice that the values should not + >although it is a best practice that the values should not contain any whitespace characters (such as a space or tab) or control characters. Matching of start and end attributes is done as a character-by-character comparison with all characters significant and no case folding occurring. The start and end attributes are ignored if they occur on an indexterm element that has child - indexterm elements.

    Index range indications can occur in the + indexterm elements.

    Index range indications can occur in the topicmeta of a topicref at the map level, in the prolog of a topic, or in the body of a topic, and are interpreted as follows (see for samples):

      @@ -83,7 +83,7 @@ by last-in-first-out. In other words, the ranges are interpreted as nested rather than overlapping with the highest-level container taking precedence over narrower contained ranges.

      As defined above, there is no such thing as an index range start that isn't terminated by either a matching end or some maximum scope. There can, however, be unmatched index range end - indications; these are ignored.

    + indications; these are ignored.

    Inheritance

    - topic/indexterm

    @@ -168,7 +168,7 @@ the range is specified for the tertiary index entry "pecorino":<in

    • -

    There are three locations that can declare a range - the body of a +

    There are three locations that can declare a range - the body of a topic, the prolog of a topic, and a map.

    • In the following example, the range begins at the start of the diff --git a/specification/langRef/base/keydef.dita b/specification/langRef/base/keydef.dita index 5d1c7127..2d89e890 100644 --- a/specification/langRef/base/keydef.dita +++ b/specification/langRef/base/keydef.dita @@ -26,7 +26,7 @@
      Inheritance

      + map/topicref mapgroup-d/keydef

      Example

      The following example defines keys that can be used to refer to the indicated topics. These keys - can be used within the map, from any topic in this map, or + can be used within the map, from any topic in this map, or in any context where this map is imported. Note that the processing-role attribute defaults to "resource-only", which ensures that specified topics will not be rendered in a print document or in a navigation TOC based on this definition in the map. In diff --git a/specification/langRef/base/keyword.dita b/specification/langRef/base/keyword.dita index 2208507e..f8480323 100644 --- a/specification/langRef/base/keyword.dita +++ b/specification/langRef/base/keyword.dita @@ -27,7 +27,7 @@ defining with inline paragraph definitions.

    • Use kwd to indicate programming keywords in syntax diagrams and syntax phrases.

    Specialized elements derived from keyword - might also have extended processing, such as different + might also have extended processing, such as different formatting or automatic indexing.

    All keyword or indexterm elements in the keywords metadata element are considered part of the topic's metadata and should be processed as appropriate for the given output medium.

    diff --git a/specification/langRef/base/keywords.dita b/specification/langRef/base/keywords.dita index c1ead2b4..ff427496 100644 --- a/specification/langRef/base/keywords.dita +++ b/specification/langRef/base/keywords.dita @@ -5,7 +5,7 @@ <xmlelement>keywords</xmlelement> The keywords element contains a list of terms from a controlled or uncontrolled subject vocabulary that applies to the topic or map. The keywords can be used by a search engine. The keywords are marked up using + >can be used by a search engine. The keywords are marked up using the indexterm and/or keyword elements. @@ -21,7 +21,7 @@ keywords element are considered part of the topic's metadata and should be reflected in the output as appropriate for the output medium.While the keyword element can be used inline, the keywords + >can be used inline, the keywords element is not an inline element. The keywords element only appears in the topicmeta or prolog, and is used to specify keywords that apply to the topic.

    diff --git a/specification/langRef/base/line-through.dita b/specification/langRef/base/line-through.dita index fec8c3e7..725f0cbc 100644 --- a/specification/langRef/base/line-through.dita +++ b/specification/langRef/base/line-through.dita @@ -3,7 +3,7 @@ <xmlelement>line-through</xmlelement> The line-through element indicates text that is rendered with a line struck through the content. This element is + >is rendered with a line struck through the content. This element is designed to enable authors to indicate a deletion or revision for rhetorical purpose; it is not intended to be used for indicating revisions. diff --git a/specification/langRef/base/link.dita b/specification/langRef/base/link.dita index 8a5701a5..746effd8 100644 --- a/specification/langRef/base/link.dita +++ b/specification/langRef/base/link.dita @@ -21,7 +21,7 @@ and linklist) allow authors to define groups with common attributes or to preserve the authored sequence of links on output. Links placed in a linkpool - might be rearranged or removed for display purposes (combined + might be rearranged or removed for display purposes (combined with other local or map-based links); links in a linklist should be displayed in the order they are defined. Refer to those elements for additional explanation. diff --git a/specification/langRef/base/longquoteref.dita b/specification/langRef/base/longquoteref.dita index 142a367b..cd01d348 100644 --- a/specification/langRef/base/longquoteref.dita +++ b/specification/langRef/base/longquoteref.dita @@ -14,7 +14,7 @@
    Rendering of this element is left up to DITA processors. Depending on the - presentation format, it might be appropriate to ignore the + presentation format, it might be appropriate to ignore the element, present it as a link, use it to turn the entire quote into a link, or do something else.
    diff --git a/specification/langRef/base/map.dita b/specification/langRef/base/map.dita index 4859ec5f..b756f80b 100644 --- a/specification/langRef/base/map.dita +++ b/specification/langRef/base/map.dita @@ -30,12 +30,12 @@ topics that are nested are the children. which means they are referenced in a definite sequence.
  • Family. Child topics can be labeled as having a family relationship, which means they all refer to each other.
    • -

    When rendering a map, processors might make use of these +

    When rendering a map, processors might make use of these relationships, such as to create a Table of Contents (TOC), aggregate topics into a PDF - document, or create links between topics in output.

    The title element can optionally be used + document, or create links between topics in output.

    The title element can optionally be used to provide a title for the map (the title element is preferred over the title attribute). In some scenarios the title is purely informational, - and is present as an aid to the author. In other scenarios it might be useful or even required. For example, if a map is converted to Eclipse Help, the Eclipse system will require a title for the resulting table of contents. In the bookmap specialization of map, the diff --git a/specification/langRef/base/navref.dita b/specification/langRef/base/navref.dita index de3311cf..5e98c5c3 100644 --- a/specification/langRef/base/navref.dita +++ b/specification/langRef/base/navref.dita @@ -16,7 +16,7 @@

    For example, if a map is converted to the Eclipse help system format, the DITA element <navref mapref="other.ditamap"/> - is converted to the Eclipse element <link + is converted to the Eclipse element <link toc="other.xml"/>. When Eclipse loads the referencing map, it will replace this link element with the contents of the file other.xml, provided that the file other.xml is available.

    Note that not all output formats support such linking. In order to include another map directly @@ -43,7 +43,7 @@ map/navref

    mapref
    Specifies the URI of the map file or non-DITA resource to be referenced. It might reference a DITA map or a resource that is + >might reference a DITA map or a resource that is appropriate for your output format (such as XML TOC file for Eclipse output).
    diff --git a/specification/langRef/base/navtitle.dita b/specification/langRef/base/navtitle.dita index 7f9d8103..d406ef63 100644 --- a/specification/langRef/base/navtitle.dita +++ b/specification/langRef/base/navtitle.dita @@ -5,7 +5,7 @@ <xmlelement>navtitle</xmlelement> The navigation title (navtitle) element is one of a set of alternate titles that can be included inside the titlealts element. - This navigation title might differ from the first level heading + This navigation title might differ from the first level heading that shows in the main browser window. Use navtitle when the actual title of the topic isn't appropriate for use in a table of contents, navigation pane, or online content (for example, because the actual title is too long). Beginning with DITA 1.2, the diff --git a/specification/langRef/base/object.dita b/specification/langRef/base/object.dita index 23d1d619..6d3995b8 100644 --- a/specification/langRef/base/object.dita +++ b/specification/langRef/base/object.dita @@ -139,7 +139,7 @@ flash/swflash.cab#version=6,0,0,0"
    archive
    Specifies a space-separated list of URIs indicating resources needed by the - object. These resources might include those + object. These resources might include those URIs specified by the classid and data attributes. Preloading these resources usually results in faster loadtimes for objects. The URIs in the list should be relative to the URI specified in @@ -259,8 +259,8 @@ flash/swflash.cab#version=6,0,0,0"
    usemap
    Indicates that a client-side image map is to be used. An image map specifies active geometric regions of an included object and assigns a link to each - region. When a link is selected, a document might be retrieved or a program might be retrieved or a program might run on the server.
    diff --git a/specification/langRef/base/overline.dita b/specification/langRef/base/overline.dita index 7d1f6a00..909af8df 100644 --- a/specification/langRef/base/overline.dita +++ b/specification/langRef/base/overline.dita @@ -3,7 +3,7 @@ <xmlelement>overline</xmlelement> The overline element indicates content that is rendered with a line above it. is rendered with a line above it. diff --git a/specification/langRef/base/param.dita b/specification/langRef/base/param.dita index 9603616a..3083332a 100644 --- a/specification/langRef/base/param.dita +++ b/specification/langRef/base/param.dita @@ -4,8 +4,8 @@ <xmlelement>param</xmlelement> The param (parameter) element specifies a set of values that might be required by an object at runtime. - Any number of param elements might + >might     be required by an object at runtime. + Any number of param elements might appear in the content of an object in any order, but must be placed at the start of the content of the enclosing object. This element is comparable to the XHMTL param element, and its attributes' semantics derive from their HTML diff --git a/specification/langRef/base/platform.dita b/specification/langRef/base/platform.dita index 6f9d7d0b..8f04e5ff 100644 --- a/specification/langRef/base/platform.dita +++ b/specification/langRef/base/platform.dita @@ -3,7 +3,7 @@ <xmlelement>platform</xmlelement>The platform metadata element contains a description of the operating system and/or hardware related to the product being described by the prodinfo element. The platform element - can be used to provide a more detailed definition of values + can be used to provide a more detailed definition of values used throughout the map or topic on the platform attribute.platformprolog elementsplatform
    Inheritance

    - topic/platform

    Example

    See .

    Attributes

    The following attributes are available on this element: prodinfo The prodinfo metadata element contains information about the product or products that are the subject matter of the current topic. The - prodinfo element also can be used to + prodinfo element also can be used to provide a more detailed definition of values used throughout the map or topic on the product attribute. diff --git a/specification/langRef/base/prolog.dita b/specification/langRef/base/prolog.dita index e0e15e61..7f17d9f0 100644 --- a/specification/langRef/base/prolog.dita +++ b/specification/langRef/base/prolog.dita @@ -7,7 +7,7 @@ whole (for example, author information or subject category) that is either entered by the author or maintained by a software application. Much of the metadata inside the prolog will not be displayed with the topic when the topic is - rendered, but it might be used by processes that generate search + rendered, but it might be used by processes that generate search indexes or customize navigation. prologprolog elementsprolog diff --git a/specification/langRef/base/related-links.dita b/specification/langRef/base/related-links.dita index 83451abe..e1366077 100644 --- a/specification/langRef/base/related-links.dita +++ b/specification/langRef/base/related-links.dita @@ -19,7 +19,7 @@

    1. Links within a linklist element appear in the order defined, while those outside of a linklist - might be sorted and displayed in a different order or + might be sorted and displayed in a different order or location (based upon their role, target, importance, or other qualifiers).
    2. PDF or print-oriented output typically ignores hierarchical links such as those with roles of ancestor, parent, child, descendant, next, previous, or sibling, although this diff --git a/specification/langRef/base/relcolspec.dita b/specification/langRef/base/relcolspec.dita index 2a92c2fd..0e95390b 100644 --- a/specification/langRef/base/relcolspec.dita +++ b/specification/langRef/base/relcolspec.dita @@ -5,7 +5,7 @@ <xmlelement>relcolspec</xmlelement> The relcolspec element is used to define a column in a - relationship table. The relcolspec element relcolspec element can be used to set default attribute values for the topicref elements in the column. @@ -60,7 +60,7 @@ from the navtitle or title element specified within the topic.
    3. If no title is specified and no topicref is present in the - relcolspec, a rendering tool relcolspec, a rendering tool might choose to generate a title for the links generated from that column.

    diff --git a/specification/langRef/base/reltable.dita b/specification/langRef/base/reltable.dita index d5c5eae9..e4ec42df 100644 --- a/specification/langRef/base/reltable.dita +++ b/specification/langRef/base/reltable.dita @@ -71,7 +71,7 @@ map/reltable

    </relcell> </relrow> </reltable> -</map>

    A DITA-aware tool might represent the +</map>

    A DITA-aware tool might represent the reltable element graphically:

    type="concept" @@ -116,7 +116,7 @@ links would be as follows:
    bathistory.dita
    batsonar.dita, batcaring.dita, batfeeding.dita
    -

    Although such tables can initially take some time to learn and +

    Although such tables can initially take some time to learn and manipulate, they are inherently an efficient way to manage these links. In particular, they increase the prospect for reuse among topics, because those topics do not contain context-specific links. A relationship table also makes it easy to see and manage patterns; diff --git a/specification/langRef/base/required-cleanup.dita b/specification/langRef/base/required-cleanup.dita index 85f85b1f..c451d5d1 100644 --- a/specification/langRef/base/required-cleanup.dita +++ b/specification/langRef/base/required-cleanup.dita @@ -15,7 +15,7 @@

    • Processors must strip this element from output by default. The content of required-cleanup is not considered to be verified data.
      • -
    • Processor options might be provided to allow a draft view of +
    • Processor options might be provided to allow a draft view of migrated content in context.
    diff --git a/specification/langRef/base/resourceid.dita b/specification/langRef/base/resourceid.dita index 5e49316e..417e7ace 100644 --- a/specification/langRef/base/resourceid.dita +++ b/specification/langRef/base/resourceid.dita @@ -17,7 +17,7 @@

    The appid and appname attributes are available to associate an ID with an application. Multiple appid values can be associated with a single appname value, and multiple appname values can be -associated with a single appid value. Because the values +associated with a single appid value. Because the values for the appid and appname attributes work in combination to specify a specific ID for a specific application, each combination of values for the appid and appname attributes should be unique within the context @@ -115,7 +115,7 @@ of a single root map.

    that exist in both a map and a topic. This attribute only is valid when used within a topicref element in a map. The allowable values are -dita-use-conref-target and the following:

    -
    +
    topic-and-map
    Use IDs from both the topic and map.
    diff --git a/specification/langRef/base/searchtitle.dita b/specification/langRef/base/searchtitle.dita index 1a5a6b1f..e975ac46 100644 --- a/specification/langRef/base/searchtitle.dita +++ b/specification/langRef/base/searchtitle.dita @@ -4,10 +4,10 @@ <xmlelement>searchtitle</xmlelement> The searchtitle element is used to specify a title that is displayed by search tools that locate the topic. This is most + >is displayed by search tools that locate the topic. This is most useful when the topic has a title that makes sense in the context of a single information set, - but might be too general in a list of search results; for - example, a topic title of "Markup example" might make sense as + but might be too general in a list of search results; for + example, a topic title of "Markup example" might make sense as part of a guide to DITA, but when found among thousands of unrelated topics, a search title of "DITA markup example" is more useful. @@ -22,7 +22,7 @@
    When a topic is rendered as XHTML, the contents of the searchtitle will typically appear in the XHTML's title element, which used in the result summary for many search engines. This element might not be supported for output formats that do not support + >might not be supported for output formats that do not support distinct search titles for topics.
    Inheritance

    "- diff --git a/specification/langRef/base/section.dita b/specification/langRef/base/section.dita index 5f2f1ccb..4bda24d7 100644 --- a/specification/langRef/base/section.dita +++ b/specification/langRef/base/section.dita @@ -9,7 +9,7 @@ topic. Multiple section elements within a single topic do not represent a hierarchy, but rather peer divisions of that topic. Sections cannot be nested. A section - can have an optional title. + can have an optional title. elementsbodysection diff --git a/specification/langRef/base/sectiondiv.dita b/specification/langRef/base/sectiondiv.dita index 9edc96fc..89bc02b6 100644 --- a/specification/langRef/base/sectiondiv.dita +++ b/specification/langRef/base/sectiondiv.dita @@ -8,8 +8,8 @@ a section. There is no additional meaning associated with the sectiondiv element. The sectiondiv element does not contain a title; the lowest level of titled content within a topic is the section - itself. If additional hierarchy is required, use nested topics - instead of the section. + itself. If additional hierarchy is required, use nested topics + instead of the section. elementsbodysectiondiv @@ -22,9 +22,9 @@

    The sectiondiv element nests itself, so it can be specialized to create structured information within sections. Another common use case for the sectiondiv element is to group a sequence of related elements for - reuse, so that another topic can reference the entire set + reuse, so that another topic can reference the entire set with a single conref attribute.

    -

    Because the +

    Because the sectiondiv element can only be used within section elements, use the div element to group content that might occur in both topic bodies and sections.

    diff --git a/specification/langRef/base/simpletable.dita b/specification/langRef/base/simpletable.dita index 7322ee2c..ab815127 100644 --- a/specification/langRef/base/simpletable.dita +++ b/specification/langRef/base/simpletable.dita @@ -9,7 +9,7 @@ such as phone directory listings or parts lists are good candidates for simpletable. Another good use of simpletable is for information that seems to beg for a three-part definition list; the keycol - attribute can be used to indicate which column represents the "key" + attribute can be used to indicate which column represents the "key" or term-like column of your structure. simpletabletable elementssimpletable diff --git a/specification/langRef/base/source.dita b/specification/langRef/base/source.dita index 0f54ae68..ce3c1f91 100644 --- a/specification/langRef/base/source.dita +++ b/specification/langRef/base/source.dita @@ -14,7 +14,7 @@ or in part.

    The source element contains a description of the resource. Alternatively, the href or keyref attributes can be used to reference a description of the resource. It is + >can be used to reference a description of the resource. It is implementation-dependent what it means when the element has both content and an attribute-based reference to another resource.

    This element is equivalent to the Source element in Dublin Core.

    diff --git a/specification/langRef/base/stentry.dita b/specification/langRef/base/stentry.dita index ef0b50bf..9c21d9cc 100644 --- a/specification/langRef/base/stentry.dita +++ b/specification/langRef/base/stentry.dita @@ -1,7 +1,7 @@ <xmlelement>stentry</xmlelement>The stentry element represents a single cell within a - simpletable element. You can place any + simpletable element. You can place any number of stentry cells in either an sthead element (for headings) or strow element (for rows of data).stentrytable elementsstentry
    Inheritance

    - topic/stentry

    Example

    See .

    Attributes diff --git a/specification/langRef/base/sub.dita b/specification/langRef/base/sub.dita index 27613c27..936bc420 100644 --- a/specification/langRef/base/sub.dita +++ b/specification/langRef/base/sub.dita @@ -6,7 +6,7 @@ <xmlelement>sub</xmlelement> The sub element indicates that text should appear with subscript highlighting, or placed lower in relationship to the surrounding text. Subscripted text is - often a smaller font than the surrounding text. Formatting might vary depending on your output process. diff --git a/specification/langRef/base/subjectHead.dita b/specification/langRef/base/subjectHead.dita index e44d114c..5fd721b8 100644 --- a/specification/langRef/base/subjectHead.dita +++ b/specification/langRef/base/subjectHead.dita @@ -5,7 +5,7 @@ <xmlelement>subjectHead</xmlelement> The subjectHead element provides a heading for a group of - subjects, for use if the scheme is displayed. For instance, a schememight be displayed to let a user select subjects as part of faceted browsing. The subjectHead element itself does not reference a file and cannot be referenced as a key, so it does not define any controlled values. @@ -20,7 +20,7 @@
    Inheritance

    - map/topicref subjectScheme/subjectHead

    -

    The all-inclusive edition also contains topics about the following:

      -
    • Each element defined in the techical content specializations
      • +
    • Each element defined in the technical content + specializations
    • Each element defined in the learning-and-training specializations
     diff --git a/specification/langRef/langRef-technicalContent.dita b/specification/langRef/langRef-technicalContent.dita index 01cfcc6c..3163bdb0 100644 --- a/specification/langRef/langRef-technicalContent.dita +++ b/specification/langRef/langRef-technicalContent.dita @@ -5,8 +5,8 @@ Language reference: Technical content edition -

    The technical content edition also contains topics for each element defined in the techical - content specializations.

    +

    The technical content edition also contains topics for each element defined in the technical content specializations.

     diff --git a/specification/langRef/learningTraining-elements.ditamap b/specification/langRef/learningTraining-elements.ditamap index d3dd1a4c..61a2517c 100644 --- a/specification/langRef/learningTraining-elements.ditamap +++ b/specification/langRef/learningTraining-elements.ditamap @@ -19,19 +19,19 @@ + navtitle="Learning and training map types" > + keys="learningGroupMap" /> + keys="learningObjectMap" /> + keys="learningObjectMapRef" /> + keys="learningGroupMapRef" /> diff --git a/specification/langRef/learningTraining/lcAreaCoords.dita b/specification/langRef/learningTraining/lcAreaCoords.dita index 08007835..d1d3ffef 100644 --- a/specification/langRef/learningTraining/lcAreaCoords.dita +++ b/specification/langRef/learningTraining/lcAreaCoords.dita @@ -35,7 +35,7 @@
    poly
    -
    x1, y1, x2, y2, ..., xN, yN. To close the polygon, ensure +
    x1, y1, x2, y2, ..., xN, yN. To close the polygon, ensure that the first x and y coordinate pair and the last are the same.

    diff --git a/specification/langRef/learningTraining/lcAreaCoords2.dita b/specification/langRef/learningTraining/lcAreaCoords2.dita index 98b770d1..5c9ac657 100644 --- a/specification/langRef/learningTraining/lcAreaCoords2.dita +++ b/specification/langRef/learningTraining/lcAreaCoords2.dita @@ -34,7 +34,7 @@
    poly
    -
    x1, y1, x2, y2, ..., xN, yN. To close the polygon, ensure +
    x1, y1, x2, y2, ..., xN, yN. To close the polygon, ensure that the first x and y coordinate pair and the last are the same.
    diff --git a/specification/langRef/learningTraining/lcConstraints.dita b/specification/langRef/learningTraining/lcConstraints.dita index b5df0771..71302f21 100644 --- a/specification/langRef/learningTraining/lcConstraints.dita +++ b/specification/langRef/learningTraining/lcConstraints.dita @@ -4,7 +4,7 @@ <xmlelement>lcConstraints</xmlelement> The lcConstraints describes the organizational or technical aspects that - can limit the organization's ability to + can limit the organization's ability to effectively use the instruction to meet its goals. diff --git a/specification/langRef/learningTraining/lcGoals.dita b/specification/langRef/learningTraining/lcGoals.dita index f6e99bf5..7a7e1bdc 100644 --- a/specification/langRef/learningTraining/lcGoals.dita +++ b/specification/langRef/learningTraining/lcGoals.dita @@ -4,7 +4,7 @@ <xmlelement>lcGoals</xmlelement> The lcGoals provides the outcomes desired by the organization to be addressed by the training effort. These goals - can require concurrent efforts outside of + can require concurrent efforts outside of training such as technology acquisition, reorganization, and so forth. diff --git a/specification/langRef/learningTraining/lcInteractionBase.dita b/specification/langRef/learningTraining/lcInteractionBase.dita index 5a841bc6..88de8fd0 100644 --- a/specification/langRef/learningTraining/lcInteractionBase.dita +++ b/specification/langRef/learningTraining/lcInteractionBase.dita @@ -26,7 +26,7 @@

    + topic/fig lcInteractionBase-d/lcInteractionBase

    -

    Use +

    Use lcInteractionBase only as a base for further specialization.
    Attributes Example -

    Use +

    Use lcInteractionBase2 only as a base for further specialization.
    Attributes diff --git a/specification/langRef/learningTraining/lcIntro.dita b/specification/langRef/learningTraining/lcIntro.dita index 7737d484..06230e5d 100644 --- a/specification/langRef/learningTraining/lcIntro.dita +++ b/specification/langRef/learningTraining/lcIntro.dita @@ -6,7 +6,7 @@ introduction and description of the content to be delivered, in cases where the shortdesc is not adequate to fully describe the content. It - can also include instructor notes. + can also include instructor notes. diff --git a/specification/langRef/learningTraining/lcOrgConstraints.dita b/specification/langRef/learningTraining/lcOrgConstraints.dita index c50c6892..6aabeffa 100644 --- a/specification/langRef/learningTraining/lcOrgConstraints.dita +++ b/specification/langRef/learningTraining/lcOrgConstraints.dita @@ -4,7 +4,7 @@ <xmlelement>lcOrgConstraints</xmlelement> The lcOrgConstraints provides organizational aspects that - can limit the organization's ability to + can limit the organization's ability to effectively use the instruction to meet its goals. diff --git a/specification/langRef/learningTraining/learning2-domain.ditamap b/specification/langRef/learningTraining/learning2-domain.ditamap deleted file mode 100644 index 51fa0c40..00000000 --- a/specification/langRef/learningTraining/learning2-domain.ditamap +++ /dev/null @@ -1,41 +0,0 @@ - - - - Learning2 domain - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/specification/langRef/learningTraining/learningContentComponentRef.dita b/specification/langRef/learningTraining/learningContentComponentRef.dita index ab068f40..c62d8021 100644 --- a/specification/langRef/learningTraining/learningContentComponentRef.dita +++ b/specification/langRef/learningTraining/learningContentComponentRef.dita @@ -17,9 +17,9 @@

    The learning and training architecture defines the child topics of learningObject as being atomic units of presentation. However, these topics - might include subordinate topics. The + might include subordinate topics. The learningContentComponentRef reference - can be used to refer to any topic type. + can be used to refer to any topic type. The presentation intent is that such topics are presented as integral parts of their parent topics. This intent is reflected in the default chunk attribute value of "to-content" for the elements diff --git a/specification/langRef/learningTraining/learningGroup.dita b/specification/langRef/learningTraining/learningGroup.dita index 0d1c2811..c7a2ad8d 100644 --- a/specification/langRef/learningTraining/learningGroup.dita +++ b/specification/langRef/learningTraining/learningGroup.dita @@ -17,11 +17,11 @@

    In addition to organizing learningObject elements, a learningGroup - can include topic references to + can include topic references to learningPlan, learningOverview. and learningSummary topics, and - can also include references to + can also include references to learningAssessment topics. A learningGroup can also contain other learningGroup elements, allowing you to organize diff --git a/specification/langRef/learningTraining/learningObjectMap.dita b/specification/langRef/learningTraining/learningObjectMap.dita index 9f9afae6..3248630b 100644 --- a/specification/langRef/learningTraining/learningObjectMap.dita +++ b/specification/langRef/learningTraining/learningObjectMap.dita @@ -1,14 +1,15 @@ - + <xmlelement>learningObjectMap</xmlelement> Use a learningObjectMap to create standalone aggregations of learningContent together with its supporting plan, overview, summary, - and assessments, according to the needs identified by the learning goals and objectives. The - learningObjectMap references one and only one - learningObject. Any topicref elements that - occur before the learningObject are intended to be resource-only - references such as key definitions. + and assessments, according to the needs identified by the learning goals and objectives. Use the learningObjectMap to reference + a single learningObject. Specializations of + topicref elements that occur before the + learningObject are intended to be resource-only references such as + key definitions. @@ -26,8 +27,9 @@ learningContent, together with its supporting files and assessments, into a single standalone map type.

    -
    - +
    Inheritance

    - map/map learningObjectMap/learningObjectMap

    @@ -52,8 +54,9 @@ </learningObject> </learningObjectMap> -
    Attributes
    +
    + Attributes + +
    diff --git a/specification/langRef/learningTraining/learningSummary.dita b/specification/langRef/learningTraining/learningSummary.dita index 2b320bf5..2bba526c 100644 --- a/specification/langRef/learningTraining/learningSummary.dita +++ b/specification/langRef/learningTraining/learningSummary.dita @@ -5,7 +5,7 @@ A Learning Summary topic recaps and provides context for the achievement or accomplishment of learning objectives, provides guidance to reinforce learning and long-term memory, and - can pose questions to enhance encoding and + can pose questions to enhance encoding and verification of the learning content. diff --git a/specification/langRef/quick-reference/all-elements-a-to-z.dita b/specification/langRef/quick-reference/all-elements-a-to-z.dita index a427d232..df09136f 100644 --- a/specification/langRef/quick-reference/all-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/all-elements-a-to-z.dita @@ -234,7 +234,7 @@ - + @@ -299,9 +299,9 @@ - + - + - + @@ -81,7 +81,7 @@ - + @@ -100,7 +100,7 @@ - Release-management domain elements + navtitle="Release-management domain elements" > + /> - + /> + + /> + /> + /> + /> + /> + /> + /> + /> diff --git a/specification/langRef/task-elements.ditamap b/specification/langRef/task-elements.ditamap index 4d311e2b..be5c24f0 100644 --- a/specification/langRef/task-elements.ditamap +++ b/specification/langRef/task-elements.ditamap @@ -29,11 +29,11 @@ + keys="steptroubleshooting" /> + keys="tasktroubleshooting" /> diff --git a/specification/langRef/technicalContent-elements.ditamap b/specification/langRef/technicalContent-elements.ditamap index 99344045..df80ffeb 100644 --- a/specification/langRef/technicalContent-elements.ditamap +++ b/specification/langRef/technicalContent-elements.ditamap @@ -3,200 +3,193 @@ "map.dtd"> Technical content elements - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/specification/langRef/technicalContent/abbreviated-form.dita b/specification/langRef/technicalContent/abbreviated-form.dita index 415e5e08..5f71fb89 100644 --- a/specification/langRef/technicalContent/abbreviated-form.dita +++ b/specification/langRef/technicalContent/abbreviated-form.dita @@ -24,20 +24,20 @@ Rendering the <xmlelement>abbreviated-form</xmlelement> element

    The abbreviated-form element is intended to reference a glossentry topic that contains both a term and an abbreviated - form of that term. The topic might also provide a surface + form of that term. The topic might also provide a surface form that differs from the original term. The full term or surface form is rendered in introductory contexts where the term might be + >is rendered in introductory contexts where the term might be unfamiliar to a reader or in other contexts where a precise term is appropriate. In other - contexts a processor substitutes the abbreviated form of the + contexts a processor substitutes the abbreviated form of the term. Note that the definition of an introductory context will differ for every deliverable format.

    -

    For instance, a process composing a book deliverable might +

    For instance, a process composing a book deliverable might emit the surface form of a term on the first reference to the glossentry topic within the book or for every reference within a copyright or a warranty-related warning. A process generating an online page might emit the surface form as a hover tooltip on every + >might emit the surface form as a hover tooltip on every instance of the term.

    -

    The following rules determine how to render an +

    The following rules determine how to render an abbreviated-form element. As described, the definition of "introductory context" will vary based on the rendered format and processor.

    1. If the referenced topic is not a glossentry topic (or a @@ -76,7 +76,7 @@
      Inheritance

      + topic/term abbrev-d/abbreviated-form

      -Example

      The term and acronym can be defined as follows, in a +Example

      The term and acronym can be defined as follows, in a glossentry topic. Note that the id attribute of the topic does not need to match the term or acronym.

      <glossentry id="abs-definition"> <glossterm>Anti-lock Braking System</glossterm> diff --git a/specification/langRef/technicalContent/backmatter.dita b/specification/langRef/technicalContent/backmatter.dita index 2563173a..4ed9399a 100644 --- a/specification/langRef/technicalContent/backmatter.dita +++ b/specification/langRef/technicalContent/backmatter.dita @@ -3,7 +3,7 @@ <xmlelement>backmatter</xmlelement> The backmatter element contains the material that follows the - main body of a document and any appendices. It might include items + main body of a document and any appendices. It might include items such as a colophon, legal notices, and various types of book lists such as a glossary or an index. diff --git a/specification/langRef/technicalContent/bibliolist.dita b/specification/langRef/technicalContent/bibliolist.dita index 9e8fe433..8f5b4eff 100644 --- a/specification/langRef/technicalContent/bibliolist.dita +++ b/specification/langRef/technicalContent/bibliolist.dita @@ -8,7 +8,7 @@ wants a bibliography, containing links to related books, articles, published papers, or other types of material, generated at the particular location. If no href attribute is specified on the bibliolist element, an external processor might generate a list of bibliographic entries at this + >might generate a list of bibliographic entries at this location. bibliolistBookmap elementsbibliolist diff --git a/specification/langRef/technicalContent/bookevent.dita b/specification/langRef/technicalContent/bookevent.dita index c130c3b1..bddcdfc9 100644 --- a/specification/langRef/technicalContent/bookevent.dita +++ b/specification/langRef/technicalContent/bookevent.dita @@ -8,7 +8,7 @@ current set of specific book event types does not meet your needs. If an element already exists to describe a specific type of event, such as reviewed, edited, or approved, use that element instead. + >use that element instead. bookmap elementsbookevent bookevent diff --git a/specification/langRef/technicalContent/booklist.dita b/specification/langRef/technicalContent/booklist.dita index df7906b9..3201abce 100644 --- a/specification/langRef/technicalContent/booklist.dita +++ b/specification/langRef/technicalContent/booklist.dita @@ -10,7 +10,7 @@ list of items to be generated at the particular location.-->For example, it could be used to reference a topic that contains a list of authors for the book. When a more specific element is already available, such as tablelist - for a list of tables, use that element instead. + for a list of tables, use that element instead. booklistBookmap elementsbooklist diff --git a/specification/langRef/technicalContent/bookmeta.dita b/specification/langRef/technicalContent/bookmeta.dita index 2099482a..4a713f1c 100644 --- a/specification/langRef/technicalContent/bookmeta.dita +++ b/specification/langRef/technicalContent/bookmeta.dita @@ -25,7 +25,7 @@ map/topicmeta bookmap/bookmeta

    includes the product name, and the version, release, and modification information.
  • The bookid element contains the book's form number and part number information. The maintainer element contains information about - the current maintainer of the book; it might reference + the current maintainer of the book; it might reference the authorinformation element to provide detailed information about an author that is also the current maintainer.
  • The bookrights element contains the book's copyright information.
    • diff --git a/specification/langRef/technicalContent/bookpartno.dita b/specification/langRef/technicalContent/bookpartno.dita index 2053e7df..b5eef927 100644 --- a/specification/langRef/technicalContent/bookpartno.dita +++ b/specification/langRef/technicalContent/bookpartno.dita @@ -4,7 +4,7 @@ <xmlelement>bookpartno</xmlelement> The bookpartno element contains the book's part number, such as - 99F1234. A publisher might use a number like this one to + 99F1234. A publisher might use a number like this one to identify a book for tracking purposes. bookmap elementsbookpartno diff --git a/specification/langRef/technicalContent/booktitlealt.dita b/specification/langRef/technicalContent/booktitlealt.dita index 89e3c52e..a2ebd2eb 100644 --- a/specification/langRef/technicalContent/booktitlealt.dita +++ b/specification/langRef/technicalContent/booktitlealt.dita @@ -4,7 +4,7 @@ <xmlelement>booktitlealt</xmlelement> The booktitlealt element contains the alternative title, - subtitle, or short title for a book. It can be specialized into a + subtitle, or short title for a book. It can be specialized into a specific element for those or other purposes. Bookmap elementsbooktitlealt diff --git a/specification/langRef/technicalContent/chdeschd.dita b/specification/langRef/technicalContent/chdeschd.dita index e8ef8d36..17e4ba16 100644 --- a/specification/langRef/technicalContent/chdeschd.dita +++ b/specification/langRef/technicalContent/chdeschd.dita @@ -4,7 +4,7 @@ <xmlelement>chdeschd</xmlelement> The chdeschd element provides a specific label for the list of - descriptions of options from which a user chooses in order to + descriptions of options from which a user chooses in order to accomplish a step. The default label for the list of options could be a localized translation of Description. diff --git a/specification/langRef/technicalContent/mathmlref.dita b/specification/langRef/technicalContent/mathmlref.dita index 4f8e8f06..44067571 100644 --- a/specification/langRef/technicalContent/mathmlref.dita +++ b/specification/langRef/technicalContent/mathmlref.dita @@ -26,9 +26,9 @@ of the containing mathml element.

    The reference can be direct, using the href attribute, or indirect, using - the keyref attribute. For indirect referencing, keyref attribute. For indirect referencing, specify only the key name. - Specify the ID of the mathml element + Specify the ID of the mathml element as part of the value for the href attribute on the key definition.

    For example, to refer to the math element with the id of "equation-02" within a larger document using a key reference, you @@ -69,7 +69,7 @@ markup:<?xml version="1.0" encoding="UTF-8"?> <mfrac> <mrow> <mi mathcolor="gray">sin</mi> - <mo rspace="verythinmathspace">⁡</mo> + <mo rspace="verythinmathspace"></mo> <mi>θ</mi> </mrow> <mi>π</mi> diff --git a/specification/langRef/technicalContent/nosafety.dita b/specification/langRef/technicalContent/nosafety.dita index 02f84e8e..87d7aa9e 100644 --- a/specification/langRef/technicalContent/nosafety.dita +++ b/specification/langRef/technicalContent/nosafety.dita @@ -4,7 +4,7 @@ <xmlelement>nosafety</xmlelement> The nosafety element specifies that there are no safety - conditions to be considered. + conditions to be considered. nosafety diff --git a/specification/langRef/technicalContent/propvalue.dita b/specification/langRef/technicalContent/propvalue.dita index 38bfec0c..827b0609 100644 --- a/specification/langRef/technicalContent/propvalue.dita +++ b/specification/langRef/technicalContent/propvalue.dita @@ -4,7 +4,7 @@ <xmlelement>propvalue</xmlelement> The propvalue element indicates one or more values for the - current property type. Values can be placed in separate + current property type. Values can be placed in separate property elements if they need separate descriptions. The proptype element need not be repeated. diff --git a/specification/langRef/technicalContent/refbodydiv.dita b/specification/langRef/technicalContent/refbodydiv.dita index dad094ae..ec1180fc 100644 --- a/specification/langRef/technicalContent/refbodydiv.dita +++ b/specification/langRef/technicalContent/refbodydiv.dita @@ -5,7 +5,7 @@ <xmlelement>refbodydiv</xmlelement> The refbodydiv element is similar to the bodydiv element in that it provides an informal container for content - that might be grouped within a reference. Reference topics place + that might be grouped within a reference. Reference topics place many restrictions on their content compared to generic topics; the refbodydiv element maintains these restrictions by only allowing elements that are already available within the body of a reference. There are no additional @@ -17,11 +17,11 @@ elementsrefbodydiv -

    The refbodydiv element can nest itself, which means that it can be specialized +
    The refbodydiv element can nest itself, which means that it can be specialized to create structured information within a specialized reference topic. Another common use case for the refbodydiv element is to group a sequence of related elements - for reuse, so that another topic can reference the entire set + for reuse, so that another topic can reference the entire set with a single conref attribute.
    diff --git a/specification/langRef/technicalContent/repsep.dita b/specification/langRef/technicalContent/repsep.dita index 26bc7a36..d64b0554 100644 --- a/specification/langRef/technicalContent/repsep.dita +++ b/specification/langRef/technicalContent/repsep.dita @@ -24,7 +24,7 @@ conref="apiname.dita#apiname/progdomainelement"/> topic/ph pr-d/repsep

    Example -

    In this example, the group can be repeated. When repeated, a comma +

    In this example, the group can be repeated. When repeated, a comma should be used between selections.

    <groupchoice> <repsep>,</repsep> diff --git a/specification/langRef/technicalContent/reqcontp.dita b/specification/langRef/technicalContent/reqcontp.dita index 8275b7ea..0b8b5550 100644 --- a/specification/langRef/technicalContent/reqcontp.dita +++ b/specification/langRef/technicalContent/reqcontp.dita @@ -4,7 +4,7 @@ <xmlelement>reqcontp</xmlelement> The reqcontp element specifies a technical publication that can - be used to fulfill a condition before performing a task. It might + be used to fulfill a condition before performing a task. It might also specify a publication that is required in order to fulfill the condition, such as a list of local regulations. diff --git a/specification/langRef/technicalContent/safecond.dita b/specification/langRef/technicalContent/safecond.dita index 76618a71..8ba370fc 100644 --- a/specification/langRef/technicalContent/safecond.dita +++ b/specification/langRef/technicalContent/safecond.dita @@ -4,7 +4,7 @@ <xmlelement>safecond</xmlelement> The safecond element specifies a safety condition that must be - considered prior to completing a task. It might also contain a + considered prior to completing a task. It might also contain a complete hazard statement. safecond diff --git a/specification/langRef/technicalContent/steps-informal.dita b/specification/langRef/technicalContent/steps-informal.dita index ea668a99..1a889ecb 100644 --- a/specification/langRef/technicalContent/steps-informal.dita +++ b/specification/langRef/technicalContent/steps-informal.dita @@ -8,8 +8,8 @@ requirement of the related steps and steps-unordered elements. For example, steps-informal - might contain a paragraph that describes more than one step - in a single sentence, or it might contain sentences that mix + might contain a paragraph that describes more than one step + in a single sentence, or it might contain sentences that mix steps together with information about the steps. steps-informal diff --git a/specification/langRef/technicalContent/steps-unordered.dita b/specification/langRef/technicalContent/steps-unordered.dita index 7810f458..f6f4bbdd 100644 --- a/specification/langRef/technicalContent/steps-unordered.dita +++ b/specification/langRef/technicalContent/steps-unordered.dita @@ -5,7 +5,7 @@ <xmlelement>steps-unordered</xmlelement> Like the steps element, the steps-unordered element provides the main content of a task topic, but - particularly for cases in which the order of steps might vary from + particularly for cases in which the order of steps might vary from one situation to another. At least one step element is required inside the steps-unordered element. @@ -13,7 +13,7 @@ -

    Steps with only a single step might be rendered as a paragraph +

    Steps with only a single step might be rendered as a paragraph rather than as a list. Two or more steps should typically be rendered as an unordered list. If all of the contained steps are simple (that is, have no more than a cmd element each) then the step list should default to compact. Otherwise it should be rendered as diff --git a/specification/langRef/technicalContent/steps.dita b/specification/langRef/technicalContent/steps.dita index b29498c6..20d9dcdf 100644 --- a/specification/langRef/technicalContent/steps.dita +++ b/specification/langRef/technicalContent/steps.dita @@ -14,7 +14,7 @@ element is required inside the steps element. -

    Steps with only a single step might be rendered as a paragraph +

    Steps with only a single step might be rendered as a paragraph rather than as a list. Two or more steps should typically be rendered as an ordered list. If all of the contained steps are simple (that is, have no more than a cmd element each) then the step list should default to compact. Otherwise it should be rendered as diff --git a/specification/langRef/technicalContent/steptroubleshooting.dita b/specification/langRef/technicalContent/steptroubleshooting.dita index 6e3bfd3c..b42be3da 100644 --- a/specification/langRef/technicalContent/steptroubleshooting.dita +++ b/specification/langRef/technicalContent/steptroubleshooting.dita @@ -18,7 +18,7 @@

    - Do not use <note type="trouble"> + Do not use <note type="trouble"> inside of steptroubleshooting because its meaning there would be ambiguous.
    diff --git a/specification/langRef/technicalContent/systemoutput.dita b/specification/langRef/technicalContent/systemoutput.dita index c8c8c08d..4847b1f4 100644 --- a/specification/langRef/technicalContent/systemoutput.dita +++ b/specification/langRef/technicalContent/systemoutput.dita @@ -2,7 +2,7 @@ PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd"> <xmlelement>systemoutput</xmlelement>The systemoutput element represents computer output or responses to a command or situation. A generalized element, it represents any kind of output from the - computer, so the author might want to choose more specific + computer, so the author might want to choose more specific markup, such as msgph for messages from the application. The system output element is part of the DITA software domain, a special set of DITA elements designed to document software tasks, concepts and reference information. diff --git a/specification/langRef/technicalContent/tablelist.dita b/specification/langRef/technicalContent/tablelist.dita index adfb30c8..5e8b3f98 100644 --- a/specification/langRef/technicalContent/tablelist.dita +++ b/specification/langRef/technicalContent/tablelist.dita @@ -6,7 +6,7 @@ The tablelist element references a topic that contains a list of tables within the book. It indicates to the processing software that the author wants a list of tables generated at the particular location. If no href attribute is specified on - the tablelist element, an external processor tablelist element, an external processor might generate a list of tables at this location. tablelistBookmap elementstablelist diff --git a/specification/langRef/technicalContent/taskbody.dita b/specification/langRef/technicalContent/taskbody.dita index e30bf3a4..ba61b980 100644 --- a/specification/langRef/technicalContent/taskbody.dita +++ b/specification/langRef/technicalContent/taskbody.dita @@ -31,7 +31,7 @@ document type shells that include the task module as-is, or that specialize the task element without specializing taskbody, will also need to include the strict taskbody constraint module in order to maintain the order and cardinality of prior DITA versions.

    Task specializations that specialize the taskbody element will not be - affected by the new model, although they can be updated + affected by the new model, although they can be updated as needed to take advantage of the new elements.

    diff --git a/specification/langRef/technicalContent/tasktroubleshooting.dita b/specification/langRef/technicalContent/tasktroubleshooting.dita index a6390edd..b78fd28c 100644 --- a/specification/langRef/technicalContent/tasktroubleshooting.dita +++ b/specification/langRef/technicalContent/tasktroubleshooting.dita @@ -20,7 +20,7 @@
    - Do not use <note type="trouble"> + Do not use <note type="trouble"> inside of tasktroubleshooting because its meaning there would be ambiguous.
    diff --git a/specification/langRef/technicalContent/toc.dita b/specification/langRef/technicalContent/toc.dita index 50fdfa09..5f77a7d1 100644 --- a/specification/langRef/technicalContent/toc.dita +++ b/specification/langRef/technicalContent/toc.dita @@ -6,9 +6,9 @@ The toc element indicates to the processing software that the author wants a table of contents generated at the particular location. If no href attribute is specified on the toc element, an - external processor might generate a table of contents at this + external processor might generate a table of contents at this location. If the href attribute references a topic or map, that topic or map - contains a manually created table of contents. + contains a manually created table of contents. tocBookmap elementstoc Table of contents (toc) diff --git a/specification/langRef/technicalContent/trademarklist.dita b/specification/langRef/technicalContent/trademarklist.dita index 72dc4920..ac1c1a7f 100644 --- a/specification/langRef/technicalContent/trademarklist.dita +++ b/specification/langRef/technicalContent/trademarklist.dita @@ -7,7 +7,7 @@ list of trademarks within the book. It indicates to the processing software that the author wants a list of trademarks generated at the particular location. If no href attribute is specified on the trademarklist element, an external processor might generate a list of trademarks at this location. + >might generate a list of trademarks at this location. trademarklistbookmap elementstrademarklist diff --git a/specification/langRef/technicalContent/troubleshooting.dita b/specification/langRef/technicalContent/troubleshooting.dita index 31560d3b..f367066a 100644 --- a/specification/langRef/technicalContent/troubleshooting.dita +++ b/specification/langRef/technicalContent/troubleshooting.dita @@ -4,10 +4,11 @@ <xmlelement>troubleshooting</xmlelement> The troubleshooting element is the top-level element for a - troubleshooting topic. Troubleshooting topics document corrective action such as troubleshooting - or alarm clearing. Troubleshooting topics begin with a description of a condition that the - reader might want to correct, followed by one or more cause-remedy pairs. Each cause-remedy pair - is a potential solution to the trouble described in the condition. + troubleshooting + topic. + Troubleshooting topics begin with a description of a condition that the reader might want to + correct, followed by one or more cause-remedy pairs. Each cause-remedy pair is a potential + solution to the trouble described in the condition. diff --git a/specification/langRef/troubleshooting-elements.ditamap b/specification/langRef/troubleshooting-elements.ditamap index 1c5f0e93..bb418c13 100644 --- a/specification/langRef/troubleshooting-elements.ditamap +++ b/specification/langRef/troubleshooting-elements.ditamap @@ -3,16 +3,16 @@ Troubleshooting elements + > - - + /> + + - - + /> + + + /> diff --git a/specification/langRef/xml-mention-domain-elements.ditamap b/specification/langRef/xml-mention-domain-elements.ditamap index 48320dff..8c309e08 100644 --- a/specification/langRef/xml-mention-domain-elements.ditamap +++ b/specification/langRef/xml-mention-domain-elements.ditamap @@ -2,21 +2,21 @@ XML-mention domain elements - + /> + keys="parameterentity" /> + /> + /> + /> + /> + /> diff --git a/specification/learningTraining-relationship-tables.ditamap b/specification/learningTraining-relationship-tables.ditamap deleted file mode 100644 index c6655863..00000000 --- a/specification/learningTraining-relationship-tables.ditamap +++ /dev/null @@ -1,53 +0,0 @@ - - - - Relationship tables for the DITA specification: learningTraining - - External resources - - - - - - - - - - - - - - "Recycling Knowledge with Learning Objects," by Ruth Clark. - - - - - "Thinking XML: Learning Objects Metadata," by Uche Obguji (IBM developerWorks, - 2003). - - - - - "DITA in Education," by Dan Schneider, EduTech Wiki. - - - - - "An XML-based information architecture for learning content," by John Hunt and - Robert Bernard (IBM developerWorks, 2005). - - - - - "Design patterns for information architecture with DITA map domains," by Erik - Hennum, Don Day, John Hunt, and Dave Schell (IBM developerWorks, 2004). - - - - - - diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index e4b08a34..33b8996d 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -11,8 +11,8 @@
    Since the distinction between block and inline elements is ultimately controlled by the container of the element and the processing associated with it, the same - element might be a block in one context and an inline element - in another. Specializing document types might vary this + element might be a block in one context and an inline element + in another. Specializing document types might vary this behavior according to the needs of the document type being created, and the distinctions given below are provided only as a guide to known behavior with the base DITA document types.
    @@ -43,14 +43,14 @@ for this?-->
  • The block/inline translation column indicates whether the element represents a complete translatable segment. For example, the element cmd is presented inline with other elements, but represents a complete translation segment.
    • -
  • Items marked as block*** are blocks on their own, but might appear in the middle of a segment. They should not break the flow of the +
  • Items marked as block*** are blocks on their own, but might appear in the middle of a segment. They should not break the flow of the current segment. These are considered "subflow" elements for translation. We recommend that, when possible, these elements should only be placed at sentence boundaries to aid in translation.This element is considered a "subflow" element for translation. If it is located in the middle of a translation segment, it should not be translated as part of that segment. For example, indexterm, fn, and draft-comment - might divide a sentence in two, but should be treated as + might divide a sentence in two, but should be treated as blocks, and should not interrupt the sentence.
  • For all elements, the translate attribute will override the suggested default translation setting. So, a translation setting of "yes" or "no" in the table below does @@ -64,7 +64,7 @@ for this?--> for generated text.
  • The keyword element (as well as specializations of keyword) is an inline, phrase-like element when it appears in - the body of a document. It can also appear in the + the body of a document. It can also appear in the keywords element in topicmeta (for maps) or in the prolog (for topic). When it appears in the keywords element, each keyword @@ -3051,9 +3051,9 @@ for this?-->
    xnal-d elements (XNAL domain) <i>(new in DITA 1.1)</i>

    The XNAL information is all metadata, so it generally does not need to be translated. - Exceptions might be needed when selections from this metadata - are used for display purposes. The standard behavior might - need to change based on local business rules. For example, in some cases it might be appropriate to translate the honorific, country, or + Exceptions might be needed when selections from this metadata + are used for display purposes. The standard behavior might + need to change based on local business rules. For example, in some cases it might be appropriate to translate the honorific, country, or organizationname elements.

    @@ -3843,9 +3843,9 @@ for this?--> change-historylist metadata NO - N/A (metadata) - N/A - no + N/A (metadata) + N/A + no diff --git a/specification/non-normative/interoperability-considerations.dita b/specification/non-normative/interoperability-considerations.dita index ba12d53a..d93f8596 100644 --- a/specification/non-normative/interoperability-considerations.dita +++ b/specification/non-normative/interoperability-considerations.dita @@ -5,7 +5,7 @@ The DITA specification does not require processors to perform filtering, content reference resolution, key space construction, and other processing related to base DITA semantics in any particular order. This means that different conforming DITA processors might produce different results for the same initial data set and + >might produce different results for the same initial data set and filtering conditions. DITA users and DITA implementers need to be aware of these potential differences in behavior when DITA content will be processed by different processors. diff --git a/specification/non-normative/migration-1.1-to-1.2.dita b/specification/non-normative/migration-1.1-to-1.2.dita index 436392b8..3894bae0 100644 --- a/specification/non-normative/migration-1.1-to-1.2.dita +++ b/specification/non-normative/migration-1.1-to-1.2.dita @@ -91,7 +91,7 @@ DITA 1.2: update existing specialization modules to reflect these new patterns. However, specializations that want to enable the use of constraint modules must be updated to provide per-element-type content model and attribute list parameter entities.

    -

    Existing specializations might benefit from the new DITA 1.2 +

    Existing specializations might benefit from the new DITA 1.2 ability to have structural modules that depend on and specialize elements from domains.

    diff --git a/specification/non-normative/non-normative-information.ditamap b/specification/non-normative/non-normative-information.ditamap index 0d868b9b..100395d3 100644 --- a/specification/non-normative/non-normative-information.ditamap +++ b/specification/non-normative/non-normative-information.ditamap @@ -5,13 +5,13 @@ - + - + diff --git a/specification/non-normative/oasisdomains.dita b/specification/non-normative/oasisdomains.dita index cf2eecec..1984071c 100644 --- a/specification/non-normative/oasisdomains.dita +++ b/specification/non-normative/oasisdomains.dita @@ -8,10 +8,10 @@

    A designation of (map) after the domain name indicates that the domain only specializes map elements; a designation of (topic) indicates that the domain specializes elements that are only - available in topic or that it can only be used in topics. A + available in topic or that it can only be used in topics. A designation of (map/topic) indicates that the domain specializes elements that are common to both maps and topics, so could be used in either even if it is generally intended for one or the - other. Attribute domains can always be used in both topics and + other. Attribute domains can always be used in both topics and maps.

    diff --git a/specification/non-normative/speclimits.dita b/specification/non-normative/speclimits.dita index dacbc2ec..6597ee4d 100644 --- a/specification/non-normative/speclimits.dita +++ b/specification/non-normative/speclimits.dita @@ -61,7 +61,7 @@ purposes, document type shells can remove undesireable domains or use constraint modules to restrict content models. If content models are not relaxed enough, and markup requirements include content models that are less constrained than those defined by DITA, custom - document types might be the only option.

    + document types might be the only option.

    Customized document types do not conform to the DITA standard. Preprocessing can ensure compatibility with existing publishing processes, but it does not ensure compatibility with DITA-supporting authoring tools or content management systems. However, when an @@ -84,7 +84,7 @@ Specialization design considerations

    Requirements for new markup often appear to be incompatible with DITA architectural rules or existing markup, especially when mapping existing non-DITA markup practice to DITA, where - the existing markup might have used structures that cannot be + the existing markup might have used structures that cannot be directly expressed in DITA. For example, you might need markup for a specialized form of list where the details are not consistent with the base model for DITA lists.

    In this case you have two alternatives, one that conforms to DITA and one that does diff --git a/specification/resources/DITA1.3-spec-base.ditaval b/specification/resources-ditaval/DITA1.3-spec-base.ditaval similarity index 88% rename from specification/resources/DITA1.3-spec-base.ditaval rename to specification/resources-ditaval/DITA1.3-spec-base.ditaval index bb09d863..eee998ac 100644 --- a/specification/resources/DITA1.3-spec-base.ditaval +++ b/specification/resources-ditaval/DITA1.3-spec-base.ditaval @@ -22,6 +22,8 @@ - + + ► + ◄ + \ No newline at end of file diff --git a/specification/resources-ditaval/DITA1.3-spec-errata.ditaval b/specification/resources-ditaval/DITA1.3-spec-errata.ditaval new file mode 100644 index 00000000..7d3216de --- /dev/null +++ b/specification/resources-ditaval/DITA1.3-spec-errata.ditaval @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + ► + ◄ + + + diff --git a/specification/resources/DITA1.3-spec-learningTraining.ditaval b/specification/resources-ditaval/DITA1.3-spec-learningTraining.ditaval similarity index 88% rename from specification/resources/DITA1.3-spec-learningTraining.ditaval rename to specification/resources-ditaval/DITA1.3-spec-learningTraining.ditaval index 9846372a..c1384a97 100644 --- a/specification/resources/DITA1.3-spec-learningTraining.ditaval +++ b/specification/resources-ditaval/DITA1.3-spec-learningTraining.ditaval @@ -22,6 +22,8 @@ - + + ► + ◄ + \ No newline at end of file diff --git a/specification/resources/DITA1.3-spec-overview.ditaval b/specification/resources-ditaval/DITA1.3-spec-overview.ditaval similarity index 72% rename from specification/resources/DITA1.3-spec-overview.ditaval rename to specification/resources-ditaval/DITA1.3-spec-overview.ditaval index 87b674ef..b5700d62 100644 --- a/specification/resources/DITA1.3-spec-overview.ditaval +++ b/specification/resources-ditaval/DITA1.3-spec-overview.ditaval @@ -11,8 +11,11 @@ - - + + + ► + ◄ + + diff --git a/specification/resources/DITA1.3-spec-technicalContent.ditaval b/specification/resources-ditaval/DITA1.3-spec-technicalContent.ditaval similarity index 88% rename from specification/resources/DITA1.3-spec-technicalContent.ditaval rename to specification/resources-ditaval/DITA1.3-spec-technicalContent.ditaval index 326c80db..aaa18357 100644 --- a/specification/resources/DITA1.3-spec-technicalContent.ditaval +++ b/specification/resources-ditaval/DITA1.3-spec-technicalContent.ditaval @@ -22,6 +22,8 @@ - + + ► + ◄ + \ No newline at end of file diff --git a/specification/resources/DITA1.2-spec-footer-chm.html b/specification/resources/DITA1.2-spec-footer-chm.html deleted file mode 100644 index 5fb2af7e..00000000 --- a/specification/resources/DITA1.2-spec-footer-chm.html +++ /dev/null @@ -1,5 +0,0 @@ -

    -

    OASIS DITA Version 1.2 -- OASIS Standard, 1 December 2010
    -Copyright © OASIS Open 2005, 2010. All Rights Reserved. -

    -
    \ No newline at end of file diff --git a/specification/resources/DITA1.2-spec-footer.html b/specification/resources/DITA1.2-spec-footer.html deleted file mode 100644 index de9432bb..00000000 --- a/specification/resources/DITA1.2-spec-footer.html +++ /dev/null @@ -1,6 +0,0 @@ -

    -

    Return to LINK TBD.

    -

    OASIS DITA Version 1.3 -- OASIS Standard, date TBD
    -Copyright © OASIS Open 2005, 2014. All Rights Reserved. -

    -
    diff --git a/specification/resources/L-and-T-diagrams.pptx b/specification/resources/L-and-T-diagrams.pptx deleted file mode 100644 index 06b7d723..00000000 Binary files a/specification/resources/L-and-T-diagrams.pptx and /dev/null differ diff --git a/specification/resources/colour-palette.psd b/specification/resources/colour-palette.psd deleted file mode 100644 index 755cae8e..00000000 Binary files a/specification/resources/colour-palette.psd and /dev/null differ diff --git a/specification/resources/edition-diagrams.pptx b/specification/resources/edition-diagrams.pptx deleted file mode 100644 index 15b2d46c..00000000 Binary files a/specification/resources/edition-diagrams.pptx and /dev/null differ diff --git a/specification/resources/image-map-diagram.psd b/specification/resources/image-map-diagram.psd deleted file mode 100644 index 62abdd72..00000000 Binary files a/specification/resources/image-map-diagram.psd and /dev/null differ diff --git a/specification/resources/keyscope-diagrams.pptx b/specification/resources/keyscope-diagrams.pptx deleted file mode 100644 index 641448ae..00000000 Binary files a/specification/resources/keyscope-diagrams.pptx and /dev/null differ diff --git a/specification/resources/linking-screenshots.psd b/specification/resources/linking-screenshots.psd deleted file mode 100644 index 3cfcef22..00000000 Binary files a/specification/resources/linking-screenshots.psd and /dev/null differ diff --git a/specification/resources/oasis-cover-allInclusive.dita b/specification/resources/oasis-errata-cover-all-inclusive.dita similarity index 58% rename from specification/resources/oasis-cover-allInclusive.dita rename to specification/resources/oasis-errata-cover-all-inclusive.dita index 5342229f..aa591456 100644 --- a/specification/resources/oasis-cover-allInclusive.dita +++ b/specification/resources/oasis-errata-cover-all-inclusive.dita @@ -4,57 +4,64 @@ Specification URIs -
    +
    This version + (Authoritative + version) - (Authoritative version) - +
    -
    +
    Previous version + - - + (Authoritative version) - + +
    -
    +
    Latest version - - - (Authoritative version) - + (Authoritative version) +
    -
    -
    -
    -
    +
    +
    +
    +
    Additional artifacts -

    This prose specification is one component of a work product - that also includes:

    +

    This prose specification is one component of a work product that also includes:

      -
    • Darwin Information Typing Architecture (DITA) Part 0: Overview. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition. . Darwin Information Typing Architecture (DITA) Version 1.3 Errata 01. OASIS + Approved Errata.
      • +
    • Darwin Information Typing Architecture (DITA) Part 0: Overview Plus Errata + 01. OASIS Standard incorporating Approved Errata. .
      • +
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition Plus Errata + 01. OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition. Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition + Plus Errata 01. OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition (this - document). . Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition Plus + Errata 01 (this document). OASIS Standard incorporating Approved Errata. .
    • - -
      • +
      • @@ -67,18 +74,23 @@

    -
    -
    - -
    +
    +
    + Abstract +

    This document incorporates Errata for .

    +
    +
    + +
    Citation format

    When referencing this specification the following citation format should be used:

    -
    [DITA-v1.3-part3-all-inclusive]
    +
    [DITA-v1.3-part3-errata01]
    Darwin Information Typing Architecture (DITA) Version 1.3 Part 3: All-Inclusive - Edition. Edited by Robert D. Anderson and Kristen James Eberlein. . . . Edited by Robert D. Anderson and Kristen James + Eberlein. 25 October 2016. OASIS Standard incorporating Approved Errata. . Latest version: .
     diff --git a/specification/resources/oasis-cover-base.dita b/specification/resources/oasis-errata-cover-base.dita similarity index 60% rename from specification/resources/oasis-cover-base.dita rename to specification/resources/oasis-errata-cover-base.dita index 69142863..42634e9b 100644 --- a/specification/resources/oasis-cover-base.dita +++ b/specification/resources/oasis-errata-cover-base.dita @@ -4,7 +4,7 @@ Specification URIs -
    +
    This version (Authoritative @@ -12,46 +12,51 @@ -
    -
    +
    Previous version + - (Authoritative - version) + + (Authoritative version)
    -
    +
    Latest version - - (Authoritative version) - - + (Authoritative version) +
    -
    -
    -
    -
    +
    +
    +
    +
    Additional artifacts -

    This prose specification is one component of a work product - that also includes:

    +

    This prose specification is one component of a work product that also includes:

      -
    • Darwin Information Typing Architecture (DITA) Part 0: Overview. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition (this document). - . Darwin Information Typing Architecture (DITA) Version 1.3 Errata 01. OASIS + Approved Errata.
      • +
    • Darwin Information Typing Architecture (DITA) Part 0: Overview Plus Errata + 01. OASIS Standard incorporating Approved Errata. .
      • +
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition Plus Errata + 01. OASIS Standard incorporating Approved Errata (this document). .
      • -
    • Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition. Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition + Plus Errata 01. OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition. Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition Plus + Errata 01. OASIS Standard incorporating Approved Errata. .
    • @@ -68,20 +73,25 @@

    -
    -
    - -
    +
    +
    + Abstract +

    This document incorporates Errata for .

    +
    +
    + +
    Citation format

    When referencing this specification the following citation format should be used:

    -
    [DITA-v1.3-part1-base]
    -
    Darwin Information Typing Architecture (DITA) Version 1.3 Part 1: Base - Edition. Edited by Robert D. Anderson and Kristen James Eberlein. . . . Latest version: .
    +
    [DITA-v1.3-part1-errata01]
    +
    Darwin Information Typing Architecture (DITA) Part 1: Base Edition Plus Errata + 01. Edited by Robert D. Anderson and Kristen James Eberlein. 25 October 2016. + OASIS Standard incorporating Approved Errata. . Latest version: .
    diff --git a/specification/resources/oasis-cover.dita b/specification/resources/oasis-errata-cover-overview.dita similarity index 50% rename from specification/resources/oasis-cover.dita rename to specification/resources/oasis-errata-cover-overview.dita index 4b7158ca..9aa5fcc1 100644 --- a/specification/resources/oasis-cover.dita +++ b/specification/resources/oasis-errata-cover-overview.dita @@ -1,71 +1,89 @@ - + +"reference.dtd"> Specification URIs -
    +
    This version (Authoritative version) - + + +
    -
    +
    Previous version + - (Authoritative - version) - + + (Authoritative version) + + +
    -
    +
    Latest version - - (Authoritative version) - + (Authoritative version) + +
    -
    -
    -
    -
    +
    +
    +
    +
    Additional artifacts -

    This prose specification is one component of a work product that also includes:

    +

    This prose specification is one component of a work product that also includes:

      -
    • Darwin Information Typing Architecture (DITA) Part 0: Overview (this document). Darwin Information Typing Architecture (DITA) Version 1.3 Errata 01. OASIS + Approved Errata.
      • +
    • Darwin Information Typing Architecture (DITA) Part 0: Overview Plus Errata + 01 (this document). OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition. . Darwin Information Typing Architecture (DITA) Part 1: Base Edition Plus Errata + 01. OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition. Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition + Plus Errata 01. OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition. Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition Plus + Errata 01. OASIS Standard incorporating Approved Errata. .
    • -
      • + +

    -
    -
    - -
    +
    +
    + Abstract +

    This document incorporates Errata for .

    +
    +
    + +
    Citation format -

    When referencing this specification, the following citation format should be used:

    +

    When referencing this specification the following citation format should be used:

    -
    [DITA-v1.3-part0-overview]
    -
    Darwin Information Typing Architecture (DITA) Version 1.3 Part 0: - Overview. Edited by Robert D. Anderson and Kristen James Eberlein. . . . Latest version: .
    +
    [DITA-v1.3-part0-errata01]
    +
    Darwin Information Typing Architecture (DITA) Part 0: Overview Plus Errata + 01. Edited by Robert D. Anderson and Kristen James Eberlein. 25 October 2016. + OASIS Standard incorporating Approved Errata. . Latest version: .
    diff --git a/specification/resources/oasis-cover-technicalContent.dita b/specification/resources/oasis-errata-cover-tech-content.dita similarity index 57% rename from specification/resources/oasis-cover-technicalContent.dita rename to specification/resources/oasis-errata-cover-tech-content.dita index 35a6f489..a180c909 100644 --- a/specification/resources/oasis-cover-technicalContent.dita +++ b/specification/resources/oasis-errata-cover-tech-content.dita @@ -4,59 +4,68 @@ Specification URIs -
    +
    This version + (Authoritative + version) - (Authoritative version) - + -
    -
    +
    Previous version + (Authoritative version) - + + +
    -
    +
    Latest version - - (Authoritative version) - + (Authoritative version) + +
    -
    -
    -
    -
    +
    +
    +
    +
    Additional artifacts -

    This prose specification is one component of a work product - that also includes:

    +

    This prose specification is one component of a work product that also includes:

      -
    • Darwin Information Typing Architecture (DITA) Part 0: Overview. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition. . Darwin Information Typing Architecture (DITA) Version 1.3 Errata 01. OASIS + Approved Errata.
      • +
    • Darwin Information Typing Architecture (DITA) Part 0: Overview Plus Errata + 01. . OASIS + Standard incorporating Approved Errata.
      • +
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition Plus Errata + 01. OASIS Standard incorporating Approved Errata. .
      • -
    • Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition (this - document). . Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition + Plus Errata 01 (this document). OASIS Standard incorporating Approved Errata. + .
      • -
    • Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition. Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition Plus + Errata 01. OASIS Standard incorporating Approved Errata. .
    • - -
      • +
      • -
    • +
    • +
    • @@ -64,18 +73,23 @@

    -
    -
    - -
    +
    +
    + Abstract +

    This document incorporates Errata for .

    +
    +
    + +
    Citation format

    When referencing this specification the following citation format should be used:

    -
    [DITA-v1.3-part2-tech-content]
    +
    [DITA-v1.3-part2-errata01]
    Darwin Information Typing Architecture (DITA) Version 1.3 Part 2: Technical - Content Edition. Edited by Robert D. Anderson and Kristen James Eberlein. - . . . Edited by Robert D. Anderson and Kristen James + Eberlein. 25 October 2016. OASIS Standard incorporating Approved Errata. . Latest version: .
     diff --git a/specification/resources/oasis-errata-cover.dita b/specification/resources/oasis-errata-cover.dita new file mode 100644 index 00000000..d88799c3 --- /dev/null +++ b/specification/resources/oasis-errata-cover.dita @@ -0,0 +1,97 @@ + + + + Specification URIs + +
    + This version + + (Authoritative + version) + + + + +
    +
    + Previous version + + + + (Authoritative version) + + + + +
    +
    + Latest version + + (Authoritative version) + + + +
    +
    +
    +
    +
    + Additional artifacts +

    This prose specification is one component of a work product that also includes:

    +
      +
    • Darwin Information Typing Architecture (DITA) Version 1.3 Errata 01 (this + document). OASIS Approved Errata.
      • +
    • Darwin Information Typing Architecture (DITA) Version 1.3. Part 0: Overview Plus + Errata 01. OASIS Standard incorporating Approved Errata. .
      • +
    • Darwin Information Typing Architecture (DITA) Part 1: Base Edition Plus Errata + 01. OASIS Standard incorporating Approved Errata. .
      • +
    • Darwin Information Typing Architecture (DITA) Part 2: Technical Content Edition + Plus Errata 01. OASIS Standard incorporating Approved Errata. .
      • +
    • Darwin Information Typing Architecture (DITA) Part 3: All-Inclusive Edition Plus + Errata 01. OASIS Standard incorporating Approved Errata. .
      • +
    • ZIP file that contains the DITA source for this document: +
      • +
    +

    For more information about the editions and what they contain, see + Editions.

    +
    +
    +
    + Abstract +

    This document contains the Errata 01 for Darwin Information Typing + Architecture (DITA) Version 1.3.

    +
    +
    +
    + Citation format +

    When referencing this specification the following citation format should be used:

    +
    + +
    [DITA-v1.3-errata01]
    +
    Darwin Information Typing Architecture (DITA) Version 1.3 Errata 01. + Edited by Robert D. Anderson and Kristen James Eberlein. 25 October 2016. OASIS Approved + Errata. . Latest + version: .
    +     +
    +
    + + diff --git a/specification/resources/oasis-notices.dita b/specification/resources/oasis-notices.dita index c53d1d95..8b654197 100644 --- a/specification/resources/oasis-notices.dita +++ b/specification/resources/oasis-notices.dita @@ -4,8 +4,9 @@ Notices -

    Copyright © OASIS Open 2015. All Rights - Reserved.

    +
    +

    Copyright © OASIS Open 2016. + All Rights Reserved.

    All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full

    The name "OASIS" is a trademark of OASIS, the owner and developer of this + href="https://www.oasis-open.org/">OASIS, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and implementation and use of, specifications, while reserving the right to enforce its marks against misleading uses. Please see https://www.oasis-open.org/policies-guidelines/trademark for above guidance.

    + >https://www.oasis-open.org/policies-guidelines/trademark for above guidance.

    +
    diff --git a/specification/resources/oasis.css b/specification/resources/oasis.css deleted file mode 100644 index f780824d..00000000 --- a/specification/resources/oasis.css +++ /dev/null @@ -1,104 +0,0 @@ - -body { - background: #ffffff; - color: #000000; - margin: 14px; - font-size: 10pt; - font-family: Helvetica, Arial, sans-serif; -} - -h1.topictitle1 { - font-family: Arial, Helvetica, sans-serif; - font-size: 18pt; - font-weight: bold; - list-style-type: decimal; - color: #66116D; -} - -h2.sectiontitle { - font-family: Arial, Helvetica, sans-serif; - font-size: 14pt; - font-weight: bold; - list-style-type: decimal; - color: #66116D; -} - -pre.codeblock { - font-family: "Courier New", Courier, mono; - font-size: 9pt; - /*background-color: #9999FF;*/ - background-color: #eeeeff; - margin-left: 10%; - margin-right: 10%; - border-top-style: solid; - border-width: 1px; - border-right-style: none; - border-bottom-style: solid; - border-left-style: none; - border-top-color: #000000; - border-right-color: #000000; - border-bottom-color: #000000; - border-left-color: #000000; - white-space: pre; -} - -span.keyword { - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; - font-style: italic; -} - - -div.note { - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; - margin-left: 50px; - margin-right: 50px; -} - -ul.linkpreviews { - background-color: #FFFCCC; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - list-style-type: none -} - -ul.ullinks { - background-color: #FFFCCC; - border-top-style: solid; - border-right-style: solid; - border-bottom-style: solid; - border-left-style: solid; - list-style-type: none -} - -dt.oasis-style-reference { - font-weight: bold; - color: #66116D; -} - -thead { -background-color: #CC99FF; -} - -th { -background-color: #CC99FF; -} - -.RFC-2119 { - font-weight: bold; - font-style: normal; -} - -.title > .parameterentity, -.title > .xmlatt, -.title > .xmlelement, -.title > .xmlpi { - font-family: inherit; - font-weight: inherit; - font-style: inherit; -} - - diff --git a/specification/resources/release-mgmt-diagram.pptx b/specification/resources/release-mgmt-diagram.pptx deleted file mode 100644 index f7d33489..00000000 Binary files a/specification/resources/release-mgmt-diagram.pptx and /dev/null differ diff --git a/specification/resources/spec-release-progress.pptx b/specification/resources/spec-release-progress.pptx deleted file mode 100644 index 056052a9..00000000 Binary files a/specification/resources/spec-release-progress.pptx and /dev/null differ diff --git a/specification/resources/topic-arch-diagram.pptx b/specification/resources/topic-arch-diagram.pptx deleted file mode 100644 index 5a027324..00000000 Binary files a/specification/resources/topic-arch-diagram.pptx and /dev/null differ