diff --git a/docs/Makefile b/docs/Makefile index d7602ae826..f74bf5705e 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -45,9 +45,9 @@ clean: docs: -rm -rf $(BUILDDIR)/* - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/html cp sources/index.html $(BUILDDIR)/html/ - cp sources/gettingstarted.html $(BUILDDIR)/html/ + cp -r sources/gettingstarted $(BUILDDIR)/html/ cp sources/dotcloud.yml $(BUILDDIR)/html/ cp sources/CNAME $(BUILDDIR)/html/ cp sources/.nojekyll $(BUILDDIR)/html/ diff --git a/docs/sources/documentation/commandline/basecommands.rst b/docs/sources/commandline/basecommands.rst similarity index 100% rename from docs/sources/documentation/commandline/basecommands.rst rename to docs/sources/commandline/basecommands.rst diff --git a/docs/sources/documentation/commandline/cli.rst b/docs/sources/commandline/cli.rst similarity index 100% rename from docs/sources/documentation/commandline/cli.rst rename to docs/sources/commandline/cli.rst diff --git a/docs/sources/documentation/commandline/index.rst b/docs/sources/commandline/index.rst similarity index 100% rename from docs/sources/documentation/commandline/index.rst rename to docs/sources/commandline/index.rst diff --git a/docs/sources/documentation/concepts/containers.rst b/docs/sources/concepts/containers.rst similarity index 100% rename from docs/sources/documentation/concepts/containers.rst rename to docs/sources/concepts/containers.rst diff --git a/docs/sources/documentation/concepts/index.rst b/docs/sources/concepts/index.rst similarity index 100% rename from docs/sources/documentation/concepts/index.rst rename to docs/sources/concepts/index.rst diff --git a/docs/sources/documentation/contributing/contributing.rst b/docs/sources/contributing/contributing.rst similarity index 100% rename from docs/sources/documentation/contributing/contributing.rst rename to docs/sources/contributing/contributing.rst diff --git a/docs/sources/documentation/contributing/devenvironment.rst b/docs/sources/contributing/devenvironment.rst similarity index 100% rename from docs/sources/documentation/contributing/devenvironment.rst rename to docs/sources/contributing/devenvironment.rst diff --git a/docs/sources/documentation/contributing/index.rst b/docs/sources/contributing/index.rst similarity index 100% rename from docs/sources/documentation/contributing/index.rst rename to docs/sources/contributing/index.rst diff --git a/docs/sources/documentation/examples/hello_world.rst b/docs/sources/documentation/examples/hello_world.rst deleted file mode 100644 index 910bc1f366..0000000000 --- a/docs/sources/documentation/examples/hello_world.rst +++ /dev/null @@ -1,34 +0,0 @@ -:title: Hello world example -:description: A simple hello world example with Docker -:keywords: docker, example, hello world - -.. _hello_world: - -Hello World -=========== -This is the most basic example available for using docker - -This example assumes you have Docker installed and it will download the busybox image and then use that image to run a simple echo command, that will echo hello world back to the console over standard out. - -.. code-block:: bash - - $ docker run busybox /bin/echo hello world - -**Explanation:** - -- **"docker run"** run a command in a new container -- **"busybox"** is the image we want to run the command inside of. -- **"/bin/echo"** is the command we want to run in the container -- **"hello world"** is the input for the echo command - -**Video:** - -See the example in action - -.. raw:: html - -
Consider adding docker to your PATH
for simplicity.