diff --git a/compose/install.md b/compose/install.md
index 630429f1a6..fe60143a0b 100644
--- a/compose/install.md
+++ b/compose/install.md
@@ -216,7 +216,7 @@ Alternatively, if you're not worried about keeping them, you can remove them.
 Compose just creates new ones.
 
 ```bash
-docker rm -f -v myapp_web_1 myapp_db_1 ...
+docker container rm -f -v myapp_web_1 myapp_db_1 ...
 ```
 
 ## Uninstallation
diff --git a/config/containers/logging/gelf.md b/config/containers/logging/gelf.md
index 9cac25cd31..55a7462830 100644
--- a/config/containers/logging/gelf.md
+++ b/config/containers/logging/gelf.md
@@ -61,7 +61,7 @@ To make the configuration permanent, you can configure it in `/etc/docker/daemon
 ```
 
 You can set the logging driver for a specific container by setting the
-`--log-driver` flag when using `docker create` or `docker run`:
+`--log-driver` flag when using `docker container create` or `docker run`:
 
 ```bash
 $ docker run \
diff --git a/config/containers/logging/json-file.md b/config/containers/logging/json-file.md
index 9d5c90ac5c..72fc2f8cec 100644
--- a/config/containers/logging/json-file.md
+++ b/config/containers/logging/json-file.md
@@ -37,7 +37,7 @@ option.
 Restart Docker for the changes to take effect for newly created containers. Existing containers do not use the new logging configuration.
 
 You can set the logging driver for a specific container by using the
-`--log-driver` flag to `docker create` or `docker run`:
+`--log-driver` flag to `docker container create` or `docker run`:
 
 ```bash
 $ docker run \
diff --git a/config/containers/logging/syslog.md b/config/containers/logging/syslog.md
index b83c94d533..cc64d627f4 100644
--- a/config/containers/logging/syslog.md
+++ b/config/containers/logging/syslog.md
@@ -57,7 +57,7 @@ Restart Docker for the changes to take effect.
 > **Note**: The syslog-address supports both UDP and TCP.
 
 You can set the logging driver for a specific container by using the
-`--log-driver` flag to `docker create` or `docker run`:
+`--log-driver` flag to `docker container create` or `docker run`:
 
 ```bash
 docker run \
diff --git a/config/thirdparty/ambassador_pattern_linking.md b/config/thirdparty/ambassador_pattern_linking.md
index a23a4343da..91fd169722 100644
--- a/config/thirdparty/ambassador_pattern_linking.md
+++ b/config/thirdparty/ambassador_pattern_linking.md
@@ -124,7 +124,7 @@ containers `env`:
 This environment is used by the ambassador `socat` script to expose Redis
 to the world (via the `-p 6379:6379` port mapping):
 
-    $ docker rm redis_ambassador
+    $ docker container rm redis_ambassador
     $ CMD="apk update && apk add socat && sh"
     $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 alpine:3.2 sh -c "$CMD"
     [...]
diff --git a/config/thirdparty/dsc.md b/config/thirdparty/dsc.md
index b2339dd008..1b382bb587 100644
--- a/config/thirdparty/dsc.md
+++ b/config/thirdparty/dsc.md
@@ -90,7 +90,7 @@ file and execute configurations against multiple nodes as such:
 
 ### Images
 Image configuration is equivalent to running: `docker pull [image]` or
-`docker rmi -f [IMAGE]`.
+`docker image rm -f [IMAGE]`.
 
 Using the same steps defined above, execute `DockerClient` with the `Image`
 parameter and apply the configuration:
@@ -124,7 +124,7 @@ docker run -d --name="[containername]" -p '[port]' -e '[env]' --link '[link]'\
 or
 
 ```
-docker rm -f [containername]
+docker container rm -f [containername]
 ```
 
 To create or remove containers, you can use the `Container` parameter with one
diff --git a/develop/develop-images/multistage-build.md b/develop/develop-images/multistage-build.md
index bb7a15f53d..dcff323fc0 100644
--- a/develop/develop-images/multistage-build.md
+++ b/develop/develop-images/multistage-build.md
@@ -69,9 +69,9 @@ echo Building alexellis2/href-counter:build
 docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \  
     -t alexellis2/href-counter:build . -f Dockerfile.build
 
-docker create --name extract alexellis2/href-counter:build  
-docker cp extract:/go/src/github.com/alexellis/href-counter/app ./app  
-docker rm -f extract
+docker container create --name extract alexellis2/href-counter:build  
+docker container cp extract:/go/src/github.com/alexellis/href-counter/app ./app  
+docker container rm -f extract
 
 echo Building alexellis2/href-counter:latest
 
diff --git a/develop/sdk/examples.md b/develop/sdk/examples.md
index c1892f7dcd..587a69e611 100644
--- a/develop/sdk/examples.md
+++ b/develop/sdk/examples.md
@@ -437,7 +437,7 @@ Reticulating spline 5...
 
 ## List all images
 
-List the images on your Engine, similar to `docker images`:
+List the images on your Engine, similar to `docker image ls`:
 
 <ul class="nav nav-tabs">
   <li class="active"><a data-toggle="tab" data-target="#tab-listimages-go" data-group="go">Go</a></li>
diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md
index 96d330c7cf..e2d321a64a 100644
--- a/docker-for-mac/index.md
+++ b/docker-for-mac/index.md
@@ -88,15 +88,15 @@ docker-machine version 0.10.0, build 76ed2a6
 
     The `nginx` webserver continues to run in the container on that port
     until you stop and/or remove the container. If you want to stop the
-    webserver, type: `docker stop webserver` and start it again with `docker
+    webserver, type: `docker container stop webserver` and start it again with `docker
     start webserver`. A stopped container does not show up with `docker ps`; for
     that, you need to run `docker ps -a`.
 
     To stop and remove the running container with a single command, type:
-    `docker rm -f webserver`. This removes the container, but not the
-    `nginx` image. You can list local images with `docker images`. You might
+    `docker container rm -f webserver`. This removes the container, but not the
+    `nginx` image. You can list local images with `docker image ls`. You might
     want to keep some images around so that you don't need to pull them again
-    from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
+    from Docker Hub. To remove an image you no longer need, use `docker image rm` followed by an image ID or image name. For example, `docker image rm nginx`.
 
 **Want more example applications?** [Get Started](/get-started/) and [Samples](/samples/) are great places to start.
 
diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md
index 4b930ccee9..71b8b9e173 100644
--- a/docker-for-windows/index.md
+++ b/docker-for-windows/index.md
@@ -228,14 +228,14 @@ and make sure `docker` commands are working properly.
 
     The `nginx` webserver continues to run in the container on that port
     until you stop and/or remove the container. If you want to stop the
-    webserver, type: `docker stop webserver` and start it again with `docker
+    webserver, type: `docker container stop webserver` and start it again with `docker
     start webserver`.
 
     To stop and remove the running container with a single command, type:
-    `docker rm -f webserver`. This removes the container, but not the
-    `nginx` image. You can list local images with `docker images`. You might
+    `docker container rm -f webserver`. This removes the container, but not the
+    `nginx` image. You can list local images with `docker image ls`. You might
     want to keep some images around so that you don't need to pull them again
-    from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
+    from Docker Hub. To remove an image you no longer need, use `docker image rm` followed by an image ID or image name. For example, `docker image rm nginx`.
 
 **Want more example applications?** [Get Started](/get-started/) and [Samples](/samples) are great places to start.
 
diff --git a/engine/docker-overview.md b/engine/docker-overview.md
index e9707fc3f4..44eb204f85 100644
--- a/engine/docker-overview.md
+++ b/engine/docker-overview.md
@@ -193,7 +193,7 @@ the default registry configuration):
 1.  If you do not have the `ubuntu` image locally, Docker pulls it from your
     configured registry, as though you had run `docker pull ubuntu` manually.
 
-2.  Docker creates a new container, as though you had run a `docker create`
+2.  Docker creates a new container, as though you had run a `docker container create`
     command manually.
 
 3.  Docker allocates a read-write filesystem to the container, as its final
diff --git a/engine/examples/apt-cacher-ng.md b/engine/examples/apt-cacher-ng.md
index 4c0045da18..b5ccd3af6f 100644
--- a/engine/examples/apt-cacher-ng.md
+++ b/engine/examples/apt-cacher-ng.md
@@ -116,6 +116,6 @@ instruction, and the image we built to run the service:
 Finally, clean up after your test by stopping and removing the
 container, and then removing the image.
 
-    $ docker stop test_apt_cacher_ng
-    $ docker rm test_apt_cacher_ng
-    $ docker rmi eg_apt_cacher_ng
+    $ docker container stop test_apt_cacher_ng
+    $ docker container rm test_apt_cacher_ng
+    $ docker image rm eg_apt_cacher_ng
diff --git a/engine/examples/running_ssh_service.md b/engine/examples/running_ssh_service.md
index e5669339d4..2d4d8e568a 100644
--- a/engine/examples/running_ssh_service.md
+++ b/engine/examples/running_ssh_service.md
@@ -76,7 +76,7 @@ Finally, clean up after your test by stopping and removing the
 container, and then removing the image.
 
 ```bash
-$ docker stop test_sshd
-$ docker rm test_sshd
-$ docker rmi eg_sshd
+$ docker container stop test_sshd
+$ docker container rm test_sshd
+$ docker image rm eg_sshd
 ```
diff --git a/engine/security/apparmor.md b/engine/security/apparmor.md
index 8e03225f33..d452161f28 100644
--- a/engine/security/apparmor.md
+++ b/engine/security/apparmor.md
@@ -13,7 +13,7 @@ Docker automatically generates and loads a default profile for containers named
 `docker-default`. On Docker versions `1.13.0` and later, the Docker binary generates
 this profile in `tmpfs` and then loads it into the kernel. On Docker versions
 earlier than `1.13.0`, this profile is generated in `/etc/apparmor.d/docker`
-instead. 
+instead.
 
 > **Note**: This profile is used on containers, _not_ on the Docker Daemon.
 
@@ -176,7 +176,7 @@ profile docker-nginx flags=(attach_disconnected,mediate_deleted) {
 4. Exec into the running container.
 
    ```bash
-   $ docker exec -it apparmor-nginx bash
+   $ docker container exec -it apparmor-nginx bash
    ```
 
 5. Try some operations to test the profile.
@@ -222,7 +222,7 @@ In the above example, you can see `profile=/usr/bin/docker`. This means the
 user has the `docker-engine` (Docker Engine Daemon) profile loaded.
 
 > **Note**: On version of Ubuntu > 14.04 this is all fine and well, but Trusty
-> users might run into some issues when trying to `docker exec`.
+> users might run into some issues when trying to `docker container exec`.
 
 Look at another log line:
 
diff --git a/engine/security/trust/trust_sandbox.md b/engine/security/trust/trust_sandbox.md
index 775cf37d63..6cfbf8a326 100644
--- a/engine/security/trust/trust_sandbox.md
+++ b/engine/security/trust/trust_sandbox.md
@@ -127,7 +127,7 @@ Now that everything is setup, you can go into your `trustsandbox` container and
 start testing Docker content trust. From your host machine, obtain a shell
 in the `trustsandbox` container.
 
-    $ docker exec -it trustsandbox sh
+    $ docker container exec -it trustsandbox sh
     / #
 
 ### Test some trust operations
@@ -217,7 +217,7 @@ data. Then, you try and pull it.
 2.  Open a new interactive terminal from your host, and obtain a shell into the
     `sandboxregistry` container.
 
-        $ docker exec -it sandboxregistry bash
+        $ docker container exec -it sandboxregistry bash
         root@65084fc6f047:/#
 
 3.  List the layers for the `test/trusttest` image you pushed:
@@ -242,7 +242,7 @@ data. Then, you try and pull it.
 
 7.  List the `trusttest` image.
 
-        / # docker images | grep trusttest
+        / # docker image ls | grep trusttest
         REPOSITORY                            TAG                 IMAGE ID            CREATED             SIZE
         docker/trusttest                      latest              cc7629d1331a        11 months ago       5.025 MB
         sandboxregistry:5000/test/trusttest   latest              cc7629d1331a        11 months ago       5.025 MB
@@ -250,7 +250,7 @@ data. Then, you try and pull it.
 
 8.  Remove the `trusttest:latest` image from our local cache.
 
-        / # docker rmi -f cc7629d1331a
+        / # docker image rm -f cc7629d1331a
         Untagged: docker/trusttest:latest
         Untagged: sandboxregistry:5000/test/trusttest:latest
         Untagged: sandboxregistry:5000/test/trusttest@sha256:ebf59c538accdf160ef435f1a19938ab8c0d6bd96aef8d4ddd1b379edf15a926
diff --git a/engine/security/userns-remap.md b/engine/security/userns-remap.md
index 4f594ceed7..dd4cc31563 100644
--- a/engine/security/userns-remap.md
+++ b/engine/security/userns-remap.md
@@ -243,7 +243,7 @@ See
 for some of these limitations.
 
 To disable user namespaces for a specific container, add the `--userns=host`
-flag to the `docker create`, `docker run`, or `docker exec` command.
+flag to the `docker container create`, `docker container run`, or `docker container exec` command.
 
 ## User namespace known limitations
 
diff --git a/engine/swarm/configs.md b/engine/swarm/configs.md
index 41017d51e5..90d77c15a1 100644
--- a/engine/swarm/configs.md
+++ b/engine/swarm/configs.md
@@ -158,7 +158,7 @@ real-world example, continue to
     ```
 
 4.  Get the ID of the `redis` service task container using `docker ps`, so that
-    you can use `docker exec` to connect to the container and read the contents
+    you can use `docker container exec` to connect to the container and read the contents
     of the config data file, which defaults to being readable by all and has the
     same name as the name of the config. The first command below illustrates
     how to find the container ID, and the second and third commands use shell
@@ -169,11 +169,11 @@ real-world example, continue to
 
     5cb1c2348a59
 
-    $ docker exec $(docker ps --filter name=redis -q) ls -l /my-config
+    $ docker container exec $(docker ps --filter name=redis -q) ls -l /my-config
 
     -r--r--r--    1 root     root            12 Jun  5 20:49 my-config                                                     
 
-    $ docker exec $(docker ps --filter name=redis -q) cat /my-config
+    $ docker container exec $(docker ps --filter name=redis -q) cat /my-config
 
     This is a config
     ```
@@ -207,7 +207,7 @@ real-world example, continue to
     `service update` command redeploys the service.
 
     ```none
-    $ docker exec -it $(docker ps --filter name=redis -q) cat /my-config
+    $ docker container exec -it $(docker ps --filter name=redis -q) cat /my-config
 
     cat: can't open '/my-config': No such file or directory
     ```
diff --git a/engine/swarm/secrets.md b/engine/swarm/secrets.md
index 099aef3a47..7193e77e34 100644
--- a/engine/swarm/secrets.md
+++ b/engine/swarm/secrets.md
@@ -197,7 +197,7 @@ real-world example, continue to
     ```
 
 4.  Get the ID of the `redis` service task container using `docker ps` , so that
-    you can use `docker exec` to connect to the container and read the contents
+    you can use `docker container exec` to connect to the container and read the contents
     of the secret data file, which defaults to being readable by all and has the
     same name as the name of the secret. The first command below illustrates
     how to find the container ID, and the second and third commands use shell
@@ -208,12 +208,12 @@ real-world example, continue to
 
     5cb1c2348a59
 
-    $ docker exec $(docker ps --filter name=redis -q) ls -l /run/secrets
+    $ docker container exec $(docker ps --filter name=redis -q) ls -l /run/secrets
 
     total 4
     -r--r--r--    1 root     root            17 Dec 13 22:48 my_secret_data
 
-    $ docker exec $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
+    $ docker container exec $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
 
     This is a secret
     ```
@@ -257,7 +257,7 @@ real-world example, continue to
     `service update` command redeploys the service.
 
     ```none
-    $ docker exec -it $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
+    $ docker container exec -it $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
 
     cat: can't open '/run/secrets/my_secret_data': No such file or directory
     ```
@@ -898,14 +898,14 @@ use it, then remove the old secret.
     uses shell expansion to do it all in a single step.
 
     ```bash
-    $ docker exec <CONTAINER_ID> \
+    $ docker container exec <CONTAINER_ID> \
         bash -c 'mysqladmin --user=wordpress --password="$(< /run/secrets/old_mysql_password)" password "$(< /run/secrets/mysql_password)"'
     ```
 
     **or**:
 
     ```bash
-    $ docker exec $(docker ps --filter name=mysql -q) \
+    $ docker container exec $(docker ps --filter name=mysql -q) \
         bash -c 'mysqladmin --user=wordpress --password="$(< /run/secrets/old_mysql_password)" password "$(< /run/secrets/mysql_password)"'
     ```
 
diff --git a/engine/tutorials/networkingcontainers.md b/engine/tutorials/networkingcontainers.md
index 364aa29ca8..96dce3d271 100644
--- a/engine/tutorials/networkingcontainers.md
+++ b/engine/tutorials/networkingcontainers.md
@@ -175,7 +175,7 @@ Then, get the IP address of your `web`
 
 Now, open a shell to your running `db` container:
 
-    $ docker exec -it db bash
+    $ docker container exec -it db bash
 
     root@a205f0dd33b2:/# ping 172.17.0.2
     ping 172.17.0.2
@@ -195,7 +195,7 @@ Docker networking allows you to attach a container to as many networks as you li
 
 Open a shell into the `db` application again and try the ping command. This time just use the container name `web` rather than the IP address.
 
-    $ docker exec -it db bash
+    $ docker container exec -it db bash
 
     root@a205f0dd33b2:/# ping web
     PING web (10.0.0.2) 56(84) bytes of data.
diff --git a/engine/userguide/networking/default_network/dockerlinks.md b/engine/userguide/networking/default_network/dockerlinks.md
index 5b98b614c7..f449cf5e51 100644
--- a/engine/userguide/networking/default_network/dockerlinks.md
+++ b/engine/userguide/networking/default_network/dockerlinks.md
@@ -145,7 +145,7 @@ You can also use `docker inspect` to return the container's name.
 > **Note**:
 > Container names must be unique. That means you can only call
 > one container `web`. If you want to re-use a container name you must delete
-> the old container (with `docker rm`) before you can create a new
+> the old container (with `docker container rm`) before you can create a new
 > container with the same name. As an alternative you can use the `--rm`
 > flag with the `docker run` command. This deletes the container
 > immediately after it is stopped.
@@ -166,7 +166,7 @@ image, which contains a PostgreSQL database.
 Now, you need to delete the `web` container you created previously so you can replace it
 with a linked one:
 
-    $ docker rm -f web
+    $ docker container rm -f web
 
 Now, create a new `web` container and link it with your `db` container.
 
diff --git a/engine/userguide/networking/index.md b/engine/userguide/networking/index.md
index e1916c707e..fdc14790d8 100644
--- a/engine/userguide/networking/index.md
+++ b/engine/userguide/networking/index.md
@@ -77,7 +77,7 @@ container lacks a network interface. Attaching to such a container and looking
 at its stack you see this:
 
 ```bash
-$ docker attach nonenetcontainer
+$ docker container attach nonenetcontainer
 
 root@0cb243cd1293:/# cat /etc/hosts
 127.0.0.1	localhost
@@ -223,7 +223,7 @@ inside the container. You are connected as `root`, so your command prompt is
 a `#` character.
 
 ```none
-$ docker attach container1
+$ docker container attach container1
 
 root@3386a527aa08:/# ip -4 addr
 
diff --git a/engine/userguide/networking/overlay-standalone-swarm.md b/engine/userguide/networking/overlay-standalone-swarm.md
index f59de80e7e..622857a97b 100644
--- a/engine/userguide/networking/overlay-standalone-swarm.md
+++ b/engine/userguide/networking/overlay-standalone-swarm.md
@@ -381,7 +381,7 @@ to have external connectivity outside of their cluster.
 2.  Check the Nginx container's network interfaces.
 
     ```bash
-    $ docker exec web ip addr
+    $ docker container exec web ip addr
 
     1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default
     link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
diff --git a/engine/userguide/networking/work-with-networks.md b/engine/userguide/networking/work-with-networks.md
index 3d5ae669c8..677ae787ff 100644
--- a/engine/userguide/networking/work-with-networks.md
+++ b/engine/userguide/networking/work-with-networks.md
@@ -338,11 +338,11 @@ needed.
 
     eth1    Link encap:Ethernet  HWaddr 02:42:AC:15:00:02
 
-7.  Use the `docker attach` command to connect to the running `container2` and
+7.  Use the `docker container attach` command to connect to the running `container2` and
     examine its networking stack:
 
     ```bash
-    $ docker attach container2
+    $ docker container attach container2
     ```
 
     Use the `ifconfig` command to examine the container's networking stack. You
@@ -432,7 +432,7 @@ needed.
     to ping `container1` by IP address.
 
     ```bash
-    $ docker attach container3
+    $ docker container attach container3
 
     $ ping 172.17.0.2
     PING 172.17.0.2 (172.17.0.2): 56 data bytes
@@ -503,7 +503,7 @@ The following example briefly describes how to use `--link`.
     in an error. Attach to `container4` and try to ping either `container5` or `c5`:
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     $ ping container5
 
@@ -528,7 +528,7 @@ The following example briefly describes how to use `--link`.
     Now attach to `container4` and try to ping `c5` and `container5`.
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     / # ping -w 4 c5
     PING c5 (172.25.0.5): 56 data bytes
@@ -557,7 +557,7 @@ The following example briefly describes how to use `--link`.
 3.  Finally, attach to `container5` and verify that you can ping `container4`.
 
     ```bash
-    $ docker attach container5
+    $ docker container attach container5
 
     / # ping -w 4 c4
     PING c4 (172.25.0.4): 56 data bytes
@@ -616,7 +616,7 @@ The following example illustrates these points.
    try pinging container `container5` using alias `c5`:
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     / # ping -w 4 foo
     PING foo (172.26.0.3): 56 data bytes
@@ -652,7 +652,7 @@ The following example illustrates these points.
     ```bash
     $ docker network disconnect isolated_nw container5
 
-    $ docker attach container4
+    $ docker container attach container4
 
     / # ping -w 4 c5
     ping: bad address 'c5'
@@ -710,7 +710,7 @@ The following example illustrates this limitation.
     network alias (`app`). Notice that the IP address is the same.
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     / # ping -w 4 app
     PING app (172.25.0.6): 56 data bytes
@@ -753,7 +753,7 @@ The following example illustrates this limitation.
     these networks) and `container5` (which is connected only to `isolated_nw`).
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     / # ping -w 4 scoped-app
     PING foo (172.26.0.5): 56 data bytes
@@ -770,7 +770,7 @@ The following example illustrates this limitation.
     Detach from `container4` and leave it running using `CTRL-p CTRL-q`.
 
     ```bash
-    $ docker attach container5
+    $ docker container attach container5
 
     / # ping -w 4 scoped-app
     ping: bad address 'scoped-app'
@@ -821,7 +821,7 @@ The following example illustrates how to set up and use network aliases.
 2.  Start a continuous ping from `container4` to the `app` alias.
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     $ ping app
     PING app (172.25.0.6): 56 data bytes
@@ -836,7 +836,7 @@ The following example illustrates how to set up and use network aliases.
 
 3.  In another terminal, stop `container6`.
     ```bash
-    $ docker stop container6
+    $ docker container stop container6
     ```
 
     In the terminal attached to `container4`, observe the `ping` output.
@@ -871,7 +871,7 @@ The following example illustrates how to set up and use network aliases.
     several times, you can see responses from each of the containers.
 
     ```bash
-    $ docker attach container4
+    $ docker container attach container4
 
     $ ping app
     PING app (172.25.0.6): 56 data bytes
@@ -951,7 +951,7 @@ disconnect` command.
     which is on the `isolated_nw` network.
 
     ```bash
-    $ docker attach container2
+    $ docker container attach container2
 
     / # ifconfig
     eth0      Link encap:Ethernet  HWaddr 02:42:AC:11:00:03  
@@ -997,9 +997,9 @@ disconnect` command.
 4.  Remove `container4`, `container5`, `container6`, and `container7`.
 
     ```bash
-    $ docker stop container4 container5 container6 container7
+    $ docker container stop container4 container5 container6 container7
 
-    $ docker rm container4 container5 container6 container7
+    $ docker container rm container4 container5 container6 container7
     ```
 
 ### Handle stale network endpoints
@@ -1022,7 +1022,7 @@ $ docker run -d --name redis_db --network multihost redis
 
 ERROR: Cannot start container bc0b19c089978f7845633027aa3435624ca3d12dd4f4f764b61eac4c0610f32e: container already connected to network multihost
 
-$ docker rm -f redis_db
+$ docker container rm -f redis_db
 
 $ docker network disconnect -f multihost redis_db
 
diff --git a/get-started/part2.md b/get-started/part2.md
index 4210189ce2..3f8126ac7d 100644
--- a/get-started/part2.md
+++ b/get-started/part2.md
@@ -181,7 +181,7 @@ docker build -t friendlyhello .
 Where is your built image? It's in your machine's local Docker image registry:
 
 ```shell
-$ docker images
+$ docker image ls
 
 REPOSITORY            TAG                 IMAGE ID
 friendlyhello         latest              326387cea398
@@ -310,11 +310,11 @@ For example:
 docker tag friendlyhello john/get-started:part2
 ```
 
-Run [docker images](/engine/reference/commandline/images/) to see your newly
+Run [docker image ls](/engine/reference/commandline/image_ls/) to see your newly
 tagged image. (You can also use `docker image ls`.)
 
 ```shell
-$ docker images
+$ docker image ls
 REPOSITORY               TAG                 IMAGE ID            CREATED             SIZE
 friendlyhello            latest              d9e555c53008        3 minutes ago       195MB
 john/get-started         part2               d9e555c53008        3 minutes ago       195MB
diff --git a/kitematic/userguide.md b/kitematic/userguide.md
index be0373409b..a8257f9a9d 100644
--- a/kitematic/userguide.md
+++ b/kitematic/userguide.md
@@ -93,7 +93,7 @@ so this resets this log view.
 
 ### Starting a terminal in a container
 
-The "Terminal" icon at the top of the container summary runs `docker exec -i -t <your container> sh`.
+The "Terminal" icon at the top of the container summary runs `docker container exec -i -t <your container> sh`.
 This allows you to make quick changes, or to debug a problem.
 
 > **Note**: Your exec'ed `sh` process does not have the same environment settings
diff --git a/machine/overview.md b/machine/overview.md
index 90f81375ea..16c63c3485 100644
--- a/machine/overview.md
+++ b/machine/overview.md
@@ -76,7 +76,7 @@ client-server application made up of the Docker daemon, a REST API that
 specifies interfaces for interacting with the daemon, and a command line
 interface (CLI) client that talks to the daemon (through the REST API wrapper).
 Docker Engine accepts `docker` commands from the CLI, such as
-`docker run <image>`, `docker ps` to list running containers, `docker images`
+`docker run <image>`, `docker ps` to list running containers, `docker image ls`
 to list images, and so on.
 
 ![Docker Engine](img/engine.png)
diff --git a/notary/reference/server-config.md b/notary/reference/server-config.md
index 70dd5ff153..da65281735 100644
--- a/notary/reference/server-config.md
+++ b/notary/reference/server-config.md
@@ -372,7 +372,7 @@ $ kill -s SIGUSR1 PID
 or
 
 ```bash
-$ docker exec -i CONTAINER_ID kill -s SIGUSR1 PID
+$ docker container exec -i CONTAINER_ID kill -s SIGUSR1 PID
 ```
 
 To decrease logging level
@@ -384,7 +384,7 @@ $ kill -s SIGUSR2 PID
 or
 
 ```bash
-$ docker exec -i CONTAINER_ID kill -s SIGUSR2 PID
+$ docker container exec -i CONTAINER_ID kill -s SIGUSR2 PID
 ```
 
 PID is the process id of `notary-server` and it may not the PID 1 process if you are running
@@ -393,7 +393,7 @@ the container with some kind of wrapper startup script or something.
 You can get the PID of `notary-server` through
 
 ```bash
-$ docker exec CONTAINER_ID ps aux
+$ docker container exec CONTAINER_ID ps aux
 ```
 
 or
diff --git a/registry/deploying.md b/registry/deploying.md
index 9934075ce3..571fc0f379 100644
--- a/registry/deploying.md
+++ b/registry/deploying.md
@@ -75,17 +75,17 @@ as `my-ubuntu`, then pushes it to the local registry. Finally, the
 
 ## Stop a local registry
 
-To stop the registry, use the same `docker stop` command as with any other
+To stop the registry, use the same `docker container stop` command as with any other
 container.
 
 ```bash
-$ docker stop registry
+$ docker container stop registry
 ```
 
-To remove the container, use `docker rm`.
+To remove the container, use `docker container rm`.
 
 ```bash
-$ docker stop registry && docker rm -v registry
+$ docker container stop registry && docker container rm -v registry
 ```
 
 ## Basic configuration
@@ -204,7 +204,7 @@ If you have been issued an _intermediate_ certificate instead, see
 2.  Stop the registry if it is currently running.
 
     ```bash
-    $ docker stop registry
+    $ docker container stop registry
     ```
 
 3.  Restart the registry, directing it to use the TLS certificate. This command
@@ -415,7 +415,7 @@ secrets.
 2.  Stop the registry.
 
     ```bash
-    $ docker stop registry
+    $ docker container stop registry
     ```
 
 3.  Start the registry with basic authentication.
diff --git a/registry/index.md b/registry/index.md
index d91b799a8a..d8ebf297e3 100644
--- a/registry/index.md
+++ b/registry/index.md
@@ -56,7 +56,7 @@ Pull (or build) some image from the hub
 
 Tag the image so that it points to your registry
 
-    docker tag ubuntu localhost:5000/myfirstimage
+    docker image tag ubuntu localhost:5000/myfirstimage
 
 Push it
 
@@ -68,7 +68,7 @@ Pull it back
 
 Now stop your registry and remove all data
 
-    docker stop registry && docker rm -v registry
+    docker container stop registry && docker container rm -v registry
 
 ## Next
 
diff --git a/registry/recipes/index.md b/registry/recipes/index.md
index f5d10390a5..97d3226985 100644
--- a/registry/recipes/index.md
+++ b/registry/recipes/index.md
@@ -17,7 +17,7 @@ At this point, it's assumed that:
  * you have installed Docker Compose
  * it's HIGHLY recommended that you get a certificate from a known CA instead of self-signed certificates
  * inside the current directory, you have a X509 `domain.crt` and `domain.key`, for the CN `myregistrydomain.com`
- * be sure you have stopped and removed any previously running registry (typically `docker stop registry && docker rm -v registry`)
+ * be sure you have stopped and removed any previously running registry (typically `docker container stop registry && docker container rm -v registry`)
 
 ## The List
 
diff --git a/storage/storagedriver/index.md b/storage/storagedriver/index.md
index 25b91e7efa..23426d47be 100644
--- a/storage/storagedriver/index.md
+++ b/storage/storagedriver/index.md
@@ -178,7 +178,7 @@ with the `CMD` instruction, and a read-write container layer. Docker already
 has all the layers from the first image, so it does not need to pull them again.
 The two images share any layers they have in common.
 
-If you build images from the two Dockerfiles, you can use `docker images` and
+If you build images from the two Dockerfiles, you can use `docker image ls` and
 `docker history` commands to verify that the cryptographic IDs of the shared
 layers are the same.
 
@@ -239,7 +239,7 @@ layers are the same.
 7.  Check out the sizes of the images:
 
     ```bash
-    $ docker images
+    $ docker image ls
 
     REPOSITORY                         TAG                     IMAGE ID            CREATED             SIZE
     acme/my-final-image                1.0                     dbf995fc07ff        58 seconds ago      103MB
diff --git a/swarm/install-manual.md b/swarm/install-manual.md
index 02cbe47056..bdfb946748 100644
--- a/swarm/install-manual.md
+++ b/swarm/install-manual.md
@@ -268,7 +268,7 @@ replica.
 
 3. Shut down the primary manager, replacing `<id_name>` with the container's id or name (for example, "8862717fe6d3" or "trusting_lamarr").
 
-        docker rm -f <id_name>
+        docker container rm -f <id_name>
 
 4. Start the swarm manager. For example:
 
diff --git a/swarm/scheduler/filter.md b/swarm/scheduler/filter.md
index 8d9dda885c..b5ab32daa9 100644
--- a/swarm/scheduler/filter.md
+++ b/swarm/scheduler/filter.md
@@ -154,7 +154,7 @@ Step 3 : RUN gem install sinatra
 Removing intermediate container 68671d4a17b0
 Successfully built cd70495a1514
 
-$ docker images
+$ docker image ls
 REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
 dockerswarm/swarm   manager             8c2c56438951        2 days ago          795.7 MB
 ouruser/sinatra     v2                  cd70495a1514        35 seconds ago      318.7 MB
@@ -280,7 +280,7 @@ As you can see here, the containers were only scheduled on nodes that had the
 `redis` image. Instead of the image name, you could have specified the image ID.
 
 ```bash
-$ docker images
+$ docker image ls
 REPOSITORY                         TAG                       IMAGE ID            CREATED             VIRTUAL SIZE
 redis                              latest                    06a1f75304ba        2 days ago          111.1 MB
 
diff --git a/swarm/swarm_at_scale/deploy-app.md b/swarm/swarm_at_scale/deploy-app.md
index f2dfb1b6ac..49fe09af32 100644
--- a/swarm/swarm_at_scale/deploy-app.md
+++ b/swarm/swarm_at_scale/deploy-app.md
@@ -174,7 +174,7 @@ allow you to take advantage of the loadbalancer.
 2. Check your work by reviewing the configuration of nginx.
 
    ```html
-   $ docker exec interlock cat /etc/conf/nginx.conf
+   $ docker container exec interlock cat /etc/conf/nginx.conf
    ... output snipped ...
 
    upstream results.myenterprise.example.com {
diff --git a/swarm/swarm_at_scale/deploy-infra.md b/swarm/swarm_at_scale/deploy-infra.md
index 1b745cfcb8..9ef1c4cc9e 100644
--- a/swarm/swarm_at_scale/deploy-infra.md
+++ b/swarm/swarm_at_scale/deploy-infra.md
@@ -267,7 +267,7 @@ in Step 4.
     docker: Error response from daemon: Conflict. The name "/interlock" is already in use by container d846b801a978c76979d46a839bb05c26d2ab949ff9f4f740b06b5e2564bae958. You have to remove (or rename) that container to reuse that name.
     ```
 
-     Remove the interlock container with the `docker rm interlock` and try again.
+     Remove the interlock container with the `docker container rm interlock` and try again.
 
 
 11. Start an `nginx` container on the load balancer.