Update container terminology in CLI Reference guide

Author: adellape

cli_reference/admin_cli_operations.adoc

@@ -97,7 +97,7 @@ $ oadm ipfailover <ipfailover_config>
 ----
 
 === registry
-Installs an integrated Docker registry:
+Installs an integrated container registry:
 ----
 $ oadm registry
 ----
@@ -111,7 +111,7 @@ ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]
 === build-chain
 Outputs the inputs and dependencies of any builds:
 ----
-$ oadm build-chain <image-stream>[:<tag>]
+$ oadm build-chain <image_stream>[:<tag>]
 ----
 endif::[]
 

cli_reference/basic_cli_operations.adoc

@@ -357,7 +357,7 @@ $ oc rollback <deployment_name>
 
 === new-build
 Create a build configuration based on the source code in the current Git
-repository (with a public remote) and a Docker image:
+repository (with a public remote) and a container image:
 ----
 $ oc new-build .
 ----
@@ -385,9 +385,9 @@ $ oc cancel-build bc/<buildconfig_name> --state=<state>
 Example values for `*state*` are *new* or *pending*.
 
 === import-image
-Import tag and image information from an external Docker image repository:
+Import tag and image information from an external image repository:
 ----
-$ oc import-image <imagestream>
+$ oc import-image <image_stream>
 ----
 
 === scale
@@ -400,7 +400,7 @@ $ oc scale <object_type> <object_name> --replicas=<#_of_replicas>
 ----
 
 === tag
-Take an existing tag or image from an image stream, or a Docker image pull spec,
+Take an existing tag or image from an image stream, or a container image "pull spec",
 and set it as the most recent image for a tag in one or more other image
 streams:
 ----

cli_reference/cli_by_example_content.adoc

@@ -59,7 +59,7 @@
 
 [options="nowrap"]
 ----
-  // Create an application based on the source code in the current git repository (with a public remote) and a Docker image
+  // Create an application based on the source code in the current git repository (with a public remote) and a container image
   $ oc new-app . --docker-image=repo/langimage
 
   // Create a Ruby application based on the provided [image]~[source code] combination
@@ -79,7 +79,7 @@
 
   // Create an application from a remote repository and specify a context directory
   $ oc new-app https://github.com/youruser/yourgitrepo --context-dir=src/build
- 
+
   // Create an application based on a template file, explicitly setting a parameter value
   $ oc new-app --file=./example/myapp/template.json --param=MYSQL_USER=admin
 ----
@@ -210,7 +210,7 @@
 
 [options="nowrap"]
 ----
-  // Create a build config based on the source code in the current git repository (with a public remote) and a Docker image
+  // Create a build config based on the source code in the current git repository (with a public remote) and a container image
   $ oc new-build . --docker-image=repo/langimage
 
   // Create a NodeJS build config based on the provided [image]~[source code] combination
@@ -240,7 +240,7 @@
 ====
 
 
-== Imports images from a Docker registry
+== Imports images from a container registry
 
 ====
 
@@ -278,7 +278,7 @@
   // Tag a specific image.
   $ oc tag openshift/ruby@sha256:6b646fa6bf5e5e4c7fa41056c27910e679c03ebe7f93e361e6515a9da7e258cc yourproject/ruby:tip
 
-  // Tag an external Docker image.
+  // Tag an external container image.
   $ oc tag --source=docker openshift/origin:latest yourproject/ruby:tip
 
   // Remove the specified spec tag from an image stream.
@@ -406,7 +406,7 @@
   // Remove all volumes for pod 'p1'
   $ oc volume pod/p1 --remove --confirm
 
-  // Remove volume 'v1' from deployment config 'registry'  
+  // Remove volume 'v1' from deployment config 'registry'
   $ oc volume dc/registry --remove --name=v1
 
   // Unmount volume v1 from container c1 on pod p1 and remove the volume v1 if it is not referenced by any containers on pod p1
@@ -731,10 +731,10 @@
 ----
   // Show Merged kubeconfig settings.
   $ oc config view
-  
+
   // Show only local kubeconfig settings
   $ oc config view --local
-  
+
   // Get the password for the e2e user
   $ oc config view -o template --template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}'
 ----
@@ -749,10 +749,10 @@
 ----
   // Set only the server field on the e2e cluster entry without touching other values.
   $ oc config set-cluster e2e --server=https://1.2.3.4
-  
+
   // Embed certificate authority data for the e2e cluster entry
   $ oc config set-cluster e2e --certificate-authority=~/.kube/e2e/kubernetes.ca.crt
-  
+
   // Disable cert checking for the dev cluster entry
   $ oc config set-cluster e2e --insecure-skip-tls-verify=true
 ----
@@ -768,10 +768,10 @@
   // Set only the "client-key" field on the "cluster-admin"
   // entry, without touching other values:
   $ oc config set-credentials cluster-admin --client-key=~/.kube/admin.key
-  
+
   // Set basic auth for the "cluster-admin" entry
   $ oc config set-credentials cluster-admin --username=admin --password=uXFGweU9l35qcif
-  
+
   // Embed client certificate data in the "cluster-admin" entry
   $ oc config set-credentials cluster-admin --client-certificate=~/.kube/admin.crt --embed-certs=true
 ----
@@ -798,7 +798,7 @@
 ----
   // Change the config context to use
   oc config use-context my-context
-  
+
   // Set the value of a config preference
   oc config set preferences.some true
 ----