From 0d19a29ef622e86b704f148923469488737371a6 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Sun, 19 Mar 2017 19:10:04 +0800 Subject: [PATCH 1/4] update out-of-resource.md change "thresholds" to "threshold" --- docs/concepts/cluster-administration/out-of-resource.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/cluster-administration/out-of-resource.md b/docs/concepts/cluster-administration/out-of-resource.md index 76e7125e7e..27a84464f3 100644 --- a/docs/concepts/cluster-administration/out-of-resource.md +++ b/docs/concepts/cluster-administration/out-of-resource.md @@ -106,7 +106,7 @@ To configure hard eviction thresholds, the following flag is supported: * `eviction-hard` describes a set of eviction thresholds (e.g. `memory.available<1Gi`) that if met would trigger a pod eviction. -The `kubelet` has the following default hard eviction thresholds: +The `kubelet` has the following default hard eviction threshold: * `--eviction-hard=memory.available<100Mi` From 069a2dabc66ac076901f9befa4c992cd22497626 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Sun, 19 Mar 2017 19:17:05 +0800 Subject: [PATCH 2/4] update init-containers.md change "apply" to "application" --- docs/concepts/workloads/pods/init-containers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts/workloads/pods/init-containers.md b/docs/concepts/workloads/pods/init-containers.md index 1a43dea943..d3dc7beb88 100644 --- a/docs/concepts/workloads/pods/init-containers.md +++ b/docs/concepts/workloads/pods/init-containers.md @@ -227,7 +227,7 @@ validation error is thrown for any Container sharing a name with another. ### Resources Given the ordering and execution for Init Containers, the following rules -for resource usage apply: +for resource usage application: * The highest of any particular resource request or limit defined on all Init Containers is the *effective init request/limit* From 7cdcff78137b3b641f1ac8a0d27b78f739fcaa8d Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Mon, 20 Mar 2017 12:49:47 -0700 Subject: [PATCH 3/4] View $PAGE on Github without forking the repo Adding a "View docs/bla-bla.md on GitHub" button next to the "Edit docs/bla-bla.md" button so that people can view the file first without clicking the Edit button (which does not work without forking the repository). I did not need this because I was trying to do something without forking. I just found it to be bit difficult to view source of a page on GitHub. I'm open to ideas, perhaps we can instead add an article footer button named "View on GitHub" next to the "Edit this Page". Signed-off-by: Ahmet Alp Balkan --- editdocs.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/editdocs.md b/editdocs.md index b089db1c43..0a5ff53c88 100644 --- a/editdocs.md +++ b/editdocs.md @@ -13,6 +13,8 @@ $( document ).ready(function() { $("#continueEdit").show(); $("#continueEditButton").text("Edit " + forwarding); $("#continueEditButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/edit/master/" + forwarding) + $("#viewOnGithubButton").text("View " + forwarding + " on GitHub"); + $("#viewOnGithubButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/tree/master/" + forwarding) } else { $("#generalInstructions").show(); $("#continueEdit").hide(); @@ -26,6 +28,7 @@ $( document ).ready(function() {

Click the button below to edit the page you were just on. When you are done, click Commit Changes at the bottom of the screen. This creates a copy of our site in your GitHub account called a fork. You can make other changes in your fork after it is created, if you want. When you are ready to send us all your changes, go to the index page for your fork and click New Pull Request to let us know about it.

+

From 75fc7284a87790ec846d186d55b3cdcfc5239ff7 Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Tue, 21 Mar 2017 15:36:25 +0800 Subject: [PATCH 4/4] fix the link of ogging-elasticsearch-kibana.md fix the link of url --- .../debug-application-cluster/logging-elasticsearch-kibana.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md b/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md index 4441067d60..9931bab209 100644 --- a/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md +++ b/docs/tasks/debug-application-cluster/logging-elasticsearch-kibana.md @@ -75,7 +75,7 @@ Elasticsearch, and is part of a service named `kibana-logging`. The Elasticsearch and Kibana services are both in the `kube-system` namespace and are not directly exposed via a publicly reachable IP address. To reach them, -follow the instructions for [Accessing services running in a cluster](/docs/user-guide/accessing-the-cluster/#accessing-services-running-on-the-cluster). +follow the instructions for [Accessing services running in a cluster](/docs/concepts/cluster-administration/access-cluster/#accessing-services-running-on-the-cluster). If you try accessing the `elasticsearch-logging` service in your browser, you'll see a status page that looks something like this: