Autogenerate md documentation for kubectl

This does away with the giant dump from cobra for kubectl and instead generates md files which contain similar information, but one per verb. This might work well as part of the cobra project, instead of doing it in kube, but this gets us nice, linked, documentation right now. If people like it, I will try to get something similar into cobra.
2025-07-21 19:01:49 +00:00 · 2015-01-31 14:08:59 -05:00 · 2015-01-31 14:08:59 -05:00 · a6beb2e7df
commit a6beb2e7df
parent 9e9fb9457f
32 changed files with 1553 additions and 1120 deletions
--- a/cmd/gendocs/gen_kubectl_docs.go
+++ b/cmd/gendocs/gen_kubectl_docs.go
@ -17,42 +17,156 @@ limitations under the License.
 package main

 import (
+	"bytes"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"os"
+	"path/filepath"
+	"strings"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )

+func mergeFlags(old, newFlags *pflag.FlagSet) *pflag.FlagSet {
+	newFlags.VisitAll(func(f *pflag.Flag) {
+		if old.Lookup(f.Name) == nil {
+			old.AddFlag(f)
+		}
+	})
+	return old
+}
+
+func parentFlags(c *cobra.Command) *pflag.FlagSet {
+	if !c.HasParent() {
+		return pflag.NewFlagSet("empty", pflag.ExitOnError)
+	}
+	return mergeFlags(c.Parent().PersistentFlags(), parentFlags(c.Parent()))
+}
+
+func myFlags(c *cobra.Command) *pflag.FlagSet {
+	myFlags := c.Flags()
+	parentFlags := parentFlags(c)
+
+	if c.HasPersistentFlags() {
+		c.PersistentFlags().VisitAll(func(f *pflag.Flag) {
+			if c.Flags().Lookup(f.Name) == nil &&
+				parentFlags.Lookup(f.Name) == nil {
+				myFlags.AddFlag(f)
+			}
+		})
+	}
+	return myFlags
+}
+
+func printOptions(out *bytes.Buffer, command *cobra.Command, name string) {
+	flags := myFlags(command)
+	flags.SetOutput(out)
+	if command.Runnable() {
+		fmt.Fprintf(out, "%s\n\n", command.UseLine())
+	}
+	if flags.HasFlags() {
+		fmt.Fprintf(out, "### Options\n\n```\n")
+		flags.PrintDefaults()
+		fmt.Fprintf(out, "```\n\n")
+	}
+
+	parentFlags := parentFlags(command)
+	parentFlags.SetOutput(out)
+	if parentFlags.HasFlags() {
+		fmt.Fprintf(out, "### Options inherrited from parent commands\n\n```\n")
+		parentFlags.PrintDefaults()
+		fmt.Fprintf(out, "```\n\n")
+	}
+}
+
+func genMarkdown(command *cobra.Command, parent, docsDir string) {
+	dparent := strings.Replace(parent, " ", "-", -1)
+	name := command.Name()
+	dname := name
+	if len(parent) > 0 {
+		dname = dparent + "-" + name
+		name = parent + " " + name
+	}
+
+	out := new(bytes.Buffer)
+	short := command.Short
+	long := command.Long
+	if len(long) == 0 {
+		long = short
+	}
+
+	fmt.Fprintf(out, "## %s\n\n", name)
+	fmt.Fprintf(out, "%s\n\n", short)
+	fmt.Fprintf(out, "### Synopsis\n\n")
+	fmt.Fprintf(out, "%s\n\n", long)
+
+	printOptions(out, command, name)
+
+	if len(command.Commands()) > 0 || len(parent) > 0 {
+		fmt.Fprintf(out, "### SEE ALSO\n")
+		if len(parent) > 0 {
+			link := dparent + ".md"
+			fmt.Fprintf(out, "* [%s](%s)\n", dparent, link)
+		}
+		for _, c := range command.Commands() {
+			child := dname + "-" + c.Name()
+			link := child + ".md"
+			fmt.Fprintf(out, "* [%s](%s)\n", child, link)
+			genMarkdown(c, name, docsDir)
+		}
+		fmt.Fprintf(out, "\n")
+	}
+
+	filename := docsDir + dname + ".md"
+	outFile, err := os.Create(filename)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	defer outFile.Close()
+	_, err = outFile.Write(out.Bytes())
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
 func main() {
-	out := os.Stdout
+	// use os.Args instead of "flags" because "flags" will mess up the man pages!
+	docsDir := "docs/man/man1/"
+	if len(os.Args) == 2 {
+		docsDir = os.Args[1]
+	} else if len(os.Args) > 2 {
+		fmt.Fprintf(os.Stderr, "usage: %s [output directory]\n", os.Args[0])
+		return
+	}
+
+	docsDir, err := filepath.Abs(docsDir)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		return
+	}
+
+	stat, err := os.Stat(docsDir)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "output directory %s does not exist\n", docsDir)
+		return
+	}
+
+	if !stat.IsDir() {
+		fmt.Fprintf(os.Stderr, "output directory %s is not a directory\n", docsDir)
+		return
+	}
+	docsDir = docsDir + "/"
+
 	// Set environment variables used by kubectl so the output is consistent,
 	// regardless of where we run.
 	os.Setenv("HOME", "/home/username")
-	kubectl := cmd.NewFactory(nil).NewKubectlCommand(out)
-	fmt.Fprintf(out, "## %s\n\n", kubectl.Name())
-	fmt.Fprintf(out, "%s\n\n", kubectl.Short)
-	fmt.Fprintln(out, "### Commands\n")
+	kubectl := cmd.NewFactory(nil).NewKubectlCommand(ioutil.Discard)
+	genMarkdown(kubectl, "", docsDir)
 	for _, c := range kubectl.Commands() {
-		genMarkdown(c, nil, out)
-	}
-}
-
-func genMarkdown(command, parent *cobra.Command, out io.Writer) {
-	name := command.Name()
-	if parent != nil {
-		name = fmt.Sprintf("%s %s", parent.Name(), name)
-	}
-	fmt.Fprintf(out, "#### %s\n", name)
-	desc := command.Long
-	if len(desc) == 0 {
-		desc = command.Short
-	}
-	fmt.Fprintf(out, "%s\n\n", desc)
-	usage := command.UsageString()
-	fmt.Fprintf(out, "Usage:\n```\n%s\n```\n\n", usage[9:len(usage)-1])
-	for _, c := range command.Commands() {
-		genMarkdown(c, command, out)
+		genMarkdown(c, "kubectl", docsDir)
 	}
 }
--- a/docs/kubectl-config-set-cluster.md
+++ b/docs/kubectl-config-set-cluster.md
@ -0,0 +1,59 @@
+## kubectl config set-cluster
+
+Sets a cluster entry in .kubeconfig
+
+### Synopsis
+
+Sets a cluster entry in .kubeconfig
+	Specifying a name that already exists will merge new fields on top of existing values for those fields.
+	e.g. 
+		kubectl config set-cluster e2e --certificate-authority=~/.kube/e2e/.kubernetes.ca.cert
+		only sets the certificate-authority field on the e2e cluster entry without touching other values.
+		
+
+kubectl config set-cluster name [--server=server] [--certificate-authority=path/to/certficate/authority] [--api-version=apiversion] [--insecure-skip-tls-verify=true]
+
+### Options
+
+```
+      --api-version=: api-version for the cluster entry in .kubeconfig
+      --certificate-authority=: certificate-authority for the cluster entry in .kubeconfig
+      --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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config-set-context.md
+++ b/docs/kubectl-config-set-context.md
@ -0,0 +1,58 @@
+## kubectl config set-context
+
+Sets a context entry in .kubeconfig
+
+### Synopsis
+
+Sets a context entry in .kubeconfig
+	Specifying a name that already exists will merge new fields on top of existing values for those fields.
+	e.g. 
+		kubectl config set-context gce --user=cluster-admin
+		only sets the user field on the gce context entry without touching other values.
+		
+
+kubectl config set-context name [--cluster=cluster-nickname] [--user=user-nickname] [--namespace=namespace]
+
+### Options
+
+```
+      --cluster=: cluster for the context entry in .kubeconfig
+      --namespace=: namespace for the context entry in .kubeconfig
+      --user=: user for the context 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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config-set-credentials.md
+++ b/docs/kubectl-config-set-credentials.md
@ -0,0 +1,59 @@
+## kubectl config set-credentials
+
+Sets a user entry in .kubeconfig
+
+### Synopsis
+
+Sets a user entry in .kubeconfig
+	Specifying a name that already exists will merge new fields on top of existing values for those fields.
+	e.g. 
+		kubectl config set-credentials cluster-admin --client-key=~/.kube/cluster-admin/.kubecfg.key
+		only sets the client-key field on the cluster-admin user entry without touching other values.
+		
+
+kubectl config set-credentials name [--auth-path=path/to/auth/file] [--client-certificate=path/to/certficate/file] [--client-key=path/to/key/file] [--token=bearer_token_string]
+
+### Options
+
+```
+      --auth-path=: auth-path for the user entry in .kubeconfig
+      --client-certificate=: client-certificate for the user entry in .kubeconfig
+      --client-key=: client-key for the user entry in .kubeconfig
+      --token=: token for the user 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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config-set.md
+++ b/docs/kubectl-config-set.md
@ -0,0 +1,50 @@
+## kubectl config set
+
+Sets an individual value in a .kubeconfig file
+
+### Synopsis
+
+Sets 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.
+		property-value is the new value you wish to set.
+
+		
+
+kubectl config set property-name property-value
+
+### 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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config-unset.md
+++ b/docs/kubectl-config-unset.md
@ -0,0 +1,48 @@
+## kubectl config unset
+
+Unsets an individual value in a .kubeconfig file
+
+### Synopsis
+
+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.
+		
+
+kubectl config unset property-name
+
+### 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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config-use-context.md
+++ b/docs/kubectl-config-use-context.md
@ -0,0 +1,45 @@
+## kubectl config use-context
+
+Sets the current-context in a .kubeconfig file
+
+### Synopsis
+
+Sets the current-context in a .kubeconfig file
+
+kubectl config use-context context-name
+
+### 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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config-view.md
+++ b/docs/kubectl-config-view.md
@ -0,0 +1,61 @@
+## kubectl config view
+
+displays merged .kubeconfig settings or a specified .kubeconfig file.
+
+### Synopsis
+
+displays merged .kubeconfig settings or a specified .kubeconfig file.
+Examples:
+  // Show merged .kubeconfig settings.
+  $ kubectl config view
+
+  // Show only local ./.kubeconfig settings
+  $ kubectl config view --local
+
+kubectl config view
+
+### Options
+
+```
+      --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.
+      --output-version="": Output the formatted object with the given version (default api-version).
+  -t, --template="": Template string or path to template file to use when -o=template or -o=templatefile.
+```
+
+### 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
+      --log_dir=: If non-empty, write log files in this directory
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl-config](kubectl-config.md)
+
--- a/docs/kubectl-config.md
+++ b/docs/kubectl-config.md
@ -0,0 +1,57 @@
+## kubectl config
+
+config modifies .kubeconfig files
+
+### Synopsis
+
+config modifies .kubeconfig files using subcommands like "kubectl config set current-context my-context"
+
+kubectl config <subcommand>
+
+### Options
+
+```
+      --envvar=false: use the .kubeconfig from $KUBECONFIG
+      --global=false: use the .kubeconfig from /home/username
+      --local=false: use the .kubeconfig in the current directory
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+* [kubectl-config-view](kubectl-config-view.md)
+* [kubectl-config-set-cluster](kubectl-config-set-cluster.md)
+* [kubectl-config-set-credentials](kubectl-config-set-credentials.md)
+* [kubectl-config-set-context](kubectl-config-set-context.md)
+* [kubectl-config-set](kubectl-config-set.md)
+* [kubectl-config-unset](kubectl-config-unset.md)
+* [kubectl-config-use-context](kubectl-config-use-context.md)
+
--- a/docs/kubectl-create.md
+++ b/docs/kubectl-create.md
@ -0,0 +1,58 @@
+## kubectl create
+
+Create a resource by filename or stdin
+
+### Synopsis
+
+Create a resource by filename or stdin.
+
+JSON and YAML formats are accepted.
+
+Examples:
+
+    $ kubectl create -f pod.json
+    // Create a pod using the data in pod.json.
+
+    $ cat pod.json | kubectl create -f -
+    // Create a pod based on the JSON passed into stdin.
+
+kubectl create -f filename
+
+### Options
+
+```
+  -f, --filename=[]: Filename, directory, or URL to file to use to create the resource
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-delete.md
+++ b/docs/kubectl-delete.md
@ -0,0 +1,72 @@
+## kubectl delete
+
+Delete a resource by filename, stdin, or resource and ID.
+
+### Synopsis
+
+Delete a resource by filename, stdin, resource and ID, or by resources and label selector.
+
+JSON and YAML formats are accepted.
+
+If both a filename and command line arguments are passed, the command line
+arguments are used and the filename is ignored.
+
+Note that the delete command does NOT do resource version checks, so if someone
+submits an update to a resource right when you submit a delete, their update
+will be lost along with the rest of the resource.
+
+Examples:
+
+    $ kubectl delete -f pod.json
+    // Delete a pod using the type and ID specified in pod.json.
+
+    $ cat pod.json | kubectl delete -f -
+    // Delete a pod based on the type and ID in the JSON passed into stdin.
+
+    $ kubectl delete pods,services -l name=myLabel
+    // Delete pods and services with label name=myLabel.
+
+    $ kubectl delete pod 1234-56-7890-234234-456456
+    // Delete a pod with ID 1234-56-7890-234234-456456.
+
+kubectl delete ([-f filename] | (<resource> [(<id> | -l <label>)]
+
+### Options
+
+```
+  -f, --filename=[]: Filename, directory, or URL to a file containing the resource to delete
+  -l, --selector="": Selector (label query) to filter on
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-describe.md
+++ b/docs/kubectl-describe.md
@ -0,0 +1,45 @@
+## kubectl describe
+
+Show details of a specific resource
+
+### Synopsis
+
+Show details of a specific resource.
+
+This command joins many API calls together to form a detailed description of a
+given resource.
+
+kubectl describe <resource> <id>
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-expose.md
+++ b/docs/kubectl-expose.md
@ -0,0 +1,73 @@
+## kubectl expose
+
+Take a replicated application and expose it as Kubernetes Service
+
+### Synopsis
+
+Take a replicated application and expose it as Kubernetes Service.
+		
+Looks up a ReplicationController by name, and uses the selector for that replication controller
+as the selector for a new Service on the specified port.
+
+Examples:
+
+    $ kubectl expose nginx --port=80 --container-port=8000
+    // Creates a service for a replicated nginx, which serves on port 80 and connects to the containers on port 8000.
+
+    $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream
+    // Create a service for a replicated streaming application on port 4100 balancing UDP traffic and named 'video-stream'.
+
+
+kubectl expose <name> --port=<port> [--protocol=TCP|UDP] [--container-port=<number-or-name>] [--service-name=<name>] [--public-ip=<ip>] [--create-external-load-balancer]
+
+### Options
+
+```
+      --container-port="": Name or number for the port on the container that the service should direct traffic to. Optional.
+      --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'.
+      --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).
+      --overrides="": An inline JSON override for the generated object. If this is non-empty, it is used to override the generated object. Requires that the object supply a valid apiVersion field.
+      --port=-1: The port that the service should serve on. Required.
+      --protocol="TCP": The network protocol for the service to be created. Default is 'tcp'.
+      --public-ip="": Name of a public IP address to set for the service. The service will be assigned this IP in addition to its generated service IP.
+      --selector="": A label selector to use for this service. If empty (the default) infer the selector from the replication controller.
+      --service-name="": The name for the newly created service.
+  -t, --template="": Template string or path to template file to use when -o=template or -o=templatefile.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-get.md
+++ b/docs/kubectl-get.md
@ -0,0 +1,77 @@
+## kubectl get
+
+Display one or many resources
+
+### Synopsis
+
+Display one or many resources.
+
+Possible resources include pods (po), replication controllers (rc), services
+(se), minions (mi), or events (ev).
+
+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).
+
+Examples:
+
+    $ kubectl get pods
+    // List all pods in ps output format.
+
+    $ kubectl get replicationController 1234-56-7890-234234-456456
+    // List a single replication controller with specified ID in ps output format.
+
+    $ kubectl get -o json pod 1234-56-7890-234234-456456
+    // List a single pod in JSON output format.
+
+    $ kubectl get -o template pod 1234-56-7890-234234-456456 --template={{.currentState.status}}
+    // Return only the status value of the specified pod.
+
+    $ kubectl get rc,services
+    // List all replication controllers and services together in ps output format.
+
+kubectl get [(-o|--output=)json|yaml|template|...] <resource> [<id>]
+
+### Options
+
+```
+      --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).
+  -l, --selector="": Selector (label query) to filter on
+  -t, --template="": Template string or path to template file to use when -o=template or -o=templatefile.
+  -w, --watch=false: After listing/getting the requested object, watch for changes.
+      --watch-only=false: Watch for changes to the requested object(s), without listing/getting first.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-label.md
+++ b/docs/kubectl-label.md
@ -0,0 +1,69 @@
+## kubectl label
+
+Update the labels on a resource
+
+### Synopsis
+
+Update the labels on a resource.
+
+If --overwrite is true, then existing labels can be overwritten, otherwise attempting to overwrite a label will result in an error.
+If --resource-version is specified, then updates will use this resource version, otherwise the existing resource-version will be used.
+
+Examples:
+  $ kubectl label pods foo unhealthy=true
+  <update a pod with the label 'unhealthy' and the value 'true'>
+
+  $ kubectl label --overwrite pods foo status=unhealthy
+  <update a pod with the label 'status' and the value 'unhealthy' overwritting an existing value>
+  
+  $ kubectl label pods foo status=unhealthy --resource-version=1
+  <update a pod with the label 'status' and the value 'unhealthy' if the resource is unchanged from version 1>
+  
+  $ kubectl label pods foo bar-
+  <update a pod by removing a label named 'bar' if it exists. Does not require the --overwrite flag.>
+
+kubectl label [--overwrite] <resource> <name> <key-1>=<val-1> ... <key-n>=<val-n> [--resource-version=<version>]
+
+### Options
+
+```
+      --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).
+      --overwrite=false: If true, allow labels to be overwritten, otherwise reject label updates that overwrite existing labels.
+      --resource-version="": If non-empty, the labels update will only succeed if this is the current resource-version for the object.
+  -t, --template="": Template string or path to template file to use when -o=template or -o=templatefile.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-log.md
+++ b/docs/kubectl-log.md
@ -0,0 +1,56 @@
+## kubectl log
+
+Print the logs for a container in a pod.
+
+### Synopsis
+
+Print the logs for a container in a pod. If the pod has only one container, the container name is optional.
+
+Examples:
+
+    $ kubectl log 123456-7890 ruby-container
+    // Returns snapshot of ruby-container logs from pod 123456-7890.
+
+    $ kubectl log -f 123456-7890 ruby-container
+    // Starts streaming of ruby-container logs from pod 123456-7890.
+
+kubectl log [-f] <pod> [<container>]
+
+### Options
+
+```
+  -f, --follow=false: Specify if the logs should be streamed.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-namespace.md
+++ b/docs/kubectl-namespace.md
@ -0,0 +1,45 @@
+## kubectl namespace
+
+SUPERCEDED: Set and view the current Kubernetes namespace
+
+### Synopsis
+
+SUPERCEDED:  Set and view the current Kubernetes namespace scope for command line requests.
+
+namespace has been superceded by the context.namespace field of .kubeconfig files.  See 'kubectl config set-context --help' for more details.
+
+
+kubectl namespace [<namespace>]
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-proxy.md
+++ b/docs/kubectl-proxy.md
@ -0,0 +1,51 @@
+## kubectl proxy
+
+Run a proxy to the Kubernetes API server
+
+### Synopsis
+
+Run a proxy to the Kubernetes API server.
+
+kubectl proxy
+
+### Options
+
+```
+      --api-prefix="/api/": Prefix to serve the proxied API under.
+  -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.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-resize.md
+++ b/docs/kubectl-resize.md
@ -0,0 +1,63 @@
+## kubectl resize
+
+Set a new size for a Replication Controller.
+
+### Synopsis
+
+Set a new size for a Replication Controller.
+
+Resize also allows users to specify one or more preconditions for the resize action.
+If --current-replicas or --resource-version is specified, it is validated before the
+resize is attempted, and it is guaranteed that the precondition holds true when the
+resize is sent to the server.
+
+Examples:
+
+    $ kubectl resize --replicas=3 replicationcontrollers foo
+    // Resize replication controller named 'foo' to 3.
+
+    $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
+    // If the replication controller named foo's current size is 2, resize foo to 3.
+
+kubectl resize [--resource-version=<version>] [--current-replicas=<count>] --replicas=<count> <resource> <id>
+
+### Options
+
+```
+      --current-replicas=-1: Precondition for current size. Requires that the current size of the replication controller match this value in order to 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.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-rollingupdate.md
+++ b/docs/kubectl-rollingupdate.md
@ -0,0 +1,63 @@
+## kubectl rollingupdate
+
+Perform a rolling update of the given ReplicationController.
+
+### Synopsis
+
+Perform a rolling update of the given ReplicationController.
+
+Replaces the specified controller with new controller, updating one pod at a time to use the
+new PodTemplate. The new-controller.json must specify the same namespace as the
+existing controller and overwrite at least one (common) label in its replicaSelector.
+
+Examples:
+
+    $ kubectl rollingupdate frontend-v1 -f frontend-v2.json
+    // Update pods of frontend-v1 using new controller data in frontend-v2.json.
+
+    $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
+    // Update pods of frontend-v1 using JSON data passed into stdin.
+
+kubectl rollingupdate <old-controller-name> -f <new-controller.json>
+
+### Options
+
+```
+  -f, --filename="": Filename or URL to file to use to create the new controller.
+      --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".
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-run-container.md
+++ b/docs/kubectl-run-container.md
@ -0,0 +1,73 @@
+## kubectl run-container
+
+Run a particular image on the cluster.
+
+### Synopsis
+
+Create and run a particular image, possibly replicated.
+Creates a replication controller to manage the created container(s).
+
+Examples:
+
+    $ kubectl run-container nginx --image=dockerfile/nginx
+    // Starts a single instance of nginx.
+
+    $ kubectl run-container nginx --image=dockerfile/nginx --replicas=5
+    // Starts a replicated instance of nginx.
+
+    $ kubectl run-container nginx --image=dockerfile/nginx --dry-run
+    // Dry run. Print the corresponding API objects without creating them.
+  
+    $ kubectl run-container nginx --image=dockerfile/nginx --overrides='{ "apiVersion": "v1beta1", "desiredState": { ... } }'
+    // Start a single instance of nginx, but overload the desired state with a partial set of values parsed from JSON
+
+kubectl run-container <name> --image=<image> [--port=<port>] [--replicas=replicas] [--dry-run=<bool>] [--overrides=<inline-json>]
+
+### Options
+
+```
+      --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'.
+      --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.
+  -o, --output="": Output format. One of: json|yaml|template|templatefile.
+      --output-version="": Output the formatted object with the given version (default api-version).
+      --overrides="": An inline JSON override for the generated object. If this is non-empty, it is used to override the generated object. Requires that the object supply a valid apiVersion field.
+      --port=-1: The port that this container exposes.
+  -r, --replicas=1: Number of replicas to create for this container. Default is 1.
+  -t, --template="": Template string or path to template file to use when -o=template or -o=templatefile.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-stop.md
+++ b/docs/kubectl-stop.md
@ -0,0 +1,51 @@
+## kubectl stop
+
+Gracefully shut down a resource.
+
+### Synopsis
+
+Gracefully shut down a resource.
+
+Attempts to shut down and delete a resource that supports graceful termination.
+If the resource is resizable it will be resized to 0 before deletion.
+
+Examples:
+
+    $ kubectl stop replicationcontroller foo
+    // Shut down foo.
+
+
+kubectl stop <resource> <id>
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-update.md
+++ b/docs/kubectl-update.md
@ -0,0 +1,62 @@
+## kubectl update
+
+Update a resource by filename or stdin.
+
+### Synopsis
+
+Update a resource by filename or stdin.
+
+JSON and YAML formats are accepted.
+
+Examples:
+
+    $ kubectl update -f pod.json
+    // Update a pod using the data in pod.json.
+
+    $ cat pod.json | kubectl update -f -
+    // Update a pod based on the JSON passed into stdin.
+
+    $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState": { "manifest": [{ "cpu": 100 }]}}'
+    // Update a pod by downloading it, applying the patch, then updating. Requires apiVersion be specified.
+
+kubectl update -f filename
+
+### Options
+
+```
+  -f, --filename=[]: Filename, directory, or URL to file to use to update the resource.
+      --patch="": A JSON document to override the existing resource. The resource is downloaded, patched with the JSON, then updated.
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl-version.md
+++ b/docs/kubectl-version.md
@ -0,0 +1,48 @@
+## kubectl version
+
+Print the client and server version information.
+
+### Synopsis
+
+Print the client and server version information.
+
+kubectl version
+
+### Options
+
+```
+  -c, --client=false: Client version only (no server required).
+```
+
+### 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
+  -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
+      --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.
+  -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
+      --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
+```
+
+### SEE ALSO
+* [kubectl](kubectl.md)
+
--- a/docs/kubectl.md
+++ b/docs/kubectl.md
--- a/docs/man/man1/kube-apiserver.1
+++ b/docs/man/man1/kube-apiserver.1
@ -1,13 +1,16 @@
 .TH "KUBERNETES" "1" " kubernetes User Manuals" "Scott Collier" "October 2014"  ""

+
 .SH NAME
 .PP
 kube\-apiserver \- Provides the API for kubernetes orchestration.

+
 .SH SYNOPSIS
 .PP
 \fBkube\-apiserver\fP [OPTIONS]

+
 .SH DESCRIPTION
 .PP
 The \fBkubernetes\fP API server validates and configures data for 3 types of objects: pods, services, and replicationControllers. Beyond just servicing REST operations, the API Server does two other things as well: 1. Schedules pods to worker nodes. Right now the scheduler is very simple. 2. Synchronize pod information (where they are, what ports they are exposing) with the service configuration.
@ -15,6 +18,7 @@ The \fBkubernetes\fP API server validates and configures data for 3 types of obj
 .PP
 The the kube\-apiserver several options.

+
 .SH OPTIONS
 .PP
 \fB\-\-address\fP=""
@ -49,10 +53,6 @@ The the kube\-apiserver several options.
    List of etcd servers to watch (
 \[la]http://ip:port\[ra]), comma separated

-.PP
-\fB\-\-health\_check\_minions\fP=
-    If true, health check minions and filter unhealthy ones. Default true.
-
 .PP
 \fB\-\-log\_backtrace\_at=\fP:0
    when logging hits line file:N, emit a stack trace
@ -97,6 +97,7 @@ The the kube\-apiserver several options.
 \fB\-\-vmodule\fP=
    comma\-separated list of pattern=N settings for file\-filtered logging

+
 .SH EXAMPLES
 .PP
 .RS
@ -105,6 +106,8 @@ The the kube\-apiserver several options.
 /usr/bin/kube\-apiserver \-\-logtostderr=true \-\-v=0 \-\-etcd\_servers=http://127.0.0.1:4001 \-\-address=0.0.0.0 \-\-port=8080 \-\-kubelet\_port=10250 \-\-allow\_privileged=false

 .fi
+.RE
+

 .SH HISTORY
 .PP
--- a/docs/man/man1/kube-controller-manager.1
+++ b/docs/man/man1/kube-controller-manager.1
@ -1,13 +1,16 @@
 .TH "KUBERNETES" "1" " kubernetes User Manuals" "Scott Collier" "October 2014"  ""

+
 .SH NAME
 .PP
 kube\-controller\-manager \- Enforces kubernetes services.

+
 .SH SYNOPSIS
 .PP
 \fBkube\-controller\-manager\fP [OPTIONS]

+
 .SH DESCRIPTION
 .PP
 The \fBkubernetes\fP controller manager is really a service that is layered on top of the simple pod API. To enforce this layering, the logic for the replicationController is actually broken out into another server. This server watches etcd for changes to replicationController objects and then uses the public Kubernetes API to implement the replication algorithm.
@ -15,6 +18,7 @@ The \fBkubernetes\fP controller manager is really a service that is layered on t
 .PP
 The kube\-controller\-manager has several options.

+
 .SH OPTIONS
 .PP
 \fB\-\-address\fP=""
@ -70,12 +74,16 @@ The kube\-controller\-manager has several options.

 .PP
 \fB\-\-machines\fP=[]
-        List of machines to schedule onto, comma separated.
+    List of machines to schedule onto, comma separated.

 .PP
 \fB\-\-master\fP=""
    The address of the Kubernetes API server.

+.PP
+\fB\-\-node\_sync\_peroid\fP=10s
+    The period for syncing nodes from cloudprovider.
+
 .PP
 \fB\-\-port\fP=10252
    The port that the controller\-manager's http service runs on.
@ -96,6 +104,7 @@ The kube\-controller\-manager has several options.
 \fB\-\-vmodule\fP=
    comma\-separated list of pattern=N settings for file\-filtered logging.

+
 .SH EXAMPLES
 .PP
 .RS
@ -104,6 +113,8 @@ The kube\-controller\-manager has several options.
 /usr/bin/kube\-controller\-manager \-\-logtostderr=true \-\-v=0 \-\-master=127.0.0.1:8080

 .fi
+.RE
+

 .SH HISTORY
 .PP
--- a/docs/man/man1/kube-proxy.1
+++ b/docs/man/man1/kube-proxy.1
@ -1,13 +1,16 @@
 .TH "KUBERNETES" "1" " kubernetes User Manuals" "Scott Collier" "October 2014"  ""

+
 .SH NAME
 .PP
 kube\-proxy \- Provides network proxy services.

+
 .SH SYNOPSIS
 .PP
 \fBkube\-proxy\fP [OPTIONS]

+
 .SH DESCRIPTION
 .PP
 The \fBkubernetes\fP network proxy runs on each node. This reflects services as defined in the Kubernetes API on each node and can do simple TCP stream forwarding or round robin TCP forwarding across a set of backends. Service endpoints are currently found through Docker\-links\-compatible environment variables specifying ports opened by the service proxy. Currently the user must select a port to expose the service on on the proxy, as well as the container's port to target.
@ -15,6 +18,7 @@ The \fBkubernetes\fP network proxy runs on each node. This reflects services as
 .PP
 The kube\-proxy takes several options.

+
 .SH OPTIONS
 .PP
 \fB\-\-alsologtostderr\fP=false
@ -73,6 +77,7 @@ The kube\-proxy takes several options.
 \fB\-\-vmodule\fP=
    comma\-separated list of pattern=N settings for file\-filtered logging

+
 .SH EXAMPLES
 .PP
 .RS
@ -81,6 +86,8 @@ The kube\-proxy takes several options.
 /usr/bin/kube\-proxy \-\-logtostderr=true \-\-v=0 \-\-etcd\_servers=http://127.0.0.1:4001

 .fi
+.RE
+

 .SH HISTORY
 .PP
--- a/docs/man/man1/kube-scheduler.1
+++ b/docs/man/man1/kube-scheduler.1
@ -1,13 +1,16 @@
 .TH "KUBERNETES" "1" " kubernetes User Manuals" "Scott Collier" "October 2014"  ""

+
 .SH NAME
 .PP
 kube\-scheduler \- Schedules containers on hosts.

+
 .SH SYNOPSIS
 .PP
 \fBkube\-scheduler\fP [OPTIONS]

+
 .SH DESCRIPTION
 .PP
 The \fBkubernetes\fP scheduler is a policy\-rich, topology\-aware, workload\-specific function that significantly impacts availability, performance, and capacity. The scheduler needs to take into account individual and collective resource requirements, quality of service requirements, hardware/software/policy constraints, affinity and anti\-affinity specifications, data locality, inter\-workload interference, deadlines, and so on. Workload\-specific requirements will be exposed through the API as necessary.
@ -15,6 +18,7 @@ The \fBkubernetes\fP scheduler is a policy\-rich, topology\-aware, workload\-spe
 .PP
 The kube\-scheduler can take several options.

+
 .SH OPTIONS
 .PP
 \fB\-\-address=\fP"127.0.0.1"
@ -72,6 +76,7 @@ The kube\-scheduler can take several options.
 \fB\-\-vmodule\fP=
    comma\-separated list of pattern=N settings for file\-filtered logging.

+
 .SH EXAMPLES
 .PP
 .RS
@ -80,6 +85,8 @@ The kube\-scheduler can take several options.
 /usr/bin/kube\-scheduler \-\-logtostderr=true \-\-v=0 \-\-master=127.0.0.1:8080

 .fi
+.RE
+

 .SH HISTORY
 .PP
--- a/docs/man/man1/kubelet.1
+++ b/docs/man/man1/kubelet.1
@ -1,13 +1,16 @@
 .TH "KUBERNETES" "1" " kubernetes User Manuals" "Scott Collier" "October 2014"  ""

+
 .SH NAME
 .PP
 kubelet \- Processes a container manifest so the containers are launched according to how they are described.

+
 .SH SYNOPSIS
 .PP
 \fBkubelet\fP [OPTIONS]

+
 .SH DESCRIPTION
 .PP
 The \fBkubernetes\fP kubelet runs on each node. The Kubelet works in terms of a container manifest. A container manifest is a YAML or JSON file that describes a pod. The Kubelet takes a set of manifests that are provided in various mechanisms and ensures that the containers described in those manifests are started and continue running.
@ -21,10 +24,12 @@ There are 4 ways that a container manifest can be provided to the Kubelet:
 .nf
 File Path passed as a flag on the command line. This file is rechecked every 20 seconds (configurable with a flag).
 HTTP endpoint HTTP endpoint passed as a parameter on the command line. This endpoint is checked every 20 seconds (also configurable with a flag).
-etcd server The Kubelet will reach out and do a watch on an etcd server. The etcd path that is watched is /registry/hosts/\$(hostname \-f). As this is a watch, changes are noticed and acted upon very quickly.
+etcd server The Kubelet will reach out and do a watch on an etcd server. The etcd path that is watched is /registry/hosts/$(hostname \-f). As this is a watch, changes are noticed and acted upon very quickly.
 HTTP server The kubelet can also listen for HTTP and respond to a simple API (underspec'd currently) to submit a new manifest.

 .fi
+.RE
+

 .SH OPTIONS
 .PP
@ -128,6 +133,7 @@ HTTP server The kubelet can also listen for HTTP and respond to a simple API (un
 \fB\-\-vmodule\fP=
    comma\-separated list of pattern=N settings for file\-filtered logging.

+
 .SH EXAMPLES
 .PP
 .RS
@ -136,6 +142,8 @@ HTTP server The kubelet can also listen for HTTP and respond to a simple API (un
 /usr/bin/kubelet \-\-logtostderr=true \-\-v=0 \-\-etcd\_servers=http://127.0.0.1:4001 \-\-address=127.0.0.1 \-\-port=10250 \-\-hostname\_override=127.0.0.1 \-\-allow\_privileged=false

 .fi
+.RE
+

 .SH HISTORY
 .PP
--- a/hack/run-gendocs.sh
+++ b/hack/run-gendocs.sh
@ -90,7 +90,5 @@ if [[ ! -x "$gendocs" || ! -x "$genman" ]]; then
  exit 1
 fi

-
-KUBECTL_DOC="docs/kubectl.md"
-${gendocs} > ${KUBECTL_DOC}
-${genman} "${KUBE_ROOT}/docs/man/man1"
+${gendocs} "${KUBE_ROOT}/docs/"
+${genman} "${KUBE_ROOT}/docs/man/man1/"
--- a/hack/verify-gendocs.sh
+++ b/hack/verify-gendocs.sh
@ -91,19 +91,12 @@ if [[ ! -x "$gendocs" || ! -x "$genman" ]]; then
  exit 1
 fi

-KUBECTL_DOC="docs/kubectl.md"
-
-echo "diffing ${KUBECTL_DOC} against generated output from ${gendocs}"
-"${gendocs}" | diff "${KUBE_ROOT}/${KUBECTL_DOC}" - && echo "${KUBECTL_DOC} up to date." || {
-  echo "${KUBECTL_DOC} is out of date. Please run hack/run-gendocs.sh"
-  exit 1
-}
-
 DOCROOT="${KUBE_ROOT}/docs/"
 TMP_DOCROOT="${KUBE_ROOT}/docs_tmp/"
 cp -a "${DOCROOT}" "${TMP_DOCROOT}"
 echo "diffing ${DOCROOT} against generated output from ${genman}"
 ${genman} "${TMP_DOCROOT}/man/man1/"
+${gendocs} "${TMP_DOCROOT}"
 set +e
 diff -Naupr "${DOCROOT}" "${TMP_DOCROOT}"
 ret=$?