@@ -5,13 +5,13 @@ toc::[]

 == oc build-logs

-Show container logs from the build container

+Show logs from a build

 ====

 [options="nowrap"]

 ----

-  // Stream logs from container to stdout

+  // Stream logs from container

   $ openshift cli build-logs 566bed879d2d

 ----

 ====

@@ -162,23 +162,23 @@ Delete a resource by filename, stdin, resource and name, or by resources and lab

 == oc deploy

-View, start, cancel, or retry deployments

+View, start, cancel, or retry a deployment

 ====

 [options="nowrap"]

 ----

-  // Display the latest deployment for the 'database' DeploymentConfig

+  // Display the latest deployment for the 'database' deployment config

   $ openshift cli deploy database

-  // Start a new deployment based on the 'database' DeploymentConfig

+  // Start a new deployment based on the 'database'

   $ openshift cli deploy database --latest

-  // Retry the latest failed deployment based on the 'frontend' DeploymentConfig

+  // Retry the latest failed deployment based on 'frontend'

   // The deployer pod and any hook pods are deleted for the latest failed deployment

   $ openshift cli deploy frontend --retry

-  // Cancel the in-progress deployment based on the 'frontend' DeploymentConfig

+  // Cancel the in-progress deployment based on 'frontend'

   $ openshift cli deploy frontend --cancel

 ----

 ====

@@ -536,8 +536,8 @@ Process a template into list of resources

 [options="nowrap"]

 ----

-  // Convert template.json file into resource list

-  $ openshift cli process -f template.json

+  // Convert template.json file into resource list and pass to create

+  $ openshift cli process -f template.json | openshift cli create -f -

   // Process template while passing a user-defined label

   $ openshift cli process -f template.json -l name=mytemplate

@@ -284,7 +284,7 @@ echo "templates: ok"

 [ "$(openshift start kubernetes 2>&1 | grep 'Kubernetes server components')" ]

 # check deprecated admin cmds for backward compatibility

 [ "$(oadm create-master-certs -h 2>&1 | grep 'Create keys and certificates')" ]

-[ "$(oadm create-key-pair -h 2>&1 | grep 'Create a 2048-bit RSA key pair')" ]

+[ "$(oadm create-key-pair -h 2>&1 | grep 'Create an RSA key pair')" ]

 [ "$(oadm create-server-cert -h 2>&1 | grep 'Create a key and server certificate')" ]

 [ "$(oadm create-signer-cert -h 2>&1 | grep 'Create a self-signed CA')" ]

@@ -629,7 +629,7 @@ oc delete bc/ruby-sample-build-validtag

 oc delete bc/ruby-sample-build-invalidtag

 # Test admin manage-node operations

-[ "$(openshift admin manage-node --help 2>&1 | grep 'Manage node operations')" ]

+[ "$(openshift admin manage-node --help 2>&1 | grep 'Manage nodes')" ]

 [ "$(oadm manage-node --selector='' --schedulable=true | grep --text 'Ready' | grep -v 'Sched')" ]

 oc create -f examples/hello-openshift/hello-pod.json

 #[ "$(oadm manage-node --list-pods | grep 'hello-openshift' | grep -E '(unassigned|assigned)')" ]

@@ -23,7 +23,8 @@ import (

 	"github.com/openshift/origin/pkg/version"

 )

-const adminLong = `OpenShift Administrative Commands

+const adminLong = `

+OpenShift Administrative Commands

 Commands for managing an OpenShift cluster are exposed here. Many administrative

 actions involve interaction with the OpenShift client as well.`

@@ -15,13 +15,15 @@ import (

 const (

 	ManageNodeCommandName = "manage-node"

-	manageNodeLong = `Manage node operations

+	manageNodeLong = `

+Manage nodes

+

+This command provides common operations on nodes for administrators.

 schedulable: Marking node schedulable will allow pods to be schedulable on the node and

 	     marking node unschedulable will block pods to be scheduled on the node.

-evacuate: Migrate all/selected pods. There is an option to delete the bare pods.

-          It can list all pods that will be migrated before performing evacuation.

+evacuate: Migrate all/selected pod on the provided nodes.

 list-pods: List all/selected pods on given/selected nodes. It can list the output in json/yaml format.`

@@ -32,12 +32,12 @@ type NewProjectOptions struct {

 	AdminUser string

 }

-const newProjectLong = `Create a new project

+const newProjectLong = `

+Create a new project

 Use this command to create a project. You may optionally specify metadata about the project,

 an admin user (and role, if you want to use a non-default admin role), and a node selector

-to restrict which nodes pods in this project can be scheduled to.

-`

+to restrict which nodes pods in this project can be scheduled to.`

 // NewCmdNewProject implements the OpenShift cli new-project command

 func NewCmdNewProject(name, fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

@@ -22,7 +22,8 @@ import (

 )

 const (

-	registryLong = `Install or configure a Docker registry for OpenShift

+	registryLong = `

+Install or configure a Docker registry for OpenShift

 This command sets up a Docker registry integrated with OpenShift to provide notifications when

 images are pushed. With no arguments, the command will check for the existing registry service

@@ -27,7 +27,8 @@ import (

 )

 const (

-	routerLong = `Install or configure an OpenShift router

+	routerLong = `

+Install or configure an OpenShift router

 This command helps to setup an OpenShift router to take edge traffic and balance it to

 your application. With no arguments, the command will check for an existing router

@@ -23,7 +23,8 @@ import (

 	"github.com/openshift/origin/pkg/version"

 )

-const cliLong = `OpenShift Client.

+const cliLong = `

+OpenShift Client

 The OpenShift client exposes commands for managing your applications, as well as lower level

 tools to interact with each component of your system.

@@ -17,11 +17,14 @@ import (

 )

 const (

-	buildLogsLong = `Retrieve logs from the containers where the build occurred.

+	buildLogsLong = `

+Retrieve logs for a build

-NOTE: This command may be moved in the future.`

+This command displays the log for the provided build. If the pod that ran the build has been deleted logs

+will no longer be available. If the build has not yet completed, the build logs will be streamed until the

+build completes or fails.`

-	buildLogsExample = `  // Stream logs from container to stdout

+	buildLogsExample = `  // Stream logs from container

   $ %[1]s build-logs 566bed879d2d`

 )

@@ -30,7 +33,7 @@ func NewCmdBuildLogs(fullName string, f *clientcmd.Factory, out io.Writer) *cobr

 	opts := api.BuildLogOptions{}

 	cmd := &cobra.Command{

 		Use:     "build-logs BUILD",

-		Short:   "Show container logs from the build container",

+		Short:   "Show logs from a build",

 		Long:    buildLogsLong,

 		Example: fmt.Sprintf(buildLogsExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -15,7 +15,11 @@ import (

 )

 const (

-	cancelBuildLong = `Cancels a pending or running build.`

+	cancelBuildLong = `

+Cancels a pending or running build

+

+This command requests a graceful shutdown of the running build. There may be a delay between requesting 

+the build and the time the build is terminated.`

 	cancelBuildExample = `  // Cancel the build with the given name

   $ %[1]s cancel-build 1da32cvq

@@ -14,7 +14,12 @@ import (

 )

 const (

-	configLong = `Manages the OpenShift config files.

+	configLong = `

+Manage the OpenShift client config files

+

+The OpenShift client stores configuration in the current user's home directory (under the .kube directory as

+config). When you login the first time, a new config file is created, and subsequent project changes with the

+'project' command will set the current context. These subcommands allow you to manage the config directly.

 Reference: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/kubeconfig-file.md`

@@ -38,23 +38,42 @@ type DeployOptions struct {

 }

 const (

-	deployLong = `View, start, cancel, or retry deployments.

+	deployLong = `

+View, start, cancel, or retry a deployment

-If no options are given, view the latest deployment.

+This command allows you to control a deployment config. Each individual deployment is exposed

+as a new replication controller, and the deployment process manages scaling down old deployments

+and scaling up new ones. You can rollback to any previous deployment, or even scale multiple

+deployments up at the same time.

-NOTE: This command is still under active development and is subject to change.`

+There are several deployment strategies defined:

-	deployExample = `  // Display the latest deployment for the 'database' DeploymentConfig

+* Rolling (default) - scales up the new deployment in stages, gradually reducing the number

+  of old deployments. If one of the new deployed pods never becomes "ready", the new deployment

+  will be rolled back (scaled down to zero). Use when your application can tolerate two versions

+  of code running at the same time (many web applications, scalable databases)

+* Recreate - scales the old deployment down to zero, then scales the new deployment up to full.

+  Use when your application cannot tolerate two versions of code running at the same time

+* Custom - run your own deployment process inside a Docker container using your own scripts.

+

+If a deployment fails, you may opt to retry it (if the error was transient). Some deployments may

+never successfully complete - in which case you can use the '--latest' flag to force a redeployment.

+When rolling back to a previous deployment, a new deployment will be created with an identical copy

+of your config at the latest position.

+

+If no options are given, shows information about the latest deployment.`

+

+	deployExample = `  // Display the latest deployment for the 'database' deployment config

   $ %[1]s deploy database

-  // Start a new deployment based on the 'database' DeploymentConfig

+  // Start a new deployment based on the 'database'

   $ %[1]s deploy database --latest

-  // Retry the latest failed deployment based on the 'frontend' DeploymentConfig

+  // Retry the latest failed deployment based on 'frontend'

   // The deployer pod and any hook pods are deleted for the latest failed deployment

   $ %[1]s deploy frontend --retry

-  // Cancel the in-progress deployment based on the 'frontend' DeploymentConfig

+  // Cancel the in-progress deployment based on 'frontend'

   $ %[1]s deploy frontend --cancel`

 )

@@ -66,7 +85,7 @@ func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 	cmd := &cobra.Command{

 		Use:     "deploy DEPLOYMENTCONFIG",

-		Short:   "View, start, cancel, or retry deployments",

+		Short:   "View, start, cancel, or retry a deployment",

 		Long:    deployLong,

 		Example: fmt.Sprintf(deployExample, fullName),

 		Run: func(cmd *cobra.Command, args []string) {

@@ -24,7 +24,8 @@ import (

 )

 const (

-	editLong = `Edit a resource from the default editor.

+	editLong = `

+Edit a resource from the default editor

 The edit command allows you to directly edit any API resource you can retrieve via the

 command line tools. It will open the editor defined by your OC_EDITOR, GIT_EDITOR,

@@ -18,7 +18,8 @@ import (

 )

 const (

-	envLong = `Update environment variables on a pod template

+	envLong = `

+Update environment variables on a pod template

 List environment variable definitions in one or more pods or pod templates.

 Add, update, or remove container environment variable definitions in one or

@@ -20,7 +20,8 @@ import (

 )

 const (

-	exportLong = `Export resources so they can be used elsewhere

+	exportLong = `

+Export resources so they can be used elsewhere

 The export command makes it easy to take existing objects and convert them to configuration files

 for backups or for creating elsewhere in the cluster. Fields that cannot be specified on create

@@ -15,10 +15,11 @@ import (

 )

 const (

-	exposeLong = `Expose containers internally as services or externally via routes.

+	exposeLong = `

+Expose containers internally as services or externally via routes

 There is also the ability to expose a deployment configuration, replication controller, service, or pod

-as a new service on a specified port. If no labels are specified, the new object will re-use the 

+as a new service on a specified port. If no labels are specified, the new object will re-use the

 labels from the object it exposes.`

 	exposeExample = `  // Create a route based on service nginx. The new route will re-use nginx's labels

@@ -18,7 +18,8 @@ import (

 )

 const (

-	importImageLong = `Import tag and image information from an external Docker image repository.

+	importImageLong = `

+Import tag and image information from an external Docker image repository

 Only image streams that have a value set for spec.dockerImageRepository may

 have tag and image information imported.`

@@ -19,7 +19,8 @@ import (

 )

 const (

-	loginLong = `Log in to an OpenShift server and save config for future use

+	loginLong = `

+Log in to an OpenShift server and save login for subsequent use

 First-time users of the OpenShift client should run this command to connect to a server,

 establish an authenticated session, and save connection to the configuration file. The

@@ -26,7 +26,8 @@ type LogoutOptions struct {

 }

 const (

-	logoutLong = `Log out of the active session out by clearing saved tokens

+	logoutLong = `

+Log out of the active session out by clearing saved tokens

 An authentication token is stored in the config file after login - this command will delete

 that token on the server, and then remove the token from the configuration file.

@@ -29,7 +29,8 @@ type usage interface {

 var errExit = fmt.Errorf("exit directly")

 const (

-	newAppLong = `Create a new application in OpenShift by specifying source code, templates, and/or images.

+	newAppLong = `

+Create a new application in OpenShift by specifying source code, templates, and/or images

 This command will try to build up the components of an application using images, templates,

 or code that has a public repository. It will lookup the images on the local Docker installation

@@ -15,7 +15,8 @@ import (

 )

 const (

-	newBuildLong = `Create a new build in OpenShift by specifying source code.

+	newBuildLong = `

+Create a new build in OpenShift by specifying source code

 This command will try to create a build configuration for your application using images and

 code that has a public repository. It will lookup the images on the local Docker installation

@@ -23,12 +23,18 @@ import (

 )

 const (

-	processLong = `Process template into a list of resources specified in filename or stdin

+	processLong = `

+Process template into a list of resources specified in filename or stdin

-JSON and YAML formats are accepted.`

+Templates allow parameterization of resources prior to being sent to the server for creation or

+update. Templates have "parameters", which may either be generated on creation or set by the user,

+as well as metadata describing the template.

-	processExample = `  // Convert template.json file into resource list

-  $ %[1]s process -f template.json

+The output of the process command is always a list of one or more resources. You may pipe the

+output to the create command over STDIN (using the '-f -' option) or redirect it to a file.`

+

+	processExample = `  // Convert template.json file into resource list and pass to create

+  $ %[1]s process -f template.json | %[1]s create -f -

   // Process template while passing a user-defined label

   $ %[1]s process -f template.json -l name=mytemplate

@@ -34,7 +34,8 @@ type ProjectOptions struct {

 }

 const (

-	projectLong = `Switch to another project and make it the default in your configuration

+	projectLong = `

+Switch to another project and make it the default in your configuration

 If no project was specified on the command line, display information about the current active

 project. Since you can use this command to connect to projects on different servers, you will

@@ -29,13 +29,14 @@ type NewProjectOptions struct {

 }

 const (

-	requestProjectLong = `Create a new project for yourself in OpenShift with you as the project admin.

+	requestProjectLong = `

+Create a new project for yourself in OpenShift

-Assuming your cluster admin has granted you permission, this command will 

-create a new project for you and assign you as the project admin.  You must 

-be logged in, so you might have to run %[1]s first.

+Assuming your cluster admin has granted you permission, this command will create a new project

+for you and assign you as the project admin. If your administrator has not given you permission to

+create your own projects, contact your system administrator.

-After your project is created you can switch to it using %[2]s <project name>.`

+After your project is created it will be made your default project in your config.`

 	requestProjectExample = `  // Create a new project with minimal information

   $ %[1]s web-team-dev

@@ -24,7 +24,8 @@ import (

 )

 const (

-	rollbackLong = `Revert part of an application back to a previous deployment.

+	rollbackLong = `

+Revert an application back to a previous deployment

 When you run this command your deployment configuration will be updated to

 match a previous deployment. By default only the pod and container

@@ -26,7 +26,8 @@ import (

 )

 const (

-	startBuildLong = `Start a build.

+	startBuildLong = `

+Start a build

 This command starts a build for the provided BuildConfig or re-runs an existing build using

 --from-build=<name>. You may pass the --follow flag to see output from the build.`

@@ -13,8 +13,12 @@ import (

 )

 const (

-	statusLong = `Show a high level overview of the current project. Links components by their relationships.

-For more information about individual items, use the describe command (e.g. oc describe buildConfig,

+	statusLong = `

+Show a high level overview of the current project

+

+This command will show services, deployment configs, build configurations, and active deployments.

+If you have any misconfigured components information about them will be shown. For more information

+about individual items, use the describe command (e.g. oc describe buildConfig,

 oc describe deploymentConfig, oc describe service).`

 	statusExample = `  // Show an overview of the current project

@@ -17,7 +17,8 @@ import (

 )

 const (

-	tagLong = `Tag existing images into image streams

+	tagLong = `

+Tag existing images into image streams

 The tag command allows you to take an existing tag or image from an image

 stream, or a Docker image pull spec, and set it as the most recent image for a

@@ -24,7 +24,8 @@ import (

 )

 const (

-	volumeLong = `Update volumes on a pod template

+	volumeLong = `

+Update volumes on a pod template

 This command can add, update or remove volumes from containers for any object

 that has a pod template (replication controllers or deployment configurations).

@@ -15,7 +15,8 @@ import (

 const WhoAmIRecommendedCommandName = "whoami"

-const whoamiLong = `Show information about the current session

+const whoamiLong = `

+Show information about the current session

 The default options for this command will return the currently authenticated user name

 or an empty string.  Other flags support returning the currently used token or the

@@ -24,7 +24,7 @@ func tab(original string) string {

 }

 const (

-	getLong = `Display one or many resources.

+	getLong = `Display one or many resources

 Possible resources include builds, buildConfigs, services, pods, etc.`

@@ -54,7 +54,7 @@ func NewCmdGet(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Comm

 }

 const (

-	replaceLong = `Replace a resource by filename or stdin.

+	replaceLong = `Replace a resource by filename or stdin

 JSON and YAML formats are accepted.`

@@ -94,7 +94,7 @@ func NewCmdPatch(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Co

 }

 const (

-	deleteLong = `Delete a resource by filename, stdin, resource and ID, or by resources and label selector.

+	deleteLong = `Delete a resource

 JSON and YAML formats are accepted.

@@ -130,7 +130,10 @@ func NewCmdDelete(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 }

 const (

-	logsLong = `Print the logs for a container in a pod. If the pod has only one container, the container name is optional.`

+	logsLong = `

+Print the logs for a container in a pod

+

+If the pod has only one container, the container name is optional.`

 	logsExample = `  // Returns snapshot of ruby-container logs from pod 123456-7890.

   $ %[1]s logs 123456-7890 ruby-container

@@ -148,7 +151,7 @@ func NewCmdLogs(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Com

 }

 const (

-	createLong = `Create a resource by filename or stdin.

+	createLong = `Create a resource by filename or stdin

 JSON and YAML formats are accepted.`

@@ -168,7 +171,7 @@ func NewCmdCreate(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 }

 const (

-	execLong = `Execute a command in a container.`

+	execLong = `Execute a command in a container`

 	execExample = `  // Get output from running 'date' in ruby-container from pod 123456-7890

   $ %[1]s exec -p 123456-7890 -c ruby-container date

@@ -186,7 +189,7 @@ func NewCmdExec(fullName string, f *clientcmd.Factory, cmdIn io.Reader, cmdOut,

 }

 const (

-	portForwardLong = `Forward 1 or more local ports to a pod.`

+	portForwardLong = `Forward 1 or more local ports to a pod`

 	portForwardExample = `  // Listens on ports 5000 and 6000 locally, forwarding data to/from ports 5000 and 6000 in the pod

   $ %[1]s port-forward -p mypod 5000 6000

@@ -210,7 +213,7 @@ func NewCmdPortForward(fullName string, f *clientcmd.Factory) *cobra.Command {

 }

 const (

-	describeLong = `Show details of a specific resource.

+	describeLong = `Show details of a specific resource

 This command joins many API calls together to form a detailed description of a

 given resource.`

@@ -232,7 +235,7 @@ func NewCmdDescribe(fullName string, f *clientcmd.Factory, out io.Writer) *cobra

 }

 const (

-	proxyLong = `Run a proxy to the Kubernetes API server.`

+	proxyLong = `Run a proxy to the Kubernetes API server`

 	proxyExample = `  // Run a proxy to kubernetes apiserver on port 8011, serving static content from ./local/www/

   $ %[1]s proxy --port=8011 --www=./local/www/

@@ -251,7 +254,7 @@ func NewCmdProxy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Co

 }

 const (

-	scaleLong = `Set a new size for a Replication Controller either directly or via its Deployment Configuration.

+	scaleLong = `Set a new size for a deployment or replication controller

 Scale also allows users to specify one or more preconditions for the scale action.

 If --current-replicas or --resource-version is specified, it is validated before the

@@ -274,7 +277,7 @@ func NewCmdScale(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Co

 }

 const (

-	stopLong = `Gracefully shut down a resource by id or filename.

+	stopLong = `Gracefully shut down a resource by id or filename

 Attempts to shut down and delete a resource that supports graceful termination.

 If the resource is scalable it will be scaled to 0 before deletion.`

@@ -301,7 +304,7 @@ func NewCmdStop(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Com

 }

 const (

-	labelLong = `Update the labels on a resource.

+	labelLong = `Update the labels on a resource

 A valid label value is consisted of letters and/or numbers with a max length of %[1]d characters.

 If --overwrite is true, then existing labels can be overwritten, otherwise attempting to overwrite a label will result in an error.

@@ -22,7 +22,9 @@ import (

 const (

 	AddSecretRecommendedName = "add"

-	addSecretLong = `Add secrets to a ServiceAccount

+	// TODO: move to examples

+	addSecretLong = `

+Add secrets to a ServiceAccount

 After you have created a secret, you probably want to make use of that secret inside of a pod, for a build, or as an image pull secret.  In order to do that, you must add your secret to a service account.

@@ -19,7 +19,8 @@ import (

 const (

 	CreateDockerConfigSecretRecommendedName = "new-dockercfg"

-	createDockercfgLong = `Create a new dockercfg secret

+	createDockercfgLong = `

+Create a new dockercfg secret

 Dockercfg secrets are used to authenticate against Docker registries.

@@ -22,11 +22,12 @@ import (

 const (

 	NewSecretRecommendedCommandName = "new"

-	newLong = `Create a new secret based on a key file or on files within a directory.

+	newLong = `

+Create a new secret based on a file or directory

-	Key files can be specified using their file path, in which case a default name will be given to them, or optionally 

-	with a name and file path, in which case the given name will be used. Specifying a directory will create a secret 

-	using with all valid keys in that directory.

+Key files can be specified using their file path, in which case a default name will be given to them, or optionally 

+with a name and file path, in which case the given name will be used. Specifying a directory will create a secret 

+using with all valid keys in that directory.

 `

 	newExamples = `  // Create a new secret named my-secret with a key named ssh-privatekey

@@ -12,7 +12,8 @@ import (

 const SecretsRecommendedName = "secrets"

 const (

-	secretsLong = `Manage secrets in your project.

+	secretsLong = `

+Manage secrets in your project

 Secrets are used to store confidential information that should not be contained inside of an image.

 They are commonly used to hold things like keys for authentication to other internal systems like 

@@ -20,7 +20,9 @@ import (

 )

 const (

-	buildChainLong = `Output build dependencies of a specific image stream.

+	buildChainLong = `

+Output the inputs and dependencies of your builds

+

 Supported output formats are json, dot, and ast. The default is set to json.

 Tag and namespace are optional and if they are not specified, 'latest' and the 

 default namespace will be used respectively.`

@@ -8,12 +8,14 @@ import (

 )

 const (

-	stiBuilderLong = `Perform a Source-to-Image Build.

+	stiBuilderLong = `

+Perform a Source-to-Image build

 This command executes a Source-to-Image build using arguments passed via the environment.

 It expects to be run inside of a container.`

-	dockerBuilderLong = `Perform a Docker Build.

+	dockerBuilderLong = `

+Perform a Docker build

 This command executes a Docker build using arguments passed via the environment.

 It expects to be run inside of a container.`

@@ -23,9 +23,10 @@ import (

 )

 const (

-	deployerLong = `Perform a Deployment.

+	deployerLong = `

+Perform a deployment

-This command makes calls to OpenShift to perform a deployment as described by a DeploymentConfig.`

+This command makes calls to OpenShift to perform a deployment as described by a deployment configuration.`

 )

 type config struct {

@@ -20,7 +20,8 @@ import (

 )

 const (

-	routerLong = `Start an OpenShift router.

+	routerLong = `

+Start an OpenShift router

 This command launches a router connected to your OpenShift master. The router listens for routes and endpoints

 created by users and keeps a local router configuration up to date with those changes.`

@@ -25,7 +25,8 @@ import (

 	"github.com/openshift/origin/pkg/version"

 )

-const openshiftLong = `OpenShift Application Platform.

+const openshiftLong = `

+OpenShift Application Platform

 OpenShift helps you build, deploy, and manage your applications. To start an all-in-one server, run:

@@ -30,7 +30,7 @@ type CreateKeyPairOptions struct {

 }

 const createKeyPairLong = `

-Create a 2048-bit RSA key pair, and generate PEM-encoded public/private key files.

+Create an RSA key pair and generate PEM-encoded public/private key files

 Example: Creating service account signing and authenticating key files:

@@ -18,7 +18,8 @@ import (

 )

 const CreateMasterCertsCommandName = "create-master-certs"

-const masterCertLong = `Create keys and certificates for an OpenShift master

+const masterCertLong = `

+Create keys and certificates for an OpenShift master

 This command creates keys and certs necessary to run a secure OpenShift master.

 It also creates keys, certificates, and configuration necessary for most

@@ -28,6 +28,8 @@ type CreateServerCertOptions struct {

 }

 const createServerLong = `

+Create a key and server certificate

+

 Create a key and server certificate valid for the specified hostnames,

 signed by the specified CA. These are useful for securing infrastructure

 components such as the router, authentication server, etc.

@@ -39,6 +39,8 @@ func BindSignerCertOptions(options *CreateSignerCertOptions, flags *pflag.FlagSe

 }

 const createSignerLong = `

+Create a self-signed CA key/cert

+

 Create a self-signed CA key/cert for signing certificates used by

 OpenShift components.

@@ -12,7 +12,8 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 )

-const apiserverLong = `Start Kubernetes apiserver

+const apiserverLong = `

+Start Kubernetes apiserver

 This command launches an instance of the Kubernetes apiserver (kube-apiserver).`

@@ -12,7 +12,8 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 )

-const controllersLong = `Start Kubernetes controller manager

+const controllersLong = `

+Start Kubernetes controller manager

 This command launches an instance of the Kubernetes controller-manager (kube-controller-manager).`

@@ -13,7 +13,8 @@ import (

 	"github.com/openshift/origin/pkg/version"

 )

-const kubernetesLong = `Start Kubernetes server components

+const kubernetesLong = `

+Start Kubernetes server components

 The primary Kubernetes server components can be started individually using their direct

 arguments. No configuration settings will be used when launching these components.

@@ -12,7 +12,8 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 )

-const proxyLong = `Start Kubernetes Proxy

+const proxyLong = `

+Start Kubernetes Proxy

 This command launches an instance of the Kubernetes proxy (kube-proxy).`

@@ -12,7 +12,8 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app"

 )

-const schedulerLong = `Start Kubernetes scheduler

+const schedulerLong = `

+Start Kubernetes scheduler

 This command launches an instance of the Kubernetes controller-manager (kube-controller-manager).`

@@ -37,7 +37,8 @@ type AllInOneOptions struct {

 	Output io.Writer

 }

-const allInOneLong = `Start an OpenShift all-in-one server

+const allInOneLong = `

+Start an OpenShift all-in-one server

 This command helps you launch an OpenShift all-in-one server, which allows

 you to run all of the components of an OpenShift system on a server with Docker. Running

@@ -29,7 +29,9 @@ type NodeOptions struct {

 	Output     io.Writer

 }

-const nodeLong = `Start an OpenShift node.

+const nodeLong = `

+Start an OpenShift node

+

 This command helps you launch an OpenShift node.  Running

   $ openshift start node --master=<masterIP>