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/index.rst b/docs/sources/documentation/index.rst deleted file mode 100644 index 92efc113e0..0000000000 --- a/docs/sources/documentation/index.rst +++ /dev/null @@ -1,18 +0,0 @@ -:title: docker documentation -:description: docker documentation -:keywords: - -Documentation -============= - -This documentation has the following resources: - -.. toctree:: - :maxdepth: 1 - - concepts/index - installation/index - examples/index - contributing/index - commandline/index - faq \ No newline at end of file diff --git a/docs/sources/documentation/examples/hello_world.rst b/docs/sources/examples/hello_world.rst similarity index 100% rename from docs/sources/documentation/examples/hello_world.rst rename to docs/sources/examples/hello_world.rst diff --git a/docs/sources/documentation/examples/hello_world_daemon.rst b/docs/sources/examples/hello_world_daemon.rst similarity index 100% rename from docs/sources/documentation/examples/hello_world_daemon.rst rename to docs/sources/examples/hello_world_daemon.rst diff --git a/docs/sources/documentation/examples/index.rst b/docs/sources/examples/index.rst similarity index 100% rename from docs/sources/documentation/examples/index.rst rename to docs/sources/examples/index.rst diff --git a/docs/sources/documentation/examples/python_web_app.rst b/docs/sources/examples/python_web_app.rst similarity index 100% rename from docs/sources/documentation/examples/python_web_app.rst rename to docs/sources/examples/python_web_app.rst diff --git a/docs/sources/documentation/faq.rst b/docs/sources/faq.rst similarity index 100% rename from docs/sources/documentation/faq.rst rename to docs/sources/faq.rst diff --git a/docs/sources/gettingstarted.html b/docs/sources/gettingstarted/index.html similarity index 86% rename from docs/sources/gettingstarted.html rename to docs/sources/gettingstarted/index.html index 7d198629cd..48de374c1e 100644 --- a/docs/sources/gettingstarted.html +++ b/docs/sources/gettingstarted/index.html @@ -13,15 +13,15 @@ - - + + - + - - + + @@ -34,9 +34,9 @@
- +
@@ -99,7 +99,7 @@

Consider adding docker to your PATH for simplicity.

- Continue with the Hello world example. + Continue with the Hello world example. @@ -117,8 +117,8 @@ vagrant and an Ubuntu virtual machine.

@@ -180,7 +180,7 @@ - + - - @@ -36,9 +34,9 @@