Skip to content

Commit 4104ed6

Browse files
authored
Merge pull request #34668 from jboxman/use-ascii-apostrophe
Use ASCII ' instead of ’ for apostrophe
2 parents f7016c2 + 102120d commit 4104ed6

File tree

92 files changed

+144
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+144
-144
lines changed

architecture/architecture.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ workflows.
2525
* xref:../registry/architecture-component-imageregistry.adoc[Image Registry] -
2626
The image registry provides a scalable repository for storing and retrieving
2727
container images that are produced by and run on the cluster. Image access is
28-
integrated with the clusters role-based access controls and user authentication
28+
integrated with the cluster's role-based access controls and user authentication
2929
system.
3030
* xref:../openshift_images/images-understand.adoc[Image
3131
streams] - The imagestream API provides an abstraction over container images

architecture/cicd_gitops.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Using a _continuous integration/continuous delivery_ (CI/CD) methodology enables
1313
_Continuous integration_ is an automation process for developers. Code changes to an application are regularly built, tested, and merged to a shared repository.
1414

1515
_Continuous delivery_ and _continuous deployment_ are closely related concepts that are sometimes used interchangeably and refer to automation of the pipeline.
16-
Continuous delivery uses automation to ensure that a developers changes to an application are tested and sent to a repository, where an operations team can deploy them to a production environment. Continuous deployment enables the release of changes, starting from the repository and ending in production. Continuous deployment speeds up application delivery and prevents the operations team from getting overloaded.
16+
Continuous delivery uses automation to ensure that a developer's changes to an application are tested and sent to a repository, where an operations team can deploy them to a production environment. Continuous deployment enables the release of changes, starting from the repository and ending in production. Continuous deployment speeds up application delivery and prevents the operations team from getting overloaded.
1717

1818
[id="cicd_gitops_methodology"]
1919
== The GitOps methodology and practice

architecture/understanding-development.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ like updating the Operator, can happen automatically and invisibly to the
378378
Operator's users.
379379

380380
An example of a useful Operator is one that is set up to automatically back up
381-
data at particular times. Having an Operator manage an applications backup at
381+
data at particular times. Having an Operator manage an application's backup at
382382
set times can save a system administrator from remembering to do it.
383383

384384
Any application maintenance that has traditionally been completed manually,

cicd/gitops/gitops-release-notes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For an overview of {gitops-title}, see xref:../../cicd/gitops/understanding-open
2020
[id="gitops-inclusive-language"]
2121
== Making open source more inclusive
2222

23-
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 Wrights message].
23+
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].
2424

2525
// Modules included, most to least recent
2626
include::modules/gitops-release-notes-1-1.adoc[leveloffset=+1]

cicd/pipelines/op-release-notes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For an overview of {pipelines-title}, see xref:../../cicd/pipelines/understandin
2121
[id="openshift-pipelines-inclusive-language"]
2222
== Making open source more inclusive
2323

24-
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 Wrights message].
24+
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].
2525

2626
// Modules included, most to least recent
2727
include::modules/op-release-notes-1-4.adoc[leveloffset=+1]

jaeger/jaeger_install/rhbjaeger-deploying.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ include::modules/jaeger-config-ingester.adoc[leveloffset=+2]
7272
[id="injecting-sidecars"]
7373
== Injecting sidecars
7474

75-
{ProductName} relies on a proxy sidecar within the applications pod to provide the agent. The Jaeger Operator can inject Jaeger Agent sidecars into Deployment workloads. You can enable automatic sidecar injection or manage it manually.
75+
{ProductName} relies on a proxy sidecar within the application's pod to provide the agent. The Jaeger Operator can inject Jaeger Agent sidecars into Deployment workloads. You can enable automatic sidecar injection or manage it manually.
7676

7777
include::modules/jaeger-sidecar-automatic.adoc[leveloffset=+2]
7878

jaeger/jaeger_install/rhbjaeger-updating.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ The Operator Lifecycle Manager (OLM) controls the installation, upgrade, and rol
99
The OLM queries for available Operators as well as upgrades for installed Operators.
1010
For more information about how {product-title} handled upgrades, refer to the xref:../../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[Operator Lifecycle Manager] documentation.
1111

12-
The update approach used by the Jaeger Operator upgrades the managed Jaeger instances to the version associated with the Operator. Whenever a new version of the Jaeger Operator is installed, all the Jaeger application instances managed by the Operator will be upgraded to the Operators version. For example, if version 1.10 is installed (both Operator and backend components) and the Operator is upgraded to version 1.11, then as soon as the Operator upgrade has completed, the Operator will scan for running Jaeger instances and upgrade them to 1.11 as well.
12+
The update approach used by the Jaeger Operator upgrades the managed Jaeger instances to the version associated with the Operator. Whenever a new version of the Jaeger Operator is installed, all the Jaeger application instances managed by the Operator will be upgraded to the Operator's version. For example, if version 1.10 is installed (both Operator and backend components) and the Operator is upgraded to version 1.11, then as soon as the Operator upgrade has completed, the Operator will scan for running Jaeger instances and upgrade them to 1.11 as well.

logging/cluster-logging-release-notes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The following advisories are available for {ProductName} 5.0:
1919
[id="openshift-logging-5-0-inclusive-language"]
2020
== Making open source more inclusive
2121

22-
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 Wrights message].
22+
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].
2323

2424
[id="openshift-logging-5-0-deprecated-removed-features"]
2525
== Deprecated and removed features

modules/architecture-platform-benefits.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ endif::[]
2020
ifdef::openshift-dedicated[]
2121
* {product-title} clusters are deployed on AWS environments and can be used as part of a hybrid approach for application management.
2222
endif::[]
23-
* Integrated Red Hat technology. Major components in {product-title} come from {op-system-base-full} and related Red Hat technologies. {product-title} benefits from the intense testing and certification initiatives for Red Hats enterprise quality software.
23+
* Integrated Red Hat technology. Major components in {product-title} come from {op-system-base-full} and related Red Hat technologies. {product-title} benefits from the intense testing and certification initiatives for Red Hat's enterprise quality software.
2424
* Open source development model. Development is completed in the open, and the source code is available from public software repositories. This open collaboration fosters rapid innovation and development.
2525

2626
Although Kubernetes excels at managing your applications, it does not specify

modules/builds-secrets-overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data: <2>
2222
stringData: <4>
2323
hostname: myapp.mydomain.com <5>
2424
----
25-
<1> Indicates the structure of the secrets key names and values.
25+
<1> Indicates the structure of the secret's key names and values.
2626
<2> The allowable format for the keys in the `data` field must meet the guidelines in the `DNS_SUBDOMAIN` value in the Kubernetes identifiers glossary.
2727
<3> The value associated with keys in the `data` map must be base64 encoded.
2828
<4> Entries in the `stringData` map are converted to base64 and the entry are then moved to the `data` map automatically. This field is write-only. The value is only be returned by the `data` field.

0 commit comments

Comments
 (0)