Skip to content

Commit 0d9cea8

Browse files
author
“Emily
committed
tempate-update resolved merge conflicts
1 parent 1848b01 commit 0d9cea8

File tree

4 files changed

+87
-85
lines changed

4 files changed

+87
-85
lines changed

modular-docs-manual/files/TEMPLATE_ASSEMBLY_a-collection-of-modules.adoc

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,24 @@ See also the complementary step on the last line of this file.
66

77
ifdef::context[:parent-context: {context}]
88

9+
10+
////
11+
Indicate the content type:
12+
////
13+
:_mod-docs-content-type: ASSEMBLY
14+
915
////
1016
Base the file name and the ID on the assembly title. For example:
1117
* file name: assembly-my-user-story.adoc
1218
* ID: [id="assembly-my-user-story_{context}"]
1319
* Title: = My user story
14-
////
15-
16-
////
17-
Indicate the content type in one of the following
18-
ways:
19-
Add the prefix assembly- or assembly_ to the file name.
20-
Add the following attribute before the module ID:
21-
:_mod-docs-content-type: ASSEMBLY
22-
////
2320

24-
////
2521
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken. Include {context} in the ID so the assembly can be reused.
2622
////
2723
2824
[id="assembly-my-user-story_{context}"]
2925
= My user story
26+
3027
////
3128
Be sure to include a line break between the title and the :context: variable and the :context: variable and the assembly introduction.
3229

@@ -62,25 +59,26 @@ include::modules/TEMPLATE_CONCEPT_explaining_a_concept.adoc[leveloffset=+1]
6259
include::modules/TEMPLATE_PROCEDURE_doing_one_procedure.adoc[leveloffset=+2]
6360
// Add a blank line after each 'include::' statement.
6461
65-
include::modules/TEMPLATE_PROCEDURE_reference-material.adoc[leveloffset=2]
62+
include::modules/TEMPLATE_PROCEDURE_reference-material.adoc[leveloffset=+2]
6663
67-
[role="_additional-resources"]
6864
== Next steps
6965
7066
* This section is optional.
71-
* Provide a bulleted list of links that contain instructions that might be useful to the user after they complete this procedure.
72-
* Use an unnumbered bullet (*) if the list includes only one step.
67+
* Provide information about the next steps the user might want to take. T
68+
* This section can include text and links.
7369
7470
// If the last module included in your assembly contains an Additional resources section as well, check the appearance of the rendered assembly. If the two Additional resources sections might be confusing for a reader, consider consolidating their content and removing one of them.
71+
7572
[role="_additional-resources"]
7673
== Additional resources
77-
78-
* This section is optional.
79-
* Provide a bulleted list of links to other closely-related material. These links can include `link:` and `xref:` macros.
80-
* Use an unnumbered bullet (*) if the list includes only one step.
81-
8274
////
83-
Restore the context to what it was before this assembly.
75+
Optional. Delete if not used.
76+
Provide a bulleted list of links and display text relevant to the assembly. These links can include `link:` and `xref:` macros. Do not include additional text.
8477
////
78+
* link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide]
79+
* xref:some-module_{context}[]
80+
81+
// Restore the context to what it was before this assembly.
82+
8583
ifdef::parent-context[:context: {parent-context}]
8684
ifndef::parent-context[:!context:]
Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11
////
2-
Base the file name and the ID on the module title. For example:
3-
* file name: con_my-concept-module-a.adoc
4-
* ID: [id="my-concept-module-a_{context}"]
5-
* Title: = My concept module A
2+
Indicate the module types:
63
////
74

8-
////
9-
Indicate the module type in one of the following
10-
ways:
11-
Add the prefix con- or con_ to the file name.
12-
Add the following attribute before the module ID:
135
:_mod-docs-content-type: CONCEPT
14-
////
156

167
////
17-
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken.
18-
////
8+
Base the file name and the ID on the module title. For example:
9+
* file name: con_my-concept-module-a.adoc
10+
* ID: [id="my-concept-module-a_{context}"]
11+
* Title: = My concept module A
1912

20-
[id="my-concept-module-a_{context}"]
13+
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken.
2114

22-
////
2315
The `context` attribute enables module reuse. Every module ID includes {context}, which ensures that the module has a unique ID so you can include it multiple times in the same guide.
2416
////
2517

18+
[id="my-concept-module-a_{context}"]
19+
2620
= My concept module A
2721
////
28-
In the title of concept modules, include nouns or noun phrases that are used in the body text. This helps readers and search engines find the information quickly. Do not start the title of concept modules with a verb. See also _Wording of headings_ in _The IBM Style Guide_.
22+
In the title of concept modules, include nouns or noun phrases that are used in the body text. This helps readers and search engines find the information quickly. Do not start the title of concept modules with a verb or gerund. See also _Wording of headings_ in _The IBM Style Guide_.
2923
3024
Be sure to include a line break between the title and the module introduction.
3125
////
@@ -40,20 +34,19 @@ The contents of a concept module give the user descriptions and explanations nee
4034

4135

4236
////
43-
Include titles and alternative text descriptions for images.
44-
Alternative text should provide a textual, complete description of the image as a full sentence.
37+
Do not include level three headings (===).
38+
Include titles and alternative text descriptions for images and enclose the descriptions in quotation marks (""). Alternative text should provide a textual, complete description of the image as a full sentence.
4539
Images should never be the sole means of conveying information and should only supplement the text.
46-
Avoid screenshots or other images that might quickly go out of date and that create a maintenance burden on documentation.
47-
Provide text equivalents for every diagram, image, or other non-text element. Avoid using images of text instead of actual text.
40+
Avoid screenshots or other images that might quickly go out of date and that create a maintenance burden on documentation. Provide text equivalents for every diagram, image, or other non-text element. Avoid using images of text instead of actual text.
4841
////
4942
//.Image title
50-
//image::image-file.png[A textual representation of the essential information conveyed by the image.]
43+
//image::image-file.png["A textual representation of the essential information conveyed by the image."]
5144

5245
[role="_additional-resources"]
5346
.Additional resources
5447
////
5548
Optional. Delete if not used.
49+
Provide a bulleted list of links and display text relevant to the assembly. These links can include `link:` and `xref:` macros. Do not include additional text.
5650
////
57-
* A bulleted list of links to other closely-related material. These links can include `link:` and `xref:` macros.
58-
* For more details on writing concept modules, see the link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide].
59-
* Use a consistent system for file names, IDs, and titles. For tips, see _Anchor Names and File Names_ in link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide].
51+
* link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide]
52+
* xref:some-module_{context}[]
Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,68 @@
1+
2+
////
3+
Indicate the module type:
4+
////
5+
6+
:_mod-docs-content-type: PROCEDURE
7+
18
////
29
Base the file name and the ID on the module title. For example:
310
* file name: proc_doing-procedure-a.adoc
411
* ID: [id="doing-procedure-a_{context}"]
512
* Title: = Doing procedure A
613

7-
Indicate the module type in one of the following
8-
ways:
9-
Add the prefix proc- or proc_ to the file name.
10-
Add the following attribute before the module ID:
11-
:_mod-docs-content-type: PROCEDURE
14+
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken.
1215

13-
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken. The `context` attribute enables module reuse. Every module ID includes {context}, which ensures that the module has a unique ID even if it is reused multiple times in an assembly file.
16+
The `context` attribute enables module reuse. Every module ID includes {context}, which ensures that the module has a unique ID so you can include it multiple times in the same guide.
1417
////
1518

1619
[id="doing-procedure-a_{context}"]
1720

1821
= Doing procedure A
1922
////
2023
Start the title of a procedure module with a gerund, such as Creating, Installing, or Deploying.
21-
2224
Be sure to include a line break between the title and the module introduction.
2325
////
2426

2527
Write a short introductory paragraph that provides an overview of the module. The introduction should include what the module will help the user do and why it will be beneficial to the user. Include key words that relate to the module to maximize search engine optimization.
2628

2729
.Prerequisites
28-
2930
* A bulleted list of conditions that must be satisfied before the user starts the steps in this module.
3031
* Prerequisites can be full sentences or sentence fragments; however, prerequisite list items must be parallel.
32+
* Do not use imperative statements in the Prerequisites section.
33+
34+
.Procedure
35+
. Make each step an instruction.
36+
. Include one imperative sentences for each step, for example:
37+
.. Do this thing and then select *Next*.
38+
.. Do this other thing, and this other thing, and then select *Next*.
39+
. Use an unnumbered bullet (*) if the procedure includes only one step.
40+
+
41+
NOTE: You can add text, tables, code examples, images, and other items to a step. However, these items must be connected to the step the a plus sign (+). Any items under the .Procedure heading and before one of the following approved headings cannot be converted to DITA.
3142

3243
////
33-
If you have only one prerequisite, list it as a single bullet point.
34-
Do not write prerequisites in the imperative.
35-
You can include links to more information about the prerequisites.
36-
Delete the .Prerequisites section title and bullets if the module has no prerequisites.
44+
Only the following block headings can be reliably mapped to DITA: Prerequisites, Procedure, Verification, Troubleshooting, Troubleshooting steps, Next steps, Next step, Additional resources. They must appear in this order and are only allowed in a procedure module. You can also use block headings in figure, table, and example titles.
3745
////
3846

39-
.Procedure
4047

41-
. Make each step an instruction.
48+
.Verification
49+
Delete this section if it does not apply to your module. Provide the user with verification methods for the procedure, such as expected output or commands that confirm success or failure.
4250

43-
. Include one command or action for each step with the exception of simple follow-step, for example:
44-
.. Do this thing and then select *Next*.
45-
.. Do this other thing and then select *Next*.
51+
* Provide an example of expected command output or a pop-up window that the user receives when the procedure is successful.
52+
* List actions for the user to complete, such as entering a command, to determine the success or failure of the procedure.
53+
* Make each step an instruction.
54+
* Use an unnumbered bullet (*) if the verification includes only one step.
4655

47-
. Use an unnumbered bullet (*) if the procedure includes only one step.
56+
.Troubleshooting
57+
Delete this section if it does not apply to your module. Provide the user with troubleshooting steps.
58+
59+
* Make each step an instruction.
60+
* Use an unnumbered bullet (*) if the troubleshooting includes only one step.
4861

49-
.Verification
62+
63+
.Next steps
64+
* Provide a bulleted list of links that contain instructions that might be useful to the user after they complete this procedure.
65+
* Use an unnumbered bullet (*) if the list includes only one step.
5066

5167
Delete this section if it does not apply to your module. Provide the user with verification methods for the procedure, such as expected output or commands that confirm success or failure.
5268

@@ -67,7 +83,9 @@ NOTE: Do not use *Next steps* to provide a second list of instructions.
6783

6884
[role="_additional-resources"]
6985
.Additional resources
70-
71-
* This section is optional.
72-
* Provide a bulleted list of links to other closely-related material. These links can include `link:` and `xref:` macros.
73-
* Use an unnumbered bullet (*) if the list includes only one step.
86+
////
87+
Optional. Delete if not used.
88+
Provide a bulleted list of links and display text relevant to the assembly. These links can include `link:` and `xref:` macros. Do not include additional text.
89+
////
90+
* link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide]
91+
* xref:some-module_{context}[]
Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1+
////
2+
Indicate the module type:
3+
////
4+
:_mod-docs-content-type: REFERENCE
5+
16
////
27
Base the file name and the ID on the module title. For example:
38
* file name: ref_my-reference-a.adoc
49
* ID: [id="my-reference-a_{context}"]
510
* Title: = My reference A
6-
////
7-
8-
////
9-
Indicate the module type in one of the following
10-
ways:
11-
Add the prefix ref- or ref_ to the file name.
12-
Add the following attribute before the module ID:
13-
:_mod-docs-content-type: REFERENCE
14-
////
1511

16-
////
1712
The ID is an anchor that links to the module. Avoid changing it after the module has been published to ensure existing links are not broken.
13+
14+
The `context` attribute enables module reuse. Every module ID includes {context}, which ensures that the module has a unique ID so you can include it multiple times in the same guide.
1815
////
1916

2017
[id="reference-material_{context}"]
2118

22-
////
23-
The `context` attribute enables module reuse. Every module ID includes {context}, which ensures that the module has a unique ID even if it is reused multiple times in a guide.
24-
////
25-
2619
= Reference material
2720
////
2821
In the title of a reference module, include nouns that are used in the body text. For example, "Keyboard shortcuts for ___" or "Command options for ___." This helps readers and search engines find the information quickly.
@@ -32,8 +25,8 @@ Be sure to include a line break between the title and the module introduction.
3225

3326
Write a short introductory paragraph that provides an overview of the module.
3427

35-
A reference module provides data that users might want to look up, but do not need to remember. It has a very strict structure, often in the form of a list or a table.
36-
A well-organized reference module enables users to scan it quickly to find the details they want.
28+
A reference module provides data that users might want to look up, but do not need to remember. It has a very strict structure, often in the form of a list or a table. A well-organized reference module enables users to scan it quickly to find the details they want.
29+
3730
AsciiDoc markup to consider for reference data:
3831

3932
.Unordered list
@@ -57,7 +50,7 @@ Term 2:: Definition
5750
.Additional resources
5851
////
5952
Optional. Delete if not used.
53+
Provide a bulleted list of links and display text relevant to the assembly. These links can include `link:` and `xref:` macros. Do not include additional text.
6054
////
61-
* A bulleted list of links to other closely-related material. These links can include `link:` and `xref:` macros.
62-
* For more details on writing reference modules, see the link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide].
63-
* Use a consistent system for file names, IDs, and titles. For tips, see _Anchor Names and File Names_ in link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide].
55+
* link:https://github.com/redhat-documentation/modular-docs#modular-documentation-reference-guide[Modular Documentation Reference Guide]
56+
* xref:some-module_{context}[]

0 commit comments

Comments
 (0)