Pārlūkot izejas kodu

Merge pull request #9657 from moxiegirl/9655

Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
James Turnbull 10 gadi atpakaļ
vecāks
revīzija
3e3749fe4b
1 mainītis faili ar 12 papildinājumiem un 9 dzēšanām
  1. 12 9
      docs/sources/contributing/devenvironment.md

+ 12 - 9
docs/sources/contributing/devenvironment.md

@@ -40,22 +40,25 @@ with the name of branch or revision number.
 
 
 ## Build the Environment
 ## Build the Environment
 
 
-This following command will build a development environment using the
-Dockerfile in the current directory. Essentially, it will install all
+This following command builds a development environment using the
+`Dockerfile` in the current directory. Essentially, it installs all
 the build and runtime dependencies necessary to build and test Docker.
 the build and runtime dependencies necessary to build and test Docker.
-This command will take some time to complete when you first execute it.
+Your first build will take some time to complete. On Linux systems:
 
 
     $ sudo make build
     $ sudo make build
+    
+On Mac OS X, from within the `boot2docker` shell:
+
+    $ make build
+
+> **Note**:
+> On Mac OS X, the Docker make targets such as `build`, `binary`, and `test`
+> should **not** be built by the 'root' user. Therefore, you shouldn't use `sudo` when 
+> running these commands on OS X. 
 
 
 If the build is successful, congratulations! You have produced a clean
 If the build is successful, congratulations! You have produced a clean
 build of docker, neatly encapsulated in a standard build environment.
 build of docker, neatly encapsulated in a standard build environment.
 
 
-> **Note**:
-> On Mac OS X, make targets such as `build`, `binary`, and `test`
-> must **not** be built under root. So, for example, instead of the above
-> command, issue:
-> 
->     $ make build
 
 
 ## Build the Docker Binary
 ## Build the Docker Binary