@@ -398,25 +398,6 @@ _oc_start-build()

     must_have_one_noun=()

 }

-_oc_build-logs()

-{

-    last_command="oc_build-logs"

-    commands=()

-

-    flags=()

-    two_word_flags=()

-    flags_with_completion=()

-    flags_completion=()

-

-    flags+=("--follow")

-    flags+=("-f")

-    flags+=("--nowait")

-    flags+=("-w")

-

-    must_have_one_flag=()

-    must_have_one_noun=()

-}

-

 _oc_deploy()

 {

     last_command="oc_deploy"

@@ -2020,7 +2001,6 @@ _oc()

     commands+=("status")

     commands+=("project")

     commands+=("start-build")

-    commands+=("build-logs")

     commands+=("deploy")

     commands+=("rollback")

     commands+=("new-build")

@@ -2208,25 +2208,6 @@ _openshift_cli_start-build()

     must_have_one_noun=()

 }

-_openshift_cli_build-logs()

-{

-    last_command="openshift_cli_build-logs"

-    commands=()

-

-    flags=()

-    two_word_flags=()

-    flags_with_completion=()

-    flags_completion=()

-

-    flags+=("--follow")

-    flags+=("-f")

-    flags+=("--nowait")

-    flags+=("-w")

-

-    must_have_one_flag=()

-    must_have_one_noun=()

-}

-

 _openshift_cli_deploy()

 {

     last_command="openshift_cli_deploy"

@@ -3830,7 +3811,6 @@ _openshift_cli()

     commands+=("status")

     commands+=("project")

     commands+=("start-build")

-    commands+=("build-logs")

     commands+=("deploy")

     commands+=("rollback")

     commands+=("new-build")

@@ -120,7 +120,7 @@ A few examples:

 ----

 cancel-build BUILD

-build-logs BUILD

+deploy DEPLOYMENTCONFIG

 login [URL]

 edit (RESOURCE/NAME | -f FILENAME)

 new-app (IMAGE | IMAGESTREAM | TEMPLATE | PATH | URL ...)

@@ -39,7 +39,7 @@ Build Failures

 To investigate a build failure, first check the build logs.  You can view the build logs via

-    $ oc build-logs [build_id]

+    $ oc logs build/[build_id]

 and you can get the build id via:

@@ -52,19 +52,6 @@ Attach to a running container.

 ====

-== oc build-logs

-Show logs from a build

-

-====

-

-[options="nowrap"]

-  # Stream logs from container

-  $ openshift cli build-logs 566bed879d2d

-====

-

-

 == oc cancel-build

 Cancel a pending or running build

@@ -502,22 +489,22 @@ Print the logs for a resource.

 [options="nowrap"]

 ----

-  # Returns snapshot of ruby-container logs from pod backend.

-  $ openshift cli logs backend -c ruby-container

-

-  # Starts streaming of ruby-container logs from pod backend.

-  $ openshift cli logs -f pod/backend -c ruby-container

+  # Start streaming the logs of the most recent build of the openldap build config.

+  $ logs openshift cli -f bc/openldap

-  # Starts streaming the logs of the most recent build of the openldap build config.

-  $ openshift cli logs -f bc/openldap

-

-  # Starts streaming the logs of the latest deployment of the mysql deployment config.

-  $ openshift cli logs -f dc/mysql

+  # Start streaming the logs of the latest deployment of the mysql deployment config.

+  $ logs openshift cli -f dc/mysql

   # Get the logs of the first deployment for the mysql deployment config. Note that logs

   # from older deployments may not exist either because the deployment was successful

   # or due to deployment pruning or manual deletion of the deployment.

-  $ openshift cli logs --version=1 dc/mysql

+  $ logs openshift cli --version=1 dc/mysql

+

+  # Return a snapshot of ruby-container logs from pod backend.

+  $ logs openshift cli backend -c ruby-container

+

+  # Start streaming of ruby-container logs from pod backend.

+  $ logs openshift cli -f pod/backend -c ruby-container

 ----

 ====

@@ -271,7 +271,7 @@ This section covers how to perform all the steps of building, deploying, and upd

      command below (substituting your build name from the "oc get builds"

      output).

-         $ oc build-logs ruby-sample-build-1 -n test

+         $ oc logs build/ruby-sample-build-1 -n test

     The creation of the new image in the Docker registry will

     automatically trigger a deployment of the application, creating a

@@ -110,7 +110,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *

 			Message: "Troubleshooting and Debugging Commands:",

 			Commands: []*cobra.Command{

 				cmd.NewCmdExplain(fullName, f, out),

-				cmd.NewCmdLogs(fullName, f, out),

+				cmd.NewCmdLogs(cmd.LogsRecommendedName, fullName, f, out),

 				cmd.NewCmdRsh(cmd.RshRecommendedName, fullName, f, in, out, errout),

 				rsync.NewCmdRsync(rsync.RsyncRecommendedName, fullName, f, out, errout),

 				cmd.NewCmdExec(fullName, f, in, out, errout),

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

 		Short:      "Show logs from a build",

 		Long:       buildLogsLong,

 		Example:    fmt.Sprintf(buildLogsExample, fullName),

-		SuggestFor: []string{"builds"},

+		Deprecated: fmt.Sprintf("use %q instead.", LogsRecommendedName),

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

 			err := RunBuildLogs(fullName, f, out, cmd, opts, args)

@@ -19,28 +19,35 @@ import (

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 )

+// LogsRecommendedName is the recommended command name

+// TODO: Probably move this pattern upstream?

+const LogsRecommendedName = "logs"

+

 const (

 	logsLong = `

 Print the logs for a resource.

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

-

-	logsExample = `  # Returns snapshot of ruby-container logs from pod backend.

-  $ %[1]s logs backend -c ruby-container

-

-  # Starts streaming of ruby-container logs from pod backend.

-  $ %[1]s logs -f pod/backend -c ruby-container

+Supported resources are builds, build configs (bc), deployment configs (dc), and pods.

+When a pod is specified and has more than one container, the container name should be

+specified via -c. When a build config or deployment config is specified, you can view

+the logs for a particular version of it via --version.`

-  # Starts streaming the logs of the most recent build of the openldap build config.

-  $ %[1]s logs -f bc/openldap

+	logsExample = `  # Start streaming the logs of the most recent build of the openldap build config.

+  $ %[1]s -f bc/openldap

-  # Starts streaming the logs of the latest deployment of the mysql deployment config.

-  $ %[1]s logs -f dc/mysql

+  # Start streaming the logs of the latest deployment of the mysql deployment config.

+  $ %[1]s -f dc/mysql

   # Get the logs of the first deployment for the mysql deployment config. Note that logs

   # from older deployments may not exist either because the deployment was successful

   # or due to deployment pruning or manual deletion of the deployment.

-  $ %[1]s logs --version=1 dc/mysql`

+  $ %[1]s --version=1 dc/mysql

+

+  # Return a snapshot of ruby-container logs from pod backend.

+  $ %[1]s backend -c ruby-container

+

+  # Start streaming of ruby-container logs from pod backend.

+  $ %[1]s -f pod/backend -c ruby-container`

 )

 // OpenShiftLogsOptions holds all the necessary options for running oc logs.

@@ -53,14 +60,15 @@ type OpenShiftLogsOptions struct {

 }

 // NewCmdLogs creates a new logs command that supports OpenShift resources.

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

+func NewCmdLogs(name, parent string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

 	o := OpenShiftLogsOptions{

 		KubeLogOptions: &kcmd.LogsOptions{},

 	}

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

 	cmd.Short = "Print the logs for a resource."

 	cmd.Long = logsLong

-	cmd.Example = fmt.Sprintf(logsExample, fullName)

+	cmd.Example = fmt.Sprintf(logsExample, name+" "+parent)

+	cmd.SuggestFor = []string{"builds", "deployments"}

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

 		cmdutil.CheckErr(o.Complete(f, out, cmd, args))

 		if err := o.Validate(); err != nil {

@@ -16,7 +16,7 @@ import (

 func TestFlagParity(t *testing.T) {

 	kubeCmd := kcmd.NewCmdLog(nil, ioutil.Discard)

 	f := clientcmd.NewFactory(nil)

-	originCmd := NewCmdLogs("", f, ioutil.Discard)

+	originCmd := NewCmdLogs("oc", "logs", f, ioutil.Discard)

 	kubeCmd.LocalFlags().VisitAll(func(kubeFlag *pflag.Flag) {

 		originFlag := originCmd.LocalFlags().Lookup(kubeFlag.Name)

@@ -260,7 +260,7 @@ func RunNewApplication(fullName string, f *clientcmd.Factory, out io.Writer, c *

 			}

 		case *buildapi.BuildConfig:

 			if len(t.Spec.Triggers) > 0 {

-				fmt.Fprintf(out, "%sBuild scheduled for %q - use the build-logs command to track its progress.\n", indent, t.Name)

+				fmt.Fprintf(out, "%sBuild scheduled for %q - use the logs command to track its progress.\n", indent, t.Name)

 			}

 		case *imageapi.ImageStream:

 			if len(t.Status.DockerImageRepository) == 0 {