Merge pull request #30428 from CodeJuan/master

Automatic merge from submit-queue fixed typos, the path is not docker  This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30428)

Merge pull request #30428 from CodeJuan/master
74bf4439 · Kubernetes Submit Queue · GitHub · c31831ed · 849adf5a · 74bf4439
Commit 74bf4439 authored Aug 11, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 11, 2016
8 changed files
--- a/cluster/ubuntu/master-flannel/init_conf/flanneld.conf
+++ b/cluster/ubuntu/master-flannel/init_conf/flanneld.conf
@@ -19,7 +19,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/flanneld)
 	FLANNEL=/opt/bin/$UPSTART_JOB
 	FLANNEL_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/master/init_conf/etcd.conf
+++ b/cluster/ubuntu/master/init_conf/etcd.conf
@@ -24,7 +24,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/etcd)
 	ETCD=/opt/bin/$UPSTART_JOB
 	ETCD_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/master/init_conf/kube-apiserver.conf
+++ b/cluster/ubuntu/master/init_conf/kube-apiserver.conf
@@ -20,7 +20,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-apiserver)
 	KUBE_APISERVER=/opt/bin/$UPSTART_JOB
 	KUBE_APISERVER_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/master/init_conf/kube-controller-manager.conf
+++ b/cluster/ubuntu/master/init_conf/kube-controller-manager.conf
@@ -20,7 +20,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-controller-manager)
 	KUBE_CONTROLLER_MANAGER=/opt/bin/$UPSTART_JOB
 	KUBE_CONTROLLER_MANAGER_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/master/init_conf/kube-scheduler.conf
+++ b/cluster/ubuntu/master/init_conf/kube-scheduler.conf
@@ -20,7 +20,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-scheduler)
 	KUBE_SCHEDULER=/opt/bin/$UPSTART_JOB
 	KUBE_SCHEDULER_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/minion-flannel/init_conf/flanneld.conf
+++ b/cluster/ubuntu/minion-flannel/init_conf/flanneld.conf
@@ -18,7 +18,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/flanneld)
 	FLANNEL=/opt/bin/$UPSTART_JOB
 	FLANNEL_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/minion/init_conf/kube-proxy.conf
+++ b/cluster/ubuntu/minion/init_conf/kube-proxy.conf
@@ -22,7 +22,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/kube-proxy)
 	KUBE_PROXY=/opt/bin/$UPSTART_JOB
 	KUBE_PROXY_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then

--- a/cluster/ubuntu/minion/init_conf/kubelet.conf
+++ b/cluster/ubuntu/minion/init_conf/kubelet.conf
@@ -20,7 +20,7 @@ pre-start script
 end script

 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
+	# modify these in /etc/default/$UPSTART_JOB (/etc/default/kubelet)
 	KUBELET=/opt/bin/$UPSTART_JOB
 	KUBELET_OPTS=""
 	if [ -f /etc/default/$UPSTART_JOB ]; then