Merge pull request #1041 from klgill/copy-cqa-changes

copied cqa edits from downstream

Author: openshift-merge-bot[bot]

docs_user/assemblies/assembly_rhoso-180-adoption-overview.adoc

@@ -8,7 +8,7 @@ ifdef::context[:parent-context: {context}]
 = {rhos_long_noacro} {rhos_curr_ver} adoption overview
 
 [role="_abstract"]
-Adoption is the process of migrating a {rhos_prev_long} ({OpenStackShort}) {rhos_prev_ver} control plane to {rhos_long_noacro} {rhos_curr_ver}, and then completing an in-place upgrade of the data plane. Adoption enables you to retain existing infrastructure investments while modernizing your {OpenStackShort} deployment on a containerized {rhocp_long} foundation. To ensure that you understand the entire adoption process and how to sufficiently prepare your {OpenStackShort} environment, review the prerequisites, adoption process, and post-adoption tasks.
+Adoption is the process of migrating a {rhos_prev_long} ({OpenStackShort}) {rhos_prev_ver} control plane to {rhos_long_noacro} {rhos_curr_ver}, and then completing an in-place upgrade of the data plane. You can retain existing infrastructure investments and modernize your {OpenStackShort} deployment on a containerized {rhocp_long} foundation. To ensure that you understand the entire adoption process and how to sufficiently prepare your {OpenStackShort} environment, review the prerequisites, adoption process, and post-adoption tasks.
 
 [IMPORTANT]
 Read the whole adoption guide before you start

docs_user/modules/con_adoption-limitations.adoc

@@ -32,12 +32,12 @@ Unsupported features::
 +
 The adoption process does not support the following features:
 +
-* instanceHA
-* DCN
-* Designate
+* Instance high availability (instanceHA)
+* Distributed Compute node architecture (DCN)
+* DNS-as-a-service (designate)
 * {loadbalancer_first_ref}
-* BGP
-* Adopting a FIPS environment
+* Border Gateway Protocol (BGP)
+* Adopting a Federal Information Processing Standards (FIPS) environment
 * The {key_manager} only supports the simple crypto plug-in
 
 

docs_user/modules/proc_completing-prerequisites-for-migrating-ceph-monitoring-stack.adoc

@@ -4,7 +4,7 @@
 = Completing prerequisites for a {Ceph} cluster with monitoring stack components
 
 [role="_abstract"]
-Complete the following prerequisites before you migrate a {Ceph} cluster with monitoring stack components.
+Before you migrate a {Ceph} cluster with monitoring stack components, you must gather monitoring stack information, review and update the container image registry, and remove the undercloud container images.
 
 [NOTE]
 In addition to updating the container images related to the monitoring stack, you must update the configuration entry related to the `container_image_base`. This has an impact on all the {Ceph} daemons that rely on the undercloud images.