Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Replace remaining kargo usages to kubespray
  update example templates
  redirect fix for meanstack article

docs/concepts/example-concept-template.md

@@ -1,14 +1,19 @@
 ---
 title: Example Concept Template
+assignees:
+- chenopis
 ---
 
 {% capture overview %}
+
 **NOTE:** Be sure to also [create an entry in the table of contents](/docs/home/contribute/write-new-topic/#creating-an-entry-in-the-table-of-contents) for your new document.
 
 This page explains ...
+
 {% endcapture %}
 
 {% capture body %}
+
 ## Understanding ...
 
 Kubernetes provides ...
@@ -16,13 +21,16 @@ Kubernetes provides ...
 ## Using ...
 
 To use ...
+
 {% endcapture %}
 
 {% capture whatsnext %}
+
 **[Optional Section]**
 
 * Learn more about [Writing a New Topic](/docs/home/contribute/write-new-topic/).
 * See [Using Page Templates - Concept template](/docs/home/contribute/page-templates/#concept_template) for how to use this template.
+
 {% endcapture %}
 
 {% include templates/concept.md %}

docs/getting-started-guides/kubespray.md

@@ -32,7 +32,7 @@ to [kubeadm](../kubeadm) and [kops](../kops).
 
 * You must have cloud instances or baremetal nodes running for your future Kubernetes cluster.
   A way to achieve that is to use the
-  [kargo-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md).
+  [kubespray-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md).
 * Or provision baremetal hosts with a tool-of-your-choice or launch cloud instances,
   then create an inventory file for Ansible with this [tool](https://github.com/kubernetes-incubator/kubespray/blob/master/contrib/inventory_builder/inventory.py).
 
@@ -65,7 +65,7 @@ to [kubeadm](../kubeadm) and [kops](../kops).
 #### Checklist
 
 * Apply deployment with
- [kargo-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md)
+ [kubespray-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md)
   or ``ansible-playbook``
  [manual commands](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md#starting-custom-deployment).
 
@@ -95,6 +95,5 @@ Note, that it is highly unrecommended to delete production clusters with the res
 
 ## Feedback
 
-* Slack Channel: [#kargo](https://kubernetes.slack.com/messages/kargo/)
+* Slack Channel: [#kubespray](https://kubernetes.slack.com/messages/kubespray/)
 * [GitHub Issues](https://github.com/kubernetes-incubator/kubespray/issues)
-

docs/tasks/example-task-template.md

@@ -1,37 +1,50 @@
 ---
 title: Example Task Template
+assignees:
+- chenopis
 ---
 
 {% capture overview %}
+
 **NOTE:** Be sure to also [create an entry in the table of contents](/docs/home/contribute/write-new-topic/#creating-an-entry-in-the-table-of-contents) for your new document.
 
 This page shows how to ...
+
 {% endcapture %}
 
 {% capture prerequisites %}
+
+* {% include task-tutorial-prereqs.md %}
 * Do this.
 * Do this too.
+
 {% endcapture %}
 
 {% capture steps %}
+
 ## Doing ...
 
 1. Do this.
 1. Do this next. Possibly read this [related explanation](...).
+
 {% endcapture %}
 
 {% capture discussion %}
+
 ## Understanding ...
 **[Optional Section]**
 
 Here's an interesting thing to know about the steps you just did.
+
 {% endcapture %}
 
 {% capture whatsnext %}
+
 **[Optional Section]**
 
 * Learn more about [Writing a New Topic](/docs/home/contribute/write-new-topic/).
 * See [Using Page Templates - Task template](/docs/home/contribute/page-templates/#task_template) for how to use this template.
+
 {% endcapture %}
 
 {% include templates/task.md %}

docs/tutorials/example-tutorial-template.md

@@ -1,25 +1,35 @@
 ---
 title: Example Tutorial Template
+assignees:
+- chenopis
 ---
 
 {% capture overview %}
+
 **NOTE:** Be sure to also [create an entry in the table of contents](/docs/home/contribute/write-new-topic/#creating-an-entry-in-the-table-of-contents) for your new document.
 
 This page shows how to ...
+
 {% endcapture %}
 
 {% capture prerequisites %}
+
+* {% include task-tutorial-prereqs.md %}
 * Do this.
 * Do this too.
+
 {% endcapture %}
 
 {% capture objectives %}
+
 * Learn this.
 * Build this.
 * Run this.
+
 {% endcapture %}
 
 {% capture lessoncontent %}
+
 ## Building ...
 
 1. Do this.
@@ -32,20 +42,25 @@ This page shows how to ...
 
 ## Understanding the code
 Here's something interesting about the code you ran in the preceding steps.
+
 {% endcapture %}
 
 {% capture cleanup %}
+
 **[Optional Section]**
 
 * Delete this.
 * Stop this.
+
 {% endcapture %}
 
 {% capture whatsnext %}
+
 **[Optional Section]**
 
 * Learn more about [Writing a New Topic](/docs/home/contribute/write-new-topic/).
 * See [Using Page Templates - Tutorial template](/docs/home/contribute/page-templates/#tutorial_template) for how to use this template.
+
 {% endcapture %}
 
 {% include templates/tutorial.md %}

js/redirects.js

@@ -83,7 +83,7 @@ $( document ).ready(function() {
     },
     {
         "from": "/docs/getting-started-guides/meanstack/",
-        "to": "https://medium.com/google-cloud/running-a-mean-stack-on-google-cloud-platform-with-app-engine-and-mongolab-4bbd2040ea75"
+        "to": "https://medium.com/google-cloud/running-a-mean-stack-on-google-cloud-platform-with-kubernetes-149ca81c2b5d"
     },
     {
         "from": "/docs/samples/",