Merge pull request #9027 from kalexand-rh/PR7369

kalexand-rh · web-flow · commit 1a64fe52caa3 · 2018-05-04T08:48:50.000-04:00
[master] Release: Link Fixes from 3.7
diff --git a/admin_guide/garbage_collection.adoc b/admin_guide/garbage_collection.adoc
@@ -14,7 +14,7 @@ toc::[]
 
 The {product-title} node performs two types of garbage collection:
 
-* xref:container-garbage-collection[Container garbage collection]: Removes
+* xref:container-garbage-collection[Container garbage collection] Removes
 terminated containers.
 * xref:image-garbage-collection[Image garbage collection]: Removes images not
 referenced by any running pods.
diff --git a/admin_guide/limits.adoc b/admin_guide/limits.adoc
@@ -388,8 +388,8 @@ Across all persistent volume claims in a project, the following must hold true:
 [[creating-a-limit-range]]
 == Creating a Limit Range
 
-To apply a limit range to a project, create a xref:limit-range-obj-def[limit range
-object definition] on your file system to your desired specifications, then run:
+To apply a limit range to a project, create a limit range
+object definition on your file system to your desired specifications, then run:
 
 ----
 $ oc create -f <limit_range_file> -n <project>
diff --git a/admin_guide/monitoring_images.adoc b/admin_guide/monitoring_images.adoc
@@ -80,5 +80,4 @@ xref:../install_config/registry/index.adoc#install-config-registry-overview[Red
 [[monitoring-images-pruning]]
 == Pruning Images
 
-The information returned from the above commands is helpful when performing
-xref:pruning_resources.adoc#pruning-images[image pruning].
+The information returned from the above commands is helpful when performing image pruning.
diff --git a/admin_guide/out_of_resource_handling.adoc b/admin_guide/out_of_resource_handling.adoc
@@ -513,7 +513,7 @@ The node then kills the container with the highest score.
 
 Containers with the lowest quality of service that are consuming the largest amount of memory relative to the scheduling request are failed first.
 
-Unlike pod eviction, if a pod container is OOM failed, it can be restarted by the node based on the node xref:../rest_api/openshift_v1.html#v1-podspec[restart policy].
+Unlike pod eviction, if a pod container is OOM failed, it can be restarted by the node based on the node restart policy.
 
 
 [[out-of-resource-scheduler]]
diff --git a/admin_guide/pruning_resources.adoc b/admin_guide/pruning_resources.adoc
@@ -232,7 +232,7 @@ run outside of the cluster network, the route needs to be provided using
 .^|`--force-insecure`
 |*Use caution with this option.* Allow an insecure connection to the Docker
 registry that is hosted via HTTP or has an invalid HTTPS certificate. See
-xref:#pruning-images-secure-or-insecure[Using Secure or Insecure Connections]
+xref:pruning-images-secure-or-insecure[Using Secure or Insecure Connections]
 for more information.
 
 .^|`--keep-tag-revisions=<N>`
@@ -504,8 +504,7 @@ ifdef::openshift-origin,openshift-enterprise[]
 == Hard Pruning the Registry
 
 The OpenShift Container Registry can accumulate blobs that are not referenced by
-the {product-title} cluster's etcd. The basic xref:pruning-images[Pruning
-Images] procedure, therefore, is unable to operate on them. These are called
+the {product-title} cluster's etcd. The basic Pruning Images procedure, therefore, is unable to operate on them. These are called
 _orphaned blobs_.
 
 Orphaned blobs can occur from the following scenarios:
@@ -546,7 +545,7 @@ images that are no longer needed. The hard prune does not remove images on its
 own. It only removes blobs stored in the registry storage. Therefore, you should
 run this just before the hard prune.
 +
-See xref:pruning-images[Pruning Images] for steps.
+See Pruning Images for steps.
 
 . +++<b>Switch the registry to read-only mode:</b>+++ If the registry is not
 running in read-only mode, any pushes happening at the same time as the prune
diff --git a/admin_guide/scheduling/pod_affinity.adoc b/admin_guide/scheduling/pod_affinity.adoc
@@ -200,7 +200,7 @@ spec:
 +
 .. For a preferred rule, specify a weight, 1-100.
 +
-.. Specify an `operator`. The xref:../../rest_api/openshift_v1.adoc#unversioned-labelselectorrequirement[operator] can be `In`, `NotIn`, `Exists`, or `DoesNotExist`. For example, use the operator `In` to require the label to be in the node.
+.. Specify an `operator`. The operator can be `In`, `NotIn`, `Exists`, or `DoesNotExist`. For example, use the operator `In` to require the label to be in the node.
 
 . Specify a `topologyKey`, which is a prepopulated link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#interlude-built-in-node-labels[Kubernetes label] that the system uses to denote such a topology domain.
 
diff --git a/architecture/additional_concepts/other_api_objects.adoc b/architecture/additional_concepts/other_api_objects.adoc
@@ -68,7 +68,7 @@ makes sure the volume is available on the same node as the pod that requires it.
 A _custom resource_ is an extension of the Kubernetes API that extends the API or allows you to
 introduce your own API into a project or a cluster.
 
-See xref:../admin_guide/custom_resource_definitions.adoc#admin-guide-custom-resources[Extend the Kubernetes API with Custom Resources].
+  See xref:../../admin_guide/custom_resource_definitions.adoc#admin-guide-custom-resources[Extend the Kubernetes API with Custom Resources].
 
 == OAuth Objects
 
diff --git a/architecture/additional_concepts/storage.adoc b/architecture/additional_concepts/storage.adoc
@@ -247,7 +247,7 @@ status of the volume.
 
 ifdef::openshift-enterprise,openshift-origin[]
 - xref:../../install_config/persistent_storage/persistent_storage_nfs.adoc#install-config-persistent-storage-persistent-storage-nfs[NFS]
-- xref:../../rest_api/kubernetes_v1.adoc#v1-hostpathvolumesource[HostPath]
+- HostPath
 - xref:../../install_config/persistent_storage/persistent_storage_glusterfs.adoc#install-config-persistent-storage-persistent-storage-glusterfs[GlusterFS]
 - xref:../../install_config/persistent_storage/persistent_storage_ceph_rbd.adoc#install-config-persistent-storage-persistent-storage-ceph-rbd[Ceph
 RBD]
diff --git a/architecture/core_concepts/pods_and_services.adoc b/architecture/core_concepts/pods_and_services.adoc
@@ -154,10 +154,7 @@ a `*secret*` volume containing the service account credentials.
 This pod definition does not include attributes that
 are filled by {product-title} automatically after the pod is created and
 its lifecycle begins. The
-xref:../../rest_api/kubernetes_v1.adoc#rest-api-kubernetes-v1[Kubernetes API documentation]
-has complete details of the pod REST API object attributes, and the
-link:https://kubernetes.io/docs/concepts/workloads/pods/pod/[Kubernetes pod documentation]
-has details about the functionality and purpose of pods.
+link:https://kubernetes.io/docs/concepts/workloads/pods/pod/[Kubernetes pod documentation] has details about the functionality and purpose of pods.
 ====
 
 [[admin-manage-pod-restart]]
diff --git a/architecture/infrastructure_components/kubernetes_infrastructure.adoc b/architecture/infrastructure_components/kubernetes_infrastructure.adoc
@@ -254,6 +254,4 @@ command.
 can be reached. Defaults to the *`metadata.name`* value when empty.
 ====
 
-The xref:../../rest_api/kubernetes_v1.adoc#v1-node[REST API Reference] has
-more details on these definitions.
 endif::[]
diff --git a/creating_images/custom.adoc b/creating_images/custom.adoc
@@ -46,8 +46,7 @@ variables with the information needed to proceed with the build:
 |Variable Name |Description
 
 |`*BUILD*`
-|The entire serialized JSON of the `*Build*`
-xref:../rest_api/openshift_v1.adoc#v1-build[object definition]. If you need to
+|The entire serialized JSON of the `*Build*` object definition. If you need to
 use a specific API version for serialization, you can set the
 `*buildAPIVersion*` parameter in the
 xref:../dev_guide/builds/build_strategies.adoc#custom-strategy-options[custom strategy
@@ -92,10 +91,6 @@ Although Custom builder image authors have great flexibility in defining the
 build process, your builder image must still adhere to the following required
 steps necessary for seamlessly running a build inside of {product-title}:
 
-. Read the `*Build*` xref:../rest_api/openshift_v1.adoc#v1-build[object
-definition], which contains all the necessary information about input parameters
-for the build.
+. The `*Build*` object definition contains all the necessary information about input parameters for the build.
 . Run the build process.
-. If your build produces an image, push it to the build's
-xref:../rest_api/openshift_v1.adoc#v1-buildoutput[output location] if it is
-defined. Other output locations can be passed with environment variables.
+. If your build produces an image, push it to the build's output location if it is defined. Other output locations can be passed with environment variables.
diff --git a/dev_guide/dev_tutorials/openshift_pipeline.adoc b/dev_guide/dev_tutorials/openshift_pipeline.adoc
@@ -50,10 +50,8 @@ If Jenkins auto-provisioning is enabled on your cluster, and you do not need to
 make any customizations to the Jenkins master, you can skip the previous step.
 
 ifdef::openshift-origin,openshift-enterprise[]
-For more information about
-Jenkins autoprovisioning, see
-xref:../../install_config/configuring_pipeline_execution.adoc#install-config-configuring-pipeline-execution[Configuring
-Pipeline Execution].
+For more information about Jenkins autoprovisioning, see
+xref:../../install_config/configuring_pipeline_execution.adoc#install-config-configuring-pipeline-execution[Configuring Pipeline Execution].
 endif::[]
 ====
 
diff --git a/dev_guide/managing_images.adoc b/dev_guide/managing_images.adoc
@@ -373,7 +373,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[]
+ifdef::openshift-enterprise,openshift-origin[]
 xref:../dev_guide/deployments/kubernetes_deployments.adoc#dev-guide-kubernetes-deployments-support[Kubernetes
 deployments].
 
@@ -1232,4 +1232,4 @@ endif::[]
 for the whole cluster.
 <8> Languages this image supports. This value will be used during `oc new-app` invocations to try to match potential
 builder images to the provided source repository.
-<9> Version information for this tag.
+<9> Version information for this tag.
diff --git a/dev_guide/volumes.adoc b/dev_guide/volumes.adoc
@@ -145,8 +145,7 @@ character.
 
 |`--source`
 |Details of volume source as a JSON string. Recommended if the desired volume
-source is not supported by `--type`. See
-xref:../rest_api/kubernetes_v1.adoc#v1-volume[available volume sources]
+source is not supported by `--type`.
 |
 
 |`-o, --output`
diff --git a/rest_api/oapi/v1.Build.adoc b/rest_api/oapi/v1.Build.adoc
@@ -1,3 +1,4 @@
+[[rest-api-v1-build]]
 = v1.Build
 {product-author}
 {product-version}
diff --git a/scaling_performance/cluster_limits.adoc b/scaling_performance/cluster_limits.adoc
@@ -80,7 +80,7 @@ expensive and slow down processing given state changes.]
 ====
 Oversubscribing the physical resources on a node affects resource guarantees the
 Kubernetes scheduler makes during pod placement. Learn what measures you can
-take to xref:../../admin_guide/overcommit.adoc#disabling-swap-memory[avoid memory swapping].
+take to xref:../admin_guide/overcommit.adoc#disabling-swap-memory[avoid memory swapping].
 ====
 
 While
diff --git a/security/container_content.adoc b/security/container_content.adoc
@@ -233,7 +233,7 @@ with an external URL for additional details:
 While
 xref:../architecture/core_concepts/builds_and_image_streams.adoc#image-streams[image
 stream objects] are what an end-user of {product-title} operates against,
-xref:../rest_api/openshift_v1.adoc#v1-image[image objects] are annotated with
+image objects are annotated with
 security metadata. Image objects are cluster-scoped, pointing to a single image
 that may be referenced by many image streams and tags.
 

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ spec:`
`200`	`200`	`+`
`201`	`201`	`.. For a preferred rule, specify a weight, 1-100.`
`202`	`202`	`+`
`203`		-.. Specify an `operator`. The xref:../../rest_api/openshift_v1.adoc#unversioned-labelselectorrequirement[operator] can be `In`, `NotIn`, `Exists`, or `DoesNotExist`. For example, use the operator `In` to require the label to be in the node.
	`203`	+.. Specify an `operator`. The operator can be `In`, `NotIn`, `Exists`, or `DoesNotExist`. For example, use the operator `In` to require the label to be in the node.
`204`	`204`
`205`	`205`	. Specify a `topologyKey`, which is a prepopulated link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#interlude-built-in-node-labels[Kubernetes label] that the system uses to denote such a topology domain.
`206`	`206`