Merge pull request #8925 from andronat/fix_7842

rjnagal · rjnagal · commit a026ca40f8ab · 2015-05-29T09:30:13.000-07:00
Fix help msg for kubectl get cmd
diff --git a/docs/kubectl_get.md b/docs/kubectl_get.md
@@ -8,7 +8,9 @@ Display one or many resources
 Display one or many resources.
 
 Possible resources include pods (po), replication controllers (rc), services
-(svc), nodes, events (ev), or component statuses (cs).
+(svc), nodes, events (ev), component statuses (cs), limit ranges (limits),
+minions (mi), persistent volumes (pv), persistent volume claims (pvc)
+or resource quotas (quota).
 
 By specifying the output as 'template' and providing a Go template as the value
 of the --template flag, you can filter the attributes of the fetched resource(s).
@@ -85,6 +87,6 @@ $ kubectl get rc/web service/frontend pods/web-pod-13je7
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-22 14:24:30.17132893 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-28 22:43:52.329286408 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_get.md?pixel)]()
diff --git a/docs/man/man1/kubectl-get.1 b/docs/man/man1/kubectl-get.1
@@ -17,7 +17,9 @@ Display one or many resources.
 
 .PP
 Possible resources include pods (po), replication controllers (rc), services
-(svc), nodes, events (ev), or component statuses (cs).
+(svc), nodes, events (ev), component statuses (cs), limit ranges (limits),
+minions (mi), persistent volumes (pv), persistent volume claims (pvc)
+or resource quotas (quota).
 
 .PP
 By specifying the output as 'template' and providing a Go template as the value
diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go
@@ -32,7 +32,9 @@ const (
 	get_long = `Display one or many resources.
 
 Possible resources include pods (po), replication controllers (rc), services
-(svc), nodes, events (ev), or component statuses (cs).
+(svc), nodes, events (ev), component statuses (cs), limit ranges (limits),
+minions (mi), persistent volumes (pv), persistent volume claims (pvc)
+or resource quotas (quota).
 
 By specifying the output as 'template' and providing a Go template as the value
 of the --template flag, you can filter the attributes of the fetched resource(s).`
