merge origin master

content/en/docs/concepts/workloads/controllers/deployment.md

@@ -3,6 +3,11 @@ reviewers:
 - bgrant0607
 - janetkuo
 title: Deployments
+feature:
+  title: Automated rollouts and rollbacks
+  description: >
+    Kubernetes progressively rolls out changes to your application or its configuration, while monitoring application health to ensure it doesn't kill all your instances at the same time. If something goes wrong, Kubernetes will rollback the change for you. Take advantage of a growing ecosystem of deployment solutions.
+
 content_template: templates/concept
 weight: 30
 ---

content/en/docs/concepts/workloads/controllers/jobs-run-to-completion.md

@@ -4,6 +4,10 @@ reviewers:
 - soltysh
 title: Jobs - Run to Completion
 content_template: templates/concept
+feature:
+  title: Batch execution
+  description: >
+    In addition to services, Kubernetes can manage your batch and CI workloads, replacing containers that fail, if desired.
 weight: 70
 ---
 

content/en/docs/concepts/workloads/controllers/replicationcontroller.md

@@ -3,6 +3,12 @@ reviewers:
 - bprashanth
 - janetkuo
 title: ReplicationController
+feature: 
+  title: Self-healing
+  anchor: How a ReplicationController Works
+  description: >
+    Restarts containers that fail, replaces and reschedules containers when nodes die, kills containers that don't respond to your user-defined health check, and doesn't advertise them to clients until they are ready to serve.
+
 content_template: templates/concept
 weight: 20
 ---

content/en/docs/concepts/workloads/pods/pod-lifecycle.md

@@ -181,7 +181,7 @@ status:
       lastTransitionTime: 2018-01-01T00:00:00Z
     - type: "www.example.com/feature-1"   # an extra PodCondition
       status: "False"
-      lastProbeTIme: null
+      lastProbeTime: null
       lastTransitionTime: 2018-01-01T00:00:00Z
   containerStatuses:
     - containerID: docker://abcd...