Revert "Update cobra/pflag. Also update generated kubectl documentation."

Godeps/Godeps.json

@@ -357,11 +357,11 @@
 		},
 		{
 			"ImportPath": "github.com/spf13/cobra",
-			"Rev": "9e7273d5469dd5e04a35fd8823ba510117448c0b"
+			"Rev": "f8e1ec56bdd7494d309c69681267859a6bfb7549"
 		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
-			"Rev": "11b7cf8387a31f278486eaad758162830eca8c73"
+			"Rev": "370c3171201099fa6b466db45c8a032cbce33d8d"
 		},
 		{
 			"ImportPath": "github.com/stretchr/objx",

Godeps/_workspace/src/github.com/spf13/cobra/cobra_test.go

@@ -11,14 +11,11 @@ var _ = fmt.Println
 
 var tp, te, tt, t1 []string
 var flagb1, flagb2, flagb3, flagbr bool
-var flags1, flags2a, flags2b, flags3 string
+var flags1, flags2, flags3 string
 var flagi1, flagi2, flagi3, flagir int
 var globalFlag1 bool
 var flagEcho, rootcalled bool
 
-const strtwoParentHelp = "help message for parent flag strtwo"
-const strtwoChildHelp = "help message for child flag strtwo"
-
 var cmdPrint = &Command{
 	Use:   "print [string to print]",
 	Short: "Print anything to the screen",
@@ -75,12 +72,11 @@ func flagInit() {
 	cmdRootNoRun.ResetFlags()
 	cmdRootSameName.ResetFlags()
 	cmdRootWithRun.ResetFlags()
-	cmdRootNoRun.PersistentFlags().StringVarP(&flags2a, "strtwo", "t", "two", strtwoParentHelp)
 	cmdEcho.Flags().IntVarP(&flagi1, "intone", "i", 123, "help message for flag intone")
 	cmdTimes.Flags().IntVarP(&flagi2, "inttwo", "j", 234, "help message for flag inttwo")
 	cmdPrint.Flags().IntVarP(&flagi3, "intthree", "i", 345, "help message for flag intthree")
 	cmdEcho.PersistentFlags().StringVarP(&flags1, "strone", "s", "one", "help message for flag strone")
-	cmdTimes.PersistentFlags().StringVarP(&flags2b, "strtwo", "t", "2", strtwoChildHelp)
+	cmdTimes.PersistentFlags().StringVarP(&flags2, "strtwo", "t", "two", "help message for flag strtwo")
 	cmdPrint.PersistentFlags().StringVarP(&flags3, "strthree", "s", "three", "help message for flag strthree")
 	cmdEcho.Flags().BoolVarP(&flagb1, "boolone", "b", true, "help message for flag boolone")
 	cmdTimes.Flags().BoolVarP(&flagb2, "booltwo", "c", false, "help message for flag booltwo")
@@ -381,21 +377,10 @@ func TestChildCommandFlags(t *testing.T) {
 		t.Errorf("invalid flag should generate error")
 	}
 
-	if !strings.Contains(r.Output, "unknown shorthand flag") {
+	if !strings.Contains(r.Output, "intone=123") {
 		t.Errorf("Wrong error message displayed, \n %s", r.Output)
 	}
 
-	// Testing with persistent flag overwritten by child
-	noRRSetupTest("echo times --strtwo=child one two")
-
-	if flags2b != "child" {
-		t.Errorf("flag value should be child, %s given", flags2b)
-	}
-
-	if flags2a != "two" {
-		t.Errorf("unset flag should have default value, expecting two, given %s", flags2a)
-	}
-
 	// Testing flag with invalid input
 	r = noRRSetupTest("echo -i10E")
 
@@ -452,13 +437,6 @@ func TestHelpCommand(t *testing.T) {
 	checkResultContains(t, r, cmdTimes.Long)
 }
 
-func TestChildCommandHelp(t *testing.T) {
-	c := noRRSetupTest("print --help")
-	checkResultContains(t, c, strtwoParentHelp)
-	r := noRRSetupTest("echo times --help")
-	checkResultContains(t, r, strtwoChildHelp)
-}
-
 func TestRunnableRootCommand(t *testing.T) {
 	fullSetupTest("")
 
@@ -508,26 +486,6 @@ func TestRootHelp(t *testing.T) {
 
 }
 
-func TestFlagAccess(t *testing.T) {
-	initialize()
-
-	local := cmdTimes.LocalFlags()
-	inherited := cmdTimes.InheritedFlags()
-
-	for _, f := range []string{"inttwo", "strtwo", "booltwo"} {
-		if local.Lookup(f) == nil {
-			t.Errorf("LocalFlags expected to contain %s, Got: nil", f)
-		}
-	}
-	if inherited.Lookup("strone") == nil {
-		t.Errorf("InheritedFlags expected to contain strone, Got: nil")
-	}
-	if inherited.Lookup("strtwo") != nil {
-		t.Errorf("InheritedFlags shouldn not contain overwritten flag strtwo")
-
-	}
-}
-
 func TestRootNoCommandHelp(t *testing.T) {
 	x := rootOnlySetupTest("--help")
 

Godeps/_workspace/src/github.com/spf13/pflag/bool_test.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"testing"
 
-	. "github.com/spf13/pflag"
+	. "github.com/ogier/pflag"
 )
 
 // This value can be a boolean ("true", "false") or "maybe"

Godeps/_workspace/src/github.com/spf13/pflag/example_test.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	flag "github.com/spf13/pflag"
+	flag "github.com/ogier/pflag"
 )
 
 // Example 1: A single string flag called "species" with default value "gopher".

Godeps/_workspace/src/github.com/spf13/pflag/flag.go

@@ -498,7 +498,6 @@ func (f *FlagSet) parseShortArg(s string, args []string) (a []string, err error)
 			if len(args) == 0 {
 				return
 			}
-			return
 		}
 		if alreadythere {
 			if bv, ok := flag.Value.(boolFlag); ok && bv.IsBoolFlag() {
@@ -552,9 +551,6 @@ func (f *FlagSet) parseArgs(args []string) (err error) {
 		} else {
 			args, err = f.parseShortArg(s, args)
 		}
-		if err != nil {
-		   return
-		}
 	}
 	return
 }

docs/kubectl-clusterinfo.md

@@ -11,12 +11,6 @@ Display addresses of the master and services with label kubernetes.io/cluster-se
 kubectl clusterinfo
 ```
 
-### Options
-
-```
-  -h, --help=false: help for clusterinfo
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -28,6 +22,7 @@ kubectl clusterinfo
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-config-set-cluster.md

@@ -28,25 +28,24 @@ $ kubectl config set-cluster e2e --insecure-skip-tls-verify=true
 ### Options
 
 ```
-      --api-version=: api-version for the cluster entry in .kubeconfig
-      --certificate-authority=: path to certificate-authority for the cluster entry in .kubeconfig
       --embed-certs=false: embed-certs for the cluster entry in .kubeconfig
-  -h, --help=false: help for set-cluster
-      --insecure-skip-tls-verify=false: insecure-skip-tls-verify for the cluster entry in .kubeconfig
-      --server=: server for the cluster entry in .kubeconfig
 ```
 
 ### Options inherrited from parent commands
 
 ```
       --alsologtostderr=false: log to standard error as well as files
+      --api-version="": The API version to use when talking to the server
   -a, --auth-path="": Path to the auth info file. If missing, prompt the user. Only used if using https.
+      --certificate-authority="": Path to a cert. file for the certificate authority.
       --client-certificate="": Path to a client key file for TLS.
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
+      --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
@@ -56,6 +55,7 @@ $ kubectl config set-cluster e2e --insecure-skip-tls-verify=true
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
       --password="": Password for basic authentication to the API server.
+  -s, --server="": The address and port of the Kubernetes API server
       --stderrthreshold=2: logs at or above this threshold go to stderr
       --token="": Bearer token for authentication to the API server.
       --user="": The name of the kubeconfig user to use

docs/kubectl-config-set-context.md

@@ -19,15 +19,6 @@ kubectl config set-context NAME [--cluster=cluster_nickname] [--user=user_nickna
 $ kubectl config set-context gce --user=cluster-admin
 ```
 
-### Options
-
-```
-      --cluster=: cluster for the context entry in .kubeconfig
-  -h, --help=false: help for set-context
-      --namespace=: namespace for the context entry in .kubeconfig
-      --user=: user for the context entry in .kubeconfig
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -37,9 +28,11 @@ $ kubectl config set-context gce --user=cluster-admin
       --certificate-authority="": Path to a cert. file for the certificate authority.
       --client-certificate="": Path to a client key file for TLS.
       --client-key="": Path to a client key file for TLS.
+      --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory
@@ -48,10 +41,12 @@ $ kubectl config set-context gce --user=cluster-admin
       --log_flush_frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
+      --namespace="": If present, the namespace scope for this CLI request.
       --password="": Password for basic authentication to the API server.
   -s, --server="": The address and port of the Kubernetes API server
       --stderrthreshold=2: logs at or above this threshold go to stderr
       --token="": Bearer token for authentication to the API server.
+      --user="": The name of the kubeconfig user to use
       --username="": Username for basic authentication to the API server.
       --v=0: log level for V logs
       --validate=false: If true, use a schema to validate the input before sending it

docs/kubectl-config-set-credentials.md

@@ -41,14 +41,7 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt -
 ### Options
 
 ```
-      --auth-path=: auth-path for the user entry in .kubeconfig
-      --client-certificate=: path to client-certificate for the user entry in .kubeconfig
-      --client-key=: path to client-key for the user entry in .kubeconfig
       --embed-certs=false: embed client cert/key for the user entry in .kubeconfig
-  -h, --help=false: help for set-credentials
-      --password=: password for the user entry in .kubeconfig
-      --token=: token for the user entry in .kubeconfig
-      --username=: username for the user entry in .kubeconfig
 ```
 
 ### Options inherrited from parent commands
@@ -56,11 +49,15 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt -
 ```
       --alsologtostderr=false: log to standard error as well as files
       --api-version="": The API version to use when talking to the server
+  -a, --auth-path="": Path to the auth info file. If missing, prompt the user. Only used if using https.
       --certificate-authority="": Path to a cert. file for the certificate authority.
+      --client-certificate="": Path to a client key file for TLS.
+      --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory
@@ -70,9 +67,12 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt -
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
+      --password="": Password for basic authentication to the API server.
   -s, --server="": The address and port of the Kubernetes API server
       --stderrthreshold=2: logs at or above this threshold go to stderr
+      --token="": Bearer token for authentication to the API server.
       --user="": The name of the kubeconfig user to use
+      --username="": Username for basic authentication to the API server.
       --v=0: log level for V logs
       --validate=false: If true, use a schema to validate the input before sending it
       --vmodule=: comma-separated list of pattern=N settings for file-filtered logging

docs/kubectl-config-set.md

@@ -13,12 +13,6 @@ PROPERTY_VALUE is the new value you wish to set.
 kubectl config set PROPERTY_NAME PROPERTY_VALUE
 ```
 
-### Options
-
-```
-  -h, --help=false: help for set
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -32,6 +26,7 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory

docs/kubectl-config-unset.md

@@ -12,12 +12,6 @@ PROPERTY_NAME is a dot delimited name where each token represents either a attri
 kubectl config unset PROPERTY_NAME
 ```
 
-### Options
-
-```
-  -h, --help=false: help for unset
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -31,6 +25,7 @@ kubectl config unset PROPERTY_NAME
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory

docs/kubectl-config-use-context.md

@@ -11,12 +11,6 @@ Sets the current-context in a .kubeconfig file
 kubectl config use-context CONTEXT_NAME
 ```
 
-### Options
-
-```
-  -h, --help=false: help for use-context
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -30,6 +24,7 @@ kubectl config use-context CONTEXT_NAME
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory

docs/kubectl-config-view.md

@@ -29,7 +29,6 @@ $ kubectl config view -o template --template='{{ index . "users" "e2e" "password
 ### Options
 
 ```
-  -h, --help=false: help for view
       --merge=true: merge together the full hierarchy of .kubeconfig files
       --no-headers=false: When using the default output, don't print headers.
   -o, --output="": Output format. One of: json|yaml|template|templatefile.
@@ -50,6 +49,7 @@ $ kubectl config view -o template --template='{{ index . "users" "e2e" "password
       --context="": The name of the kubeconfig context to use
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
+  -h, --help=false: help for config
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory

docs/kubectl-config.md

@@ -16,8 +16,6 @@ kubectl config SUBCOMMAND
 ```
       --envvar=false: use the .kubeconfig from $KUBECONFIG
       --global=false: use the .kubeconfig from /home/username
-  -h, --help=false: help for config
-      --kubeconfig="": use a particular .kubeconfig file
       --local=false: use the .kubeconfig in the current directory
 ```
 
@@ -32,7 +30,9 @@ kubectl config SUBCOMMAND
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
+      --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
       --log_dir=: If non-empty, write log files in this directory
       --log_flush_frequency=5s: Maximum number of seconds between log flushes

docs/kubectl-create.md

@@ -27,7 +27,6 @@ $ cat pod.json | kubectl create -f -
 
 ```
   -f, --filename=[]: Filename, directory, or URL to file to use to create the resource
-  -h, --help=false: help for create
 ```
 
 ### Options inherrited from parent commands
@@ -41,6 +40,7 @@ $ cat pod.json | kubectl create -f -
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-delete.md

@@ -44,7 +44,6 @@ $ kubectl delete pods --all
 ```
       --all=false: [-all] to select all the specified resources
   -f, --filename=[]: Filename, directory, or URL to a file containing the resource to delete
-  -h, --help=false: help for delete
   -l, --selector="": Selector (label query) to filter on
 ```
 
@@ -59,6 +58,7 @@ $ kubectl delete pods --all
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-describe.md

@@ -14,12 +14,6 @@ given resource.
 kubectl describe RESOURCE ID
 ```
 
-### Options
-
-```
-  -h, --help=false: help for describe
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -31,6 +25,7 @@ kubectl describe RESOURCE ID
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-exec.md

@@ -25,7 +25,6 @@ $ kubectl exec -p 123456-7890 -c ruby-container -i -t -- bash -il
 
 ```
   -c, --container="": Container name
-  -h, --help=false: help for exec
   -p, --pod="": Pod name
   -i, --stdin=false: Pass stdin to the container
   -t, --tty=false: Stdin is a TTY
@@ -42,6 +41,7 @@ $ kubectl exec -p 123456-7890 -c ruby-container -i -t -- bash -il
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-expose.md

@@ -31,7 +31,6 @@ $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream
       --create-external-load-balancer=false: If true, create an external load balancer for this service. Implementation is cloud provider dependent. Default is 'false'.
       --dry-run=false: If true, only print the object that would be sent, without creating it.
       --generator="service/v1": The name of the API generator to use.  Default is 'service/v1'.
-  -h, --help=false: help for expose
       --no-headers=false: When using the default output, don't print headers.
   -o, --output="": Output format. One of: json|yaml|template|templatefile.
       --output-version="": Output the formatted object with the given version (default api-version).
@@ -55,6 +54,7 @@ $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-get.md

@@ -39,7 +39,6 @@ $ kubectl get rc,services
 ### Options
 
 ```
-  -h, --help=false: help for get
       --no-headers=false: When using the default output, don't print headers.
   -o, --output="": Output format. One of: json|yaml|template|templatefile.
       --output-version="": Output the formatted object with the given version (default api-version).
@@ -60,6 +59,7 @@ $ kubectl get rc,services
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-label.md

@@ -34,7 +34,6 @@ $ kubectl label pods foo bar-
 ### Options
 
 ```
-  -h, --help=false: help for label
       --no-headers=false: When using the default output, don't print headers.
   -o, --output="": Output format. One of: json|yaml|template|templatefile.
       --output-version="": Output the formatted object with the given version (default api-version).
@@ -54,6 +53,7 @@ $ kubectl label pods foo bar-
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-log.md

@@ -25,7 +25,6 @@ $ kubectl log -f 123456-7890 ruby-container
 
 ```
   -f, --follow=false: Specify if the logs should be streamed.
-  -h, --help=false: help for log
       --interactive=true: If true, prompt the user for input when required. Default true.
 ```
 
@@ -40,6 +39,7 @@ $ kubectl log -f 123456-7890 ruby-container
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-namespace.md

@@ -14,12 +14,6 @@ namespace has been superceded by the context.namespace field of .kubeconfig file
 kubectl namespace [namespace]
 ```
 
-### Options
-
-```
-  -h, --help=false: help for namespace
-```
-
 ### Options inherrited from parent commands
 
 ```
@@ -31,6 +25,7 @@ kubectl namespace [namespace]
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-port-forward.md

@@ -31,7 +31,6 @@ $ kubectl port-forward -p mypod 0:5000
 ### Options
 
 ```
-  -h, --help=false: help for port-forward
   -p, --pod="": Pod name
 ```
 
@@ -46,6 +45,7 @@ $ kubectl port-forward -p mypod 0:5000
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-proxy.md

@@ -26,7 +26,6 @@ $ kubectl proxy --api-prefix=k8s-api
 
 ```
       --api-prefix="/api/": Prefix to serve the proxied API under.
-  -h, --help=false: help for proxy
   -p, --port=8001: The port on which to run the proxy.
   -w, --www="": Also serve static files from the given directory under the specified prefix.
   -P, --www-prefix="/static/": Prefix to serve static files under, if static file directory is specified.
@@ -43,6 +42,7 @@ $ kubectl proxy --api-prefix=k8s-api
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-resize.md

@@ -30,7 +30,6 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
 
 ```
       --current-replicas=-1: Precondition for current size. Requires that the current size of the replication controller match this value in order to resize.
-  -h, --help=false: help for resize
       --replicas=-1: The new desired number of replicas. Required.
       --resource-version="": Precondition for resource version. Requires that the current resource version match this value in order to resize.
 ```
@@ -46,6 +45,7 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-rollingupdate.md

@@ -29,7 +29,6 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
 
 ```
   -f, --filename="": Filename or URL to file to use to create the new controller.
-  -h, --help=false: help for rollingupdate
       --poll-interval="3s": Time delay between polling controller status after update. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
       --timeout="5m0s": Max time to wait for a controller to update before giving up. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
       --update-period="1m0s": Time to wait between updating pods. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -46,6 +45,7 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-run-container.md

@@ -33,7 +33,6 @@ $ kubectl run-container nginx --image=dockerfile/nginx --overrides='{ "apiVersio
 ```
       --dry-run=false: If true, only print the object that would be sent, without sending it.
       --generator="run-container/v1": The name of the API generator to use.  Default is 'run-container-controller/v1'.
-  -h, --help=false: help for run-container
       --image="": The image for the container to run.
   -l, --labels="": Labels to apply to the pod(s) created by this call to run-container.
       --no-headers=false: When using the default output, don't print headers.
@@ -56,6 +55,7 @@ $ kubectl run-container nginx --image=dockerfile/nginx --overrides='{ "apiVersio
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-stop.md

@@ -35,7 +35,6 @@ $ kubectl stop -f path/to/resources
 ```
       --all=false: [-all] to select all the specified resources
   -f, --filename=[]: Filename, directory, or URL to file of resource(s) to be stopped
-  -h, --help=false: help for stop
   -l, --selector="": Selector (label query) to filter on
 ```
 
@@ -50,6 +49,7 @@ $ kubectl stop -f path/to/resources
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-update.md

@@ -30,7 +30,6 @@ $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState":
 
 ```
   -f, --filename=[]: Filename, directory, or URL to file to use to update the resource.
-  -h, --help=false: help for update
       --patch="": A JSON document to override the existing resource. The resource is downloaded, patched with the JSON, then updated.
 ```
 
@@ -45,6 +44,7 @@ $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState":
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/kubectl-version.md

@@ -15,7 +15,6 @@ kubectl version
 
 ```
   -c, --client=false: Client version only (no server required).
-  -h, --help=false: help for version
 ```
 
 ### Options inherrited from parent commands
@@ -29,6 +28,7 @@ kubectl version
       --client-key="": Path to a client key file for TLS.
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
+  -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
       --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

docs/man/man1/kubectl-clusterinfo.1

@@ -16,12 +16,6 @@ kubectl clusterinfo \- Display cluster info
 Display addresses of the master and services with label kubernetes.io/cluster\-service=true
 
 
-.SH OPTIONS
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for clusterinfo
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -56,6 +50,10 @@ Display addresses of the master and services with label kubernetes.io/cluster\-s
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-config-set-cluster.1

@@ -19,29 +19,9 @@ Specifying a name that already exists will merge new fields on top of existing v
 
 .SH OPTIONS
 .PP
-\fB\-\-api\-version\fP=""
-    api\-version for the cluster entry in .kubeconfig
-
-.PP
-\fB\-\-certificate\-authority\fP=""
-    path to certificate\-authority for the cluster entry in .kubeconfig
-
-.PP
 \fB\-\-embed\-certs\fP=false
     embed\-certs for the cluster entry in .kubeconfig
 
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for set\-cluster
-
-.PP
-\fB\-\-insecure\-skip\-tls\-verify\fP=false
-    insecure\-skip\-tls\-verify for the cluster entry in .kubeconfig
-
-.PP
-\fB\-\-server\fP=""
-    server for the cluster entry in .kubeconfig
-
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
@@ -49,10 +29,18 @@ Specifying a name that already exists will merge new fields on top of existing v
     log to standard error as well as files
 
 .PP
+\fB\-\-api\-version\fP=""
+    The API version to use when talking to the server
+
+.PP
 \fB\-a\fP, \fB\-\-auth\-path\fP=""
     Path to the auth info file. If missing, prompt the user. Only used if using https.
 
 .PP
+\fB\-\-certificate\-authority\fP=""
+    Path to a cert. file for the certificate authority.
+
+.PP
 \fB\-\-client\-certificate\fP=""
     Path to a client key file for TLS.
 
@@ -77,6 +65,14 @@ Specifying a name that already exists will merge new fields on top of existing v
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
+\fB\-\-insecure\-skip\-tls\-verify\fP=false
+    If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
+
+.PP
 \fB\-\-kubeconfig\fP=""
     use a particular .kubeconfig file
 
@@ -113,6 +109,10 @@ Specifying a name that already exists will merge new fields on top of existing v
     Password for basic authentication to the API server.
 
 .PP
+\fB\-s\fP, \fB\-\-server\fP=""
+    The address and port of the Kubernetes API server
+
+.PP
 \fB\-\-stderrthreshold\fP=2
     logs at or above this threshold go to stderr
 

docs/man/man1/kubectl-config-set-context.1

@@ -17,24 +17,6 @@ Sets a context entry in .kubeconfig
 Specifying a name that already exists will merge new fields on top of existing values for those fields.
 
 
-.SH OPTIONS
-.PP
-\fB\-\-cluster\fP=""
-    cluster for the context entry in .kubeconfig
-
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for set\-context
-
-.PP
-\fB\-\-namespace\fP=""
-    namespace for the context entry in .kubeconfig
-
-.PP
-\fB\-\-user\fP=""
-    user for the context entry in .kubeconfig
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -61,6 +43,10 @@ Specifying a name that already exists will merge new fields on top of existing v
     Path to a client key file for TLS.
 
 .PP
+\fB\-\-cluster\fP=""
+    The name of the kubeconfig cluster to use
+
+.PP
 \fB\-\-context\fP=""
     The name of the kubeconfig context to use
 
@@ -73,6 +59,10 @@ Specifying a name that already exists will merge new fields on top of existing v
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 
@@ -105,6 +95,10 @@ Specifying a name that already exists will merge new fields on top of existing v
     Require server version to match client version
 
 .PP
+\fB\-\-namespace\fP=""
+    If present, the namespace scope for this CLI request.
+
+.PP
 \fB\-\-password\fP=""
     Password for basic authentication to the API server.
 
@@ -121,6 +115,10 @@ Specifying a name that already exists will merge new fields on top of existing v
     Bearer token for authentication to the API server.
 
 .PP
+\fB\-\-user\fP=""
+    The name of the kubeconfig user to use
+
+.PP
 \fB\-\-username\fP=""
     Username for basic authentication to the API server.
 

docs/man/man1/kubectl-config-set-credentials.1

@@ -34,37 +34,9 @@ Bearer token and basic auth are mutually exclusive.
 
 .SH OPTIONS
 .PP
-\fB\-\-auth\-path\fP=""
-    auth\-path for the user entry in .kubeconfig
-
-.PP
-\fB\-\-client\-certificate\fP=""
-    path to client\-certificate for the user entry in .kubeconfig
-
-.PP
-\fB\-\-client\-key\fP=""
-    path to client\-key for the user entry in .kubeconfig
-
-.PP
 \fB\-\-embed\-certs\fP=false
     embed client cert/key for the user entry in .kubeconfig
 
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for set\-credentials
-
-.PP
-\fB\-\-password\fP=""
-    password for the user entry in .kubeconfig
-
-.PP
-\fB\-\-token\fP=""
-    token for the user entry in .kubeconfig
-
-.PP
-\fB\-\-username\fP=""
-    username for the user entry in .kubeconfig
-
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
@@ -76,10 +48,22 @@ Bearer token and basic auth are mutually exclusive.
     The API version to use when talking to the server
 
 .PP
+\fB\-a\fP, \fB\-\-auth\-path\fP=""
+    Path to the auth info file. If missing, prompt the user. Only used if using https.
+
+.PP
 \fB\-\-certificate\-authority\fP=""
     Path to a cert. file for the certificate authority.
 
 .PP
+\fB\-\-client\-certificate\fP=""
+    Path to a client key file for TLS.
+
+.PP
+\fB\-\-client\-key\fP=""
+    Path to a client key file for TLS.
+
+.PP
 \fB\-\-cluster\fP=""
     The name of the kubeconfig cluster to use
 
@@ -96,6 +80,10 @@ Bearer token and basic auth are mutually exclusive.
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 
@@ -132,6 +120,10 @@ Bearer token and basic auth are mutually exclusive.
     If present, the namespace scope for this CLI request.
 
 .PP
+\fB\-\-password\fP=""
+    Password for basic authentication to the API server.
+
+.PP
 \fB\-s\fP, \fB\-\-server\fP=""
     The address and port of the Kubernetes API server
 
@@ -140,10 +132,18 @@ Bearer token and basic auth are mutually exclusive.
     logs at or above this threshold go to stderr
 
 .PP
+\fB\-\-token\fP=""
+    Bearer token for authentication to the API server.
+
+.PP
 \fB\-\-user\fP=""
     The name of the kubeconfig user to use
 
 .PP
+\fB\-\-username\fP=""
+    Username for basic authentication to the API server.
+
+.PP
 \fB\-\-v\fP=0
     log level for V logs
 

docs/man/man1/kubectl-config-set.1

@@ -18,12 +18,6 @@ PROPERTY\_NAME is a dot delimited name where each token represents either a attr
 PROPERTY\_VALUE is the new value you wish to set.
 
 
-.SH OPTIONS
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for set
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -66,6 +60,10 @@ PROPERTY\_VALUE is the new value you wish to set.
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-config-unset.1

@@ -17,12 +17,6 @@ Unsets an individual value in a .kubeconfig file
 PROPERTY\_NAME is a dot delimited name where each token represents either a attribute name or a map key.  Map keys may not contain dots.
 
 
-.SH OPTIONS
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for unset
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -65,6 +59,10 @@ PROPERTY\_NAME is a dot delimited name where each token represents either a attr
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-config-use-context.1

@@ -16,12 +16,6 @@ kubectl config use\-context \- Sets the current\-context in a .kubeconfig file
 Sets the current\-context in a .kubeconfig file
 
 
-.SH OPTIONS
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for use\-context
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -64,6 +58,10 @@ Sets the current\-context in a .kubeconfig file
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-config-view.1

@@ -21,10 +21,6 @@ You can use \-\-output=template \-\-template=TEMPLATE to extract specific values
 
 .SH OPTIONS
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for view
-
-.PP
 \fB\-\-merge\fP=true
     merge together the full hierarchy of .kubeconfig files
 
@@ -88,6 +84,10 @@ You can use \-\-output=template \-\-template=TEMPLATE to extract specific values
     use the .kubeconfig from /home/username
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for config
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-config.1

@@ -26,14 +26,6 @@ config modifies .kubeconfig files using subcommands like "kubectl config set cur
     use the .kubeconfig from /home/username
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for config
-
-.PP
-\fB\-\-kubeconfig\fP=""
-    use a particular .kubeconfig file
-
-.PP
 \fB\-\-local\fP=false
     use the .kubeconfig in the current directory
 
@@ -72,10 +64,18 @@ config modifies .kubeconfig files using subcommands like "kubectl config set cur
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 
 .PP
+\fB\-\-kubeconfig\fP=""
+    Path to the kubeconfig file to use for CLI requests.
+
+.PP
 \fB\-\-log\_backtrace\_at\fP=:0
     when logging hits line file:N, emit a stack trace
 

docs/man/man1/kubectl-create.1

@@ -24,10 +24,6 @@ JSON and YAML formats are accepted.
 \fB\-f\fP, \fB\-\-filename\fP=[]
     Filename, directory, or URL to file to use to create the resource
 
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for create
-
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
@@ -63,6 +59,10 @@ JSON and YAML formats are accepted.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-delete.1

@@ -38,10 +38,6 @@ will be lost along with the rest of the resource.
     Filename, directory, or URL to a file containing the resource to delete
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for delete
-
-.PP
 \fB\-l\fP, \fB\-\-selector\fP=""
     Selector (label query) to filter on
 
@@ -80,6 +76,10 @@ will be lost along with the rest of the resource.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-describe.1

@@ -20,12 +20,6 @@ This command joins many API calls together to form a detailed description of a
 given resource.
 
 
-.SH OPTIONS
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for describe
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -60,6 +54,10 @@ given resource.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-exec.1

@@ -22,10 +22,6 @@ Execute a command in a container.
     Container name
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for exec
-
-.PP
 \fB\-p\fP, \fB\-\-pod\fP=""
     Pod name
 
@@ -72,6 +68,10 @@ Execute a command in a container.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-expose.1

@@ -38,10 +38,6 @@ as the selector for a new Service on the specified port.
     The name of the API generator to use.  Default is 'service/v1'.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for expose
-
-.PP
 \fB\-\-no\-headers\fP=false
     When using the default output, don't print headers.
 
@@ -117,6 +113,10 @@ as the selector for a new Service on the specified port.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-get.1

@@ -26,10 +26,6 @@ of the \-\-template flag, you can filter the attributes of the fetched resource(
 
 .SH OPTIONS
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for get
-
-.PP
 \fB\-\-no\-headers\fP=false
     When using the default output, don't print headers.
 
@@ -93,6 +89,10 @@ of the \-\-template flag, you can filter the attributes of the fetched resource(
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-label.1

@@ -22,10 +22,6 @@ If \-\-resource\-version is specified, then updates will use this resource versi
 
 .SH OPTIONS
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for label
-
-.PP
 \fB\-\-no\-headers\fP=false
     When using the default output, don't print headers.
 
@@ -85,6 +81,10 @@ If \-\-resource\-version is specified, then updates will use this resource versi
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-log.1

@@ -22,10 +22,6 @@ Print the logs for a container in a pod. If the pod has only one container, the
     Specify if the logs should be streamed.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for log
-
-.PP
 \fB\-\-interactive\fP=true
     If true, prompt the user for input when required. Default true.
 
@@ -64,6 +60,10 @@ Print the logs for a container in a pod. If the pod has only one container, the
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-namespace.1

@@ -19,12 +19,6 @@ SUPERCEDED:  Set and view the current Kubernetes namespace scope for command lin
 namespace has been superceded by the context.namespace field of .kubeconfig files.  See 'kubectl config set\-context \-\-help' for more details.
 
 
-.SH OPTIONS
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for namespace
-
-
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
 \fB\-\-alsologtostderr\fP=false
@@ -59,6 +53,10 @@ namespace has been superceded by the context.namespace field of .kubeconfig file
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-port-forward.1

@@ -18,10 +18,6 @@ Forward 1 or more local ports to a pod.
 
 .SH OPTIONS
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for port\-forward
-
-.PP
 \fB\-p\fP, \fB\-\-pod\fP=""
     Pod name
 
@@ -60,6 +56,10 @@ Forward 1 or more local ports to a pod.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-proxy.1

@@ -22,10 +22,6 @@ Run a proxy to the Kubernetes API server.
     Prefix to serve the proxied API under.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for proxy
-
-.PP
 \fB\-p\fP, \fB\-\-port\fP=8001
     The port on which to run the proxy.
 
@@ -72,6 +68,10 @@ Run a proxy to the Kubernetes API server.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-resize.1

@@ -28,10 +28,6 @@ resize is sent to the server.
     Precondition for current size. Requires that the current size of the replication controller match this value in order to resize.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for resize
-
-.PP
 \fB\-\-replicas\fP=\-1
     The new desired number of replicas. Required.
 
@@ -74,6 +70,10 @@ resize is sent to the server.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-rollingupdate.1

@@ -27,10 +27,6 @@ existing controller and overwrite at least one (common) label in its replicaSele
     Filename or URL to file to use to create the new controller.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for rollingupdate
-
-.PP
 \fB\-\-poll\-interval\fP="3s"
     Time delay between polling controller status after update. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
 
@@ -77,6 +73,10 @@ existing controller and overwrite at least one (common) label in its replicaSele
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-run-container.1

@@ -27,10 +27,6 @@ Creates a replication controller to manage the created container(s).
     The name of the API generator to use.  Default is 'run\-container\-controller/v1'.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for run\-container
-
-.PP
 \fB\-\-image\fP=""
     The image for the container to run.
 
@@ -102,6 +98,10 @@ Creates a replication controller to manage the created container(s).
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-stop.1

@@ -30,10 +30,6 @@ If the resource is resizable it will be resized to 0 before deletion.
     Filename, directory, or URL to file of resource(s) to be stopped
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for stop
-
-.PP
 \fB\-l\fP, \fB\-\-selector\fP=""
     Selector (label query) to filter on
 
@@ -72,6 +68,10 @@ If the resource is resizable it will be resized to 0 before deletion.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-update.1

@@ -25,10 +25,6 @@ JSON and YAML formats are accepted.
     Filename, directory, or URL to file to use to update the resource.
 
 .PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for update
-
-.PP
 \fB\-\-patch\fP=""
     A JSON document to override the existing resource. The resource is downloaded, patched with the JSON, then updated.
 
@@ -67,6 +63,10 @@ JSON and YAML formats are accepted.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 

docs/man/man1/kubectl-version.1

@@ -21,10 +21,6 @@ Print the client and server version information.
 \fB\-c\fP, \fB\-\-client\fP=false
     Client version only (no server required).
 
-.PP
-\fB\-h\fP, \fB\-\-help\fP=false
-    help for version
-
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
@@ -60,6 +56,10 @@ Print the client and server version information.
     The name of the kubeconfig context to use
 
 .PP
+\fB\-h\fP, \fB\-\-help\fP=false
+    help for kubectl
+
+.PP
 \fB\-\-insecure\-skip\-tls\-verify\fP=false
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.