Skip to content

Commit a8099cb

Browse files
authored
Merge pull request #33843 from bergerhoffer/typo-fixes-48
Cleaning up some typos
2 parents fd677ba + b9b1d06 commit a8099cb

26 files changed

+38
-38
lines changed

installing/installing_openstack/installing-openstack-user-sr-iov.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
4545
include::modules/installation-osp-converting-ignition-resources.adoc[leveloffset=+1]
4646
include::modules/installation-osp-creating-control-plane-ignition.adoc[leveloffset=+1]
4747
include::modules/installation-osp-creating-network-resources.adoc[leveloffset=+1]
48-
Optionally, you can use the the `inventory.yaml` file that you created to customize your installation. For example, you can deploy a cluster that uses bare metal machines.
48+
Optionally, you can use the `inventory.yaml` file that you created to customize your installation. For example, you can deploy a cluster that uses bare metal machines.
4949

5050
include::modules/installation-osp-deploying-bare-metal-machines.adoc[leveloffset=+2]
5151
include::modules/installation-osp-creating-bootstrap-machine.adoc[leveloffset=+1]
@@ -67,8 +67,8 @@ include::modules/networking-osp-enabling-vfio-noiommu.adoc[leveloffset=+2]
6767
After you apply the machine config to the machine pool, you can xref:../../post_installation_configuration/machine-configuration-tasks.html#checking-mco-status_post-install-machine-configuration-tasks[watch the machine config pool status] to see when the machines are available.
6868
====
6969

70-
// TODO: If bullet one of Next steps is truly required for this flow, these topics (in full or in part) could be added here rather than linked to.
71-
// This document is quite long, however, and operator installation and configuration should arguably remain in their their own assemblies.
70+
// TODO: If bullet one of Next steps is truly required for this flow, these topics (in full or in part) could be added here rather than linked to.
71+
// This document is quite long, however, and operator installation and configuration should arguably remain in their their own assemblies.
7272

7373
The cluster is installed and prepared for SR-IOV configuration. You must now perform the SR-IOV configuration tasks in "Next steps".
7474

modules/developer-cli-odo-connecting-a-java-application-to-mysql-database.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To connect your Java application to the database, use the `odo link` command.
99

1010
.Procedure
1111

12-
. Display the list of services:
12+
. Display the list of services:
1313
+
1414
[source,terminal]
1515
----
@@ -50,7 +50,7 @@ declare -x DATABASE_DB_PASSWORD="samplepwd"
5050
declare -x DATABASE_DB_USER="sampleuser"
5151
----
5252

53-
. Open the URL of your Java application and navigate to the `CreatePerson.xhtml` data entry page. Enter a username and age by using the the form. Click *Save*.
53+
. Open the URL of your Java application and navigate to the `CreatePerson.xhtml` data entry page. Enter a username and age by using the form. Click *Save*.
5454
+
5555
Note that now you can see the data in the database by clicking the *View Persons Record List* link.
5656
+

modules/developer-cli-odo-creating-a-java-microservice-jpa-application.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ $ odo create java-openliberty java-application
2929
+
3030
[source,terminal]
3131
----
32-
$ odo push
32+
$ odo push
3333
----
3434
+
35-
The application is now deployed to the cluster.
35+
The application is now deployed to the cluster.
3636

3737
. View the status of the cluster by streaming the OpenShift logs to the terminal:
3838
+
@@ -105,6 +105,6 @@ java-application-8080 Pushed http://java-application-8080.apps-crc.testi
105105
+
106106
The application is now deployed to the cluster and you can access it by using the URL that is created.
107107

108-
. Use the URL to navigate to the `CreatePerson.xhtml` data entry page and enter a username and age by using the the form. Click *Save*.
108+
. Use the URL to navigate to the `CreatePerson.xhtml` data entry page and enter a username and age by using the form. Click *Save*.
109109
+
110110
Note that you cannot see the data by clicking the *View Persons Record List* link since your application does not have a database connected yet.

modules/gitops-registering-an-additional-oauth-client.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ apiVersion: oauth.openshift.io/v1
1919
metadata:
2020
name: keycloak-broker <1>
2121
secret: "..." <2>
22-
redirectURIs:
22+
redirectURIs:
2323
- "https://keycloak-keycloak.apps.dev-svc-4.7-020201.devcluster.openshift.com/auth/realms/myrealm/broker/openshift-v4/endpoint" <3>
24-
grantMethod: prompt <4>
24+
grantMethod: prompt <4>
2525
')
2626
----
2727

28-
<1> The name of the OAuth client is used as the `client_id` parameter when making requests to `<namespace_route>/oauth/authorize` and ``<namespace_route>/oauth/token`.
28+
<1> The name of the OAuth client is used as the `client_id` parameter when making requests to `<namespace_route>/oauth/authorize` and `<namespace_route>/oauth/token`.
2929
<2> The `secret` is used as the client_secret parameter when making requests to `<namespace_route>/oauth/token`.
30-
<3> The `redirect_uri` parameter specified in requests to ``<namespace_route>/oauth/authorize` and ``<namespace_route>/oauth/token` must be equal to or prefixed by one of the URIs listed in the `redirectURIs` parameter value.
30+
<3> The `redirect_uri` parameter specified in requests to `<namespace_route>/oauth/authorize` and `<namespace_route>/oauth/token` must be equal to or prefixed by one of the URIs listed in the `redirectURIs` parameter value.
3131
<4> If the user has not granted access to this client, the `grantMethod` determines which action to take when this client requests tokens. Specify `auto` to automatically approve the grant and retry the request, or `prompt` to prompt the user to approve or deny the grant.

modules/images-other-jenkins-env-var.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ log file to persist when a fatal error occurs. The fatal error file is saved at
8383
|Default: `false`
8484

8585
|`NODEJS_SLAVE_IMAGE`
86-
|Setting this value overrides the image that is used for the default Node.js agent pod configuration. A related image stream tag named `jenkins-agent-nodejs` is in in the project. This variable must be set before Jenkins starts the first time for it to have an effect.
86+
|Setting this value overrides the image that is used for the default Node.js agent pod configuration. A related image stream tag named `jenkins-agent-nodejs` is in the project. This variable must be set before Jenkins starts the first time for it to have an effect.
8787
|Default Node.js agent image in Jenkins server: `image-registry.openshift-image-registry.svc:5000/openshift/jenkins-agent-nodejs:latest`
8888

8989
|`MAVEN_SLAVE_IMAGE`

modules/installation-infrastructure-user-infra.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ endif::[]
3131

3232
Before you install {product-title} on user-provisioned infrastructure, you must prepare the underlying infrastructure.
3333

34-
This section provides details about the high-level steps required to set up your cluster infrastructure in preparation for an {product-title} installation. This includes configuring IP networking and network connectivity for your cluster nodes,
34+
This section provides details about the high-level steps required to set up your cluster infrastructure in preparation for an {product-title} installation. This includes configuring IP networking and network connectivity for your cluster nodes,
3535
ifdef::ibm-z[]
36-
preparing a web server for the Ignition files,
36+
preparing a web server for the Ignition files,
3737
endif::ibm-z[]
3838
enabling the required ports through your firewall, and setting up the required DNS and load balancing infrastructure.
3939

@@ -68,7 +68,7 @@ If you are not using a DHCP service, the cluster nodes obtain their hostname thr
6868
====
6969
endif::ibm-z[]
7070
ifdef::ibm-z-kvm[]
71-
. Choose to perform either a fast track installation of {op-system-first} or a full installation of {op-system-first}. For the full installation you must set up an HTTP or HTTPS server to provide Ignition files and install images to the cluster nodes. For the fast track installation an HTTP or HTTPS server is not not required, however, a DHCP server is required. See sections “Fast-track installation: Creating {op-system-first} machines" and “Full installation: Creating {op-system-first} machines".
71+
. Choose to perform either a fast track installation of {op-system-first} or a full installation of {op-system-first}. For the full installation you must set up an HTTP or HTTPS server to provide Ignition files and install images to the cluster nodes. For the fast track installation an HTTP or HTTPS server is not required, however, a DHCP server is required. See sections “Fast-track installation: Creating {op-system-first} machines" and “Full installation: Creating {op-system-first} machines".
7272
endif::ibm-z-kvm[]
7373

7474
. Ensure that your network infrastructure provides the required network connectivity between the cluster components. See the _Networking requirements for user-provisioned infrastructure_ section for details about the requirements.

modules/installation-initializing.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ ifdef::rhv[]
155155

156156
[WARNING]
157157
====
158-
Due to a known issue with installing {product-title} versions 4.4 and 4.5 on {rh-virtualization-first} 4.4.1, you must customize `install-config.yaml` as described in link:https://access.redhat.com/solutions/5374251[Openshift IPI installation on {rh-virtualization}-4.x failed with "Error: timeout while waiting for state to become 'up' (last state: 'down', timeout: 10m0s)"]. This defect is fixed in {rh-virtualization} 4.4.2.
158+
Due to a known issue with installing {product-title} versions 4.4 and 4.5 on {rh-virtualization-first} 4.4.1, you must customize `install-config.yaml` as described in link:https://access.redhat.com/solutions/5374251[OpenShift IPI installation on {rh-virtualization}-4.x failed with "Error: timeout while waiting for state to become 'up' (last state: 'down', timeout: 10m0s)"]. This defect is fixed in {rh-virtualization} 4.4.2.
159159
====
160160
ifndef::openshift-origin[]
161161
[WARNING]
@@ -427,7 +427,7 @@ ifdef::aws+restricted[]
427427
+
428428
[source,yaml]
429429
----
430-
subnets:
430+
subnets:
431431
- subnet-1
432432
- subnet-2
433433
- subnet-3

modules/ipi-install-creating-the-openshift-manifests.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $ ./openshift-baremetal-install --dir ~/clusterconfigs create manifests
1616
----
1717
INFO Consuming Install Config from target directory
1818
WARNING Making control-plane schedulable by setting MastersSchedulable to true for Scheduler cluster settings
19-
WARNING Discarding the Openshift Manifest that was provided in the target directory because its dependencies are dirty and it needs to be regenerated
19+
WARNING Discarding the OpenShift Manifest that was provided in the target directory because its dependencies are dirty and it needs to be regenerated
2020
----
2121

2222
ifeval::[{product-version} <= 4.3]

modules/master-node-sizing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The control plane node resource requirements depend on the number of nodes in th
4040

4141
|===
4242

43-
On a cluster with three masters or control plane nodes, the CPU and memory usage will spike up when one of the nodes is stopped, rebooted or fails because the remaining two nodes must handle the load in order to be highly available. This is also expected during upgrades because the masters are cordoned, drained, and rebooted serially to apply the operating system updates, as well as the the control plane Operators update. To avoid cascading failures on large and dense clusters, keep the overall resource usage on the master nodes to at least half of all available capacity to handle the resource usage spikes. Increase the CPU and memory on the master nodes accordingly.
43+
On a cluster with three masters or control plane nodes, the CPU and memory usage will spike up when one of the nodes is stopped, rebooted or fails because the remaining two nodes must handle the load in order to be highly available. This is also expected during upgrades because the masters are cordoned, drained, and rebooted serially to apply the operating system updates, as well as the control plane Operators update. To avoid cascading failures on large and dense clusters, keep the overall resource usage on the master nodes to at least half of all available capacity to handle the resource usage spikes. Increase the CPU and memory on the master nodes accordingly.
4444

4545
[IMPORTANT]
4646
====

modules/nw-ingress-creating-a-passthrough-route.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
----
4343
<1> The name of the object, which is limited to 63 characters.
4444
<2> The `*termination*` field is set to `passthrough`. This is the only required `tls` field.
45-
<3> Optional `insecureEdgeTerminationPolicy`. The only valid values are are `None`, `Redirect`, or empty for disabled.
45+
<3> Optional `insecureEdgeTerminationPolicy`. The only valid values are `None`, `Redirect`, or empty for disabled.
4646
+
4747
The destination pod is responsible for serving certificates for the
4848
traffic at the endpoint. This is currently the only method that can support requiring client certificates, also known as two-way authentication.

0 commit comments

Comments
 (0)