Merge remote-tracking branch 'upstream/master' into release-1.6

2017-02-28 14:33:19 -08:00
parent 86df553c4b 4bb9a3a6af
commit 9a96256e49
15 changed files with 497 additions and 547 deletions
@@ -255,7 +255,7 @@ In addition to command probes and HTTP probes, Kubernetes supports
 {% capture whatsnext %}

 * Learn more about
-[Container Probes](/docs/user-guide/pod-states/#container-probes).
+[Container Probes](/docs/concepts/workloads/pods/pod-lifecycle/#container-probes).

 * Learn more about
 [Health Checking section](/docs/user-guide/walkthrough/k8s201/#health-checking).