Andrew Chen 7215af010f Merge branches 'release-1.6' and 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ...

* 'release-1.6' of https://github.com/kubernetes/kubernetes.github.io:

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (23 commits)
  Apply changes from PR #2787
  rephrase the sentence to make expression clear (#2789)
  update index.md (#2788)
  Apply changes from PR #2784 (#2950)
  The link URL of  [kube-controller-manager] is wrong
  Added pod name in run command
  Fix grammar in docs/admin/daemon.md
  update index.md (#2755)
  Update garbage-collection.md (#2732)
  Fix typo (#2842)
  Fix typo
  Fix the typos
  Apply typo fixes from #2791 (#2949)
  Fix typo in kubectl_completion.md
  fix typeo (#2856)
  Use kubectl config current-context to simplify the instructions
  fix a typo in /docs/user-guide/configmap/index.md
  Fix monitor-node-health.md
  amend monitor-node-health.md
  Update manage-compute-resources-container.md
  ...

# Conflicts:
#	docs/tools/index.md

2017-03-21 19:04:37 -07:00

..

index.md

Merge branches 'release-1.6' and 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

2017-03-21 19:04:37 -07:00

OWNERS

Adding OWNERS for docs.

2016-08-02 18:13:52 -07:00

pod-with-node-affinity.yaml

Update "node selection" documentation to reflect Beta affinity syntax

2017-03-06 11:29:28 -08:00

pod-with-pod-affinity.yaml

Update "node selection" documentation to reflect Beta affinity syntax

2017-03-06 11:29:28 -08:00

pod.yaml

Moving docs from /vX to /docs; we will use branches for old versions.

2016-02-29 15:17:22 -08:00