Skip to content

Commit 7ca21ba

Browse files
authored
Merge pull request #92135 from kalexand-rh/inclusive_update
updating the inclusive language statement
2 parents 807a5cf + c49a570 commit 7ca21ba

File tree

9 files changed

+3
-52
lines changed

9 files changed

+3
-52
lines changed

applications/connecting_applications_to_services/sbo-release-notes.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ Note the following scope of support on the Red Hat Customer Portal for these fea
5252

5353
|===
5454

55-
[id="servicebinding-inclusive-language"]
56-
== Making open source more inclusive
57-
58-
Red Hat is committed to replacing problematic language in our code, documentation, and web properties. We are beginning with these four terms: master, slave, blacklist, and whitelist. Because of the enormity of this endeavor, these changes will be implemented gradually over several upcoming releases. For more details, see link:https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language[Red Hat CTO Chris Wright's message].
59-
6055
// Modules included, most to least recent
6156
include::modules/sbo-release-notes-1-3-3.adoc[leveloffset=+1]
6257
include::modules/sbo-release-notes-1-3-1.adoc[leveloffset=+1]

cicd/gitops/gitops-release-notes.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ For an overview of {gitops-title}, see xref:../../cicd/gitops/understanding-open
2020

2121
include::modules/go-compatibility-and-support-matrix.adoc[leveloffset=+1]
2222

23-
include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
24-
2523
// Modules included, most to least recent
2624
include::modules/gitops-release-notes-1-9-2.adoc[leveloffset=+1]
2725

cicd/pipelines/op-release-notes.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ For an overview of {pipelines-title}, see xref:../../cicd/pipelines/understandin
2020

2121
include::modules/op-tkn-pipelines-compatibility-support-matrix.adoc[leveloffset=+1]
2222

23-
include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
24-
2523
// Modules included, most to least recent
2624
include::modules/op-release-notes-1-11.adoc[leveloffset=+1]
2725

contributing_to_docs/doc_guidelines.adoc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -584,12 +584,7 @@ If you are cherry picking from `main` to `enterprise-4.8` or earlier, you must m
584584
[id="adding-a-subsection-on-making-open-source-more-inclusive"]
585585
=== Adding a subsection on making open source more inclusive
586586

587-
If you create a release notes assembly for a sub-product within the `openshift/openshift-docs` repo, you might include a "Making open source more inclusive" statement. Instead of pasting the statement from the OpenShift Release Notes, use the following module, which is available in the `enterprise-4.8` branch and later:
588-
589-
[source,text]
590-
----
591-
\include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
592-
----
587+
Because the link to the "Making open source more inclusive" content has been moved to the footer of docs.redhat.com, do not include a separate module related to this content.
593588

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

modules/making-open-source-more-inclusive.adoc

Lines changed: 0 additions & 20 deletions
This file was deleted.

observability/distr_tracing/distr-tracing-rn.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,5 +1864,3 @@ This release adds the {OTELName} as a link:https://access.redhat.com/support/off
18641864
This release addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes.
18651865

18661866
include::modules/support.adoc[leveloffset=+1]
1867-
1868-
include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]

observability/otel/otel-rn.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ This release fixes the following CVEs:
297297
298298
This update introduces the following Technology Preview features:
299299
300-
*
300+
*
301301
302302
:FeatureName: Each of these features
303303
include::snippets/technology-preview.adoc[leveloffset=+1]
@@ -361,7 +361,7 @@ This release fixes the following CVEs:
361361
362362
This update introduces the following Technology Preview features:
363363
364-
*
364+
*
365365
366366
:FeatureName: Each of these features
367367
include::snippets/technology-preview.adoc[leveloffset=+1]
@@ -916,5 +916,3 @@ None.
916916
////
917917

918918
include::modules/support.adoc[leveloffset=+1]
919-
920-
include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]

service_mesh/v1x/servicemesh-release-notes.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ toc::[]
88

99
include::snippets/ossm-out-of-support.adoc[]
1010

11-
== Making open source more inclusive
12-
13-
Red Hat is committed to replacing problematic language in our code, documentation, and web properties. We are beginning with these four terms: master, slave, blacklist, and whitelist. Because of the enormity of this endeavor, these changes will be implemented gradually over several upcoming releases. For more details, see link:https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language[our CTO Chris Wright's message].
14-
15-
1611
// The following include statements pull in the module files that comprise 1.x release notes.
1712

1813
include::modules/ossm-servicemesh-overview.adoc[leveloffset=+1]

service_mesh/v2x/servicemesh-release-notes.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ toc::[]
88

99
// The following include statements pull in the module files that comprise 2.x release notes.
1010

11-
include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
12-
13-
include::modules/ossm-release-2-6-7.adoc[leveloffset=+1]
14-
15-
include::modules/ossm-release-2-5-10.adoc[leveloffset=+1]
16-
1711
include::modules/ossm-release-2-6-6.adoc[leveloffset=+1]
1812

1913
include::modules/ossm-release-2-5-9.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)