Merge branch 'master' into patch-17

2017-03-21 08:16:35 +08:00
parent 069a2dabc6 763513ccce
commit 4ba1d79c61
34 changed files with 1055 additions and 1025 deletions
@@ -274,7 +274,7 @@ spec:
 * Get hands-on experience
  [configuring liveness and readiness probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/).

-* [Container Lifecycle Hooks](/docs/user-guide/container-environment/)
+* [Container Lifecycle Hooks](/docs/concepts/containers/container-lifecycle-hooks/)

 {% endcapture %}