Browse code

The etc and dot is seprated

Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>

YuPengZTE authored on 2016/09/02 17:11:07
Showing 3 changed files
... ...
@@ -50,7 +50,7 @@ IRC channel on the Freenode network.
50 50
 | btrfs         |         |Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.|
51 51
 | contrib       |  Yes    |Install additional contributed scripts and components.|
52 52
 | device-mapper |  Yes    |Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.|
53
-| doc           |         |Add extra documentation (API, Javadoc, etc). It is recommended to enable per package instead of globally.|
53
+| doc           |         |Add extra documentation, such as API and Javadoc. It is recommended to enable per package instead of globally.|
54 54
 | vim-syntax    |         |Pulls in related vim syntax scripts.|
55 55
 | zsh-completion|         |Enable zsh completion support.|
56 56
 
... ...
@@ -136,7 +136,7 @@ Finally, if you run Docker on a server, it is recommended to run
136 136
 exclusively Docker in the server, and move all other services within
137 137
 containers controlled by Docker. Of course, it is fine to keep your
138 138
 favorite admin tools (probably at least an SSH server), as well as
139
-existing monitoring/supervision processes (e.g., NRPE, collectd, etc).
139
+existing monitoring/supervision processes, such as NRPE and collectd.
140 140
 
141 141
 ## Linux kernel capabilities
142 142
 
... ...
@@ -238,12 +238,12 @@ keep the image size down. Since the `RUN` statement starts with
238 238
 The `CMD` instruction should be used to run the software contained by your
239 239
 image, along with any arguments. `CMD` should almost always be used in the
240 240
 form of `CMD [“executable”, “param1”, “param2”…]`. Thus, if the image is for a
241
-service (Apache, Rails, etc.), you would run something like
241
+service, such as Apache and Rails, you would run something like
242 242
 `CMD ["apache2","-DFOREGROUND"]`. Indeed, this form of the instruction is
243 243
 recommended for any service-based image.
244 244
 
245
-In most other cases, `CMD` should be given an interactive shell (bash, python,
246
-perl, etc), for example, `CMD ["perl", "-de0"]`, `CMD ["python"]`, or
245
+In most other cases, `CMD` should be given an interactive shell, such as bash, python
246
+and perl. For example, `CMD ["perl", "-de0"]`, `CMD ["python"]`, or
247 247
 `CMD [“php”, “-a”]`. Using this form means that when you execute something like
248 248
 `docker run -it python`, you’ll get dropped into a usable shell, ready to go.
249 249
 `CMD` should rarely be used in the manner of `CMD [“param”, “param”]` in