瀏覽代碼

Merge pull request #6712 from SvenDowideit/pr_out_remove_superfluous_reptition_from_usingdocker_md

Remove superfluous reptition from usingdocker.md
James Turnbull 11 年之前
父節點
當前提交
debbb26291
共有 2 個文件被更改,包括 3 次插入8 次删除
  1. 1 1
      docs/sources/userguide/dockerlinks.md
  2. 2 7
      docs/sources/userguide/usingdocker.md

+ 1 - 1
docs/sources/userguide/dockerlinks.md

@@ -192,7 +192,7 @@ command to list the container's environment variables.
 > will scrub them when spawning shells for connection.
 > will scrub them when spawning shells for connection.
 
 
 We can see that Docker has created a series of environment variables with
 We can see that Docker has created a series of environment variables with
-useful information about our `db` container. Each variables is prefixed with
+useful information about our `db` container. Each variable is prefixed with
 `DB_` which is populated from the `alias` we specified above. If our `alias`
 `DB_` which is populated from the `alias` we specified above. If our `alias`
 were `db1` the variables would be prefixed with `DB1_`. You can use these
 were `db1` the variables would be prefixed with `DB1_`. You can use these
 environment variables to configure your applications to connect to the database
 environment variables to configure your applications to connect to the database

+ 2 - 7
docs/sources/userguide/usingdocker.md

@@ -87,11 +87,6 @@ This will display the help text and all available flags:
       --no-stdin=false: Do not attach stdin
       --no-stdin=false: Do not attach stdin
       --sig-proxy=true: Proxify all received signal to the process (even in non-tty mode)
       --sig-proxy=true: Proxify all received signal to the process (even in non-tty mode)
 
 
-
-None of the containers we've run did anything particularly useful
-though. So let's build on that experience by running an example web
-application in Docker.
-
 > **Note:** 
 > **Note:** 
 > You can see a full list of Docker's commands
 > You can see a full list of Docker's commands
 > [here](/reference/commandline/cli/).
 > [here](/reference/commandline/cli/).
@@ -140,8 +135,8 @@ command. This tells the `docker ps` command to return the details of the
 *last* container started.
 *last* container started.
 
 
 > **Note:** 
 > **Note:** 
-> The `docker ps` command only shows running containers. If you want to
-> see stopped containers too use the `-a` flag.
+> By default, the `docker ps` command only shows information about running
+> containers. If you want to see stopped containers too use the `-a` flag.
 
 
 We can see the same details we saw [when we first Dockerized a
 We can see the same details we saw [when we first Dockerized a
 container](/userguide/dockerizing) with one important addition in the `PORTS`
 container](/userguide/dockerizing) with one important addition in the `PORTS`