Commit Graph

24 Commits (daded6b51a4237350c00bc664778946587bf141e)

Author SHA1 Message Date
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
houjun 37af1f8318 The link URL of [kube-controller-manager] is wrong
Appears 404 Error when click  [kube-controller-manager]. The URL maybe
misses '/'.
2017-03-21 18:49:01 -07:00
Andrew Chen adacb8d8b0 Merge pull request #2777 from gyliu513/node-controller
Updated node controller for taints and tolerations.
2017-03-21 16:50:31 -07:00
Guangya Liu ce87af7f3b Updated node controller for taints and tolerations. 2017-03-18 17:34:51 +08:00
Guangya Liu 86c3768961 Added `--register-with-taints` for node.md. 2017-03-17 08:24:57 +08:00
Guangya Liu a551d2673e Removed `=` at the end of the flags. 2017-03-09 23:49:32 +08:00
xuxinkun abf9560874 Add more options for self-registration. 2017-02-21 09:40:05 -08:00
Daniel Smith 98d2cb6f44 Remove lavalamp from docs he doesn't know anything about 2017-01-09 15:14:38 -08:00
gbzhu 2cc0485a70 fix typos 2016-12-28 17:48:46 +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
Jie Luo 757f101117 fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 16:37:06 +08:00
Ben Balter bfa604351f add explicit titles to docs 2016-12-15 15:16:54 -05:00
Sam Ghods eda196d356 Fix grammatical issues in node.md 2016-12-07 17:28:14 -08:00
Anirudh Ramanathan cda627c598 Update node.md to reflect changes to node controller (#1757)
* Update node.md to reflect changes to node controller

* Review fixes.
2016-12-02 14:32:55 -08:00
Magnus Kulke 38385006ef Fixed spelling 2016-11-04 13:56:13 +01:00
Magnus Kulke 0a8408081c Updated the NodeHostname entry. 2016-11-03 20:28:51 +01:00
devin-donnelly 971f6a44e7 Merge pull request #549 from mwhooker/patch-1
mark node phase as deprecated
2016-09-26 10:35:35 -07:00
gmarek 99f7d6d2f1 update Node admin doc 2016-09-12 12:01:02 +02:00
foxish 66f28bb820 Adding OWNERS for docs. 2016-08-02 18:13:52 -07:00
Rodrigo Campos 6f26a1dcd5 Document all node conditions in k8s 1.2 2016-06-20 17:26:30 -03:00
Matthew Hooker df4a93598e mark node phase as deprecated
I'm not sure on what the best wording for this should be, but `Node Phase` is no longer populated, and so the docs should say so.

@random-liu on slack/#sig-node told me that they believed node phase was unused.

cc @dawnchen
2016-05-20 15:19:35 -07:00
Vladimir Rutsky a112e4ae7e remove trailing commas from JSON
Fixes JSON highlighting.
2016-03-14 20:11:30 +03:00
John Mulhausen 97c728d343 1.2 changes for admin/ 2016-03-06 04:26:30 -08:00
John Mulhausen 4c9e72c518 Moving docs from /vX to /docs; we will use branches for old versions. 2016-02-29 15:17:22 -08:00