Andrew Chen de0f19682a Merge branches 'master' and 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io into release-1.7 ... * 'master' of https://github.com/kubernetes/kubernetes.github.io: Fix example in the "Adding ConfigMap data to a Volume" section Update ExternalName example Completes PR #3325 * 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io:		2017-06-01 16:20:18 -07:00
..
admin	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7	2017-05-31 10:52:49 -07:00
api-reference	Update links in home, header, footer, whatisk8s (#3833)	2017-05-18 16:50:06 -07:00
concepts	Merge branches 'master' and 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io into release-1.7	2017-06-01 16:20:18 -07:00
contribute	WIP: Cleanup /docs/contribute/ migration (#3278)	2017-04-10 13:24:14 -07:00
getting-started-guides	Completes PR #3325	2017-06-01 15:02:14 -07:00
home	Templates (#3949)	2017-05-31 15:53:04 -07:00
reference	[Kubeadm] bugfix in the index listing	2017-05-31 23:23:29 +05:30
resources-reference	Update links in home, header, footer, whatisk8s (#3833)	2017-05-18 16:50:06 -07:00
setup	Completes PR #3325	2017-06-01 15:02:14 -07:00
tasks	Fix example in the "Adding ConfigMap data to a Volume" section	2017-06-01 16:18:38 -07:00
tools	Update link: user-guide/application-troubleshooting. (#3834)	2017-05-18 18:16:31 -07:00
tutorials	Changes "Mac OS" to macOS, "bootcamp" to tutorial (#3955)	2017-06-01 14:51:05 -07:00
user-guide	Remove and redirect: user-guide/application-trouble. (#3855)	2017-05-19 13:02:31 -07:00
samples.md	delete one redundant space (#3165)	2017-04-03 11:39:16 -07:00
search.md	Fix PR #3274 (#3276)	2017-04-07 15:38:50 -07:00
sitemap.md	Refactor of template demo instructions	2016-06-26 00:17:59 -07:00
tabs-example.md	Refactor tabs implementation (#3268)	2017-05-04 13:52:59 -07:00
update-user-guide-links.py	Minor patch changes to PR #3438	2017-04-19 12:25:45 -07:00