Skip to content

Commit 0927313

Browse files
authored
Merge pull request #51374 from adellape/update_product_ver_table
2 parents 1eb3208 + d146e76 commit 0927313

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

contributing_to_docs/doc_guidelines.adoc

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ If you create a release notes assembly for a sub-product within the `openshift/o
454454

455455
When possible, generalize references to the product name and/or version by using
456456
the `{product-title}` and/or `{product-version}` attributes. These attributes
457-
are pulled by AsciiBinder from the distro mapping definitions in the
457+
are pulled by AsciiBinder from the OpenShift distribution, or _distro_, mapping definitions in the
458458
https://github.com/openshift/openshift-docs/blob/main/_distro_map.yml[_distro_map.yml]
459459
file.
460460

@@ -464,27 +464,35 @@ while the associated `{product-version}` comes from the `name:` fields on any
464464

465465
How these attributes render is dependent on which distro and branch build you
466466
are viewing. The following table shows the current distros and the
467-
possible values for `{product-title}` and `{product-version}`.
467+
possible values for `{product-title}` and `{product-version}`, depending on the branch:
468468

469469
[options="header"]
470470
|===
471471
|Distro |`{product-title}` |`{product-version}`
472472

473473
|`openshift-origin`
474474
|OKD
475-
|1.2, 1.3, 1.4, 1.5, 3.6, 3.7, 3.9, 3.10, 3.11, Latest
475+
a|* 3.6, 3.7, 3.9, 3.10, 3.11
476+
* 4.6, 4.7, 4.8, 4.9, 4.10, 4.11
477+
* 4 for the `latest/` build from the `main` branch
476478

477479
|`openshift-enterprise`
478480
|OpenShift Container Platform
479-
|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
481+
a|* 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11
482+
* 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 4.10, 4.11, 4.12
480483

481484
|`openshift-dedicated`
482485
|OpenShift Dedicated
483-
|Latest
486+
a|* No value set for the latest `dedicated/` build from the `enterprise-4.11` branch
487+
* 3 for the `dedicated/3` build from the `enterprise-3.11` branch
488+
489+
|`openshift-rosa`
490+
|Red Hat OpenShift Service on AWS
491+
|No value set for the `rosa/` build from the `enterprise-4.11` branch
484492

485493
|`openshift-online`
486494
|OpenShift Online
487-
|Latest
495+
|Pro
488496
|===
489497

490498
For example:

0 commit comments

Comments
 (0)