Commit Graph

427 Commits (da5c6e41c2b0c0b0c34aeb386fa4a183ca1f539f)

Author SHA1 Message Date
Jared 2a9865f65d Merge branch 'master' into fix-typos 2016-12-27 13:50:06 -08:00
devin-donnelly f38055c553 Merge pull request #1463 from MrHohn/cluster-components-addons
Updated addons section for cluster-components
2016-12-27 13:49:39 -08:00
Aaron.L.Xu e7d75b39f6 Merge branch 'fix-typos' into master 2016-12-24 12:52:36 +08:00
dongziming 19fda13172 Fix typos 2016-12-23 20:53:16 +08:00
Aaron.L.Xu f535febaa1 fix some typos and resolve conflicts 2016-12-23 03:55:51 -08:00
Aaron.L.Xu ee8c812ef5 Merge pull request #12 from CandiceGuo/master
modify some grammar mistakes and spelling mistakes in /doc/
2016-12-23 19:41:41 +08:00
Aaron.L.Xu cbc897a320 Merge branch 'master' into master 2016-12-23 19:40:51 +08:00
CandiceGuo 990bc41aac modify some grammar mistakes in /doc/ 2016-12-23 14:39:27 +08:00
dongziming 2374e3d1bb Fixed some e.g. problems and some spelling errors. 2016-12-23 13:44:14 +08:00
Aaron.L.Xu f4ac637e27 Merge pull request #2 from tim-zju/symbolError
fix typos
2016-12-23 11:41:02 +08:00
devin-donnelly 4ab9a935c8 Merge pull request #2032 from alejandroEsc/ae/crts
authentication/#creating-certificates document inconsistent in naming for the server certificate.
2016-12-22 18:58:33 -08:00
devin-donnelly ab3c6a1b74 Merge pull request #1925 from alejandroEsc/ae/node_status
Slight improvement to clarity of Nodes.md
2016-12-22 18:42:00 -08:00
devin-donnelly b214018635 Merge pull request #1937 from xingzhou/kube-38143
Update API server --apiserver-count description.
2016-12-22 18:38:53 -08:00
devin-donnelly 1ea8cab29c Merge branch 'master' into patch-1 2016-12-22 18:31:04 -08:00
yanan Lee fbf57b224f spelling error
Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

Incorrect spelling

Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

spelling error

Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

Incorrect spelling

Signed-off-by: yanan Lee <energylyn@zju.edu.cn>

Revert "Incorrect spelling"

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix a typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix a typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-23 08:01:52 +08:00
Elijah C. Voigt f9d1cbc8fa Remove italics, correct CamelCase typos in titles 2016-12-22 14:26:59 -08:00
Alejandro Escobar 0f96b1ed77 fixed server.cert text to server.crt which is consistent with the rest of the document. 2016-12-22 10:05:00 -08:00
Alejandro Escobar 4c4959e631 changes to node.md for clarity since sections and subsections visually are that different in sizes and single line comment was not clear enough and looked incomplete, specially at first read. Added .idea/ directory in gitignore.
removed change to .gitignore and pushing to a separate pr.

suggested changes made.
2016-12-22 07:08:49 -08:00
SRaddict e0a6a2c835 revert 2016-12-22 17:57:06 +08:00
SRaddict 5d6a3aaa53 fix a series errors of using "a" and "an" 2016-12-22 16:56:12 +08:00
SRaddict 521ae621eb duplicated 'the' 2016-12-22 16:21:49 +08:00
Xing Zhou 59759f5526 Update API server --apiserver-count description.
A validation check is added for option --apiserver-count
in kubernetes ticket #38143. As a result, update related
description in doc.
2016-12-22 15:48:16 +08:00
tim-zju 30f1d03b8d symbol errors in quotation mark
Signed-off-by: tim-zju <21651152@zju.edu.cn>
2016-12-22 15:12:07 +08:00
tim-zju b27310d81a symbol errors
Signed-off-by: tim-zju <21651152@zju.edu.cn>
2016-12-22 14:37:10 +08:00
SRaddict 383e40f978 fix a series punctuation errors 2016-12-22 11:24:05 +08:00
devin-donnelly b98c2aeaaa Merge pull request #1673 from harryge00/patch-2
Update dns.md
2016-12-21 16:18:12 -08:00
devin-donnelly 100d3dc7b6 Merge branch 'master' into non-masquerade-cidr 2016-12-21 16:11:53 -08:00
devin-donnelly d427b0e2e4 Merge pull request #1888 from CaoShuFeng/roleRef
[authorization] update doc about roleRef
2016-12-21 15:20:44 -08:00
devin-donnelly d7543653b4 Merge pull request #1893 from derekwaynecarr/quota-by-storage-class
Document quota by storage class
2016-12-21 15:16:16 -08:00
devin-donnelly ea26037f2e Merge branch 'master' into linkify-github-issue 2016-12-21 15:12:50 -08:00
devin-donnelly 80395355c6 Merge pull request #1907 from bibryam/dns-doc
Fixed typos
2016-12-21 15:12:07 -08:00
devin-donnelly 8170aaa50e Merge pull request #1961 from InQuicker/kubelet-auth-formatting
Fix the formatting of bullet lists on the kubelet auth page.
2016-12-21 17:25:42 -05:00
devin-donnelly 2fc412b5fb Merge pull request #1978 from shettyg/docs
networking.md: Add OVN as a networking plugin option.
2016-12-21 17:23:18 -05:00
devin-donnelly 8afbb0adb5 Merge pull request #2010 from luojie233/branch2
Duplicated 'the'
2016-12-21 17:04:06 -05:00
devin-donnelly 221038bfa9 Merge pull request #2002 from bibryam/various-typos
Small typos fixed
2016-12-21 17:00:10 -05:00
devin-donnelly 619c3ea3b1 Merge branch 'master' into branch2 2016-12-21 16:55:29 -05:00
Jie Luo 757f101117 fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 16:37:06 +08:00
Jie Luo ccd202a07a Duplicated 'the'
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 14:33:37 +08:00
Bilgin Ibryam b4e6c6e1c7 Fixed cricial to critical 2016-12-21 06:24:43 +00:00
devin-donnelly d3f9bdfe24 Merge pull request #2001 from chentao1596/kubelet-static-pod-config
static-pod: --config should be changed to -pod-manifest-path
2016-12-20 19:25:50 -05:00
devin-donnelly 40e658f12d Merge pull request #2000 from xialonglee/cancel-italic-title
Delete italic style markdown symbol
2016-12-20 19:25:22 -05:00
devin-donnelly 71f32c8618 Merge pull request #2004 from nlamirault/patch-1
Fix kube-dns component name
2016-12-20 16:07:17 -05:00
devin-donnelly fc7d0698e4 Merge branch 'master' into calico-addon-link 2016-12-20 15:59:58 -05:00
Nicolas Lamirault fd5e585ebf Fix kube-dns component name 2016-12-20 11:29:44 +01:00
Bilgin Ibryam b413c7eecb Small typos fixed 2016-12-20 08:47:16 +00:00
chentao 4f59dd333f change to new config 2016-12-20 16:41:51 +08:00
Gunjan Patel 09bb00cea2 Merge branch 'master' into calico-addon-link 2016-12-19 23:53:29 -08:00
xialong.lee 231b924608 delete italic style 2016-12-20 09:55:11 +08:00
Ben Balter 5bab707a82 Merge branch 'master' into inline-titles 2016-12-19 18:46:34 -05:00
Lucas Käldström 09e40e26b3 Update the kubeadm documentation to v1.5 2016-12-16 16:29:28 +02:00