From 401d3c43fd5f4a4bd903d4a4e40810d77a02778e Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Tue, 9 Jun 2015 12:55:45 -0700
Subject: [PATCH] remove removed flags from usage examples

---
 docs/kubectl_config_view.md         | 5 +----
 docs/man/man1/kubectl-config-view.1 | 3 ---
 pkg/kubectl/cmd/config/view.go      | 4 ----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/docs/kubectl_config_view.md b/docs/kubectl_config_view.md
index 3b3f92d085c..18a8f4f3e85 100644
--- a/docs/kubectl_config_view.md
+++ b/docs/kubectl_config_view.md
@@ -19,9 +19,6 @@ kubectl config view
 // Show Merged kubeconfig settings.
 $ kubectl config view
 
-// Show only local kubeconfig settings
-$ kubectl config view --local
-
 // Get the password for the e2e user
 $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}'
 ```
@@ -72,6 +69,6 @@ $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.216559289 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-06-09 19:55:35.92095292 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_view.md?pixel)]()
diff --git a/docs/man/man1/kubectl-config-view.1 b/docs/man/man1/kubectl-config-view.1
index 85ab4c3c7d7..c4e237d5818 100644
--- a/docs/man/man1/kubectl-config-view.1
+++ b/docs/man/man1/kubectl-config-view.1
@@ -164,9 +164,6 @@ You can use \-\-output=template \-\-template=TEMPLATE to extract specific values
 // Show Merged kubeconfig settings.
 $ kubectl config view
 
-// Show only local kubeconfig settings
-$ kubectl config view \-\-local
-
 // Get the password for the e2e user
 $ kubectl config view \-o template \-\-template='\{\{range .users\}\}\{\{ if eq .name "e2e" \}\}\{\{ index .user.password \}\}\{\{end\}\}\{\{end\}\}'
 
diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go
index 7ec43190362..0f3e3af8ff8 100644
--- a/pkg/kubectl/cmd/config/view.go
+++ b/pkg/kubectl/cmd/config/view.go
@@ -46,9 +46,6 @@ You can use --output=template --template=TEMPLATE to extract specific values.`
 	view_example = `// Show Merged kubeconfig settings.
 $ kubectl config view
 
-// Show only local kubeconfig settings
-$ kubectl config view --local
-
 // Get the password for the e2e user
 $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}'`
 )
@@ -119,7 +116,6 @@ func (o ViewOptions) Run(out io.Writer, printer kubectl.ResourcePrinter) error {
 }
 
 func (o *ViewOptions) Complete() bool {
-	// if --kubeconfig, --global, or --local is specified, then merging doesn't make sense since you're declaring precise intent
 	if o.ConfigAccess.IsExplicitFile() {
 		if !o.Merge.Provided() {
 			o.Merge.Set("false")