From 1e80e36db4ad8cb7852173fbef6862cc3b64ecf6 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:00:06 -0500 Subject: [PATCH 01/15] Update basic-concepts.dita From 8e7839099c81d9204f46c1f3bf69bd148573943e Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:01:03 -0500 Subject: [PATCH 02/15] Update definition-of-ditamaps.dita --- specification/archSpec/base/definition-of-ditamaps.dita | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/archSpec/base/definition-of-ditamaps.dita b/specification/archSpec/base/definition-of-ditamaps.dita index 8520af87..9e6ba853 100644 --- a/specification/archSpec/base/definition-of-ditamaps.dita +++ b/specification/archSpec/base/definition-of-ditamaps.dita @@ -66,4 +66,3 @@ they can be used and reused in multiple different contexts.

are resolved.

- From a48ba59a9e1034dfc301044e225680b305ff50a5 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:02:08 -0500 Subject: [PATCH 03/15] Update ditamap-attributes.dita --- specification/archSpec/base/ditamap-attributes.dita | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/archSpec/base/ditamap-attributes.dita b/specification/archSpec/base/ditamap-attributes.dita index 61da75b0..d6d7367e 100644 --- a/specification/archSpec/base/ditamap-attributes.dita +++ b/specification/archSpec/base/ditamap-attributes.dita @@ -61,8 +61,9 @@
-

For more information, see .

+

For more information, see .

@@ -237,4 +238,4 @@ incorporated into both map and topic structural types.

- + From c82e112615cdb3eb38f1f1eff0fa31efa3663254 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:02:44 -0500 Subject: [PATCH 04/15] Update introduction-to-dita.dita From 235a7fb046f905a59907339db7b14124e0b961f3 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:03:22 -0500 Subject: [PATCH 05/15] Update maps.ditamap --- specification/archSpec/base/maps.ditamap | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/archSpec/base/maps.ditamap b/specification/archSpec/base/maps.ditamap index 3b375e13..9f3c994b 100644 --- a/specification/archSpec/base/maps.ditamap +++ b/specification/archSpec/base/maps.ditamap @@ -6,5 +6,11 @@ + + + + + + From a56ef2fd5273df10e66a65bf5e38d60088f2553f Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:03:59 -0500 Subject: [PATCH 06/15] Update single-sourcing.dita --- specification/archSpec/base/single-sourcing.dita | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/archSpec/base/single-sourcing.dita b/specification/archSpec/base/single-sourcing.dita index f44a48f6..e7fcb59b 100644 --- a/specification/archSpec/base/single-sourcing.dita +++ b/specification/archSpec/base/single-sourcing.dita @@ -70,4 +70,3 @@ renderings.

- From f74c227a7f21c776d47764517fe0ab40b7833085 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:04:32 -0500 Subject: [PATCH 07/15] Update topicbenefits.dita From 0e6486c8794beebffa101e147deea14b717df977 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:05:20 -0500 Subject: [PATCH 08/15] Update topiccontent.dita From 65ba1400a1a006ce50b36cdd1ae15e5ff6b59f34 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:05:49 -0500 Subject: [PATCH 09/15] Update topicdefined.dita From 907c3bf48f35838a1a6a9c95eb7e01112c626090 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:06:17 -0500 Subject: [PATCH 10/15] Update topics.ditamap --- specification/archSpec/base/topics.ditamap | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/archSpec/base/topics.ditamap b/specification/archSpec/base/topics.ditamap index c1f75bb9..f81f28fe 100644 --- a/specification/archSpec/base/topics.ditamap +++ b/specification/archSpec/base/topics.ditamap @@ -7,6 +7,7 @@ + From 9e3cc99c11b1f91609391db086a099b24d803f9b Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:07:02 -0500 Subject: [PATCH 11/15] Update topicstructure.dita From 0f0d1fe9b1bbd5c3e1bdf19fdb19986274838f32 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:07:42 -0500 Subject: [PATCH 12/15] Update ditamap-processing.ditamap --- specification/archSpec/base/ditamap-processing.ditamap | 5 ----- 1 file changed, 5 deletions(-) diff --git a/specification/archSpec/base/ditamap-processing.ditamap b/specification/archSpec/base/ditamap-processing.ditamap index 3d00deaf..b28e0ab2 100644 --- a/specification/archSpec/base/ditamap-processing.ditamap +++ b/specification/archSpec/base/ditamap-processing.ditamap @@ -7,11 +7,6 @@ - - - - - From 446cbd72c53f31a43e97adfccef26f19546a3201 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:08:44 -0500 Subject: [PATCH 13/15] Add files via upload --- .../example-how-cascade-att-functions.dita | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 specification/archSpec/base/example-how-cascade-att-functions.dita diff --git a/specification/archSpec/base/example-how-cascade-att-functions.dita b/specification/archSpec/base/example-how-cascade-att-functions.dita new file mode 100644 index 00000000..a862dbbe --- /dev/null +++ b/specification/archSpec/base/example-how-cascade-att-functions.dita @@ -0,0 +1,33 @@ + + + + Example: How the <xmlatt>cascade</xmlatt> attribute functions + The following example illustrates how the cascade attribute can be used + to fine tune how the values for the platform attribute apply to topics referenced + in a DITA map. + +

Here a DITA map contains a collection of topics that apply to Windows, Linux, and Macintosh OS; + it also contains a topic that is only applicable to users running the application on Linux.

+ <map product="PuffinTracker" platform="win linux mac" cascade="nomerge"> + <title>Puffin Tracking Software</title> + <topicref href="introduction.dita"/> + <topicref href="setting-up-the-product.dita"/> + <topicref href="linux-instructions.dita" platform="linux"/> +</map> +

The values of the platform attribute set at the map level cascade throughout + the map and apply to the introduction.dita and + setting-up-the-product.dita topics. However, since the value of the + cascade attribute is set to nomerge, the value of the + platform attribute for the linux-instructions.dita topic + does not merge with the values that cascade from above in the DITA map. The effective value of + the platform attribute for linux-instructions.dita is + linux.

+

The same results are produced by the following mark-up:

+ <map product="PuffinTracker" platform="win linux mac"> + <title>Puffin Tracking Software</title> + <topicref href="introduction.dita"/> + <topicref href="setting-up-the-product.dita"/> + <topicref href="linux-instructions.dita" platform="linux" cascade="nomerge"/> +</map> + + From 164a4069263f2439bb57bbf15df83a77a08296d8 Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:09:20 -0500 Subject: [PATCH 14/15] Add files via upload --- .../archSpec/base/generictopics.dita | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 specification/archSpec/base/generictopics.dita diff --git a/specification/archSpec/base/generictopics.dita b/specification/archSpec/base/generictopics.dita new file mode 100644 index 00000000..b6e751d6 --- /dev/null +++ b/specification/archSpec/base/generictopics.dita @@ -0,0 +1,24 @@ + + + + Generic topics + The element type topic is the base topic type from which all + other topic types are specialized. All topics have the same basic structure. + + + + topicsgeneric topic type + + + + +

For authors, typed content is preferred to support consistency in writing and presentation to + readers. The generic topic type is best used only if authors are not trained in information + typing or when a specialized topic type is inappropriate. The OASIS DITA standard provides + several specialized topic types, including concept, task, and reference that are critical for + technical content development.

+

For those pursuing specialization, specialize new topic types from appropriate ancestors to + meet authoring and output requirements.

+ + From 181792c6ecb76ff2865689af12d2d27adcc446cf Mon Sep 17 00:00:00 2001 From: Christina Rothwell Date: Tue, 5 Dec 2023 13:30:36 -0500 Subject: [PATCH 15/15] Update conref-file.dita --- specification/common/conref-file.dita | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/specification/common/conref-file.dita b/specification/common/conref-file.dita index 73d8c5f1..19a35e46 100644 --- a/specification/common/conref-file.dita +++ b/specification/common/conref-file.dita @@ -282,13 +282,14 @@ to alert more birds to the presence of your bird feeder.</shortdesc> The attribute can also include groups of values specified using the same syntax as generalized attributes within props; see for details on grouping syntax. The date is specified using the ISO 8601 format: YYYY-MM-DD, where YYYY is the year, MM is the month (01 to 12), and DD is the day (01-31). -
Reused error conditionsWhen located within the indexterm - element, the sort-as element is equivalent to - index-sort-as. It is an error for an - indexterm element to directly contain both - sort-as and index-sort-as - elements.
+
Reused error conditionsWhen located + within the indexterm element, the + sort-as element is equivalent to + index-sort-as. It is an error for + an indexterm element to directly contain + both sort-as and + index-sort-as + elements.
Constraints material