diff --git a/docs/installation/linux/gentoolinux.md b/docs/installation/linux/gentoolinux.md index 3b33ee453b..e3777483d1 100644 --- a/docs/installation/linux/gentoolinux.md +++ b/docs/installation/linux/gentoolinux.md @@ -50,7 +50,7 @@ IRC channel on the Freenode network. | btrfs | |Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.| | contrib | Yes |Install additional contributed scripts and components.| | device-mapper | Yes |Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.| -| doc | |Add extra documentation (API, Javadoc, etc). It is recommended to enable per package instead of globally.| +| doc | |Add extra documentation, such as API and Javadoc. It is recommended to enable per package instead of globally.| | vim-syntax | |Pulls in related vim syntax scripts.| | zsh-completion| |Enable zsh completion support.| diff --git a/docs/security/security.md b/docs/security/security.md index 2450f2bf7a..7a17f869f8 100644 --- a/docs/security/security.md +++ b/docs/security/security.md @@ -136,7 +136,7 @@ Finally, if you run Docker on a server, it is recommended to run exclusively Docker in the server, and move all other services within containers controlled by Docker. Of course, it is fine to keep your favorite admin tools (probably at least an SSH server), as well as -existing monitoring/supervision processes (e.g., NRPE, collectd, etc). +existing monitoring/supervision processes, such as NRPE and collectd. ## Linux kernel capabilities diff --git a/docs/userguide/eng-image/dockerfile_best-practices.md b/docs/userguide/eng-image/dockerfile_best-practices.md index b7463a07b9..7d1de9d92e 100644 --- a/docs/userguide/eng-image/dockerfile_best-practices.md +++ b/docs/userguide/eng-image/dockerfile_best-practices.md @@ -238,12 +238,12 @@ keep the image size down. Since the `RUN` statement starts with The `CMD` instruction should be used to run the software contained by your image, along with any arguments. `CMD` should almost always be used in the form of `CMD [“executable”, “param1”, “param2”…]`. Thus, if the image is for a -service (Apache, Rails, etc.), you would run something like +service, such as Apache and Rails, you would run something like `CMD ["apache2","-DFOREGROUND"]`. Indeed, this form of the instruction is recommended for any service-based image. -In most other cases, `CMD` should be given an interactive shell (bash, python, -perl, etc), for example, `CMD ["perl", "-de0"]`, `CMD ["python"]`, or +In most other cases, `CMD` should be given an interactive shell, such as bash, python +and perl. For example, `CMD ["perl", "-de0"]`, `CMD ["python"]`, or `CMD [“php”, “-a”]`. Using this form means that when you execute something like `docker run -it python`, you’ll get dropped into a usable shell, ready to go. `CMD` should rarely be used in the manner of `CMD [“param”, “param”]` in