Skip to content

Commit 55c3006

Browse files
authored
Merge pull request #30855 from ousleyp/in-order-to
In order to -> To
2 parents 6715d11 + 97cb247 commit 55c3006

File tree

105 files changed

+125
-125
lines changed

Some content is hidden

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

105 files changed

+125
-125
lines changed

.s2i/httpd-cfg/01-commercial.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ AddType text/vtt vtt
123123
RewriteEngine On
124124
RewriteBase /
125125

126-
# Rules have NE added to the end in order to preserve either explicit or implicit # anchor tags
126+
# Rules have NE added to the end to preserve either explicit or implicit # anchor tags
127127

128128
# Redirect 4.0 to 4.1
129129
RewriteRule ^(container-platform)/4.0/?(.*)$ /container-platform/4\.1/$2 [NE,R=301]

.s2i/httpd-cfg/01-community.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ AddType text/vtt vtt
123123
RewriteEngine On
124124
RewriteBase /
125125

126-
# Rules have NE added to the end in order to preserve either explicit or implicit # anchor tags
126+
# Rules have NE added to the end to preserve either explicit or implicit # anchor tags
127127

128128
# set OKD docs minishift to go to the 3.11 branch as minishift is not on 4.x (yet)
129129
RewriteRule ^latest/minishift/?(.*)$ /3.11/minishift/$1 [NE,R=301]

_unused_topics/monitoring-monitoring-overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ Other {product-title} framework components might be exposing metrics as well. Se
5252

5353
[NOTE]
5454
====
55-
In order to be able to deliver updates with guaranteed compatibility, configurability of the {product-title} Monitoring stack is limited to the explicitly available options.
55+
To be able to deliver updates with guaranteed compatibility, configurability of the {product-title} Monitoring stack is limited to the explicitly available options.
5656
====
5757

_unused_topics/monitoring-update-and-compatibility-guarantees.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
[id="update-and-compatibility-guarantees_{context}"]
66
= Update and compatibility guarantees
77

8-
In order to be able to deliver updates with guaranteed compatibility, configurability of the {product-title} Monitoring stack is limited to the explicitly available options. This document describes known pitfalls of which types of configuration and customization are unsupported, as well as misuse of resources provided by {product-title} Monitoring. All configuration options described in this topic are explicitly supported.
8+
To be able to deliver updates with guaranteed compatibility, configurability of the {product-title} Monitoring stack is limited to the explicitly available options. This document describes known pitfalls of which types of configuration and customization are unsupported, as well as misuse of resources provided by {product-title} Monitoring. All configuration options described in this topic are explicitly supported.
99

1010
*Modification of {product-title} monitoring resources*
1111

1212
The {product-title} Monitoring stack ensures its resources are _always_ in the state it expects them to be. If they are modified, {product-title} Monitoring will ensure that this will be reset. Nonetheless it is possible to pause this behavior, by setting the `paused` field in the `AppVersion` called `openshift-monitoring`. Setting the {product-title} Monitoring stack to be paused, stops all future updates and will cause modification of the otherwise managed resources. If resources are modified in an uncontrolled manner, this will cause undefined behavior during updates.
1313

14-
In order to ensure compatible and functioning updates, the `paused` field must be set to `false` on upgrades.
14+
To ensure compatible and functioning updates, the `paused` field must be set to `false` on upgrades.
1515

1616
*Usage of resources created by {product-title} monitoring*
1717

_unused_topics/nodes-pods-priority-examples.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="nodes-pods-priority-examples_{context}"]
66
= Pod priority example scenarios
77

8-
Pod priority and preemption assigns a priority to pods for scheduling. The scheduler will preempt (evict) lower-priority pods in order to schedule higher-priority pods.
8+
Pod priority and preemption assigns a priority to pods for scheduling. The scheduler will preempt (evict) lower-priority pods to schedule higher-priority pods.
99

1010
Typical preemption scenario::
1111
*Pod P* is a pending pod.
@@ -43,7 +43,7 @@ Pod priority and cross-node preemption::
4343
+
4444
There are no other cases of anti-affinity between *Pod P* and other pods in the zone.
4545
46-
. In order to schedule *Pod P* on *Node N*, the scheduler must preempt *Pod Q* to remove the pod anti-affinity violation, allowing the scheduler to schedule *Pod P* on *Node N*.
46+
. To schedule *Pod P* on *Node N*, the scheduler must preempt *Pod Q* to remove the pod anti-affinity violation, allowing the scheduler to schedule *Pod P* on *Node N*.
4747
4848
The scheduler can preempt *Pod Q*, but scheduler does not perform cross-node preemption. So, Pod P will be deemed unschedulable on Node N.
4949
////

backup_and_restore/disaster_recovery/about-disaster-recovery.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88
The disaster recovery documentation provides information for administrators on
99
how to recover from several disaster situations that might occur with their
1010
{product-title} cluster. As an administrator, you might need to follow one or
11-
more of the following procedures in order to return your cluster to a working
11+
more of the following procedures to return your cluster to a working
1212
state.
1313

1414
xref:../../backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[Restoring to a previous cluster state]::

cli_reference/developer_cli_odo/creating_and_deploying_applications_with_odo/sample-applications.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For `{odo-title}` Java and Node.js are the officially supported component types.
2929
Run `odo catalog list components` to verify the officially supported component types.
3030
====
3131

32-
In order to access the component over the web, create a URL using `odo url create`.
32+
To access the component over the web, create a URL using `odo url create`.
3333

3434

3535

contributing_to_docs/term_glossary.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ link:doc_guidelines.adoc[Documentation Guidelines] for markup information.
203203

204204
Docker can build images automatically by reading the instructions from a
205205
Dockerfile. A Dockerfile is a text document that contains all the commands you
206-
would normally execute manually in order to build a docker image.
206+
would normally execute manually to build a docker image.
207207

208208
Source: https://docs.docker.com/reference/builder/
209209

@@ -570,7 +570,7 @@ This is commonly abbreviated as SCC.
570570
Usage: service(s)
571571

572572
Kubernetes native API object that serves as an internal load balancer. It
573-
identifies a set of replicated pods in order to proxy the connections it
573+
identifies a set of replicated pods to proxy the connections it
574574
receives to them. Backing pods can be added to or removed from a service
575575
arbitrarily while the service remains consistently available, enabling anything
576576
that depends on the service to refer to it at a consistent address.

jaeger/jaeger_arch/rhbjaeger-architecture.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include::modules/jaeger-document-attributes.adoc[]
55

66
toc::[]
77

8-
Every time a user takes an action in an application, a request is executed by the architecture that may require dozens of different services to participate in order to produce a response.
8+
Every time a user takes an action in an application, a request is executed by the architecture that may require dozens of different services to participate to produce a response.
99
Jaeger lets you perform distributed tracing, which records the path of a request through various microservices that make up an application.
1010

1111
_Distributed tracing_ is a technique that is used to tie the information about different units of work together — usually executed in different processes or hosts — to understand a whole chain of events in a distributed transaction.

migration/migrating_3_4/troubleshooting-3-4.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88

99
You can view the {mtc-full} ({mtc-short}) custom resources and download logs to troubleshoot a failed migration.
1010

11-
If the application was stopped during the failed migration, you must roll it back manually in order to prevent data corruption.
11+
If the application was stopped during the failed migration, you must roll it back manually to prevent data corruption.
1212

1313
[NOTE]
1414
====

0 commit comments

Comments
 (0)