Browse code

Fix some flaws in man.

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

Jian Zhang authored on 2016/02/25 10:48:21
Showing 6 changed files
... ...
@@ -20,7 +20,7 @@ You can copy from the container's file system to the local machine or the
20 20
 reverse, from the local filesystem to the container. If `-` is specified for
21 21
 either the `SRC_PATH` or `DEST_PATH`, you can also stream a tar archive from
22 22
 `STDIN` or to `STDOUT`. The `CONTAINER` can be a running or stopped container.
23
-The `SRC_PATH` or `DEST_PATH` be a file or directory.
23
+The `SRC_PATH` or `DEST_PATH` can be a file or directory.
24 24
 
25 25
 The `docker cp` command assumes container paths are relative to the container's 
26 26
 `/` (root) directory. This means supplying the initial forward slash is optional; 
... ...
@@ -82,7 +82,7 @@ It is not possible to copy certain system files such as resources under
82 82
 Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive.
83 83
 The command extracts the content of the tar to the `DEST_PATH` in container's
84 84
 filesystem. In this case, `DEST_PATH` must specify a directory. Using `-` as
85
-`DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.
85
+the `DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.
86 86
 
87 87
 # OPTIONS
88 88
 **-L**, **--follow-link**=*true*|*false*
... ...
@@ -39,7 +39,7 @@ and Docker images will report:
39 39
 
40 40
 The `--since` and `--until` parameters can be Unix timestamps, date formatted
41 41
 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
42
-relative to the client machine’s time. If you do not provide the --since option,
42
+relative to the client machine’s time. If you do not provide the `--since` option,
43 43
 the command returns only new and/or live events.  Supported formats for date
44 44
 formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
45 45
 `2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
... ...
@@ -39,7 +39,7 @@ Import to docker via pipe and stdin:
39 39
 
40 40
     # cat exampleimage.tgz | docker import - example/imagelocal
41 41
 
42
-Import with a commit message 
42
+Import with a commit message. 
43 43
 
44 44
     # cat exampleimage.tgz | docker import --message "New image imported from tarball" - exampleimagelocal:new
45 45
 
... ...
@@ -89,7 +89,7 @@ NETWORK ID          NAME                DRIVER
89 89
 You can also filter for a substring in a name as this shows:
90 90
 
91 91
 ```bash
92
-$ docker ps --filter name=foo
92
+$ docker network ls --filter name=foo
93 93
 NETWORK ID          NAME                DRIVER
94 94
 95e74588f40d        foo                 bridge
95 95
 06e7eef0a170        foobar              bridge
... ...
@@ -99,8 +99,8 @@ NETWORK ID          NAME                DRIVER
99 99
 
100 100
 The `id` filter matches on all or part of a network's ID.
101 101
 
102
-The following filter matches all networks with a name containing the
103
-`06e7eef01700` string.
102
+The following filter matches all networks with an ID containing the
103
+`63d1ff1f77b0...` string.
104 104
 
105 105
 ```bash
106 106
 $ docker network ls --filter id=63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161
... ...
@@ -108,14 +108,14 @@ NETWORK ID          NAME                DRIVER
108 108
 63d1ff1f77b0        dev                 bridge
109 109
 ```
110 110
 
111
-You can also filter for a substring in a ID as this shows:
111
+You can also filter for a substring in an ID as this shows:
112 112
 
113 113
 ```bash
114
-$ docker ps --filter id=95e74588f40d
114
+$ docker network ls --filter id=95e74588f40d
115 115
 NETWORK ID          NAME                DRIVER
116 116
 95e74588f40d        foo                 bridge
117 117
 
118
-$ docker ps --filter id=95e
118
+$ docker network ls --filter id=95e
119 119
 NETWORK ID          NAME                DRIVER
120 120
 95e74588f40d        foo                 bridge
121 121
 ```
... ...
@@ -20,7 +20,7 @@ To remove the network named 'my-network':
20 20
 ```
21 21
 
22 22
 To delete multiple networks in a single `docker network rm` command, provide
23
-multiple network names or id's. The following example deletes a network with id
23
+multiple network names or ids. The following example deletes a network with id
24 24
 `3695c422697f` and a network named `my-network`:
25 25
 
26 26
 ```bash
... ...
@@ -50,15 +50,15 @@ command. The use that name as follows:
50 50
 
51 51
 ## Removing a container and all associated volumes
52 52
 
53
-  $ docker rm -v redis
54
-  redis
53
+    $ docker rm -v redis
54
+    redis
55 55
 
56 56
 This command will remove the container and any volumes associated with it.
57 57
 Note that if a volume was specified with a name, it will not be removed.
58 58
 
59
-  $ docker create -v awesome:/foo -v /bar --name hello redis
60
-  hello
61
-  $ docker rm -v hello
59
+    $ docker create -v awesome:/foo -v /bar --name hello redis
60
+    hello
61
+    $ docker rm -v hello
62 62
 
63 63
 In this example, the volume for `/foo` will remain in tact, but the volume for
64 64
 `/bar` will be removed. The same behavior holds for volumes inherited with