Skip to content

Commit e8f0ef6

Browse files
authored
Merge pull request #56857 from adellape/actualsentence
2 parents f57b25f + 9f6af56 commit e8f0ef6

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

contributing_to_docs/doc_guidelines.adoc

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ include::_attributes/common-attributes.adoc
44
:toc: macro
55

66
The documentation guidelines for OpenShift 4 build on top of the
7-
link:https://redhat-documentation.github.io/modular-docs/[Red Hat modular docs reference guide].
7+
link:https://redhat-documentation.github.io/modular-docs/[_Red Hat modular docs reference guide_].
8+
9+
[NOTE]
10+
====
11+
These _Documentation guidelines_ are primarily concerned with the modular structure and AsciiDoc / AsciiBinder requirements for building OpenShift documention. For general style guidelines in OpenShift docs, see the following:
12+
13+
* Primary source: link:https://www.ibm.com/docs/en/ibm-style[_IBM Style_]
14+
* Supplementary source: link:https://redhat-documentation.github.io/supplementary-style-guide/[_Red Hat supplementary style guide for product documentation_]
15+
16+
When looking for style guidance, reference the _Red Hat supplementary style guide for product documentation_ first, because it overrides certain guidance from the _IBM Style_ guide.
17+
====
818

919
toc::[]
1020

@@ -184,7 +194,7 @@ If you create a directory with a multiple-word name, separate each word with an
184194

185195
[NOTE]
186196
====
187-
Do not italicize user-replaced values. This guideline is an exception to the link:https://redhat-documentation.github.io/supplementary-style-guide/#user-replaced-values[Red Hat supplementary style guide].
197+
Do not italicize user-replaced values. This guideline is an exception to the link:https://redhat-documentation.github.io/supplementary-style-guide/#user-replaced-values[_Red Hat supplementary style guide for product documentation_].
188198
====
189199

190200
Do not create or rename a top-level directory in the repository and topic map without checking with the docs program manager first.
@@ -339,7 +349,7 @@ An _assembly_ is a collection of modules that describes how to accomplish a user
339349
Avoid link:https://redhat-documentation.github.io/modular-docs/#nesting-assemblies[nesting assemblies] in other assembly files. You can create more complicated document structures by modifying the link:https://github.com/openshift/openshift-docs/tree/main/_topic_maps[topic maps].
340350

341351
For more information about forming assemblies, see the
342-
link:https://redhat-documentation.github.io/modular-docs/#forming-assemblies[Red Hat modular docs reference guide] and the link:https://raw.githubusercontent.com/redhat-documentation/modular-docs/master/modular-docs-manual/files/TEMPLATE_ASSEMBLY_a-collection-of-modules.adoc[assembly template].
352+
link:https://redhat-documentation.github.io/modular-docs/#forming-assemblies[_Red Hat modular docs reference guide_] and the link:https://raw.githubusercontent.com/redhat-documentation/modular-docs/master/modular-docs-manual/files/TEMPLATE_ASSEMBLY_a-collection-of-modules.adoc[assembly template].
343353

344354
[NOTE]
345355
====
@@ -358,15 +368,15 @@ Avoid using gerunds in concept titles. "About <concept>"
358368
is a common concept module title.
359369

360370
For more information about creating concept modules, see the
361-
link:https://redhat-documentation.github.io/modular-docs/#creating-concept-modules[Red Hat modular docs reference guide] and the link:https://raw.githubusercontent.com/redhat-documentation/modular-docs/master/modular-docs-manual/files/TEMPLATE_CONCEPT_concept-explanation.adoc[concept template].
371+
link:https://redhat-documentation.github.io/modular-docs/#creating-concept-modules[_Red Hat modular docs reference guide_] and the link:https://raw.githubusercontent.com/redhat-documentation/modular-docs/master/modular-docs-manual/files/TEMPLATE_CONCEPT_concept-explanation.adoc[concept template].
362372

363373
== Writing procedures
364374
A _procedure_ contains the steps that users follow to complete a process or task. Procedures contain ordered steps and explicit commands. In most cases, create your procedures as individual modules and include them in appropriate assemblies.
365375

366376
Use a gerund in the procedure title, such as "Creating".
367377

368378
For more information about writing procedures, see the
369-
link:https://redhat-documentation.github.io/modular-docs/#creating-procedure-modules[Red Hat modular docs reference guide] and the link:https://raw.githubusercontent.com/redhat-documentation/modular-docs/master/modular-docs-manual/files/TEMPLATE_PROCEDURE_doing-one-procedure.adoc[procedure template].
379+
link:https://redhat-documentation.github.io/modular-docs/#creating-procedure-modules[_Red Hat modular docs reference guide_] and the link:https://raw.githubusercontent.com/redhat-documentation/modular-docs/master/modular-docs-manual/files/TEMPLATE_PROCEDURE_doing-one-procedure.adoc[procedure template].
370380

371381
[NOTE]
372382
====
@@ -399,7 +409,7 @@ In the example, `cloud-provider-first` and `cloud-provider` are not defined by t
399409
====
400410

401411
For more information about creating text snippets, see the
402-
link:https://redhat-documentation.github.io/modular-docs/#using-text-snippets[Red Hat modular docs reference guide]
412+
link:https://redhat-documentation.github.io/modular-docs/#using-text-snippets[_Red Hat modular docs reference guide_].
403413

404414
[id="Auto-generated-content"]
405415
== Auto-generated content
@@ -677,7 +687,7 @@ Links can be used to cross-reference internal assemblies or send readers to exte
677687
In OpenShift docs:
678688

679689
* All links to internal content is created using `xref` and **must have an anchor ID**.
680-
* Only use `xref` in assemblies, not modules.
690+
* Only use `xref` in assemblies, not in modules.
681691
* All links to external websites are created using `link`.
682692

683693
[IMPORTANT]
@@ -693,36 +703,31 @@ To provide an example URL path that you do not want to render as a hyperlink, us
693703
....
694704

695705
=== Internal cross-references
696-
Whenever possible the link to another assembly should be part of the actual sentence.
697-
Avoid creating links as a separate sentence that begins with "See [this assembly] for more information on x".
698706

699-
[NOTE]
700-
====
701-
Use the relative file path (from the file you are editing, to the file you are linking to),
702-
even if you are linking to the same directory that you are writing in. This makes search and replace
703-
operations to fix broken links much easier.
707+
Use the relative file path (from the file you are editing to the file you are linking to), even if you are linking to the same directory that you are writing in. This makes search and replace operations to fix broken links much easier.
704708

705-
For example, if you are writing in *_architecture/core_concepts/deployments.adoc_* and you want to
706-
link to *_architecture/core_concepts/routes.adoc_* then you must include the path back to the first
707-
level of the assembly directory:
709+
For example, if you are writing in `architecture/core_concepts/deployments.adoc` and you want to link to `architecture/core_concepts/routes.adoc`, then you must include the path back to the first level of the assembly directory:
708710

709711
----
710712
xref:../../architecture/networking/routes.adoc#architecture-core-concepts-routes
711713
----
714+
715+
[NOTE]
716+
====
717+
In OpenShift docs, you can only use `xref` in assemblies, not in modules.
712718
====
713719

714720
.Markup example of cross-referencing
715721
----
716-
Rollbacks revert part of an application back to a previous deployment. Rollbacks can be performed using the REST API or
717-
the xref:../cli_reference/openshift_cli/get_started_cli.adoc#installing-openshift-cli[OpenShift CLI].
722+
For more information, see xref:../dev_guide/application_lifecycle/new_app.adoc#dev-guide-new-app[Creating an application].
718723
719-
Before you can create a domain, you must first xref:../dev_guide/application_lifecycle/new_app.adoc#dev-guide-new-app[create an application].
724+
Rollbacks can be performed using the REST API or the xref:../cli_reference/openshift_cli/get_started_cli.adoc#installing-openshift-cli[OpenShift CLI].
720725
----
721726

722727
.Rendered output of cross-referencing
723-
> Rollbacks revert part of an application back to a previous deployment. Rollbacks can be performed using the REST API or the xref:../cli_reference/openshift_cli/get_started_cli.adoc#installing-openshift-cli[OpenShift CLI].
728+
> For more information, see xref:../dev_guide/application_lifecycle/new_app.adoc#dev-guide-new-app[Creating an application].
724729
>
725-
> Before you can create a domain, you must first xref:../dev_guide/application_lifecycle/new_app.adoc#dev-guide-new-app[create an application].
730+
> Rollbacks can be performed using the REST API or the xref:../cli_reference/openshift_cli/get_started_cli.adoc#installing-openshift-cli[OpenShift CLI].
726731

727732
=== Links to external websites
728733

@@ -779,12 +784,12 @@ xref:../dir/<filename>.adoc#anchor-id[friendly title]
779784
For example, if you are working on `bar.adoc` and you want to link to `zig.adoc`, do it this way:
780785

781786
----
782-
xref:../baz/zig.adoc#baz-zig[see the ZIG manual for more]
787+
For more information, see the xref:../baz/zig.adoc#baz-zig[ZIG manual].
783788
----
784789

785790
[NOTE]
786791
====
787-
You must use the .adoc extension in order for the link to work correctly and you must specify an anchor ID.
792+
You must use the `.adoc` extension in order for the link to work correctly and you must specify an anchor ID.
788793
====
789794

790795
== Embedding an external file
@@ -837,7 +842,7 @@ To indicate that a feature is in Technology Preview, include the `snippets/techn
837842

838843
To indicate that a feature is deprecated, include the `modules/deprecated-feature.adoc` file in the feature's assembly, or to each relevant assembly such as for a deprecated Operator, to keep the supportability wording consistent across deprecated features. Provide a value for the `:FeatureName:` variable before you include this module.
839844

840-
See link:https://github.com/openshift/openshift-docs/pull/31776/files[an example] of how this is applied.
845+
For more information on how this is applied, see link:https://github.com/openshift/openshift-docs/pull/31776/files[this example PR].
841846

842847
== Verification of your content
843848
All documentation changes must be verified by a QE team associate before merging. This includes executing all "Procedure" changes and confirming expected results. There are exceptions for typo-level changes, formatting-only changes, and other negotiated documentation sets and distributions.
@@ -1973,6 +1978,6 @@ a|
19731978

19741979
|A footnote is created with the footnote macro. If you plan to reference a footnote more than once, use the ID footnoteref macro. The Customer Portal does not support spaces in the footnoteref. For example, "dynamic PV" should be "dynamicPV".
19751980

1976-
|See link:http://asciidoctor.org/docs/user-manual/#user-footnotes[Footnotes] for the footnote and footnoteref syntax.
1981+
|For footnote and footnoteref syntax, see link:http://asciidoctor.org/docs/user-manual/#user-footnotes[AsciiDoctor documentation].
19771982

19781983
|===

0 commit comments

Comments
 (0)