Merge remote-tracking branch 'origin' into release-1.4

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

docs/admin/static-pods.md

@@ -48,7 +48,7 @@ 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/"
@@ -56,7 +56,7 @@ For example, this is how to start a simple web server as a static pod:
 
     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/user-guide/services/index.md

@@ -460,7 +460,7 @@ within AWS Certificate Manager.
     "metadata": {
         "name": "my-service",
         "annotations": {
-            "service.beta.kubernetes.io/aws-load-balancer-backend-protocol=": "(https|http|ssl|tcp)"
+            "service.beta.kubernetes.io/aws-load-balancer-backend-protocol": "(https|http|ssl|tcp)"
         }
     },
 ```

netlify.toml

@@ -0,0 +1,6 @@
+[build]
+  command = "make build"
+  publish = "_site"
+
+[context.deploy-preview]
+  command = "make build-preview"

package.json

@@ -1,14 +0,0 @@
-{		
-  "name": "githubpagessites",		
-  "description": "Version 1.1 of the docs for Kubernetes",		
-  "version": "1.1",		
-  "private": true,		
-  "license": "Apache Version 2.0",		
-  "author": "The Kubernetes Authors",		
-  "engines": {		
-  "node": "~4.2"		
-},		
-  "dependencies": {		
-    "express": "^4.13.4"		
-  }		
-}