diff --git a/docs/man/man1/kubectl-get.1 b/docs/man/man1/kubectl-get.1
index f419b540897..348281723ad 100644
--- a/docs/man/man1/kubectl-get.1
+++ b/docs/man/man1/kubectl-get.1
@@ -184,9 +184,6 @@ $ kubectl get pods
 # List all pods in ps output format with more information (such as node name).
 $ kubectl get pods \-o wide
 
-# List all pods in resource/name format (such as pod/nginx).
-$ kubectl get pods \-o name
-
 # List a single replication controller with specified NAME in ps output format.
 $ kubectl get replicationcontroller web
 
diff --git a/docs/user-guide/kubectl/kubectl_get.md b/docs/user-guide/kubectl/kubectl_get.md
index 47a19a84185..797d98a45ff 100644
--- a/docs/user-guide/kubectl/kubectl_get.md
+++ b/docs/user-guide/kubectl/kubectl_get.md
@@ -61,9 +61,6 @@ $ kubectl get pods
 # List all pods in ps output format with more information (such as node name).
 $ kubectl get pods -o wide
 
-# List all pods in resource/name format (such as pod/nginx).
-$ kubectl get pods -o name
-
 # List a single replication controller with specified NAME in ps output format.
 $ kubectl get replicationcontroller web
 
@@ -132,7 +129,7 @@ $ kubectl get rc/web service/frontend pods/web-pod-13je7
 
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-09-22 12:53:42.288852192 +0000 UTC
+###### Auto generated by spf13/cobra on 4-Nov-2015
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_get.md?pixel)]()
diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
index ddc14ffcb32..d151ea31b57 100644
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -122,6 +122,9 @@ __custom_func() {
    * persistentvolumeclaims (aka 'pvc')
    * limitranges (aka 'limits')
    * resourcequotas (aka 'quota')
+   * componentstatuses (aka 'cs')
+   * endpoints (aka 'ep')
+   * quota
 `
 )
 
diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go
index 0396423a26b..73b5b75f8db 100644
--- a/pkg/kubectl/cmd/get.go
+++ b/pkg/kubectl/cmd/get.go
@@ -50,9 +50,6 @@ $ kubectl get pods
 # List all pods in ps output format with more information (such as node name).
 $ kubectl get pods -o wide
 
-# List all pods in resource/name format (such as pod/nginx).
-$ kubectl get pods -o name
-
 # List a single replication controller with specified NAME in ps output format.
 $ kubectl get replicationcontroller web