Merge pull request #5469 from vikram-redhat/master

Online Weekly Release Link Fixes

Author: vikram-redhat

architecture/additional_concepts/storage.adoc

@@ -141,7 +141,7 @@ If supported by appropriate volume plug-in, recycling performs a basic scrub (`r
 The `recycle` reclaim policy is deprecated in favor of dynamic provisioning and it will be removed in future releases.
 ====
 
-ifndef::openshift-online+openshift-dedicated[]
+ifndef::openshift-online,openshift-dedicated[]
 
 You can configure a custom recycler pod template using the controller manager command line arguments as described in the  xref:../../install_config/master_node_configuration.adoc#master-config-admission-control-config[ControllerArguments] section. The custom recycler pod template must contain a `volumes` specification, as shown in the example below:
 

architecture/networking/routes.adoc

@@ -23,7 +23,7 @@ Your administrator may have configured a
 ifdef::openshift-online,openshift-dedicated[]
 DNS wildcard entry
 endif::[]
-ifndef::openshift-online+openshift-dedicated[]
+ifndef::openshift-online,openshift-dedicated[]
 xref:../../install_config/install/prerequisites.adoc#prereq-dns[DNS wildcard entry]
 endif::[]
 that will resolve to the {product-title} node that is running the

architecture/topics/openshift_sdn_plugins.adoc

@@ -14,8 +14,7 @@ with them. In {product-title} clusters, the *default* project has VNID 0. This
 facilitates certain services, such as the load balancer, to communicate with
 all other pods in the cluster and vice versa.
 * The *ovs-networkpolicy* plug-in (currently in Tech Preview) allows project
-administrators to configure their own isolation policies using
-xref:../../admin_guide/managing_networking.adoc#admin-guide-networking-networkpolicy[NetworkPolicy objects].
+administrators to configure their own isolation policies using NetworkPolicy objects.
 
 ifdef::openshift-enterprise,openshift-origin[]
 [NOTE]

architecture/topics/sticky_sessions.adoc

@@ -54,8 +54,11 @@ implementing stick-tables that synchronize between a set of peers.
 
 Specific configuration for this router implementation is stored in the
 *_haproxy-config.template_* file located in the *_/var/lib/haproxy/conf_*
-directory of the router container. The file may be
-xref:../../install_config/router/customized_haproxy_router.adoc#[customized].
+directory of the router container. 
+ifdef::openshift-enterprise,openshift-origin[]
+The file may be
+xref:../../install_config/router/customized_haproxy_router.adoc#install-config-router-customized-haproxy[customized]
+endif::[]
 
 [NOTE]
 ====

dev_guide/managing_images.adoc

@@ -361,7 +361,7 @@ Currently, it is also possible to make them work with native Kubernetes
 resources, such as xref:../dev_guide/jobs.adoc#dev-guide-jobs[jobs],
 xref:../architecture/core_concepts/deployments.adoc#replication-controllers[replication
 controllers], replica sets or
-ifndef::openshift-online+openshift-dedicated[]
+ifndef::openshift-online,openshift-dedicated[]
 xref:../dev_guide/deployments/kubernetes_deployments.adoc#dev-guide-kubernetes-deployments-support[Kubernetes
 deployments].
 
@@ -370,7 +370,7 @@ xref:../admin_guide/image_policy.adoc#admin-guide-image-policy[configures
 exactly what resources] can be used.
 
 endif::[]
-ifdef::openshift-online+openshift-dedicated[]
+ifdef::openshift-online,openshift-dedicated[]
 Kubernetes deployments.
 endif::[]