From 3b71336edcd3798a11ea8a2f9c94b012357b32c3 Mon Sep 17 00:00:00 2001 From: Thatcher Peskens Date: Wed, 27 Mar 2013 16:43:13 -0700 Subject: [PATCH] Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/ --- docs/Makefile | 2 +- .../commandline/basecommands.rst | 0 .../{documentation => }/commandline/cli.rst | 0 .../{documentation => }/commandline/index.rst | 0 .../concepts/containers.rst | 0 .../{documentation => }/concepts/index.rst | 0 .../contributing/contributing.rst | 0 .../contributing/devenvironment.rst | 0 .../contributing/index.rst | 0 docs/sources/documentation/index.rst | 18 -- .../examples/hello_world.rst | 0 .../examples/hello_world_daemon.rst | 0 .../{documentation => }/examples/index.rst | 0 .../examples/python_web_app.rst | 0 docs/sources/{documentation => }/faq.rst | 0 docs/sources/gettingstarted.html | 8 +- docs/sources/index.html | 4 +- docs/sources/index.rst | 24 +- docs/sources/index_orig.html | 245 ------------------ .../installation/amazon.rst | 0 .../installation/images/win/_01.gif | Bin .../installation/images/win/_02.gif | Bin .../installation/images/win/_06.gif | Bin .../installation/images/win/cygwin.gif | Bin .../installation/images/win/putty.gif | Bin .../installation/images/win/putty_2.gif | Bin .../installation/images/win/run_02_.gif | Bin .../installation/images/win/run_03.gif | Bin .../installation/images/win/run_04.gif | Bin .../installation/images/win/ssh-config.gif | Bin .../installation/index.rst | 0 .../installation/macos.rst | 0 .../installation/ubuntulinux.rst | 0 .../installation/windows.rst | 0 docs/theme/docker/layout.html | 11 +- 35 files changed, 22 insertions(+), 290 deletions(-) rename docs/sources/{documentation => }/commandline/basecommands.rst (100%) rename docs/sources/{documentation => }/commandline/cli.rst (100%) rename docs/sources/{documentation => }/commandline/index.rst (100%) rename docs/sources/{documentation => }/concepts/containers.rst (100%) rename docs/sources/{documentation => }/concepts/index.rst (100%) rename docs/sources/{documentation => }/contributing/contributing.rst (100%) rename docs/sources/{documentation => }/contributing/devenvironment.rst (100%) rename docs/sources/{documentation => }/contributing/index.rst (100%) delete mode 100644 docs/sources/documentation/index.rst rename docs/sources/{documentation => }/examples/hello_world.rst (100%) rename docs/sources/{documentation => }/examples/hello_world_daemon.rst (100%) rename docs/sources/{documentation => }/examples/index.rst (100%) rename docs/sources/{documentation => }/examples/python_web_app.rst (100%) rename docs/sources/{documentation => }/faq.rst (100%) delete mode 100644 docs/sources/index_orig.html rename docs/sources/{documentation => }/installation/amazon.rst (100%) rename docs/sources/{documentation => }/installation/images/win/_01.gif (100%) rename docs/sources/{documentation => }/installation/images/win/_02.gif (100%) rename docs/sources/{documentation => }/installation/images/win/_06.gif (100%) rename docs/sources/{documentation => }/installation/images/win/cygwin.gif (100%) rename docs/sources/{documentation => }/installation/images/win/putty.gif (100%) rename docs/sources/{documentation => }/installation/images/win/putty_2.gif (100%) rename docs/sources/{documentation => }/installation/images/win/run_02_.gif (100%) rename docs/sources/{documentation => }/installation/images/win/run_03.gif (100%) rename docs/sources/{documentation => }/installation/images/win/run_04.gif (100%) rename docs/sources/{documentation => }/installation/images/win/ssh-config.gif (100%) rename docs/sources/{documentation => }/installation/index.rst (100%) rename docs/sources/{documentation => }/installation/macos.rst (100%) rename docs/sources/{documentation => }/installation/ubuntulinux.rst (100%) rename docs/sources/{documentation => }/installation/windows.rst (100%) diff --git a/docs/Makefile b/docs/Makefile index d7602ae826..29c40a6acd 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -45,7 +45,7 @@ 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 sources/dotcloud.yml $(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.html index 7d198629cd..4b94595027 100644 --- a/docs/sources/gettingstarted.html +++ b/docs/sources/gettingstarted.html @@ -36,7 +36,7 @@