Merge pull request #41229 from rh-tokeefe/OSSMDOC-368

JStickler · web-flow · commit 5312f2018572 · 2022-02-04T11:27:04.000-05:00
OSSMDOC-368: fix typo, change workflow to workload.
diff --git a/modules/ossm-migrating-to-20.adoc b/modules/ossm-migrating-to-20.adoc
@@ -518,6 +518,6 @@ Resources are configured under `spec.runtime.<component>`. The following compone
 Some components support resource limiting and scheduling. For more information, see xref:../../service_mesh/v2x/ossm-performance-scalability.adoc#ossm-performance-scalability[Performance and scalability].
 
 [id="ossm-migrrating-apps_{context}"]
-== Next steps for migrating your applications and workflows
+== Next steps for migrating your applications and workloads
 
 Move the application workload to the new mesh and remove the old instances to complete your upgrade.
diff --git a/modules/ossm-security-mtls.adoc b/modules/ossm-security-mtls.adoc
@@ -9,4 +9,4 @@ Mutual Transport Layer Security (mTLS) is a protocol that enables two parties au
 
 By default, mTLS in {ProductName} is enabled and set to permissive mode, where the sidecars in {ProductShortName} accept both plain-text traffic and connections that are encrypted using mTLS. If a service in your mesh is communicating with a service outside the mesh, strict mTLS could break communication between those services. Use permissive mode while you migrate your workloads to {ProductShortName}. Then, you can enable strict mTLS across your mesh, namespace, or application.
 
-Enabling mTLS across your mesh at the control plane level secures all the traffic in your service mesh without rewriting your applications and workflows. You can secure namespaces in your mesh at the data plane level in the `ServiceMeshControlPlane` resource. To customize traffic encryption connections, configure namespaces at the application level with `PeerAuthentication` and `DestinationRule` resources.
+Enabling mTLS across your mesh at the control plane level secures all the traffic in your service mesh without rewriting your applications and workloads. You can secure namespaces in your mesh at the data plane level in the `ServiceMeshControlPlane` resource. To customize traffic encryption connections, configure namespaces at the application level with `PeerAuthentication` and `DestinationRule` resources.
diff --git a/modules/ossm-upgrading-to-21.adoc b/modules/ossm-upgrading-to-21.adoc
@@ -96,7 +96,7 @@ Red Hat is unable to support `EnvoyFilter` configuration except where explicitly
 ====
 
 [id="ossm-upgrading-mig-apps_{context}"]
-== Next steps for migrating your applications and workflows
+== Next steps for migrating your applications and workloads
 
 To complete the migration, restart all of the application pods in the mesh to upgrade the Envoy sidecar proxies and their configuration.
 
diff --git a/service_mesh/v2x/ossm-create-mesh.adoc b/service_mesh/v2x/ossm-create-mesh.adoc
@@ -4,7 +4,7 @@
 include::modules/ossm-document-attributes.adoc[]
 :context: ossm-create-mesh
 
-After installing the Operators and `ServiceMeshControlPlane` resource, add applications, workloads, or services to your mesh by creating a `ServiceMeshMemberRoll` resource and specifying the namespaces where your content is located. If you already have an application, workflow, or service to add to a `ServiceMeshMemberRoll` resource, use the following steps. Or, to install a sample application called Bookinfo and add it to a  `ServiceMeshMemberRoll` resource, skip to the tutorial for installing the xref:../../service_mesh/v2x/ossm-create-mesh.adoc#ossm-tutorial-bookinfo-overview_ossm-create-mesh[Bookinfo example application] to see how an application works in {ProductName}.
+After installing the Operators and `ServiceMeshControlPlane` resource, add applications, workloads, or services to your mesh by creating a `ServiceMeshMemberRoll` resource and specifying the namespaces where your content is located. If you already have an application, workload, or service to add to a `ServiceMeshMemberRoll` resource, use the following steps. Or, to install a sample application called Bookinfo and add it to a  `ServiceMeshMemberRoll` resource, skip to the tutorial for installing the xref:../../service_mesh/v2x/ossm-create-mesh.adoc#ossm-tutorial-bookinfo-overview_ossm-create-mesh[Bookinfo example application] to see how an application works in {ProductName}.
 
 The items listed in the `ServiceMeshMemberRoll` resource are the applications and workflows that are managed by the `ServiceMeshControlPlane` resource. The control plane, which includes the {ProductShortName} Operators, Istiod, and `ServiceMeshControlPlane`, and the data plane, which includes applications and Envoy proxy, must be in separate namespaces.
 
@@ -29,4 +29,4 @@ include::modules/ossm-tutorial-bookinfo-removing.adoc[leveloffset=+2]
 
 == Next steps
 
-* To continue the installation process, you must xref:../../service_mesh/v2x/prepare-to-deploy-applications-ossm.adoc#deploying-applications-ossm[enable sidecar injection]. 
+* To continue the installation process, you must xref:../../service_mesh/v2x/prepare-to-deploy-applications-ossm.adoc#deploying-applications-ossm[enable sidecar injection].

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@ Mutual Transport Layer Security (mTLS) is a protocol that enables two parties au`
`9`	`9`
`10`	`10`	`By default, mTLS in {ProductName} is enabled and set to permissive mode, where the sidecars in {ProductShortName} accept both plain-text traffic and connections that are encrypted using mTLS. If a service in your mesh is communicating with a service outside the mesh, strict mTLS could break communication between those services. Use permissive mode while you migrate your workloads to {ProductShortName}. Then, you can enable strict mTLS across your mesh, namespace, or application.`
`11`	`11`
`12`		-Enabling mTLS across your mesh at the control plane level secures all the traffic in your service mesh without rewriting your applications and workflows. You can secure namespaces in your mesh at the data plane level in the `ServiceMeshControlPlane` resource. To customize traffic encryption connections, configure namespaces at the application level with `PeerAuthentication` and `DestinationRule` resources.
	`12`	+Enabling mTLS across your mesh at the control plane level secures all the traffic in your service mesh without rewriting your applications and workloads. You can secure namespaces in your mesh at the data plane level in the `ServiceMeshControlPlane` resource. To customize traffic encryption connections, configure namespaces at the application level with `PeerAuthentication` and `DestinationRule` resources.