@@ -5220,6 +5220,7 @@ _oc_autoscale()

     must_have_one_flag+=("--max=")

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

@@ -11488,6 +11489,7 @@ _oc_rollout_history()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -11535,6 +11537,7 @@ _oc_rollout_latest()

     must_have_one_flag=()

     must_have_one_noun=()

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

 }

@@ -11588,6 +11591,7 @@ _oc_rollout_pause()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -11643,6 +11647,7 @@ _oc_rollout_resume()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -11700,6 +11705,7 @@ _oc_rollout_undo()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -12054,8 +12060,10 @@ _oc_scale()

     must_have_one_flag=()

     must_have_one_flag+=("--replicas=")

     must_have_one_noun=()

+    must_have_one_noun+=("deployment")

     must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("job")

+    must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

     noun_aliases+=("deploy")

@@ -9691,6 +9691,7 @@ _openshift_cli_autoscale()

     must_have_one_flag+=("--max=")

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

@@ -16049,6 +16050,7 @@ _openshift_cli_rollout_history()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16097,6 +16099,7 @@ _openshift_cli_rollout_latest()

     must_have_one_flag=()

     must_have_one_noun=()

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

 }

@@ -16151,6 +16154,7 @@ _openshift_cli_rollout_pause()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16207,6 +16211,7 @@ _openshift_cli_rollout_resume()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16265,6 +16270,7 @@ _openshift_cli_rollout_undo()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16624,8 +16630,10 @@ _openshift_cli_scale()

     must_have_one_flag=()

     must_have_one_flag+=("--replicas=")

     must_have_one_noun=()

+    must_have_one_noun+=("deployment")

     must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("job")

+    must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

     noun_aliases+=("deploy")

@@ -5381,6 +5381,7 @@ _oc_autoscale()

     must_have_one_flag+=("--max=")

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

@@ -11649,6 +11650,7 @@ _oc_rollout_history()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -11696,6 +11698,7 @@ _oc_rollout_latest()

     must_have_one_flag=()

     must_have_one_noun=()

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

 }

@@ -11749,6 +11752,7 @@ _oc_rollout_pause()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -11804,6 +11808,7 @@ _oc_rollout_resume()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -11861,6 +11866,7 @@ _oc_rollout_undo()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -12215,8 +12221,10 @@ _oc_scale()

     must_have_one_flag=()

     must_have_one_flag+=("--replicas=")

     must_have_one_noun=()

+    must_have_one_noun+=("deployment")

     must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("job")

+    must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

     noun_aliases+=("deploy")

@@ -9852,6 +9852,7 @@ _openshift_cli_autoscale()

     must_have_one_flag+=("--max=")

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

@@ -16210,6 +16211,7 @@ _openshift_cli_rollout_history()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16258,6 +16260,7 @@ _openshift_cli_rollout_latest()

     must_have_one_flag=()

     must_have_one_noun=()

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

 }

@@ -16312,6 +16315,7 @@ _openshift_cli_rollout_pause()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16368,6 +16372,7 @@ _openshift_cli_rollout_resume()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16426,6 +16431,7 @@ _openshift_cli_rollout_undo()

     must_have_one_flag=()

     must_have_one_noun=()

     must_have_one_noun+=("deployment")

+    must_have_one_noun+=("deploymentconfig")

     noun_aliases=()

     noun_aliases+=("deploy")

     noun_aliases+=("deployments")

@@ -16785,8 +16791,10 @@ _openshift_cli_scale()

     must_have_one_flag=()

     must_have_one_flag+=("--replicas=")

     must_have_one_noun=()

+    must_have_one_noun+=("deployment")

     must_have_one_noun+=("deploymentconfig")

     must_have_one_noun+=("job")

+    must_have_one_noun+=("replicaset")

     must_have_one_noun+=("replicationcontroller")

     noun_aliases=()

     noun_aliases+=("deploy")

@@ -890,7 +890,7 @@ Attach to a running container

 == oc autoscale

-Autoscale a deployment config or replication controller

+Autoscale a deployment config, deployment, replication controller, or replica set

 ====

@@ -3,7 +3,7 @@

 .SH NAME

 .PP

-oc autoscale \- Autoscale a deployment config or replication controller

+oc autoscale \- Autoscale a deployment config, deployment, replication controller, or replica set

 .SH SYNOPSIS

@@ -3,7 +3,7 @@

 .SH NAME

 .PP

-openshift cli autoscale \- Autoscale a deployment config or replication controller

+openshift cli autoscale \- Autoscale a deployment config, deployment, replication controller, or replica set

 .SH SYNOPSIS

@@ -71,6 +71,7 @@ func NewCmdRolloutLatest(fullName string, f *clientcmd.Factory, out io.Writer) *

 			err = opts.RunRolloutLatest()

 			kcmdutil.CheckErr(err)

 		},

+		ValidArgs: []string{"deploymentconfig"},

 	}

 	kcmdutil.AddOutputFlagsForMutation(cmd)

@@ -72,6 +72,7 @@ func NewCmdRolloutHistory(fullName string, f *clientcmd.Factory, out io.Writer)

 	cmd := rollout.NewCmdRolloutHistory(f.Factory, out)

 	cmd.Long = rolloutHistoryLong

 	cmd.Example = fmt.Sprintf(rolloutHistoryExample, fullName)

+	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }

@@ -93,6 +94,7 @@ func NewCmdRolloutPause(fullName string, f *clientcmd.Factory, out io.Writer) *c

 	cmd := rollout.NewCmdRolloutPause(f.Factory, out)

 	cmd.Long = rolloutPauseLong

 	cmd.Example = fmt.Sprintf(rolloutPauseExample, fullName)

+	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }

@@ -112,6 +114,7 @@ func NewCmdRolloutResume(fullName string, f *clientcmd.Factory, out io.Writer) *

 	cmd := rollout.NewCmdRolloutResume(f.Factory, out)

 	cmd.Long = rolloutResumeLong

 	cmd.Example = fmt.Sprintf(rolloutResumeExample, fullName)

+	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }

@@ -148,5 +151,6 @@ func NewCmdRolloutUndo(fullName string, f *clientcmd.Factory, out io.Writer) *co

 	cmd := rollout.NewCmdRolloutUndo(f.Factory, out)

 	cmd.Long = rolloutUndoLong

 	cmd.Example = fmt.Sprintf(rolloutUndoExample, fullName)

+	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }

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

 	cmd.Short = "Change the number of pods in a deployment"

 	cmd.Long = scaleLong

 	cmd.Example = fmt.Sprintf(scaleExample, fullName)

-	cmd.ValidArgs = []string{"deploymentconfig", "job", "replicationcontroller"}

+	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }

@@ -358,9 +358,10 @@ increase or decrease number of pods deployed within the system as needed.`

 // NewCmdAutoscale is a wrapper for the Kubernetes cli autoscale command

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

 	cmd := kcmd.NewCmdAutoscale(f.Factory, out)

-	cmd.Short = "Autoscale a deployment config or replication controller"

+	cmd.Short = "Autoscale a deployment config, deployment, replication controller, or replica set"

 	cmd.Long = autoScaleLong

 	cmd.Example = fmt.Sprintf(autoScaleExample, fullName)

+	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }