Skip to content

[enterprise-4.12] - Manual CP from #49244 to enterprise-4.12 #70024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
agantony wants to merge 1 commit into from
Closed

[enterprise-4.12] - Manual CP from #49244 to enterprise-4.12 #70024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contributing_to_docs/doc_guidelines.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ toc::[] <7>
+
[NOTE]
====
The `{product-name}` and `{product-version}` common attributes are not defined in the `_attributes/common-attributes.adoc` file. Those attributes are pulled by AsciiBinder from the distro mapping definitions in the https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml] file. See xref:product-name-and-version[Product name and version] for more information on this topic.
The `{product-title}` and `{product-version}` common attributes are not defined in the `_attributes/common-attributes.adoc` file. Those attributes are pulled by AsciiBinder from the distro mapping definitions in the https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml] file. See xref:product-name-and-version[Product title and version] and xref:attribute-files[attribute files] for more information on this topic.
Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer Jan 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing that should be here is "and xref:attribute-files[attribute files]"

Suggested change
The `{product-title}` and `{product-version}` common attributes are not defined in the `_attributes/common-attributes.adoc` file. Those attributes are pulled by AsciiBinder from the distro mapping definitions in the https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml] file. See xref:product-name-and-version[Product title and version] and xref:attribute-files[attribute files] for more information on this topic.
The `{product-title}` and `{product-version}` common attributes are not defined in the `_attributes/common-attributes.adoc` file. Those attributes are pulled by AsciiBinder from the distro mapping definitions in the https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml] file. See xref:product-name-and-version[Product title and version] for more information on this topic.

That piece is new content that went into main by another PR later, and shouldn't be added to the cherry pick, because it wasn't added by your PR.

====
+
<5> Context used for identifying headers in modules that is the same as the anchor ID. Example: cli-developer-commands.
Expand Down Expand Up @@ -393,7 +393,7 @@ If you create a release notes assembly for a sub-product within the `openshift/o
----

[id="product-name-and-version"]
== Product name and version
== Product title and version

When possible, generalize references to the product name and/or version by using
the `{product-title}` and/or `{product-version}` attributes. These attributes
Expand All @@ -419,7 +419,7 @@ possible values for `{product-title}` and `{product-version}`.

|`openshift-enterprise`
|OpenShift Container Platform
|3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7
|3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 4.10, 4.11, 4.12

|`openshift-dedicated`
|OpenShift Dedicated
Expand Down