zacharysarah 258fc90f5a Merge branch 'master' into release-1.8

2017-12-06 14:45:26 -06:00

..

admin

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

api-reference

Put orphaned topics in TOC. (#6051)

2017-10-25 22:10:00 -07:00

concepts

Merge branch 'master' into release-1.8

2017-12-06 14:45:26 -06:00

getting-started-guides

fix typo

2017-11-30 17:08:01 +08:00

home

Update index.md

2017-11-28 15:46:43 +10:00

reference

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

resources-reference

fix typo in api/resources reference: "Worloads"

2017-09-28 01:20:53 +08:00

setup

Resolving merge conflicts with master

2017-11-30 18:53:33 -06:00

tasks

Merge branch 'master' into release-1.8

2017-12-06 14:45:26 -06:00

tools

Update dead link for kubeadm (#6170)

2017-11-07 15:40:21 -08:00

tutorials

Merge branch 'master' into release-1.8

2017-12-06 14:45:26 -06:00

user-guide

Merge branch 'master' into release-1.8

2017-12-06 14:45:26 -06:00

search.md

Fix/re-introduce custom Jekyll tags for better glossary integration (#6163)

2017-11-06 15:36:24 -06:00

sitemap.md

…

update-user-guide-links.py

…