Merge pull request #1348 from klgill/minor-changes-to-sync-with-downstream

minor changes

Author: openshift-merge-bot[bot]

docs_user/adoption-attributes.adoc

@@ -164,7 +164,7 @@ endif::[]
 
 // Common URLs. Do not override. Do not delete.
 :base_url: https://access.redhat.com/documentation
-:defaultURL: https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/{rhos_curr_ver}/html
+:defaultURL: https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/18.0/html
 :defaultOCPURL: https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp_curr_ver}/html
 :defaultCephURL:  https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/{CephVernum}/html
 

docs_user/assemblies/assembly_adopting-the-image-service.adoc

@@ -37,7 +37,7 @@ include::../modules/proc_verifying-the-image-service-adoption.adoc[leveloffset=+
 
 [role="_additional-resources"]
 == Additional resources
-* link:{defaultURL}/customizing_persistent_storage/assembly_glance-customizing-the-image-service_customizing-cinder#assembly_glance-configuring-quotas_configuring-glance[Configuring image quotas]
+* link:{defaultURL}/customizing_persistent_storage/assembly_glance-configuring-quotas_osp[Customizing Image service (glance) quota limits]
 
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]

docs_user/modules/proc_reusing-existing-subnet-ranges.adoc

@@ -18,5 +18,7 @@ new control plane services.
 
 [role="_additional-resources"]
 .Additional resources
+ifeval::["{build_variant}" != "ospdo"]
 * xref:using-new-subnet-ranges_{context}[Using new subnet ranges]
+endif::[]
 * xref:configuring-isolated-networks_configuring-network[Configuring isolated networks]