From 8ec10944020ca0f337eea1ef17fbbfcd6327bf7b Mon Sep 17 00:00:00 2001 From: Kathryn Alexander Date: Mon, 14 Apr 2025 10:59:47 -0400 Subject: [PATCH] updating the inclusive language statement --- .../sbo-release-notes.adoc | 5 ----- cicd/gitops/gitops-release-notes.adoc | 2 -- cicd/pipelines/op-release-notes.adoc | 2 -- contributing_to_docs/doc_guidelines.adoc | 7 +------ .../making-open-source-more-inclusive.adoc | 20 ------------------- .../distr_tracing/distr-tracing-rn.adoc | 2 -- observability/otel/otel-rn.adoc | 6 ++---- .../v1x/servicemesh-release-notes.adoc | 5 ----- .../v2x/servicemesh-release-notes.adoc | 6 ------ virt/virt-2-6-release-notes.adoc | 5 ----- virt/virt-4-10-release-notes.adoc | 5 ----- virt/virt-4-9-release-notes.adoc | 5 ----- 12 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 modules/making-open-source-more-inclusive.adoc diff --git a/applications/connecting_applications_to_services/sbo-release-notes.adoc b/applications/connecting_applications_to_services/sbo-release-notes.adoc index 2853cab49e..d3457cd978 100644 --- a/applications/connecting_applications_to_services/sbo-release-notes.adoc +++ b/applications/connecting_applications_to_services/sbo-release-notes.adoc @@ -52,11 +52,6 @@ Note the following scope of support on the Red Hat Customer Portal for these fea |=== -[id="servicebinding-inclusive-language"] -== Making open source more inclusive - -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]. - // Modules included, most to least recent include::modules/sbo-release-notes-1-3-3.adoc[leveloffset=+1] include::modules/sbo-release-notes-1-3-1.adoc[leveloffset=+1] diff --git a/cicd/gitops/gitops-release-notes.adoc b/cicd/gitops/gitops-release-notes.adoc index 533329e0bc..622d25d2b3 100644 --- a/cicd/gitops/gitops-release-notes.adoc +++ b/cicd/gitops/gitops-release-notes.adoc @@ -20,8 +20,6 @@ For an overview of {gitops-title}, see xref:../../cicd/gitops/understanding-open include::modules/go-compatibility-and-support-matrix.adoc[leveloffset=+1] -include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1] - // Modules included, most to least recent include::modules/gitops-release-notes-1-9-0.adoc[leveloffset=+1] // 1.25.0 additional resources, OCP docs diff --git a/cicd/pipelines/op-release-notes.adoc b/cicd/pipelines/op-release-notes.adoc index 670dd54577..d41322c8b6 100644 --- a/cicd/pipelines/op-release-notes.adoc +++ b/cicd/pipelines/op-release-notes.adoc @@ -20,8 +20,6 @@ For an overview of {pipelines-title}, see xref:../../cicd/pipelines/understandin include::modules/op-tkn-pipelines-compatibility-support-matrix.adoc[leveloffset=+1] -include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1] - // Modules included, most to least recent include::modules/op-release-notes-1-11.adoc[leveloffset=+1] diff --git a/contributing_to_docs/doc_guidelines.adoc b/contributing_to_docs/doc_guidelines.adoc index 5441f0e5f2..1960a91fab 100644 --- a/contributing_to_docs/doc_guidelines.adoc +++ b/contributing_to_docs/doc_guidelines.adoc @@ -385,12 +385,7 @@ If you are cherry picking from `main` to `enterprise-4.8` or earlier, you must m [id="adding-a-subsection-on-making-open-source-more-inclusive"] === Adding a subsection on making open source more inclusive -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: - -[source,text] ----- -\include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1] ----- +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. [id="product-name-and-version"] == Product name and version diff --git a/modules/making-open-source-more-inclusive.adoc b/modules/making-open-source-more-inclusive.adoc deleted file mode 100644 index 027e670671..0000000000 --- a/modules/making-open-source-more-inclusive.adoc +++ /dev/null @@ -1,20 +0,0 @@ -// Module included in the following assemblies: -// -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-0.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-1.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-2.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-3.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-4.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-5.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-6.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-7.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-8.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9.adoc -// * distr_tracing/distr_tracing_rn/distr-tracing-rn-3-0.adoc - -:_mod-docs-content-type: CONCEPT - -[id="making-open-source-more-inclusive_{context}"] -= Making open source more inclusive - -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]. diff --git a/observability/distr_tracing/distr-tracing-rn.adoc b/observability/distr_tracing/distr-tracing-rn.adoc index 12bc6e418e..030b7e1b61 100644 --- a/observability/distr_tracing/distr-tracing-rn.adoc +++ b/observability/distr_tracing/distr-tracing-rn.adoc @@ -1864,5 +1864,3 @@ This release adds the {OTELName} as a link:https://access.redhat.com/support/off This release addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes. include::modules/support.adoc[leveloffset=+1] - -include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1] diff --git a/observability/otel/otel-rn.adoc b/observability/otel/otel-rn.adoc index a00352b3fb..f3275c8279 100644 --- a/observability/otel/otel-rn.adoc +++ b/observability/otel/otel-rn.adoc @@ -297,7 +297,7 @@ This release fixes the following CVEs: This update introduces the following Technology Preview features: -* +* :FeatureName: Each of these features include::snippets/technology-preview.adoc[leveloffset=+1] @@ -361,7 +361,7 @@ This release fixes the following CVEs: This update introduces the following Technology Preview features: -* +* :FeatureName: Each of these features include::snippets/technology-preview.adoc[leveloffset=+1] @@ -916,5 +916,3 @@ None. //// include::modules/support.adoc[leveloffset=+1] - -include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1] diff --git a/service_mesh/v1x/servicemesh-release-notes.adoc b/service_mesh/v1x/servicemesh-release-notes.adoc index 318b9a4190..43680994b0 100644 --- a/service_mesh/v1x/servicemesh-release-notes.adoc +++ b/service_mesh/v1x/servicemesh-release-notes.adoc @@ -8,11 +8,6 @@ toc::[] include::snippets/ossm-out-of-support.adoc[] -== Making open source more inclusive - -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]. - - // The following include statements pull in the module files that comprise 1.x release notes. include::modules/ossm-servicemesh-overview.adoc[leveloffset=+1] diff --git a/service_mesh/v2x/servicemesh-release-notes.adoc b/service_mesh/v2x/servicemesh-release-notes.adoc index 0fb11c73c5..88b274a71d 100644 --- a/service_mesh/v2x/servicemesh-release-notes.adoc +++ b/service_mesh/v2x/servicemesh-release-notes.adoc @@ -8,12 +8,6 @@ toc::[] // The following include statements pull in the module files that comprise 2.x release notes. -include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1] - -include::modules/ossm-release-2-6-7.adoc[leveloffset=+1] - -include::modules/ossm-release-2-5-10.adoc[leveloffset=+1] - include::modules/ossm-release-2-6-6.adoc[leveloffset=+1] include::modules/ossm-release-2-5-9.adoc[leveloffset=+1] diff --git a/virt/virt-2-6-release-notes.adoc b/virt/virt-2-6-release-notes.adoc index 34a5b2cb18..e1525a0c02 100644 --- a/virt/virt-2-6-release-notes.adoc +++ b/virt/virt-2-6-release-notes.adoc @@ -28,11 +28,6 @@ include::modules/virt-supported-cluster-version.adoc[leveloffset=+2] Other operating system templates shipped with {VirtProductName} are not supported. -[id="virt-2-6-inclusive-language"] -== Making open source more inclusive - -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]. - [id="virt-2-6-new"] == New and changed features diff --git a/virt/virt-4-10-release-notes.adoc b/virt/virt-4-10-release-notes.adoc index 70b3f4b76d..91c87db316 100644 --- a/virt/virt-4-10-release-notes.adoc +++ b/virt/virt-4-10-release-notes.adoc @@ -22,11 +22,6 @@ include::modules/virt-supported-cluster-version.adoc[leveloffset=+2] //CNV-13807 Supported guest operating systems To view the supported guest operating systems for {VirtProductName}, refer to link:https://access.redhat.com/articles/973163#ocpvirt[Certified Guest Operating Systems in Red Hat OpenStack Platform, Red Hat Virtualization and OpenShift Virtualization]. -[id="virt-4-10-inclusive-language"] -== Making open source more inclusive - -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]. - [id="virt-4-10-new"] == New and changed features diff --git a/virt/virt-4-9-release-notes.adoc b/virt/virt-4-9-release-notes.adoc index d53678b0ce..70e25fa123 100644 --- a/virt/virt-4-9-release-notes.adoc +++ b/virt/virt-4-9-release-notes.adoc @@ -31,11 +31,6 @@ Other operating system templates shipped with {VirtProductName} are not supporte //CNV-8167 Supported guest operating systems //CNV-13793 Supported guest OS -[id="virt-4-9-inclusive-language"] -== Making open source more inclusive - -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]. - [id="virt-4-9-new"] == New and changed features //CNV-8875 OLM and stable channels