Merge remote-tracking branch 'upstream/master'

2016-12-05 10:19:54 -05:00
parent 18252f80e4 f5c876845d
commit 3e6493cf46
28 changed files with 634 additions and 1093 deletions
@@ -55,5 +55,3 @@ toc:
    path: https://github.com/kubernetes/kubernetes/milestones/
  - title: Contributing to Kubernetes Documentation
    path: /editdocs/
-  - title: New Template Instructions
-    path: /docs/templatedemos/