Browse code

fix typos, grammar, more concise wording

Signed-off-by: Liana Lo <liana.lixia@gmail.com>

Liana Lo authored on 2015/03/26 11:30:11
Showing 2 changed files
... ...
@@ -7,7 +7,7 @@ page_keywords: development, inception, container, image Dockerfile, dependencies
7 7
 In this section, you learn to develop like a member of Docker's core team.
8 8
 The `docker` repository includes a `Dockerfile` at its root. This file defines
9 9
 Docker's development environment.  The `Dockerfile` lists the environment's
10
-dependencies: system libraries and binaries, go environment, go dependencies,
10
+dependencies: system libraries and binaries, Go environment, Go dependencies,
11 11
 etc. 
12 12
 
13 13
 Docker's development environment is itself, ultimately a Docker container.
... ...
@@ -22,13 +22,12 @@ you continue working with your fork on this branch.
22 22
 
23 23
 ##  Clean your host of Docker artifacts
24 24
 
25
-Docker developers run the latest stable release of the Docker software; Or 
26
-Boot2docker and Docker if their machine is Mac OS X. They clean their local
25
+Docker developers run the latest stable release of the Docker software (with Boot2Docker if their machine is Mac OS X). They clean their local
27 26
 hosts of unnecessary Docker artifacts such as stopped containers or unused
28
-images. Cleaning unnecessary artifacts isn't strictly necessary but it is
27
+images. Cleaning unnecessary artifacts isn't strictly necessary, but it is
29 28
 good practice, so it is included here.
30 29
 
31
-To remove unnecessary artifacts.
30
+To remove unnecessary artifacts,
32 31
 
33 32
 1. Verify that you have no unnecessary containers running on your host.
34 33
 
... ...
@@ -75,7 +74,7 @@ To remove unnecessary artifacts.
75 75
 
76 76
         $ docker rmi -f $(docker images -q -a -f dangling=true)
77 77
 
78
-    This command uses `docker images` to lists all images (`-a` flag) by numeric
78
+    This command uses `docker images` to list all images (`-a` flag) by numeric
79 79
     IDs (`-q` flag) and filter them to find dangling images (`-f
80 80
     dangling=true`). Then, the `docker rmi` command forcibly (`-f` flag) removes
81 81
     the resulting list. To remove just one image, use the `docker rmi ID`
... ...
@@ -100,13 +99,13 @@ environment.
100 100
         
101 101
 	If you are following along with this guide, you created a `dry-run-test`
102 102
 	branch when you <a href="/project/set-up-git" target="_blank"> set up Git for
103
-	contributing</a>
103
+	contributing</a>.
104 104
 
105 105
 4. Ensure you are on your `dry-run-test` branch.
106 106
 
107 107
         $ git checkout dry-run-test
108 108
         
109
-    If you get a message that the branch doesn't exist, add the `-b` flag so the
109
+    If you get a message that the branch doesn't exist, add the `-b` flag (git checkout -b dry-run-test) so the
110 110
     command both creates the branch and checks it out.
111 111
 
112 112
 5. Compile your development environment container into an image.
... ...
@@ -201,7 +200,7 @@ build and run a `docker` binary in your container.
201 201
 
202 202
     ![Multiple terminals](/project/images/three_terms.png)
203 203
 
204
-    Mac OSX users, make sure you run `eval "$(boot2docker shellinit)"` in any new 
204
+    Mac OS X users, make sure you run `eval "$(boot2docker shellinit)"` in any new
205 205
     terminals.
206 206
 
207 207
 2. In a terminal, create a new container from your `dry-run-test` image.
... ...
@@ -212,7 +211,7 @@ build and run a `docker` binary in your container.
212 212
     The command creates a container from your `dry-run-test` image. It opens an
213 213
     interactive terminal (`-ti`) running a `/bin/bash shell`.  The
214 214
     `--privileged` flag gives the container access to kernel features and device
215
-    access. It is this flag that allows you to run a container in a container.
215
+    access. This flag allows you to run a container in a container.
216 216
     Finally, the `-rm` flag instructs Docker to remove the container when you
217 217
     exit the `/bin/bash` shell.
218 218
 
... ...
@@ -282,7 +281,7 @@ with the `make.sh` script.
282 282
 
283 283
         root@5f8630b873fe:/go/src/github.com/docker/docker#  docker -dD
284 284
 
285
-    The `-dD` flag starts the daemon in debug mode; You'll find this useful
285
+    The `-dD` flag starts the daemon in debug mode. You'll find this useful
286 286
     when debugging your code.
287 287
 
288 288
 9. Bring up one of the terminals on your local host.
... ...
@@ -365,7 +364,7 @@ container.
365 365
 
366 366
     Your location will be different because it reflects your environment. 
367 367
 
368
-3. Create a container using `dry-run-test` but this time mount your repository
368
+3. Create a container using `dry-run-test`, but this time, mount your repository
369 369
 onto the `/go` directory inside the container.
370 370
 
371 371
         $  docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/docker/docker dry-run-test /bin/bash
... ...
@@ -384,7 +383,7 @@ onto the `/go` directory inside the container.
384 384
 
385 385
         $ cd ~/repos/docker-fork/
386 386
 
387
-6. Create a fresh binary but this time use the `make` command.
387
+6. Create a fresh binary, but this time, use the `make` command.
388 388
 
389 389
         $ make BINDDIR=. binary
390 390
 
... ...
@@ -134,12 +134,12 @@ To configure your username, email, and add a remote:
134 134
 
135 135
 ## Create and push a branch
136 136
 
137
-As you change code in your fork, you make your changes on a repository branch.
137
+As you change code in your fork, make your changes on a repository branch.
138 138
 The branch name should reflect what you are working on. In this section, you
139 139
 create a branch, make a change, and push it up to your fork. 
140 140
 
141 141
 This branch is just for testing your config for this guide. The changes are part
142
-of a dry run so the branch name is going to be dry-run-test. To create an push
142
+of a dry run, so the branch name will be dry-run-test. To create and push
143 143
 the branch to your fork on GitHub:
144 144
 
145 145
 1. Open a terminal and go to the root of your `docker-fork`.