@@ -89,7 +89,7 @@ Install your app dependencies using the `npm` binary:

     # Install app dependencies

     COPY package.json /src/package.json

-    RUN cd /src; npm install

+    RUN cd /src; npm install --production

 To bundle your app's source code inside the Docker image, use the `COPY`

 instruction:

@@ -119,7 +119,7 @@ Your `Dockerfile` should now look like this:

     # Install app dependencies

     COPY package.json /src/package.json

-    RUN cd /src; npm install

+    RUN cd /src; npm install --production

     # Bundle app source

     COPY . /src

@@ -32,7 +32,7 @@ display your kernel version:

     $ uname -r

     3.10.0-229.el7.x86_64

-Finally, is it recommended that you fully update your system. Please keep in

+Finally, it is recommended that you fully update your system. Please keep in

 mind that your system should be fully patched to fix any potential kernel bugs.

 Any reported kernel bugs may have already been fixed on the latest kernel

 packages.

@@ -249,7 +249,7 @@ Json Parameters:

           An ever increasing delay (double the previous delay, starting at 100mS)

           is added before each restart to prevent flooding the server.

   -   **NetworkMode** - Sets the networking mode for the container. Supported

-        values are: `bridge`, `host`, and `container:<name|id>`

+        values are: `bridge`, `host`, `none`, and `container:<name|id>`

   -   **Devices** - A list of devices to add to the container specified in the

         form

         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -596,7 +596,7 @@ Json Parameters:

         An ever increasing delay (double the previous delay, starting at 100mS)

         is added before each restart to prevent flooding the server.

 -   **NetworkMode** - Sets the networking mode for the container. Supported

-      values are: `bridge`, `host`, and `container:<name|id>`

+      values are: `bridge`, `host`, `none`, and `container:<name|id>`

 -   **Devices** - A list of devices to add to the container specified in the

       form

       `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -249,7 +249,7 @@ Json Parameters:

           An ever increasing delay (double the previous delay, starting at 100mS)

           is added before each restart to prevent flooding the server.

   -   **NetworkMode** - Sets the networking mode for the container. Supported

-        values are: `bridge`, `host`, and `container:<name|id>`

+        values are: `bridge`, `host`, `none`, and `container:<name|id>`

   -   **Devices** - A list of devices to add to the container specified in the

         form

         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -251,7 +251,7 @@ Json Parameters:

           An ever increasing delay (double the previous delay, starting at 100mS)

           is added before each restart to prevent flooding the server.

   -   **NetworkMode** - Sets the networking mode for the container. Supported

-        values are: `bridge`, `host`, and `container:<name|id>`

+        values are: `bridge`, `host`, `none`, and `container:<name|id>`

   -   **Devices** - A list of devices to add to the container specified in the

         form

         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -270,7 +270,7 @@ Json Parameters:

             An ever increasing delay (double the previous delay, starting at 100mS)

             is added before each restart to prevent flooding the server.

     -   **NetworkMode** - Sets the networking mode for the container. Supported

-          values are: `bridge`, `host`, and `container:<name|id>`

+          values are: `bridge`, `host`, `none`, and `container:<name|id>`

     -   **Devices** - A list of devices to add to the container specified in the

           form

           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -281,7 +281,7 @@ Json Parameters:

             An ever increasing delay (double the previous delay, starting at 100mS)

             is added before each restart to prevent flooding the server.

     -   **NetworkMode** - Sets the networking mode for the container. Supported

-          values are: `bridge`, `host`, and `container:<name|id>`

+          values are: `bridge`, `host`, `none`, and `container:<name|id>`

     -   **Devices** - A list of devices to add to the container specified as a JSON object in the

       form

           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -289,7 +289,7 @@ Json Parameters:

             An ever increasing delay (double the previous delay, starting at 100mS)

             is added before each restart to prevent flooding the server.

     -   **NetworkMode** - Sets the networking mode for the container. Supported

-          values are: `bridge`, `host`, and `container:<name|id>`

+          values are: `bridge`, `host`, `none`, and `container:<name|id>`

     -   **Devices** - A list of devices to add to the container specified as a JSON object in the

       form

           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -305,7 +305,8 @@ Json Parameters:

             An ever increasing delay (double the previous delay, starting at 100mS)

             is added before each restart to prevent flooding the server.

     -   **NetworkMode** - Sets the networking mode for the container. Supported

-          values are: `bridge`, `host`, and `container:<name|id>`

+          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken

+          as a custom network's name to which this container should connect to.

     -   **Devices** - A list of devices to add to the container specified as a JSON object in the

       form

           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -386,7 +386,8 @@ Json Parameters:

             An ever increasing delay (double the previous delay, starting at 100mS)

             is added before each restart to prevent flooding the server.

     -   **NetworkMode** - Sets the networking mode for the container. Supported

-          values are: `bridge`, `host`, and `container:<name|id>`

+          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken

+          as a custom network's name to which this container should connect to.

     -   **Devices** - A list of devices to add to the container specified as a JSON object in the

       form

           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

@@ -579,7 +579,7 @@ The `<dest>` is an absolute path, or a path relative to `WORKDIR`, into which

 the source will be copied inside the destination container.

     ADD test relativeDir/          # adds "test" to `WORKDIR`/relativeDir/

-    ADD test /absoluteDir          # adds "test" to /absoluteDir

+    ADD test /absoluteDir/         # adds "test" to /absoluteDir/

 All new files and directories are created with a UID and GID of 0.

@@ -691,7 +691,7 @@ The `<dest>` is an absolute path, or a path relative to `WORKDIR`, into which

 the source will be copied inside the destination container.

     COPY test relativeDir/   # adds "test" to `WORKDIR`/relativeDir/

-    COPY test /absoluteDir   # adds "test" to /absoluteDir

+    COPY test /absoluteDir/  # adds "test" to /absoluteDir/

 All new files and directories are created with a UID and GID of 0.

@@ -31,7 +31,7 @@ volumes mounted inside the container.

 By default, the container being committed and its processes will be paused

 while the image is committed. This reduces the likelihood of encountering data

 corruption during the process of creating the commit.  If this behavior is

-undesired, set the 'p' option to false.

+undesired, set the `--pause` option to false.

 The `--change` option will apply `Dockerfile` instructions to the image that is

 created.  Supported `Dockerfile` instructions:

@@ -23,7 +23,7 @@ You can copy from the container's file system to the local machine or the

 reverse, from the local filesystem to the container. If `-` is specified for

 either the `SRC_PATH` or `DEST_PATH`, you can also stream a tar archive from

 `STDIN` or to `STDOUT`. The `CONTAINER` can be a running or stopped container.

-The `SRC_PATH` or `DEST_PATH` be a file or directory.

+The `SRC_PATH` or `DEST_PATH` can be a file or directory.

 The `docker cp` command assumes container paths are relative to the container's 

 `/` (root) directory. This means supplying the initial forward slash is optional;

@@ -85,4 +85,4 @@ It is not possible to copy certain system files such as resources under

 Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive.

 The command extracts the content of the tar to the `DEST_PATH` in container's

 filesystem. In this case, `DEST_PATH` must specify a directory. Using `-` as

-`DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.

+the `DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.

@@ -37,7 +37,7 @@ Docker networks report the following events:

 The `--since` and `--until` parameters can be Unix timestamps, date formatted

 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed

-relative to the client machine’s time. If you do not provide the --since option,

+relative to the client machine’s time. If you do not provide the `--since` option,

 the command returns only new and/or live events.  Supported formats for date

 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,

 `2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local

@@ -47,7 +47,7 @@ Import to docker via pipe and `STDIN`.

     $ cat exampleimage.tgz | docker import - exampleimagelocal:new

-Import with a commit message

+Import with a commit message.

     $ cat exampleimage.tgz | docker import --message "New image imported from tarball" - exampleimagelocal:new

@@ -94,7 +94,7 @@ NETWORK ID          NAME                DRIVER

 You can also filter for a substring in a name as this shows:

 ```bash

-$ docker ps --filter name=foo

+$ docker network ls --filter name=foo

 NETWORK ID          NAME                DRIVER

 95e74588f40d        foo                 bridge

 06e7eef0a170        foobar              bridge

@@ -104,8 +104,8 @@ NETWORK ID          NAME                DRIVER

 The `id` filter matches on all or part of a network's ID.

-The following filter matches all networks with a name containing the

-`06e7eef01700` string.

+The following filter matches all networks with an ID containing the

+`63d1ff1f77b0...` string.

 ```bash

 $ docker network ls --filter id=63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161

@@ -113,14 +113,14 @@ NETWORK ID          NAME                DRIVER

 63d1ff1f77b0        dev                 bridge

 ```

-You can also filter for a substring in a ID as this shows:

+You can also filter for a substring in an ID as this shows:

 ```bash

-$ docker ps --filter id=95e74588f40d

+$ docker network ls --filter id=95e74588f40d

 NETWORK ID          NAME                DRIVER

 95e74588f40d        foo                 bridge

-$ docker ps --filter id=95e

+$ docker network ls --filter id=95e

 NETWORK ID          NAME                DRIVER

 95e74588f40d        foo                 bridge

 ```

@@ -25,7 +25,7 @@ To remove the network named 'my-network':

 ```

 To delete multiple networks in a single `docker network rm` command, provide

-multiple network names or id's. The following example deletes a network with id

+multiple network names or ids. The following example deletes a network with id

 `3695c422697f` and a network named `my-network`:

 ```bash

@@ -57,6 +57,8 @@ The currently supported filters are:

 * exited (int - the code of exited containers. Only useful with `--all`)

 * status (created|restarting|running|paused|exited|dead)

 * ancestor (`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`) - filters containers that were created from the given image or a descendant.

+* before (container's id or name) - filters containers created before given id or name

+* since (container's id or name) - filters containers created since given id or name

 * isolation (default|process|hyperv)   (Windows daemon only)

@@ -163,6 +165,34 @@ in it's layer stack.

     CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES

     82a598284012        ubuntu:12.04.5      "top"               3 minutes ago        Up 3 minutes                            sleepy_bose

+#### Before

+

+The `before` filter shows only containers created before the container with given id or name. For example, 

+having these containers created:

+

+    $ docker ps

+    CONTAINER ID        IMAGE       COMMAND       CREATED              STATUS              PORTS              NAMES

+    9c3527ed70ce        busybox     "top"         14 seconds ago       Up 15 seconds                          desperate_dubinsky

+    4aace5031105        busybox     "top"         48 seconds ago       Up 49 seconds                          focused_hamilton

+    6e63f6ff38b0        busybox     "top"         About a minute ago   Up About a minute                      distracted_fermat

+

+Filtering with `before` would give:

+

+    $ docker ps -f before=9c3527ed70ce

+    CONTAINER ID        IMAGE       COMMAND       CREATED              STATUS              PORTS              NAMES

+    4aace5031105        busybox     "top"         About a minute ago   Up About a minute                      focused_hamilton

+    6e63f6ff38b0        busybox     "top"         About a minute ago   Up About a minute                      distracted_fermat

+

+#### Since

+

+The `since` filter shows only containers created since the container with given id or name. For example,

+with the same containers as in `before` filter:

+

+    $ docker ps -f since=6e63f6ff38b0

+    CONTAINER ID        IMAGE       COMMAND       CREATED             STATUS              PORTS               NAMES

+    9c3527ed70ce        busybox     "top"         10 minutes ago      Up 10 minutes                           desperate_dubinsky

+    4aace5031105        busybox     "top"         10 minutes ago      Up 10 minutes                           focused_hamilton

+

 ## Formatting

@@ -46,15 +46,15 @@ This command will delete all stopped containers. The command

 the `rm` command which will delete them. Any running containers will not be

 deleted.

-  $ docker rm -v redis

-  redis

+    $ docker rm -v redis

+    redis

 This command will remove the container and any volumes associated with it.

 Note that if a volume was specified with a name, it will not be removed.

-  $ docker create -v awesome:/foo -v /bar --name hello redis

-  hello

-  $ docker rm -v hello

+    $ docker create -v awesome:/foo -v /bar --name hello redis

+    hello

+    $ docker rm -v hello

 In this example, the volume for `/foo` will remain intact, but the volume for

 `/bar` will be removed. The same behavior holds for volumes inherited with

@@ -326,17 +326,17 @@ Guide.

 ### Connect a container to a network (--net)

 When you start a container use the `--net` flag to connect it to a network.

-This adds the `busybox` container to the `mynet` network.

+This adds the `busybox` container to the `my-net` network.

 ```bash

-$ docker run -itd --net=my-multihost-network busybox

+$ docker run -itd --net=my-net busybox

 ```

 You can also choose the IP addresses for the container with `--ip` and `--ip6`

 flags when you start the container on a user-defined network.

 ```bash

-$ docker run -itd --net=my-multihost-network --ip=10.10.9.75 busybox

+$ docker run -itd --net=my-net --ip=10.10.9.75 busybox

 ```

 If you want to add a running container to a network use the `docker network connect` subcommand.

@@ -19,9 +19,11 @@ feature to restrict your application's access.

 This feature is available only if the kernel is configured with `CONFIG_SECCOMP`

 enabled.

-> **Note**: On Ubuntu 14.04, Debian Wheezy, and Debian Jessie, you must download

-> the [latest static Docker Linux binary](../installation/binaries.md) to use

-> seccomp.

+> **Note**: Seccomp profiles require seccomp 2.2.1 and are only

+> available starting with Debian 9 "Stretch", Ubuntu 15.10 "Wily", and

+> Fedora 22. To use this feature on Ubuntu 14.04, Debian Wheezy, or

+> Debian Jessie, you must download the [latest static Docker Linux binary](../installation/binaries.md).

+> This feature is currently *not* available on other distributions.

 ## Passing a profile for a container

@@ -16,7 +16,7 @@ user-defined networks works differently compared to the containers connected

 to `default bridge` network.

 > **Note**: In order to maintain backward compatibility, the DNS configuration

-> in `default bridge` network is retained with no behaviorial change.

+> in `default bridge` network is retained with no behavioral change.

 > Please refer to the [DNS in default bridge network](default_network/configure-dns.md)

 > for more information on DNS configuration in the `default bridge` network.

@@ -61,7 +61,7 @@ Four different options affect container domain name services.

       Using this option as you <code>run</code> a container gives the new

       container's <code>/etc/hosts</code> an extra entry named

       <code>ALIAS</code> that points to the IP address of the container

-      identified by <code>CONTAINER_NAME_or_ID<c/ode>. This lets processes

+      identified by <code>CONTAINER_NAME_or_ID</code>. This lets processes

       inside the new container connect to the hostname <code>ALIAS</code>

       without having to know its IP.  The <code>--link=</code> option is

       discussed in more detail below. Because Docker may assign a different IP

@@ -86,16 +86,17 @@ lo        Link encap:Local Loopback

 The `host` network adds a container on the hosts network stack. You'll find the

 network configuration inside the container is identical to the host.

-With the exception of the the `bridge` network, you really don't need to

+With the exception of the `bridge` network, you really don't need to

 interact with these default networks. While you can list and inspect them, you

 cannot remove them. They are required by your Docker installation. However, you

 can add your own user-defined networks and these you can remove when you no

 longer need them. Before you learn more about creating your own networks, it is

-worth looking at the `default` network a bit.

+worth looking at the default `bridge` network a bit.

 ### The default bridge network in detail

-The default bridge network is present on all Docker hosts. The `docker network inspect`

+The default `bridge` network is present on all Docker hosts. The `docker network inspect` 

+command returns information about a network:

 ```

 $ docker network inspect bridge

@@ -279,7 +280,7 @@ ff02::1	ip6-allnodes

 ff02::2	ip6-allrouters

 ```

-The default `docker0` bridge network supports the use of port mapping and  `docker run --link` to allow communications between containers in the `docker0` network. These techniques are cumbersome to set up and prone to error. While they are still available to you as techniques, it is better to avoid them and define your own bridge networks instead.

+The default `docker0` bridge network supports the use of port mapping and `docker run --link` to allow communications between containers in the `docker0` network. These techniques are cumbersome to set up and prone to error. While they are still available to you as techniques, it is better to avoid them and define your own bridge networks instead.

 ## User-defined networks

@@ -483,7 +484,7 @@ built-in network drivers. For example:

     $ docker network create --driver weave mynet

-You can inspect it, add containers too and from it, and so forth. Of course,

+You can inspect it, add containers to and from it, and so forth. Of course,

 different plugins may make use of different technologies or frameworks. Custom

 networks can include features not present in Docker's default networks. For more

 information on writing plugins, see [Extending Docker](../../extend/index.md) and

@@ -110,7 +110,7 @@ single 8GB general purpose SSD EBS volume. The Docker data directory

     centos              latest              c8a648134623        4 weeks ago         196.6 MB

     ubuntu              15.04               c8be1ac8145a        7 weeks ago         131.3 MB

-    $ du -hs /var/lib/docker

+    $ sudo du -hs /var/lib/docker

     2.0G    /var/lib/docker

     $ time docker run --rm -v /var/lib/docker:/var/lib/docker docker/v1.10-migrator

@@ -275,12 +275,12 @@ image that you just pulled, make a change to it, and build a new image based on

 command.

 1. In an empty directory, create a simple `Dockerfile` that starts with the 

-2. ubuntu:15.04 image.

+   ubuntu:15.04 image.

         FROM ubuntu:15.04

 2. Add a new file called "newfile" in the image's `/tmp` directory with the 

-3. text "Hello world" in it.

+   text "Hello world" in it.

     When you are done, the `Dockerfile` contains two lines:

@@ -291,7 +291,7 @@ command.

 3. Save and close the file.

 4. From a terminal in the same folder as your `Dockerfile`, run the following 

-5. command:

+   command:

         $ docker build -t changed-ubuntu .

         Sending build context to Docker daemon 2.048 kB

@@ -310,14 +310,14 @@ command.

     The output above shows a new image with image ID `94e6b7d2c720`.

 5. Run the `docker images` command to verify the new `changed-ubuntu` image is 

-6. in the Docker host's local storage area.

+   in the Docker host's local storage area.

         REPOSITORY       TAG      IMAGE ID       CREATED           SIZE

         changed-ubuntu   latest   03b964f68d06   33 seconds ago    131.4 MB

         ubuntu           15.04    013f3d01d247   6 weeks ago       131.3 MB

 6. Run the `docker history` command to see which image layers were used to 

-7. create the new `changed-ubuntu` image.

+   create the new `changed-ubuntu` image.

         $ docker history changed-ubuntu

         IMAGE               CREATED              CREATED BY                                      SIZE        COMMENT

@@ -47,6 +47,7 @@ the running containers.

       .Ports - Exposed ports.

       .Status - Container status.

       .Size - Container disk size.

+      .Names - Container names.

       .Labels - All labels assigned to the container.

       .Label - Value of a specific label for this container. For example `{{.Label "com.docker.swarm.cpu"}}`