Merge branch 'master' into GH-2/minimum-requirement-content

config.toml

@@ -66,10 +66,10 @@ time_format_blog = "Monday, January 02, 2006"
 description = "Production-Grade Container Orchestration"
 showedit = true
 
-latest = "v1.17"
+latest = "v1.18"
 
-fullversion = "v1.17.0"
-version = "v1.17"
+fullversion = "v1.18.0"
+version = "v1.18"
 githubbranch = "master"
 docsbranch = "master"
 deprecated = false
@@ -83,12 +83,6 @@ announcement = false
 # announcement_message is only displayed when announcement = true; update with your specific message
 announcement_message = "The Kubernetes Documentation team would like your feedback!  Please take a <a href='https://www.surveymonkey.com/r/8R237FN' target='_blank'>short survey</a> so we can improve the Kubernetes online documentation."
 
-[[params.versions]]
-fullversion = "v1.17.0"
-version = "v1.17"
-githubbranch = "v1.17.0"
-docsbranch = "release-1.17"
-url = "https://kubernetes.io"
 
 [params.pushAssets]
 css = [
@@ -102,33 +96,40 @@ js = [
 ]
 
 [[params.versions]]
-fullversion = "v1.16.3"
+fullversion = "v1.18.0"
+version = "v1.18"
+githubbranch = "v1.18.0"
+docsbranch = "release-1.18"
+url = "https://kubernetes.io"
+
+[[params.versions]]
+fullversion = "v1.17.4"
+version = "v1.17"
+githubbranch = "v1.17.4"
+docsbranch = "release-1.17"
+url = "https://v1-17.docs.kubernetes.io"
+
+[[params.versions]]
+fullversion = "v1.16.8"
 version = "v1.16"
-githubbranch = "v1.16.3"
+githubbranch = "v1.16.8"
 docsbranch = "release-1.16"
 url = "https://v1-16.docs.kubernetes.io"
 
 [[params.versions]]
-fullversion = "v1.15.6"
+fullversion = "v1.15.11"
 version = "v1.15"
-githubbranch = "v1.15.6"
+githubbranch = "v1.15.11"
 docsbranch = "release-1.15"
 url = "https://v1-15.docs.kubernetes.io"
 
 [[params.versions]]
-fullversion = "v1.14.9"
+fullversion = "v1.14.10"
 version = "v1.14"
-githubbranch = "v1.14.9"
+githubbranch = "v1.14.10"
 docsbranch = "release-1.14"
 url = "https://v1-14.docs.kubernetes.io"
 
-[[params.versions]]
-fullversion = "v1.13.12"
-version = "v1.13"
-githubbranch = "v1.13.12"
-docsbranch = "release-1.13"
-url = "https://v1-13.docs.kubernetes.io"
-
 # Language definitions.
 
 [languages]
@@ -174,7 +175,7 @@ language_alternatives = ["en"]
 
 [languages.fr]
 title = "Kubernetes"
-description = "Production-Grade Container Orchestration"
+description = "Solution professionnelle d’orchestration de conteneurs"
 languageName ="Français"
 weight = 5
 contentDir = "content/fr"
@@ -222,7 +223,7 @@ language_alternatives = ["en"]
 
 [languages.es]
 title = "Kubernetes"
-description = "Production-Grade Container Orchestration"
+description = "Orquestación de contenedores para producción"
 languageName ="Español"
 weight = 9
 contentDir = "content/es"