Move the doc paths to match other repos

In order to build in the Infra system, we'd like to be able to reuse the existing doc build macros. To support that, move docs/source to doc/source and docs/html to doc/build/html. Change-Id: Ibd8e8e82e54c69b182120df67e6ec6908fed2908
2014-10-07 13:25:01 -07:00 · 2014-10-07 13:25:01 -07:00 · 0cbddea50d
commit 0cbddea50d
parent ebb983d3f2
31 changed files with 6 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,8 +8,8 @@
 .tox
 .stackenv
 accrc
-docs/files
-docs/html
+doc/files
+doc/build
 files/*.gz
 files/*.qcow2
 files/images
--- a/docs/source/assets/css/bootstrap.css
+++ b/docs/source/assets/css/bootstrap.css
--- a/docs/source/assets/css/local.css
+++ b/docs/source/assets/css/local.css
--- a/docs/source/assets/images/devstack.png
+++ b/docs/source/assets/images/devstack.png
--- a/docs/source/assets/images/header_bg.png
+++ b/docs/source/assets/images/header_bg.png
--- a/docs/source/assets/images/logo.png
+++ b/docs/source/assets/images/logo.png
--- a/docs/source/assets/images/quickstart.png
+++ b/docs/source/assets/images/quickstart.png
--- a/docs/source/assets/images/small_logo.png
+++ b/docs/source/assets/images/small_logo.png
--- a/docs/source/assets/js/bootstrap.js
+++ b/docs/source/assets/js/bootstrap.js
--- a/docs/source/assets/js/bootstrap.min.js
+++ b/docs/source/assets/js/bootstrap.min.js
--- a/docs/source/assets/js/jquery-1.7.1.min.js
+++ b/docs/source/assets/js/jquery-1.7.1.min.js
--- a/docs/source/changes.html
+++ b/docs/source/changes.html
--- a/docs/source/configuration.html
+++ b/docs/source/configuration.html
--- a/docs/source/contributing.html
+++ b/docs/source/contributing.html
--- a/docs/source/eucarc.html
+++ b/docs/source/eucarc.html
--- a/docs/source/exerciserc.html
+++ b/docs/source/exerciserc.html
--- a/docs/source/faq.html
+++ b/docs/source/faq.html
--- a/docs/source/guides/multinode-lab.html
+++ b/docs/source/guides/multinode-lab.html
--- a/docs/source/guides/pxe-boot.html
+++ b/docs/source/guides/pxe-boot.html
--- a/docs/source/guides/ramdisk.html
+++ b/docs/source/guides/ramdisk.html
--- a/docs/source/guides/single-machine.html
+++ b/docs/source/guides/single-machine.html
--- a/docs/source/guides/single-vm.html
+++ b/docs/source/guides/single-vm.html
--- a/docs/source/guides/usb-boot.html
+++ b/docs/source/guides/usb-boot.html
--- a/docs/source/index.html
+++ b/docs/source/index.html
--- a/docs/source/local.conf.html
+++ b/docs/source/local.conf.html
--- a/docs/source/localrc.html
+++ b/docs/source/localrc.html
--- a/docs/source/openrc.html
+++ b/docs/source/openrc.html
--- a/docs/source/overview.html
+++ b/docs/source/overview.html
--- a/docs/source/plugins.html
+++ b/docs/source/plugins.html
--- a/docs/source/stackrc.html
+++ b/docs/source/stackrc.html
--- a/tools/build_docs.sh
+++ b/tools/build_docs.sh
@ -4,7 +4,7 @@
 #
 # - Install shocco if not found on PATH and INSTALL_SHOCCO is set
 # - Clone MASTER_REPO branch MASTER_BRANCH
-# - Re-creates ``docs/html`` directory from existing repo + new generated script docs
+# - Re-creates ``doc/build/html`` directory from existing repo + new generated script docs

 # Usage:
 ## build_docs.sh [-o <out-dir>] [-g] [master|<repo> [<branch>]]
@ -29,8 +29,8 @@ MASTER_BRANCH=${MASTER_BRANCH:-master}
 # http://devstack.org is a GitHub gh-pages site in the https://github.com/cloudbuilders/devtack.git repo
 GH_PAGES_REPO=git@github.com:cloudbuilders/devstack.git

-DOCS_SOURCE=docs/source
-HTML_BUILD=docs/html
+DOCS_SOURCE=doc/source
+HTML_BUILD=doc/build/html

 # Keep track of the devstack directory
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
@ -136,7 +136,7 @@ for f in $(find functions functions-common lib samples -type f -name \*); do
    mkdir -p $FQ_HTML_BUILD/`dirname $f`;
    $SHOCCO $f > $FQ_HTML_BUILD/$f.html
 done
-echo "$FILES" >docs/files
+echo "$FILES" >doc/files

 if [[ -n $GH_UPDATE ]]; then
    GH_ROOT=$(mktemp -d work-gh-XXXX)