Merge pull request #398 from supereagle/fix-user-guide-url

Fix user guide url

5 files changed, 7 insertions, 7 deletions

diff --git a/contributors/devel/api_changes.md b/contributors/devel/api_changes.md
index 0396d6aa..4d181a2a 100755
--- a/contributors/devel/api_changes.md
+++ b/contributors/devel/api_changes.md
@@ -215,7 +215,7 @@ runs just prior to conversion. That works fine when the user creates a resource
 from a hand-written configuration -- clients can write either field and read
 either field, but what about creation or update from the output of GET, or
 update via PATCH (see
-[In-place updates](../user-guide/managing-deployments.md#in-place-updates-of-resources))?
+[In-place updates](https://kubernetes.io/docs/user-guide/managing-deployments/#in-place-updates-of-resources))?
 In this case, the two fields will conflict, because only one field would be
 updated in the case of an old client that was only aware of the old field (e.g.,
 `height`).
diff --git a/contributors/devel/coding-conventions.md b/contributors/devel/coding-conventions.md
index bcfab41d..09ebc2a6 100644
--- a/contributors/devel/coding-conventions.md
+++ b/contributors/devel/coding-conventions.md
@@ -120,7 +120,7 @@ subdirectories).
 intended for users that deploy applications or cluster administrators,
 respectively. Actual application examples belong in /examples.
     - Examples should also illustrate [best practices for configuration and
-using the system](../user-guide/config-best-practices.md)
+using the system](https://kubernetes.io/docs/user-guide/config-best-practices/)
 
   - Third-party code
 
diff --git a/contributors/devel/on-call-user-support.md b/contributors/devel/on-call-user-support.md
index a111c6fe..9ead3f2c 100644
--- a/contributors/devel/on-call-user-support.md
+++ b/contributors/devel/on-call-user-support.md
@@ -29,7 +29,7 @@ redirect users to Slack. Also check out the
 
 In general, try to direct support questions to:
 
-1. Documentation, such as the [user guide](../user-guide/README.md) and
+1. Documentation, such as the [user guide](https://kubernetes.io/docs/user-guide/) and
 [troubleshooting guide](http://kubernetes.io/docs/troubleshooting/)
 
 2. Stackoverflow
diff --git a/contributors/devel/running-locally.md b/contributors/devel/running-locally.md
index 64714ce9..3f693840 100644
--- a/contributors/devel/running-locally.md
+++ b/contributors/devel/running-locally.md
@@ -117,8 +117,8 @@ cluster/kubectl.sh get replicationcontrollers
 
 ### Running a user defined pod
 
-Note the difference between a [container](../user-guide/containers.md)
-and a [pod](../user-guide/pods.md). Since you only asked for the former, Kubernetes will create a wrapper pod for you.
+Note the difference between a [container](https://kubernetes.io/docs/user-guide/containers/)
+and a [pod](https://kubernetes.io/docs/user-guide/pods/). Since you only asked for the former, Kubernetes will create a wrapper pod for you.
 However you cannot view the nginx start page on localhost. To verify that nginx is running you need to run `curl` within the docker container (try `docker exec`).
 
 You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein:
diff --git a/contributors/devel/scheduler_algorithm.md b/contributors/devel/scheduler_algorithm.md
index 1053d11e..a115a982 100755
--- a/contributors/devel/scheduler_algorithm.md
+++ b/contributors/devel/scheduler_algorithm.md
@@ -11,7 +11,7 @@ The purpose of filtering the nodes is to filter out the nodes that do not meet c
 - `PodFitsResources`: Check if the free resource (CPU and Memory) meets the requirement of the Pod. The free resource is measured by the capacity minus the sum of requests of all Pods on the node. To learn more about the resource QoS in Kubernetes, please check [QoS proposal](../design-proposals/resource-qos.md).
 - `PodFitsHostPorts`: Check if any HostPort required by the Pod is already occupied on the node.
 - `HostName`: Filter out all nodes except the one specified in the PodSpec's NodeName field.
-- `MatchNodeSelector`: Check if the labels of the node match the labels specified in the Pod's `nodeSelector` field and, as of Kubernetes v1.2, also match the `scheduler.alpha.kubernetes.io/affinity` pod annotation if present. See [here](../user-guide/node-selection/) for more details on both.
+- `MatchNodeSelector`: Check if the labels of the node match the labels specified in the Pod's `nodeSelector` field and, as of Kubernetes v1.2, also match the `scheduler.alpha.kubernetes.io/affinity` pod annotation if present. See [here](https://kubernetes.io/docs/user-guide/node-selection/) for more details on both.
 - `MaxEBSVolumeCount`: Ensure that the number of attached ElasticBlockStore volumes does not exceed a maximum value (by default, 39, since Amazon recommends a maximum of 40 with one of those 40 reserved for the root volume -- see [Amazon's documentation](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/volume_limits.html#linux-specific-volume-limits)).  The maximum value can be controlled by setting the `KUBE_MAX_PD_VOLS` environment variable.
 - `MaxGCEPDVolumeCount`: Ensure that the number of attached GCE PersistentDisk volumes does not exceed a maximum value (by default, 16, which is the maximum GCE allows -- see [GCE's documentation](https://cloud.google.com/compute/docs/disks/persistent-disks#limits_for_predefined_machine_types)).  The maximum value can be controlled by setting the `KUBE_MAX_PD_VOLS` environment variable.
 - `CheckNodeMemoryPressure`: Check if a pod can be scheduled on a node reporting memory pressure condition. Currently, no ``BestEffort`` should be placed on a node under memory pressure as it gets automatically evicted by kubelet.
@@ -34,7 +34,7 @@ Currently, Kubernetes scheduler provides some practical priority functions, incl
 - `SelectorSpreadPriority`: Spread Pods by minimizing the number of Pods belonging to the same service, replication controller, or replica set on the same node.  If zone information is present on the nodes, the priority will be adjusted so that pods are spread across zones and nodes.
 - `CalculateAntiAffinityPriority`: Spread Pods by minimizing the number of Pods belonging to the same service on nodes with the same value for a particular label.
 - `ImageLocalityPriority`: Nodes are prioritized based on locality of images requested by a pod. Nodes with larger size of already-installed packages required by the pod will be preferred over nodes with no already-installed packages required by the pod or a small total size of already-installed packages required by the pod.
-- `NodeAffinityPriority`: (Kubernetes v1.2) Implements `preferredDuringSchedulingIgnoredDuringExecution` node affinity; see [here](../user-guide/node-selection/) for more details.
+- `NodeAffinityPriority`: (Kubernetes v1.2) Implements `preferredDuringSchedulingIgnoredDuringExecution` node affinity; see [here](https://kubernetes.io/docs/user-guide/node-selection/) for more details.
 
 The details of the above priority functions can be found in [plugin/pkg/scheduler/algorithm/priorities](http://releases.k8s.io/HEAD/plugin/pkg/scheduler/algorithm/priorities/). Kubernetes uses some, but not all, of these priority functions by default. You can see which ones are used by default in [plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go](http://releases.k8s.io/HEAD/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go). Similar as predicates, you can combine the above priority functions and assign weight factors (positive number) to them as you want (check [scheduler.md](scheduler.md) for how to customize).