Merge pull request #16225 from simplytunde/merged-master-dev-1.16

Merged master into dev-1.16

content/en/docs/reference/glossary/applications.md

@@ -5,7 +5,6 @@ date: 2019-05-12
 full_link:
 short_description: >
   The layer where various containerized applications run.
-
 aka:
 tags:
 - fundamental

content/en/docs/reference/glossary/static-pod.md

@@ -2,13 +2,17 @@
 title: Static Pod
 id: static-pod
 date: 2019-02-12
-full_link: /docs/tasks/administer-cluster/static-pod/
+full_link: /docs/tasks/configure-pod-container/static-pod/
 short_description: >
-  A pod managed directly by kubelet daemon on a specific node
+  A pod managed directly by the kubelet daemon on a specific node.
 
 aka: 
 tags:
 - fundamental
 ---
- A {{< glossary_tooltip text="pod" term_id="pod" >}} managed directly by the kubelet
- daemon on a specific node, without the API server observing it.
+
+A {{< glossary_tooltip text="pod" term_id="pod" >}} managed directly by the kubelet
+ daemon on a specific node,
+<!--more-->
+
+without the API server observing it.

content/en/docs/reference/glossary/workload.md

@@ -1,28 +1,22 @@
 ---
-title: Workloads
+title: Workload
 id: workloads
 date: 2019-02-13
 full_link: /docs/concepts/workloads/
 short_description: >
-   Workloads are objects you use to manage and run your containers on the cluster.
+   A workload is an application running on Kubernetes.
 
 aka: 
 tags:
 - fundamental
-- core-object
-- workload
 ---
-  Workloads are objects you use to manage and run your containers on the cluster.
+   A workload is an application running on Kubernetes.
 
 <!--more--> 
 
-Kubernetes performs the 
-deployment and updates the workload with the current state of the application.
-Workloads include the DaemonSet, Deployments, Jobs, Pods, ReplicaSet, ReplicationController, and StatefulSet objects.
-
-For example, a workload that has a web element and a database element might run the
-database in one {{< glossary_tooltip term_id="StatefulSet" >}} of
-{{< glossary_tooltip text="pods" term_id="pod" >}} and the webserver via
-a {{< glossary_tooltip term_id="Deployment" >}} that consists of many web app
-{{< glossary_tooltip text="pods" term_id="pod" >}}, all alike.
+Various core objects that represent different types or parts of a workload
+include the DaemonSet, Deployment, Job, ReplicaSet, and StatefulSet objects.
 
+For example, a workload that has a web server and a database might run the
+database in one {{< glossary_tooltip term_id="StatefulSet" >}} and the web server
+in a {{< glossary_tooltip term_id="Deployment" >}}.