Merge pull request #1192 from devin-donnelly/release-1.4

Merging latest changes from Master into Release 1.4 branch.
Includes configuration information for staging via Netlify.

404.md

@@ -65,7 +65,4 @@ $( document ).ready(function() {
 });
 </script>
 
-Sorry, this page was not found. :( 
-
-You can let us know by filling out the "I wish this page" text field at
-the bottom of this page. Maybe try: "I wish this page _existed_."
+Sorry, this page was not found. :(

Gemfile

@@ -0,0 +1,20 @@
+source "https://rubygems.org"
+
+gem "jekyll", "3.2.1"
+gem "jekyll-sass-converter", "1.3.0"
+gem "minima", "1.1.0"
+gem "kramdown", "1.11.1"
+gem "liquid", "3.0.6"
+gem "rouge", "1.11.1"
+gem "jemoji", "0.7.0"
+gem "jekyll-mentions", "1.2.0"
+gem "jekyll-redirect-from", "0.11.0"
+gem "jekyll-sitemap", "0.10.0"
+gem "jekyll-feed", "0.5.1"
+gem "jekyll-gist", "1.4.0"
+gem "jekyll-paginate", "1.1.0"
+gem "jekyll-coffeescript", "1.0.1"
+gem "jekyll-seo-tag", "2.0.0"
+gem "jekyll-github-metadata", "2.0.2"
+gem "listen", "3.0.6"
+gem "activesupport", "4.2.7"

Gemfile.lock

@@ -0,0 +1,119 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
+    colorator (1.1.0)
+    execjs (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.14)
+    forwardable-extended (2.6.0)
+    gemoji (2.1.0)
+    html-pipeline (2.4.2)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    i18n (0.7.0)
+    jekyll (3.2.1)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-feed (0.5.1)
+    jekyll-gist (1.4.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.0.2)
+      jekyll (~> 3.1)
+      octokit (~> 4.0)
+    jekyll-mentions (1.2.0)
+      activesupport (~> 4.0)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.11.0)
+      jekyll (>= 2.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
+    jekyll-sitemap (0.10.0)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
+    json (1.8.3)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minima (1.1.0)
+    minitest (5.9.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    pkg-config (1.1.7)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 4.2.7)
+  jekyll (= 3.2.1)
+  jekyll-coffeescript (= 1.0.1)
+  jekyll-feed (= 0.5.1)
+  jekyll-gist (= 1.4.0)
+  jekyll-github-metadata (= 2.0.2)
+  jekyll-mentions (= 1.2.0)
+  jekyll-paginate (= 1.1.0)
+  jekyll-redirect-from (= 0.11.0)
+  jekyll-sass-converter (= 1.3.0)
+  jekyll-seo-tag (= 2.0.0)
+  jekyll-sitemap (= 0.10.0)
+  jemoji (= 0.7.0)
+  kramdown (= 1.11.1)
+  liquid (= 3.0.6)
+  listen (= 3.0.6)
+  minima (= 1.1.0)
+  rouge (= 1.11.1)
+
+BUNDLED WITH
+   1.11.2

Makefile

@@ -0,0 +1,15 @@
+.PONY: all build build-preview help serve
+
+help: ## Show this help.
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+all: build ## Build site with production settings and put deliverables in _site.
+
+build: ## Build site with production settings and put deliverables in _site.
+	jekyll build
+
+build-preview: ## Build site with drafts and future posts enabled.
+	jekyll build --drafts --future
+
+serve: ## Boot the development server.
+	jekyll serve

_includes/footer.html

@@ -18,8 +18,6 @@
 				<a href="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com" class="calendar"><span>Events Calendar</span></a>
 			</div>
 			<div>
-				<span>I wish this page</span>
-				<input type="text" id="wishField" name="wishField" placeholder="enter your wish">
 			</div>
 		</div>
 		<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} Kubernetes</div>

_layouts/docwithnav.html

@@ -43,7 +43,11 @@ <h5>{{ site.data[foundTOC].abstract }}</h5>
 		        "permalink" : "http://kubernetes.github.io{{page.url}}"
 	        };
 	        (function(d,c,j){if(!document.getElementById(j)){var pd=d.createElement(c),s;pd.id=j;pd.src=('https:'==document.location.protocol)?'https://polldaddy.com/js/rating/rating.js':'http://i0.poll.fm/js/rating/rating.js';s=document.getElementsByTagName(c)[0];s.parentNode.insertBefore(pd,s);}}(document,'script','pd-rating-js'));
-        </script>{% endif %}
+		</script>
+		<a href="" onclick="window.open('https://github.com/kubernetes/kubernetes.github.io/issues/new?title=Issue%20with%20' +
+		window.location.pathname + '&body=Issue%20with%20' +
+		window.location.pathname)" class="button issue">Create Issue</a>
+	{% endif %}
 	</div>
 </section>
 

_sass/_base.sass

@@ -874,6 +874,12 @@ dd
 	img
 		max-width: 100%
 
+	a.button
+		border-radius: 2px
+
+	a.issue
+		margin-left: 20px
+
 .fixed footer
 	position: fixed
 	bottom: 0

docs/admin/networking.md

@@ -160,7 +160,7 @@ Lars Kellogg-Stedman.
 
 ### Weave Net from Weaveworks
 
-[Weave Net](https://www.weave.works/documentation/net-1-6-0-introducing-weave/) is a 
+[Weave Net](https://www.weave.works/products/weave-net/) is a 
 resilient and simple to use network for Kubernetes and its hosted applications.  
 Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-plugin/)  
 or stand-alone.  In either version, it doesn’t require any configuration or extra code 

docs/admin/node-problem.md

@@ -36,8 +36,7 @@ it to [support other log format](/docs/admin/node-problem/#support-other-log-for
 
 ## Enable/Disable in GCE cluster
 
-Node problem detector is [running as a cluster
-addon](/docs/admin/cluster-large/#addon-resources) enabled by default in the
+Node problem detector is [running as a cluster addon](cluster-large.md/#Addon-Resources) enabled by default in the
 gce cluster.
 
 You can enable/disable it by setting the environment variable

docs/admin/static-pods.md

@@ -48,15 +48,15 @@ For example, this is how to start a simple web server as a static pod:
     EOF
     ```
 
-2. Configure your kubelet daemon on the node to use this directory by running it with `--config=/etc/kubelet.d/` argument.  On Fedora Fedora 21 with Kubernetes 0.17 edit `/etc/kubernetes/kubelet` to include this line:
+2. Configure your kubelet daemon on the node to use this directory by running it with `--config=/etc/kubelet.d/` argument.  On Fedora edit `/etc/kubernetes/kubelet` to include this line:
 
     ```conf
     KUBELET_ARGS="--cluster-dns=10.254.0.10 --cluster-domain=kube.local --config=/etc/kubelet.d/"
     ```
 
     Instructions for other distributions or Kubernetes installations may vary.
 
-3. Restart kubelet. On Fedora 21, this is:
+3. Restart kubelet. On Fedora, this is:
 
     ```shell
     [root@my-node1 ~] $ systemctl restart kubelet

docs/getting-started-guides/azure.md

@@ -13,4 +13,4 @@ assignees:
 
 The recommended approach for deploying a Kubernetes 1.4 cluster on Azure is the
 [`kubernetes-anywhere`](https://github.com/kubernetes/kubernetes-anywhere) project. You will want to take a look at the
-[Azure Getting Started Guide](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/azure/README.md).
+[Azure Getting Started Guide](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/azure/README.md).

docs/getting-started-guides/clc.md

@@ -251,9 +251,9 @@ kubectl cluster-info
 
 ### Accessing the cluster programmatically 
 
-It's possible to use the locally-stored client certificates to access the api server. For example, you may want to use any of the [Kubernetes API client libraries](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/client-libraries.md) to program against your Kubernetes cluster in the programming language of your choice. 
+It's possible to use the locally stored client certificates to access the api server. For example, you may want to use any of the [Kubernetes API client libraries](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/client-libraries.md) to program against your Kubernetes cluster in the programming language of your choice. 
 
-To demostrate how to use these locally stored certificates, we provide the folowing example of using ```curl``` to communicate to the master api server via https:
+To demonstrate how to use these locally stored certificates, we provide the following example of using ```curl``` to communicate to the master api server via https:
 
 ```shell
 curl \
@@ -267,7 +267,7 @@ distributed with OSX.
 
 ### Accessing the cluster with a browser
 
-We install two UIs on Kubernetes. The orginal KubeUI and [the newer kube
+We install two UIs on Kubernetes. The original KubeUI and [the newer kube
 dashboard](/docs/user-guide/ui/). When you create a cluster, the script should output URLs for these
 interfaces like this:
 

docs/getting-started-guides/coreos/bare_metal_calico.md

@@ -39,7 +39,7 @@ Download the stable CoreOS bootable ISO from the [CoreOS website](https://coreos
 
 1.  Once you've downloaded the ISO image, burn the ISO to a CD/DVD/USB key and boot from it (if using a virtual machine you can boot directly from the ISO).  Once booted, you should be automatically logged in as the `core` user at the terminal. At this point CoreOS is running from the ISO and it hasn't been installed yet.
 
-2.  *On another machine*, download the the [master cloud-config template](https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/cloud-config/master-config-template.yaml) and save it as `master-config.yaml`.
+2.  *On another machine*, download the [master cloud-config template](https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/cloud-config/master-config-template.yaml) and save it as `master-config.yaml`.
 
 3.  Replace the following variables in the `master-config.yaml` file.
 

docs/getting-started-guides/coreos/bare_metal_offline.md

@@ -23,7 +23,7 @@ Deploy a CoreOS running Kubernetes environment. This particular guide is made to
   * /tftpboot/pxelinux.0/(MAC) -> linked to Linux image config file
 2. Update per install the link for pxelinux
 3. Update the DHCP config to reflect the host needing deployment
-4. Setup nodes to deploy CoreOS creating a etcd cluster.
+4. Setup nodes to deploy CoreOS creating an etcd cluster.
 5. Have no access to the public [etcd discovery tool](https://discovery.etcd.io/).
 6. Installing the CoreOS slaves to become Kubernetes nodes.
 
@@ -98,7 +98,7 @@ Now you should have a working PXELINUX setup to image CoreOS nodes. You can veri
 
 This section describes how to setup the CoreOS images to live alongside a pre-existing PXELINUX environment.
 
-1. Find or create the TFTP root directory that everything will be based off of.
+1. Find or create the TFTP root directory that everything will be based on.
     * For this document we will assume `/tftpboot/` is our root directory.
 2. Once we know and have our tftp root directory we will create a new directory structure for our CoreOS images.
 3. Download the CoreOS PXE files provided by the CoreOS team.

docs/getting-started-guides/logging-elasticsearch.md

@@ -93,7 +93,7 @@ asks you to configure your view of the ingested logs. Select the option for
 timeseries values and select `@timestamp`. On the following page select the
 `Discover` tab and then you should be able to see the ingested logs.
 You can set the refresh interval to 5 seconds to have the logs
-regulary refreshed.
+regularly refreshed.
 
 Here is a typical view of ingested logs from the Kibana viewer:
 

docs/getting-started-guides/meanstack.md

@@ -64,7 +64,7 @@ RUN npm install
 CMD ["node", "app.js"]
 ```
 
-A `Dockerfile` is pretty self explanatory, and this one is dead simple.
+A `Dockerfile` is pretty self-explanatory, and this one is dead simple.
 
 First, it uses the official Node.js LTS image as the base image.
 

docs/getting-started-guides/openstack-heat.md

@@ -86,7 +86,7 @@ If you do not have your environment variables set, or do not want them consumed,
 - **[config-default.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/config-default.sh)** Sets all parameters needed for heat template.
 - **[config-image.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/config-image.sh)** Sets parameters needed to download and create new OpenStack image via glance.
 - **[openrc-default.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/openrc-default.sh)** Sets environment variables for communicating to OpenStack. These are consumed by the cli tools (heat, glance, swift, nova).
-- **[openrc-swift.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/openrc-swift.sh)** Some OpenStack setups require the use of seperate swift credentials. Put those credentials in this file.
+- **[openrc-swift.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/openrc-swift.sh)** Some OpenStack setups require the use of separate swift credentials. Put those credentials in this file.
 
 Please see the contents of these files for documentation regarding each variable's function.
 

docs/getting-started-guides/ubuntu.md

@@ -59,7 +59,7 @@ $ export ETCD_VERSION=2.2.0
 For users who want to bring up a cluster with k8s version v1.1.1, `controller manager` may fail to start
 due to [a known issue](https://github.com/kubernetes/kubernetes/issues/17109). You could raise it
 up manually by using following command on the remote master server. Note that
-you should do this only after `api-server` is up. Moreover this issue is fixed in v1.1.2 and later.
+you should do this only after `api-server` is up. Moreover, this issue is fixed in v1.1.2 and later.
 
 ```shell
 $ sudo service kube-controller-manager start

docs/user-guide/compute-resources.md

@@ -122,11 +122,11 @@ runner (Docker or rkt).
 When using Docker:
 
 - The `spec.container[].resources.requests.cpu` is converted to its core value (potentially fractional),
-  and multipled by 1024, and used as the value of the [`--cpu-shares`](
+  and multiplied by 1024, and used as the value of the [`--cpu-shares`](
   https://docs.docker.com/reference/run/#runtime-constraints-on-resources) flag to the `docker run`
   command.
 - The `spec.container[].resources.limits.cpu` is converted to its millicore value,
-  multipled by 100000, and then divided by 1000, and used as the value of the [`--cpu-quota`](
+  multiplied by 100000, and then divided by 1000, and used as the value of the [`--cpu-quota`](
   https://docs.docker.com/reference/run/#runtime-constraints-on-resources) flag to the `docker run`
   command.  The [`--cpu-period`] flag is set to 100000 which represents the default 100ms period
   for measuring quota usage.  The kubelet enforces cpu limits if it was started with the

docs/user-guide/configuring-containers.md

@@ -10,7 +10,7 @@ assignees:
 
 ## Configuration in Kubernetes
 
-In addition to the imperative-style commands, such as `kubectl run` and `kubectl expose`, described [elsewhere](/docs/user-guide/quick-start), Kubernetes supports declarative configuration. Often times, configuration files are preferable to imperative commands, since they can be checked into version control and changes to the files can be code reviewed, which is especially important for more complex configurations, producing a more robust, reliable and archival system.
+In addition to the imperative-style commands, such as `kubectl run` and `kubectl expose`, described [elsewhere](/docs/user-guide/quick-start), Kubernetes supports declarative configuration. Oftentimes, configuration files are preferable to imperative commands, since they can be checked into version control and changes to the files can be code reviewed, which is especially important for more complex configurations, producing a more robust, reliable and archival system.
 
 In the declarative style, all configuration is stored in YAML or JSON configuration files using Kubernetes's API resource schemas as the configuration schemas. `kubectl` can create, update, delete, and get API resources. The `apiVersion` (currently 'v1'?), resource `kind`, and resource `name` are used by `kubectl` to construct the appropriate API path to invoke for the specified operation.
 

docs/user-guide/deployments.md

@@ -78,7 +78,7 @@ nginx-deployment-2035384211-qqcnn   1/1       Running   0          18s       app
 
 The created Replica Set will ensure that there are three nginx Pods at all times.
 
-**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each others and won't behave correctly.
+**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each other's and won't behave correctly.
 
 ## The Status of a Deployment
 
@@ -503,7 +503,7 @@ number of Pods are less than the desired number.
 
 Note that you should not create other pods whose labels match this selector, either directly, via another Deployment or via another controller such as Replica Sets or Replication Controllers. Otherwise, the Deployment will think that those pods were created by it. Kubernetes will not stop you from doing this.
 
-If you have multiple controllers that have overlapping selectors, the controllers will fight with each others and won't behave correctly.
+If you have multiple controllers that have overlapping selectors, the controllers will fight with each other's and won't behave correctly.
 
 ### Strategy