Browse code

Fix some flaws in docs

Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>

Jian Zhang authored on 2016/02/17 12:54:45
Showing 7 changed files
... ...
@@ -31,7 +31,7 @@ volumes mounted inside the container.
31 31
 By default, the container being committed and its processes will be paused
32 32
 while the image is committed. This reduces the likelihood of encountering data
33 33
 corruption during the process of creating the commit.  If this behavior is
34
-undesired, set the 'p' option to false.
34
+undesired, set the `--pause` option to false.
35 35
 
36 36
 The `--change` option will apply `Dockerfile` instructions to the image that is
37 37
 created.  Supported `Dockerfile` instructions:
... ...
@@ -23,7 +23,7 @@ You can copy from the container's file system to the local machine or the
23 23
 reverse, from the local filesystem to the container. If `-` is specified for
24 24
 either the `SRC_PATH` or `DEST_PATH`, you can also stream a tar archive from
25 25
 `STDIN` or to `STDOUT`. The `CONTAINER` can be a running or stopped container.
26
-The `SRC_PATH` or `DEST_PATH` be a file or directory.
26
+The `SRC_PATH` or `DEST_PATH` can be a file or directory.
27 27
 
28 28
 The `docker cp` command assumes container paths are relative to the container's 
29 29
 `/` (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
85 85
 Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive.
86 86
 The command extracts the content of the tar to the `DEST_PATH` in container's
87 87
 filesystem. In this case, `DEST_PATH` must specify a directory. Using `-` as
88
-`DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.
88
+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:
37 37
 
38 38
 The `--since` and `--until` parameters can be Unix timestamps, date formatted
39 39
 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
40
-relative to the client machine’s time. If you do not provide the --since option,
40
+relative to the client machine’s time. If you do not provide the `--since` option,
41 41
 the command returns only new and/or live events.  Supported formats for date
42 42
 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
43 43
 `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`.
47 47
 
48 48
     $ cat exampleimage.tgz | docker import - exampleimagelocal:new
49 49
 
50
-Import with a commit message
50
+Import with a commit message.
51 51
 
52 52
     $ cat exampleimage.tgz | docker import --message "New image imported from tarball" - exampleimagelocal:new
53 53
 
... ...
@@ -94,7 +94,7 @@ NETWORK ID          NAME                DRIVER
94 94
 You can also filter for a substring in a name as this shows:
95 95
 
96 96
 ```bash
97
-$ docker ps --filter name=foo
97
+$ docker network ls --filter name=foo
98 98
 NETWORK ID          NAME                DRIVER
99 99
 95e74588f40d        foo                 bridge
100 100
 06e7eef0a170        foobar              bridge
... ...
@@ -104,8 +104,8 @@ NETWORK ID          NAME                DRIVER
104 104
 
105 105
 The `id` filter matches on all or part of a network's ID.
106 106
 
107
-The following filter matches all networks with a name containing the
108
-`06e7eef01700` string.
107
+The following filter matches all networks with an ID containing the
108
+`63d1ff1f77b0...` string.
109 109
 
110 110
 ```bash
111 111
 $ docker network ls --filter id=63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161
... ...
@@ -113,14 +113,14 @@ NETWORK ID          NAME                DRIVER
113 113
 63d1ff1f77b0        dev                 bridge
114 114
 ```
115 115
 
116
-You can also filter for a substring in a ID as this shows:
116
+You can also filter for a substring in an ID as this shows:
117 117
 
118 118
 ```bash
119
-$ docker ps --filter id=95e74588f40d
119
+$ docker network ls --filter id=95e74588f40d
120 120
 NETWORK ID          NAME                DRIVER
121 121
 95e74588f40d        foo                 bridge
122 122
 
123
-$ docker ps --filter id=95e
123
+$ docker network ls --filter id=95e
124 124
 NETWORK ID          NAME                DRIVER
125 125
 95e74588f40d        foo                 bridge
126 126
 ```
... ...
@@ -25,7 +25,7 @@ To remove the network named 'my-network':
25 25
 ```
26 26
 
27 27
 To delete multiple networks in a single `docker network rm` command, provide
28
-multiple network names or id's. The following example deletes a network with id
28
+multiple network names or ids. The following example deletes a network with id
29 29
 `3695c422697f` and a network named `my-network`:
30 30
 
31 31
 ```bash
... ...
@@ -46,15 +46,15 @@ This command will delete all stopped containers. The command
46 46
 the `rm` command which will delete them. Any running containers will not be
47 47
 deleted.
48 48
 
49
-  $ docker rm -v redis
50
-  redis
49
+    $ docker rm -v redis
50
+    redis
51 51
 
52 52
 This command will remove the container and any volumes associated with it.
53 53
 Note that if a volume was specified with a name, it will not be removed.
54 54
 
55
-  $ docker create -v awesome:/foo -v /bar --name hello redis
56
-  hello
57
-  $ docker rm -v hello
55
+    $ docker create -v awesome:/foo -v /bar --name hello redis
56
+    hello
57
+    $ docker rm -v hello
58 58
 
59 59
 In this example, the volume for `/foo` will remain intact, but the volume for
60 60
 `/bar` will be removed. The same behavior holds for volumes inherited with