Merge pull request kubernetes#778 from leecalcote/patch-2

johndmulhausen · web-flow · commit 0cda4b6dee12 · 2016-07-07T12:10:40.000-07:00
docs/kubelet.md
diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md
@@ -14,16 +14,14 @@ that describes a pod. The kubelet takes a set of PodSpecs that are provided thro
 various mechanisms (primarily through the apiserver) and ensures that the containers
 described in those PodSpecs are running and healthy.
 
-Other than from an PodSpec from the apiserver, there are three ways that a container
-manifest can be provided to the Kubelet.
+Other than a PodSpec from the apiserver, there are three ways that a container
+manifest can be provided to the Kubelet:
 
-File: Path passed as a flag on the command line. This file is rechecked every 20
+* File: Path passed as a flag on the command line. This file is rechecked every 20
 seconds (configurable with a flag).
-
-HTTP endpoint: HTTP endpoint passed as a parameter on the command line. This endpoint
+* HTTP endpoint: HTTP endpoint passed as a parameter on the command line. This endpoint
 is checked every 20 seconds (also configurable with a flag).
-
-HTTP server: The kubelet can also listen for HTTP and respond to a simple API
+* HTTP server: The kubelet can also listen for HTTP and respond to a simple API
 (underspec'd currently) to submit a new manifest.
 
 ```
@@ -121,4 +119,4 @@ kubelet
       --volume-stats-agg-period=1m0s: Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes.  To disable volume calculations, set to 0.  Default: '1m'
 ```
 
-###### Auto generated by spf13/cobra on 15-Mar-2016
+###### Auto generated by spf13/cobra on 15-Mar-2016
