@@ -59,18 +59,13 @@ site:

 connect:

 	@echo connecting dotcloud to www.docker.io website, make sure to use user 1

 	@cd _build/website/ ; \

-	dotcloud list ; \

-	dotcloud connect dockerwebsite

+	dotcloud connect dockerwebsite ;

+	dotcloud list

 push:

 	@cd _build/website/ ; \

 	dotcloud push

-github-deploy: docs

-	rm -fr github-deploy

-	git clone ssh://git@github.com/dotcloud/docker github-deploy

-	cd github-deploy && git checkout -f gh-pages && git rm -r * && rsync -avH ../_build/html/ ./ && touch .nojekyll && echo "docker.io" > CNAME && git add * && git commit -m "Updating docs"

-

 $(VERSIONS):

 	@echo "Hello world"

@@ -85,7 +85,7 @@ On top of being a runtime for LXC, Docker is the Registry client. It supports:

 5. Index returns true/false lettings registry know if it should proceed or error out

 6. Get the payload for all layers

-It’s possible to run docker pull https://<registry>/repositories/samalba/busybox. In this case, docker bypasses the Index. However the security is not guaranteed (in case Registry A is corrupted) because there won’t be any checksum checks.

+It’s possible to run docker pull \https://<registry>/repositories/samalba/busybox. In this case, docker bypasses the Index. However the security is not guaranteed (in case Registry A is corrupted) because there won’t be any checksum checks.

 Currently registry redirects to s3 urls for downloads, going forward all downloads need to be streamed through the registry. The Registry will then abstract the calls to S3 by a top-level class which implements sub-classes for S3 and local storage.

@@ -245,8 +245,8 @@ API (pushing repos foo/bar):

 The Index has two main purposes (along with its fancy social features):

 - Resolve short names (to avoid passing absolute URLs all the time)

-   - username/projectname -> https://registry.docker.io/users/<username>/repositories/<projectname>/

-   - team/projectname -> https://registry.docker.io/team/<team>/repositories/<projectname>/

+   - username/projectname -> \https://registry.docker.io/users/<username>/repositories/<projectname>/

+   - team/projectname -> \https://registry.docker.io/team/<team>/repositories/<projectname>/

 - Authenticate a user as a repos owner (for a central referenced repository)

 3.1 Without an Index

@@ -58,7 +58,7 @@ Use the new image we just created and create a new container with network port 5

 .. code-block:: bash

     docker logs $WEB_WORKER

-     * Running on http://0.0.0.0:5000/

+     * Running on \http://0.0.0.0:5000/

 view the logs for the new container using the WEB_WORKER variable, and if everything worked as planned you should see the line "Running on http://0.0.0.0:5000/" in the log output.

@@ -70,7 +70,7 @@ lookup the public-facing port which is NAT-ed store the private port used by the

 .. code-block:: bash

-    curl http://`hostname`:$WEB_PORT

+    curl \http://`hostname`:$WEB_PORT

       Hello world!

 access the web app using curl. If everything worked as planned you should see the line "Hello world!" inside of your console.

@@ -15,7 +15,7 @@ Most frequently asked questions.

 3. **Does Docker run on Mac OS X or Windows?**

-   Not at this time, Docker currently only runs on Linux, but you can use VirtualBox to run Docker in a virtual machine on your box, and get the best of both worlds. Check out the MacOSX_ and Windows_ intallation guides.

+   Not at this time, Docker currently only runs on Linux, but you can use VirtualBox to run Docker in a virtual machine on your box, and get the best of both worlds. Check out the MacOSX_ and Windows_ installation guides.

 4. **How do containers compare to virtual machines?**

@@ -35,8 +35,8 @@ Most frequently asked questions.

     * `Ask questions on Stackoverflow`_

     * `Join the conversation on Twitter`_

-    .. _Windows: ../documentation/installation/windows.html

-    .. _MacOSX: ../documentation/installation/macos.html

+    .. _Windows: ../installation/windows/

+    .. _MacOSX: ../installation/vagrant/

     .. _the repo: http://www.github.com/dotcloud/docker

     .. _IRC\: docker on freenode: irc://chat.freenode.net#docker

     .. _Github: http://www.github.com/dotcloud/docker

new file mode 100644

Binary files /dev/null and b/docs/theme/docker/static/img/hiring_graphic.png differ

@@ -127,6 +127,22 @@

                 <h4>Repeatability</h4>

                 <p>Because each container is isolated in its own filesystem, they behave the same regardless of where, when, and alongside what they run.</p>

             </section>

+            <section class="contentblock">

+                <div class="container">

+                <div class="span2" style="margin-left: 0" >

+                    <a href="http://dotcloud.theresumator.com/apply/mWjkD4/Software-Engineer.html" title="Job description"><img src="static/img/hiring_graphic.png" width="140px" style="margin-top: 25px"></a>

+                </div>

+                <div class="span4" style="margin-left: 0">

+                    <h4>Do you think it is cool to hack on docker? Join us!</h4>

+                    <ul>

+                        <li>Work on open source</li>

+                        <li>Program in Go</li>

+                    </ul>

+                    <a href="http://dotcloud.theresumator.com/apply/mWjkD4/Software-Engineer.html" title="Job description">read more</a>

+                </div>

+                </div>

+

+            </section>

         </div>

         <div class="span6">

             <section class="contentblock">