From 383a5bec4be33a2290c629c0501f435671962d76 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 7 Oct 2016 06:00:11 +0900 Subject: [PATCH] Reorganize directory structure Currently for both upstream-training and training-guide directory slides are stored in the subdirectories of landing web pages. It is not easy to capture the directory structure and this requires Sphinx conf file to have unnecessary excluded entries. This commits reorganizes each directory to the following structure. It follows the convention in the documentation project. doc/upstream-training: (previous) +-- README.rst +-- website RST files +-- conf.py (for website) +-- build/ +-- source/ +-- slide RST files +-- conf.py (for slides) +-- _assets/ +-- _static/ +-- locale/ (new) +-- README.rst +-- build/ +-- source/ +-- website/ | +-- website RST files | +-- conf.py (for website) | +-- _assets/ +-- slides/ | +-- slide RST files | +-- conf.py (for slides) | +-- _assets/ | +-- _static/ +-- locales/ training-guide directory is reorganized similarly. training-guide _assets/README has been removed as it is used. Also updates tox.ini to share target command definitions. We do not need to have same things in many places. Note that this commit does not change the build document paths. Change-Id: I5a21f170c06d8f71f1f2d0df354e6d6280cb29d0 --- doc/training-guides/_assets/README | 1 - .../slides}/01-getting-started.rst | 10 +++--- .../slides}/02-getting-started-quiz.rst | 4 +-- .../slides}/03-using-with-horizon.rst | 14 ++++---- .../slides}/04-using-with-cli.rst | 2 +- .../slides}/06-compute-node-quiz.rst | 4 +-- .../slides}/07-associate-network-node.rst | 6 ++-- .../{ => source/slides}/_static/custom.css | 0 .../slides}/_static/os_logo_small.png | Bin .../{ => source/slides}/_static/screen.css | 0 .../slides}/compute-overview.rst | 2 +- .../slides}/conf.py | 6 ++-- .../slides}/figures/Check_mark_23x20_02.svg | 0 .../{ => source/slides}/figures/README.md | 0 .../figures/arch-havana-logical-v1.jpg | Bin .../slides}/figures/community-heartbeats.png | Bin .../slides}/figures/conceptual-arch.jpg | Bin .../slides}/figures/horizon-actions.png | Bin .../slides}/figures/horizon-essex.jpg | Bin .../slides}/figures/horizon-instances.png | Bin .../figures/horizon-main-dashboard.png | Bin .../slides}/figures/horizon-secgroup-edit.png | Bin .../slides}/figures/horizon-secgroup-list.png | Bin .../{ => source/slides}/figures/image01.png | Bin .../{ => source/slides}/figures/image02.png | Bin .../{ => source/slides}/figures/image03.png | Bin .../{ => source/slides}/figures/image04.png | Bin .../{ => source/slides}/figures/image06.png | Bin .../{ => source/slides}/figures/image08.png | Bin .../{ => source/slides}/figures/image09.png | Bin .../{ => source/slides}/figures/image11.png | Bin .../{ => source/slides}/figures/image12.png | Bin .../{ => source/slides}/figures/image16.png | Bin .../{ => source/slides}/figures/image17.png | Bin .../{ => source/slides}/figures/image19.png | Bin .../{ => source/slides}/figures/image20.png | Bin .../{ => source/slides}/figures/image21.png | Bin .../{ => source/slides}/figures/image22.png | Bin .../{ => source/slides}/figures/image23.jpg | Bin .../{ => source/slides}/figures/image24.png | Bin .../{ => source/slides}/figures/image26.png | Bin .../{ => source/slides}/figures/image27.png | Bin .../{ => source/slides}/figures/image28.png | Bin .../{ => source/slides}/figures/image29.png | Bin .../{ => source/slides}/figures/image32.png | Bin .../{ => source/slides}/figures/image34.png | Bin .../{ => source/slides}/figures/image35.png | Bin .../{ => source/slides}/figures/image36.png | Bin .../{ => source/slides}/figures/image37.png | Bin .../{ => source/slides}/figures/image38.png | Bin .../{ => source/slides}/figures/image39.png | Bin .../{ => source/slides}/figures/image40.png | Bin .../{ => source/slides}/figures/image41.png | Bin .../{ => source/slides}/figures/image42.png | Bin .../{ => source/slides}/figures/image43.png | Bin .../{ => source/slides}/figures/image44.png | Bin .../{ => source/slides}/figures/image45.png | Bin .../{ => source/slides}/figures/image46.png | Bin .../{ => source/slides}/figures/image47.png | Bin .../{ => source/slides}/figures/image48.png | Bin .../slides}/figures/network-concept.png | Bin .../slides}/figures/network-connectivity.png | Bin .../openstack-training-example-image.png | Bin ...-training-remote-content-not-available.png | Bin .../slides}/figures/os_background.png | Bin .../slides}/notes/02-getting-started.rst | 0 .../slides}/notes/06-compute-node.rst | 0 .../slides}/slide-index.rst | 2 +- .../{ => source/website}/conf.py | 4 +-- .../{ => source/website}/index.rst | 0 .../{ => slides}/_assets/01-01-release.png | Bin .../_assets/02-01-relevant-actors.png | Bin .../_assets/02-02-company-snapshot.png | Bin .../_assets/02-02-relevance-metrics.png | Bin .../_assets/02-03-company-snapshot.png | Bin .../_assets/02-04-individual-snapshot.png | Bin .../_assets/02-05-module-contributors.png | Bin .../_assets/02-06-your-management.jpg | Bin .../_assets/02-07-activity-dashboard.png | Bin .../_assets/02-08-activity-metrics.png | Bin .../source/{ => slides}/_assets/03-01-TC1.png | Bin .../source/{ => slides}/_assets/03-01-TC2.png | Bin .../{ => slides}/_assets/03-02-IRCmeeting.png | Bin .../{ => slides}/_assets/04-01-lifecycle1.png | Bin .../{ => slides}/_assets/04-02-defcore.png | Bin .../{ => slides}/_assets/04-03-lifecycle.png | Bin .../{ => slides}/_assets/04-04-lifecycle.png | Bin .../{ => slides}/_assets/04-05-stackforge.png | Bin .../_assets/05-01-design-summit.png | Bin .../_assets/05-02-design-summit.png | Bin .../{ => slides}/_assets/05-03-etherpads.png | Bin .../{ => slides}/_assets/05-05-sessions.png | Bin .../_assets/06-01-irc-meetings.png | Bin .../_assets/06-02-irc-meetings-list.png | Bin .../_assets/06-03-meeting-agenda.png | Bin .../{ => slides}/_assets/06-04-meetbot.png | Bin .../{ => slides}/_assets/11-01-devstack.png | Bin .../_assets/11-03-http-localhost.png | Bin .../source/{ => slides}/_assets/11-04-git.png | Bin .../_assets/12-01-launchpad-net.png | Bin .../{ => slides}/_assets/12-02-review.png | Bin .../{ => slides}/_assets/12-03-signin.png | Bin .../_assets/12-04-no-agreement.png | Bin .../_assets/12-05-new-agreement.png | Bin .../_assets/12-06-individual-agreement.png | Bin .../_assets/12-07-signed-agreement.png | Bin .../_assets/12-join-openstack-org.png | Bin .../{ => slides}/_assets/13-01-launchpad.png | Bin .../{ => slides}/_assets/14-01-review.png | Bin .../_assets/14-02-gerrit-workflow.png | Bin .../_assets/14-03-upload-ssh-key.png | Bin .../{ => slides}/_assets/14-04-git-config.png | Bin .../{ => slides}/_assets/14-05-install.png | Bin .../{ => slides}/_assets/14-06-git-clone.png | Bin .../_assets/14-07-git-review-s.png | Bin .../_assets/14-08-git-checkout.png | Bin .../{ => slides}/_assets/14-09-unit-tests.png | Bin .../_assets/14-11-invite-reviewers.png | Bin .../_assets/14-13-git-commit-amend.png | Bin .../_assets/14-15-patchset-history.png | Bin .../_assets/14-17-patchset-diffs.png | Bin .../{ => slides}/_assets/15-01-inspired.png | Bin .../_assets/15-02-stable-branches.png | Bin .../_assets/15-03-branch-tags.png | Bin .../_assets/15-04-preparation.png | Bin .../{ => slides}/_assets/15-05-review.png | Bin .../_assets/16-01-review-unified.png | Bin .../_assets/16-03-inline-comments.png | Bin .../_assets/16-04-draft-inline-comments.png | Bin .../_assets/16-05-regular-reviewer.png | Bin .../_assets/16-06-core-reviewer.png | Bin .../{ => slides}/_assets/17-01-bad-two.png | Bin .../{ => slides}/_assets/17-02-bad-new.png | Bin .../{ => slides}/_assets/17-03-good.png | Bin .../_assets/17-04-commit-message.png | Bin .../{ => slides}/_assets/18-01-triggered.png | Bin .../{ => slides}/_assets/18-02-review.png | Bin .../_assets/18-03-error-report.png | Bin .../_assets/18-04-false-errors.png | Bin .../{ => slides}/_assets/18-05-recheck.png | Bin .../_assets/19-01-goodworkflow.png | Bin .../_assets/19-02-badworkflow.png | Bin .../{ => slides}/_assets/20-01-sprint.png | Bin .../{ => slides}/_assets/20-git-review.png | Bin .../{ => slides}/_assets/Lego_Austin.jpg | Bin .../_assets/big-tent-and-core-services.png | Bin .../_assets/etsi-nfv-arch-framework.png | Bin .../{ => slides}/_assets/os-software.png | Bin .../{ => slides}/_assets/os_background.png | Bin .../stackalytics-module-open-reviews.png | Bin .../source/{ => slides}/_static/custom.css | 0 .../source/{ => slides}/_static/custom.js | 0 .../{ => slides}/_static/os_logo_small.png | Bin .../source/{ => slides}/_static/screen.css | 0 ...rchive-training-agile-for-contributors.rst | 0 .../source/{ => slides}/branching-model.rst | 0 .../source/{ => slides}/code-devstack.rst | 0 .../source/{ => slides}/conf.py | 2 +- .../{ => slides}/howitsmade-design-summit.rst | 0 .../{ => slides}/howitsmade-irc-meetings.rst | 0 .../howitsmade-official-projects.rst | 0 .../{ => slides}/howitsmade-release-cycle.rst | 0 .../howitsmade-relevant-actors.rst | 0 .../howitsmade-technical-committee.rst | 0 .../{ => slides}/intro-introduction.rst | 0 .../intro-openstack-as-community.rst | 0 .../intro-openstack-as-software.rst | 0 .../source/{ => slides}/slide-index.rst | 0 .../{ => slides}/workflow-commit-message.rst | 0 .../source/{ => slides}/workflow-gerrit.rst | 0 .../{ => slides}/workflow-howtocontribute.rst | 0 .../source/{ => slides}/workflow-jenkins.rst | 0 .../{ => slides}/workflow-launchpad.rst | 0 .../{ => slides}/workflow-reviewing.rst | 0 .../workflow-setup-and-first-patch.rst | 0 ...workflow-training-contribution-process.rst | 0 .../_assets}/account-setup/1.png | Bin .../_assets}/account-setup/2.png | Bin .../_assets}/account-setup/3.png | Bin .../_assets}/account-setup/4.png | Bin .../tools => website/_assets}/irc/linux/1.png | Bin .../tools => website/_assets}/irc/linux/2.png | Bin .../tools => website/_assets}/irc/linux/3.png | Bin .../tools => website/_assets}/irc/linux/4.png | Bin .../tools => website/_assets}/irc/linux/5.png | Bin .../tools => website/_assets}/irc/macos/1.png | Bin .../tools => website/_assets}/irc/macos/2.png | Bin .../tools => website/_assets}/irc/macos/3.png | Bin .../tools => website/_assets}/irc/macos/4.png | Bin .../tools => website/_assets}/irc/macos/5.png | Bin .../{ => source/website}/accounts.rst | 10 +++--- .../{ => source/website}/conf.py | 4 +-- .../{ => source/website}/git.rst | 0 .../{ => source/website}/index.rst | 0 .../{ => source/website}/irc.rst | 20 +++++------ .../website}/upstream-archives.rst | 0 .../{ => source/website}/upstream-details.rst | 0 tools/buildlang.sh | 8 ++--- tox.ini | 31 +++++------------- 199 files changed, 57 insertions(+), 73 deletions(-) delete mode 100644 doc/training-guides/_assets/README rename doc/training-guides/{associate-guide => source/slides}/01-getting-started.rst (97%) rename doc/training-guides/{associate-guide => source/slides}/02-getting-started-quiz.rst (96%) rename doc/training-guides/{associate-guide => source/slides}/03-using-with-horizon.rst (96%) rename doc/training-guides/{associate-guide => source/slides}/04-using-with-cli.rst (99%) rename doc/training-guides/{associate-guide => source/slides}/06-compute-node-quiz.rst (97%) rename doc/training-guides/{associate-guide => source/slides}/07-associate-network-node.rst (98%) rename doc/training-guides/{ => source/slides}/_static/custom.css (100%) rename doc/training-guides/{ => source/slides}/_static/os_logo_small.png (100%) rename doc/training-guides/{ => source/slides}/_static/screen.css (100%) rename doc/training-guides/{associate-guide => source/slides}/compute-overview.rst (91%) rename doc/training-guides/{associate-guide => source/slides}/conf.py (98%) rename doc/training-guides/{ => source/slides}/figures/Check_mark_23x20_02.svg (100%) rename doc/training-guides/{ => source/slides}/figures/README.md (100%) rename doc/training-guides/{ => source/slides}/figures/arch-havana-logical-v1.jpg (100%) rename doc/training-guides/{ => source/slides}/figures/community-heartbeats.png (100%) rename doc/training-guides/{ => source/slides}/figures/conceptual-arch.jpg (100%) rename doc/training-guides/{ => source/slides}/figures/horizon-actions.png (100%) rename doc/training-guides/{ => source/slides}/figures/horizon-essex.jpg (100%) rename doc/training-guides/{ => source/slides}/figures/horizon-instances.png (100%) rename doc/training-guides/{ => source/slides}/figures/horizon-main-dashboard.png (100%) rename doc/training-guides/{ => source/slides}/figures/horizon-secgroup-edit.png (100%) rename doc/training-guides/{ => source/slides}/figures/horizon-secgroup-list.png (100%) rename doc/training-guides/{ => source/slides}/figures/image01.png (100%) rename doc/training-guides/{ => source/slides}/figures/image02.png (100%) rename doc/training-guides/{ => source/slides}/figures/image03.png (100%) rename doc/training-guides/{ => source/slides}/figures/image04.png (100%) rename doc/training-guides/{ => source/slides}/figures/image06.png (100%) rename doc/training-guides/{ => source/slides}/figures/image08.png (100%) rename doc/training-guides/{ => source/slides}/figures/image09.png (100%) rename doc/training-guides/{ => source/slides}/figures/image11.png (100%) rename doc/training-guides/{ => source/slides}/figures/image12.png (100%) rename doc/training-guides/{ => source/slides}/figures/image16.png (100%) rename doc/training-guides/{ => source/slides}/figures/image17.png (100%) rename doc/training-guides/{ => source/slides}/figures/image19.png (100%) rename doc/training-guides/{ => source/slides}/figures/image20.png (100%) rename doc/training-guides/{ => source/slides}/figures/image21.png (100%) rename doc/training-guides/{ => source/slides}/figures/image22.png (100%) rename doc/training-guides/{ => source/slides}/figures/image23.jpg (100%) rename doc/training-guides/{ => source/slides}/figures/image24.png (100%) rename doc/training-guides/{ => source/slides}/figures/image26.png (100%) rename doc/training-guides/{ => source/slides}/figures/image27.png (100%) rename doc/training-guides/{ => source/slides}/figures/image28.png (100%) rename doc/training-guides/{ => source/slides}/figures/image29.png (100%) rename doc/training-guides/{ => source/slides}/figures/image32.png (100%) rename doc/training-guides/{ => source/slides}/figures/image34.png (100%) rename doc/training-guides/{ => source/slides}/figures/image35.png (100%) rename doc/training-guides/{ => source/slides}/figures/image36.png (100%) rename doc/training-guides/{ => source/slides}/figures/image37.png (100%) rename doc/training-guides/{ => source/slides}/figures/image38.png (100%) rename doc/training-guides/{ => source/slides}/figures/image39.png (100%) rename doc/training-guides/{ => source/slides}/figures/image40.png (100%) rename doc/training-guides/{ => source/slides}/figures/image41.png (100%) rename doc/training-guides/{ => source/slides}/figures/image42.png (100%) rename doc/training-guides/{ => source/slides}/figures/image43.png (100%) rename doc/training-guides/{ => source/slides}/figures/image44.png (100%) rename doc/training-guides/{ => source/slides}/figures/image45.png (100%) rename doc/training-guides/{ => source/slides}/figures/image46.png (100%) rename doc/training-guides/{ => source/slides}/figures/image47.png (100%) rename doc/training-guides/{ => source/slides}/figures/image48.png (100%) rename doc/training-guides/{ => source/slides}/figures/network-concept.png (100%) rename doc/training-guides/{ => source/slides}/figures/network-connectivity.png (100%) rename doc/training-guides/{ => source/slides}/figures/openstack-training-example-image.png (100%) rename doc/training-guides/{ => source/slides}/figures/openstack-training-remote-content-not-available.png (100%) rename doc/training-guides/{ => source/slides}/figures/os_background.png (100%) rename doc/training-guides/{associate-guide => source/slides}/notes/02-getting-started.rst (100%) rename doc/training-guides/{associate-guide => source/slides}/notes/06-compute-node.rst (100%) rename doc/training-guides/{associate-guide => source/slides}/slide-index.rst (93%) rename doc/training-guides/{ => source/website}/conf.py (99%) rename doc/training-guides/{ => source/website}/index.rst (100%) rename doc/upstream-training/source/{ => slides}/_assets/01-01-release.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-01-relevant-actors.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-02-company-snapshot.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-02-relevance-metrics.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-03-company-snapshot.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-04-individual-snapshot.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-05-module-contributors.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-06-your-management.jpg (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-07-activity-dashboard.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/02-08-activity-metrics.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/03-01-TC1.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/03-01-TC2.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/03-02-IRCmeeting.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/04-01-lifecycle1.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/04-02-defcore.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/04-03-lifecycle.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/04-04-lifecycle.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/04-05-stackforge.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/05-01-design-summit.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/05-02-design-summit.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/05-03-etherpads.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/05-05-sessions.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/06-01-irc-meetings.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/06-02-irc-meetings-list.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/06-03-meeting-agenda.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/06-04-meetbot.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/11-01-devstack.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/11-03-http-localhost.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/11-04-git.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-01-launchpad-net.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-02-review.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-03-signin.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-04-no-agreement.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-05-new-agreement.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-06-individual-agreement.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-07-signed-agreement.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/12-join-openstack-org.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/13-01-launchpad.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-01-review.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-02-gerrit-workflow.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-03-upload-ssh-key.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-04-git-config.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-05-install.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-06-git-clone.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-07-git-review-s.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-08-git-checkout.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-09-unit-tests.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-11-invite-reviewers.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-13-git-commit-amend.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-15-patchset-history.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/14-17-patchset-diffs.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/15-01-inspired.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/15-02-stable-branches.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/15-03-branch-tags.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/15-04-preparation.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/15-05-review.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/16-01-review-unified.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/16-03-inline-comments.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/16-04-draft-inline-comments.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/16-05-regular-reviewer.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/16-06-core-reviewer.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/17-01-bad-two.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/17-02-bad-new.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/17-03-good.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/17-04-commit-message.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/18-01-triggered.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/18-02-review.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/18-03-error-report.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/18-04-false-errors.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/18-05-recheck.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/19-01-goodworkflow.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/19-02-badworkflow.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/20-01-sprint.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/20-git-review.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/Lego_Austin.jpg (100%) rename doc/upstream-training/source/{ => slides}/_assets/big-tent-and-core-services.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/etsi-nfv-arch-framework.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/os-software.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/os_background.png (100%) rename doc/upstream-training/source/{ => slides}/_assets/stackalytics-module-open-reviews.png (100%) rename doc/upstream-training/source/{ => slides}/_static/custom.css (100%) rename doc/upstream-training/source/{ => slides}/_static/custom.js (100%) rename doc/upstream-training/source/{ => slides}/_static/os_logo_small.png (100%) rename doc/upstream-training/source/{ => slides}/_static/screen.css (100%) rename doc/upstream-training/source/{ => slides}/archive-training-agile-for-contributors.rst (100%) rename doc/upstream-training/source/{ => slides}/branching-model.rst (100%) rename doc/upstream-training/source/{ => slides}/code-devstack.rst (100%) rename doc/upstream-training/source/{ => slides}/conf.py (99%) rename doc/upstream-training/source/{ => slides}/howitsmade-design-summit.rst (100%) rename doc/upstream-training/source/{ => slides}/howitsmade-irc-meetings.rst (100%) rename doc/upstream-training/source/{ => slides}/howitsmade-official-projects.rst (100%) rename doc/upstream-training/source/{ => slides}/howitsmade-release-cycle.rst (100%) rename doc/upstream-training/source/{ => slides}/howitsmade-relevant-actors.rst (100%) rename doc/upstream-training/source/{ => slides}/howitsmade-technical-committee.rst (100%) rename doc/upstream-training/source/{ => slides}/intro-introduction.rst (100%) rename doc/upstream-training/source/{ => slides}/intro-openstack-as-community.rst (100%) rename doc/upstream-training/source/{ => slides}/intro-openstack-as-software.rst (100%) rename doc/upstream-training/source/{ => slides}/slide-index.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-commit-message.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-gerrit.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-howtocontribute.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-jenkins.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-launchpad.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-reviewing.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-setup-and-first-patch.rst (100%) rename doc/upstream-training/source/{ => slides}/workflow-training-contribution-process.rst (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/account-setup/1.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/account-setup/2.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/account-setup/3.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/account-setup/4.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/linux/1.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/linux/2.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/linux/3.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/linux/4.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/linux/5.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/macos/1.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/macos/2.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/macos/3.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/macos/4.png (100%) rename doc/upstream-training/source/{_assets/tools => website/_assets}/irc/macos/5.png (100%) rename doc/upstream-training/{ => source/website}/accounts.rst (95%) rename doc/upstream-training/{ => source/website}/conf.py (99%) rename doc/upstream-training/{ => source/website}/git.rst (100%) rename doc/upstream-training/{ => source/website}/index.rst (100%) rename doc/upstream-training/{ => source/website}/irc.rst (91%) rename doc/upstream-training/{ => source/website}/upstream-archives.rst (100%) rename doc/upstream-training/{ => source/website}/upstream-details.rst (100%) diff --git a/doc/training-guides/_assets/README b/doc/training-guides/_assets/README deleted file mode 100644 index ea66d28e..00000000 --- a/doc/training-guides/_assets/README +++ /dev/null @@ -1 +0,0 @@ -dummy file holding directory diff --git a/doc/training-guides/associate-guide/01-getting-started.rst b/doc/training-guides/source/slides/01-getting-started.rst similarity index 97% rename from doc/training-guides/associate-guide/01-getting-started.rst rename to doc/training-guides/source/slides/01-getting-started.rst index b25baadd..9076cedb 100644 --- a/doc/training-guides/associate-guide/01-getting-started.rst +++ b/doc/training-guides/source/slides/01-getting-started.rst @@ -2,7 +2,7 @@ Getting started =============== -.. figure:: ../figures/os_background.png +.. figure:: figures/os_background.png :class: fill :width: 100% @@ -59,7 +59,7 @@ Release Cycle - Made of four major stages: Planning, Implementation, Pre-release, Release -.. image:: ../figures/community-heartbeats.png +.. image:: figures/community-heartbeats.png *Community Heartbeat* @@ -111,7 +111,7 @@ Conceptual Architecture Conceptual Architecture (cont) ============================== -.. image:: ../figures/conceptual-arch.jpg +.. image:: figures/conceptual-arch.jpg *Conceptual Diagram* @@ -139,7 +139,7 @@ Conceptual Architecture (cont) Logical Architecture ==================== -.. image:: ../figures/arch-havana-logical-v1.jpg +.. image:: figures/arch-havana-logical-v1.jpg *Logical diagram* @@ -166,7 +166,7 @@ Dashboard (horizon) - Provides an end user and administrator interface to OpenStack services. - A modular Django web application -.. image:: ../figures/horizon-essex.jpg +.. image:: figures/horizon-essex.jpg :width: 75% .. note:: diff --git a/doc/training-guides/associate-guide/02-getting-started-quiz.rst b/doc/training-guides/source/slides/02-getting-started-quiz.rst similarity index 96% rename from doc/training-guides/associate-guide/02-getting-started-quiz.rst rename to doc/training-guides/source/slides/02-getting-started-quiz.rst index 6afe8bea..50da110b 100755 --- a/doc/training-guides/associate-guide/02-getting-started-quiz.rst +++ b/doc/training-guides/source/slides/02-getting-started-quiz.rst @@ -1,7 +1,7 @@ Getting started quiz ==================== -.. image:: ../figures/os_background.png +.. image:: figures/os_background.png :class: fill :width: 100% @@ -56,7 +56,7 @@ Getting started quiz questions Answers ======= -.. image:: ../figures/os_background.png +.. image:: figures/os_background.png :class: fill :width: 100% diff --git a/doc/training-guides/associate-guide/03-using-with-horizon.rst b/doc/training-guides/source/slides/03-using-with-horizon.rst similarity index 96% rename from doc/training-guides/associate-guide/03-using-with-horizon.rst rename to doc/training-guides/source/slides/03-using-with-horizon.rst index 14ce3faf..0d7a5ed1 100644 --- a/doc/training-guides/associate-guide/03-using-with-horizon.rst +++ b/doc/training-guides/source/slides/03-using-with-horizon.rst @@ -2,7 +2,7 @@ Using OpenStack Dashboard (Horizon) =================================== -.. figure:: ../figures/os_background.png +.. figure:: figures/os_background.png :class: fill :width: 100% @@ -72,7 +72,7 @@ Dashboard - Overview - Top-level row shows the username that you logged in with - Also access Settings or Sign Out of the Web interface -.. image:: ../figures/horizon-main-dashboard.png +.. image:: figures/horizon-main-dashboard.png Dashboard - Project tab ======================= @@ -169,7 +169,7 @@ Add security group rules (cont) - The Dashboard shows the security groups that are available for this project. -.. image:: ../figures/horizon-secgroup-list.png +.. image:: figures/horizon-secgroup-list.png Add security group rules (cont) =============================== @@ -177,7 +177,7 @@ Add security group rules (cont) - Select the default security group and click Edit Rules - The Security Group Rules page appears: -.. image:: ../figures/horizon-secgroup-edit.png +.. image:: figures/horizon-secgroup-edit.png Add keypairs ============ @@ -210,14 +210,14 @@ OpenStack Dashboard - Instances - Launch an instance from a volume - Create instance snapshots -.. image:: ../figures/horizon-instances.png +.. image:: figures/horizon-instances.png OpenStack Dashboard - Actions ============================= - Control the state of an instance -.. image:: ../figures/horizon-actions.png +.. image:: figures/horizon-actions.png OpenStack Dashboard - Track Usage ================================= @@ -225,7 +225,7 @@ OpenStack Dashboard - Track Usage - Use the Dashboard's Overview category to track usage of instances for each project. -.. image:: ../figures/horizon-main-dashboard.png +.. image:: figures/horizon-main-dashboard.png OpenStack Dashboard - Track Usage (cont) ======================================== diff --git a/doc/training-guides/associate-guide/04-using-with-cli.rst b/doc/training-guides/source/slides/04-using-with-cli.rst similarity index 99% rename from doc/training-guides/associate-guide/04-using-with-cli.rst rename to doc/training-guides/source/slides/04-using-with-cli.rst index 930b706a..e79d9074 100644 --- a/doc/training-guides/associate-guide/04-using-with-cli.rst +++ b/doc/training-guides/source/slides/04-using-with-cli.rst @@ -2,7 +2,7 @@ Using OpenStack Command-Line Interface ====================================== -.. figure:: ../figures/os_background.png +.. figure:: figures/os_background.png :class: fill :width: 100% diff --git a/doc/training-guides/associate-guide/06-compute-node-quiz.rst b/doc/training-guides/source/slides/06-compute-node-quiz.rst similarity index 97% rename from doc/training-guides/associate-guide/06-compute-node-quiz.rst rename to doc/training-guides/source/slides/06-compute-node-quiz.rst index b6eb3a64..b9a09a8f 100755 --- a/doc/training-guides/associate-guide/06-compute-node-quiz.rst +++ b/doc/training-guides/source/slides/06-compute-node-quiz.rst @@ -1,7 +1,7 @@ Compute node quiz ================= -.. image:: ../figures/os_background.png +.. image:: figures/os_background.png :class: fill :width: 100% @@ -65,7 +65,7 @@ Compute node quiz questions Answers ======= -.. image:: ../figures/os_background.png +.. image:: figures/os_background.png :class: fill :width: 100% diff --git a/doc/training-guides/associate-guide/07-associate-network-node.rst b/doc/training-guides/source/slides/07-associate-network-node.rst similarity index 98% rename from doc/training-guides/associate-guide/07-associate-network-node.rst rename to doc/training-guides/source/slides/07-associate-network-node.rst index ed280e8a..45dcfdd6 100644 --- a/doc/training-guides/associate-guide/07-associate-network-node.rst +++ b/doc/training-guides/source/slides/07-associate-network-node.rst @@ -2,7 +2,7 @@ Network node ============ -.. figure:: ../figures/os_background.png +.. figure:: figures/os_background.png :class: fill :width: 100% @@ -145,7 +145,7 @@ Typically at least **four** distinct **physical** data center **networks**: OpenStack Networking - Connectivity =================================== -.. image:: ../figures/network-connectivity.png +.. image:: figures/network-connectivity.png OpenStack Networking Concepts @@ -175,7 +175,7 @@ OpenStack Networking Concepts (cont) OpenStack Networking Concepts (cont) ==================================== -.. image:: ../figures/network-concept.png +.. image:: figures/network-concept.png Managing Networks - CLI ======================= diff --git a/doc/training-guides/_static/custom.css b/doc/training-guides/source/slides/_static/custom.css similarity index 100% rename from doc/training-guides/_static/custom.css rename to doc/training-guides/source/slides/_static/custom.css diff --git a/doc/training-guides/_static/os_logo_small.png b/doc/training-guides/source/slides/_static/os_logo_small.png similarity index 100% rename from doc/training-guides/_static/os_logo_small.png rename to doc/training-guides/source/slides/_static/os_logo_small.png diff --git a/doc/training-guides/_static/screen.css b/doc/training-guides/source/slides/_static/screen.css similarity index 100% rename from doc/training-guides/_static/screen.css rename to doc/training-guides/source/slides/_static/screen.css diff --git a/doc/training-guides/associate-guide/compute-overview.rst b/doc/training-guides/source/slides/compute-overview.rst similarity index 91% rename from doc/training-guides/associate-guide/compute-overview.rst rename to doc/training-guides/source/slides/compute-overview.rst index 28a811fe..0db41d9e 100644 --- a/doc/training-guides/associate-guide/compute-overview.rst +++ b/doc/training-guides/source/slides/compute-overview.rst @@ -2,7 +2,7 @@ Compute (Nova) ============== -.. figure:: ../figures/os_background.png +.. figure:: figures/os_background.png :class: fill :width: 100% diff --git a/doc/training-guides/associate-guide/conf.py b/doc/training-guides/source/slides/conf.py similarity index 98% rename from doc/training-guides/associate-guide/conf.py rename to doc/training-guides/source/slides/conf.py index 9946ddf5..94ad1acb 100644 --- a/doc/training-guides/associate-guide/conf.py +++ b/doc/training-guides/source/slides/conf.py @@ -40,7 +40,7 @@ extensions = [ ] # Add any paths that contain templates here, relative to this directory. -templates_path = ['../_templates'] +# templates_path = ['_templates'] # The suffix of source filenames. source_suffix = '.rst' @@ -76,7 +76,7 @@ release = '2015.5.01' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['build'] +exclude_patterns = [] # The reST default role (used for this markup: `text`) to use for all # documents. @@ -136,7 +136,7 @@ html_theme = 'default' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['../_static'] +html_static_path = ['_static'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied diff --git a/doc/training-guides/figures/Check_mark_23x20_02.svg b/doc/training-guides/source/slides/figures/Check_mark_23x20_02.svg similarity index 100% rename from doc/training-guides/figures/Check_mark_23x20_02.svg rename to doc/training-guides/source/slides/figures/Check_mark_23x20_02.svg diff --git a/doc/training-guides/figures/README.md b/doc/training-guides/source/slides/figures/README.md similarity index 100% rename from doc/training-guides/figures/README.md rename to doc/training-guides/source/slides/figures/README.md diff --git a/doc/training-guides/figures/arch-havana-logical-v1.jpg b/doc/training-guides/source/slides/figures/arch-havana-logical-v1.jpg similarity index 100% rename from doc/training-guides/figures/arch-havana-logical-v1.jpg rename to doc/training-guides/source/slides/figures/arch-havana-logical-v1.jpg diff --git a/doc/training-guides/figures/community-heartbeats.png b/doc/training-guides/source/slides/figures/community-heartbeats.png similarity index 100% rename from doc/training-guides/figures/community-heartbeats.png rename to doc/training-guides/source/slides/figures/community-heartbeats.png diff --git a/doc/training-guides/figures/conceptual-arch.jpg b/doc/training-guides/source/slides/figures/conceptual-arch.jpg similarity index 100% rename from doc/training-guides/figures/conceptual-arch.jpg rename to doc/training-guides/source/slides/figures/conceptual-arch.jpg diff --git a/doc/training-guides/figures/horizon-actions.png b/doc/training-guides/source/slides/figures/horizon-actions.png similarity index 100% rename from doc/training-guides/figures/horizon-actions.png rename to doc/training-guides/source/slides/figures/horizon-actions.png diff --git a/doc/training-guides/figures/horizon-essex.jpg b/doc/training-guides/source/slides/figures/horizon-essex.jpg similarity index 100% rename from doc/training-guides/figures/horizon-essex.jpg rename to doc/training-guides/source/slides/figures/horizon-essex.jpg diff --git a/doc/training-guides/figures/horizon-instances.png b/doc/training-guides/source/slides/figures/horizon-instances.png similarity index 100% rename from doc/training-guides/figures/horizon-instances.png rename to doc/training-guides/source/slides/figures/horizon-instances.png diff --git a/doc/training-guides/figures/horizon-main-dashboard.png b/doc/training-guides/source/slides/figures/horizon-main-dashboard.png similarity index 100% rename from doc/training-guides/figures/horizon-main-dashboard.png rename to doc/training-guides/source/slides/figures/horizon-main-dashboard.png diff --git a/doc/training-guides/figures/horizon-secgroup-edit.png b/doc/training-guides/source/slides/figures/horizon-secgroup-edit.png similarity index 100% rename from doc/training-guides/figures/horizon-secgroup-edit.png rename to doc/training-guides/source/slides/figures/horizon-secgroup-edit.png diff --git a/doc/training-guides/figures/horizon-secgroup-list.png b/doc/training-guides/source/slides/figures/horizon-secgroup-list.png similarity index 100% rename from doc/training-guides/figures/horizon-secgroup-list.png rename to doc/training-guides/source/slides/figures/horizon-secgroup-list.png diff --git a/doc/training-guides/figures/image01.png b/doc/training-guides/source/slides/figures/image01.png similarity index 100% rename from doc/training-guides/figures/image01.png rename to doc/training-guides/source/slides/figures/image01.png diff --git a/doc/training-guides/figures/image02.png b/doc/training-guides/source/slides/figures/image02.png similarity index 100% rename from doc/training-guides/figures/image02.png rename to doc/training-guides/source/slides/figures/image02.png diff --git a/doc/training-guides/figures/image03.png b/doc/training-guides/source/slides/figures/image03.png similarity index 100% rename from doc/training-guides/figures/image03.png rename to doc/training-guides/source/slides/figures/image03.png diff --git a/doc/training-guides/figures/image04.png b/doc/training-guides/source/slides/figures/image04.png similarity index 100% rename from doc/training-guides/figures/image04.png rename to doc/training-guides/source/slides/figures/image04.png diff --git a/doc/training-guides/figures/image06.png b/doc/training-guides/source/slides/figures/image06.png similarity index 100% rename from doc/training-guides/figures/image06.png rename to doc/training-guides/source/slides/figures/image06.png diff --git a/doc/training-guides/figures/image08.png b/doc/training-guides/source/slides/figures/image08.png similarity index 100% rename from doc/training-guides/figures/image08.png rename to doc/training-guides/source/slides/figures/image08.png diff --git a/doc/training-guides/figures/image09.png b/doc/training-guides/source/slides/figures/image09.png similarity index 100% rename from doc/training-guides/figures/image09.png rename to doc/training-guides/source/slides/figures/image09.png diff --git a/doc/training-guides/figures/image11.png b/doc/training-guides/source/slides/figures/image11.png similarity index 100% rename from doc/training-guides/figures/image11.png rename to doc/training-guides/source/slides/figures/image11.png diff --git a/doc/training-guides/figures/image12.png b/doc/training-guides/source/slides/figures/image12.png similarity index 100% rename from doc/training-guides/figures/image12.png rename to doc/training-guides/source/slides/figures/image12.png diff --git a/doc/training-guides/figures/image16.png b/doc/training-guides/source/slides/figures/image16.png similarity index 100% rename from doc/training-guides/figures/image16.png rename to doc/training-guides/source/slides/figures/image16.png diff --git a/doc/training-guides/figures/image17.png b/doc/training-guides/source/slides/figures/image17.png similarity index 100% rename from doc/training-guides/figures/image17.png rename to doc/training-guides/source/slides/figures/image17.png diff --git a/doc/training-guides/figures/image19.png b/doc/training-guides/source/slides/figures/image19.png similarity index 100% rename from doc/training-guides/figures/image19.png rename to doc/training-guides/source/slides/figures/image19.png diff --git a/doc/training-guides/figures/image20.png b/doc/training-guides/source/slides/figures/image20.png similarity index 100% rename from doc/training-guides/figures/image20.png rename to doc/training-guides/source/slides/figures/image20.png diff --git a/doc/training-guides/figures/image21.png b/doc/training-guides/source/slides/figures/image21.png similarity index 100% rename from doc/training-guides/figures/image21.png rename to doc/training-guides/source/slides/figures/image21.png diff --git a/doc/training-guides/figures/image22.png b/doc/training-guides/source/slides/figures/image22.png similarity index 100% rename from doc/training-guides/figures/image22.png rename to doc/training-guides/source/slides/figures/image22.png diff --git a/doc/training-guides/figures/image23.jpg b/doc/training-guides/source/slides/figures/image23.jpg similarity index 100% rename from doc/training-guides/figures/image23.jpg rename to doc/training-guides/source/slides/figures/image23.jpg diff --git a/doc/training-guides/figures/image24.png b/doc/training-guides/source/slides/figures/image24.png similarity index 100% rename from doc/training-guides/figures/image24.png rename to doc/training-guides/source/slides/figures/image24.png diff --git a/doc/training-guides/figures/image26.png b/doc/training-guides/source/slides/figures/image26.png similarity index 100% rename from doc/training-guides/figures/image26.png rename to doc/training-guides/source/slides/figures/image26.png diff --git a/doc/training-guides/figures/image27.png b/doc/training-guides/source/slides/figures/image27.png similarity index 100% rename from doc/training-guides/figures/image27.png rename to doc/training-guides/source/slides/figures/image27.png diff --git a/doc/training-guides/figures/image28.png b/doc/training-guides/source/slides/figures/image28.png similarity index 100% rename from doc/training-guides/figures/image28.png rename to doc/training-guides/source/slides/figures/image28.png diff --git a/doc/training-guides/figures/image29.png b/doc/training-guides/source/slides/figures/image29.png similarity index 100% rename from doc/training-guides/figures/image29.png rename to doc/training-guides/source/slides/figures/image29.png diff --git a/doc/training-guides/figures/image32.png b/doc/training-guides/source/slides/figures/image32.png similarity index 100% rename from doc/training-guides/figures/image32.png rename to doc/training-guides/source/slides/figures/image32.png diff --git a/doc/training-guides/figures/image34.png b/doc/training-guides/source/slides/figures/image34.png similarity index 100% rename from doc/training-guides/figures/image34.png rename to doc/training-guides/source/slides/figures/image34.png diff --git a/doc/training-guides/figures/image35.png b/doc/training-guides/source/slides/figures/image35.png similarity index 100% rename from doc/training-guides/figures/image35.png rename to doc/training-guides/source/slides/figures/image35.png diff --git a/doc/training-guides/figures/image36.png b/doc/training-guides/source/slides/figures/image36.png similarity index 100% rename from doc/training-guides/figures/image36.png rename to doc/training-guides/source/slides/figures/image36.png diff --git a/doc/training-guides/figures/image37.png b/doc/training-guides/source/slides/figures/image37.png similarity index 100% rename from doc/training-guides/figures/image37.png rename to doc/training-guides/source/slides/figures/image37.png diff --git a/doc/training-guides/figures/image38.png b/doc/training-guides/source/slides/figures/image38.png similarity index 100% rename from doc/training-guides/figures/image38.png rename to doc/training-guides/source/slides/figures/image38.png diff --git a/doc/training-guides/figures/image39.png b/doc/training-guides/source/slides/figures/image39.png similarity index 100% rename from doc/training-guides/figures/image39.png rename to doc/training-guides/source/slides/figures/image39.png diff --git a/doc/training-guides/figures/image40.png b/doc/training-guides/source/slides/figures/image40.png similarity index 100% rename from doc/training-guides/figures/image40.png rename to doc/training-guides/source/slides/figures/image40.png diff --git a/doc/training-guides/figures/image41.png b/doc/training-guides/source/slides/figures/image41.png similarity index 100% rename from doc/training-guides/figures/image41.png rename to doc/training-guides/source/slides/figures/image41.png diff --git a/doc/training-guides/figures/image42.png b/doc/training-guides/source/slides/figures/image42.png similarity index 100% rename from doc/training-guides/figures/image42.png rename to doc/training-guides/source/slides/figures/image42.png diff --git a/doc/training-guides/figures/image43.png b/doc/training-guides/source/slides/figures/image43.png similarity index 100% rename from doc/training-guides/figures/image43.png rename to doc/training-guides/source/slides/figures/image43.png diff --git a/doc/training-guides/figures/image44.png b/doc/training-guides/source/slides/figures/image44.png similarity index 100% rename from doc/training-guides/figures/image44.png rename to doc/training-guides/source/slides/figures/image44.png diff --git a/doc/training-guides/figures/image45.png b/doc/training-guides/source/slides/figures/image45.png similarity index 100% rename from doc/training-guides/figures/image45.png rename to doc/training-guides/source/slides/figures/image45.png diff --git a/doc/training-guides/figures/image46.png b/doc/training-guides/source/slides/figures/image46.png similarity index 100% rename from doc/training-guides/figures/image46.png rename to doc/training-guides/source/slides/figures/image46.png diff --git a/doc/training-guides/figures/image47.png b/doc/training-guides/source/slides/figures/image47.png similarity index 100% rename from doc/training-guides/figures/image47.png rename to doc/training-guides/source/slides/figures/image47.png diff --git a/doc/training-guides/figures/image48.png b/doc/training-guides/source/slides/figures/image48.png similarity index 100% rename from doc/training-guides/figures/image48.png rename to doc/training-guides/source/slides/figures/image48.png diff --git a/doc/training-guides/figures/network-concept.png b/doc/training-guides/source/slides/figures/network-concept.png similarity index 100% rename from doc/training-guides/figures/network-concept.png rename to doc/training-guides/source/slides/figures/network-concept.png diff --git a/doc/training-guides/figures/network-connectivity.png b/doc/training-guides/source/slides/figures/network-connectivity.png similarity index 100% rename from doc/training-guides/figures/network-connectivity.png rename to doc/training-guides/source/slides/figures/network-connectivity.png diff --git a/doc/training-guides/figures/openstack-training-example-image.png b/doc/training-guides/source/slides/figures/openstack-training-example-image.png similarity index 100% rename from doc/training-guides/figures/openstack-training-example-image.png rename to doc/training-guides/source/slides/figures/openstack-training-example-image.png diff --git a/doc/training-guides/figures/openstack-training-remote-content-not-available.png b/doc/training-guides/source/slides/figures/openstack-training-remote-content-not-available.png similarity index 100% rename from doc/training-guides/figures/openstack-training-remote-content-not-available.png rename to doc/training-guides/source/slides/figures/openstack-training-remote-content-not-available.png diff --git a/doc/training-guides/figures/os_background.png b/doc/training-guides/source/slides/figures/os_background.png similarity index 100% rename from doc/training-guides/figures/os_background.png rename to doc/training-guides/source/slides/figures/os_background.png diff --git a/doc/training-guides/associate-guide/notes/02-getting-started.rst b/doc/training-guides/source/slides/notes/02-getting-started.rst similarity index 100% rename from doc/training-guides/associate-guide/notes/02-getting-started.rst rename to doc/training-guides/source/slides/notes/02-getting-started.rst diff --git a/doc/training-guides/associate-guide/notes/06-compute-node.rst b/doc/training-guides/source/slides/notes/06-compute-node.rst similarity index 100% rename from doc/training-guides/associate-guide/notes/06-compute-node.rst rename to doc/training-guides/source/slides/notes/06-compute-node.rst diff --git a/doc/training-guides/associate-guide/slide-index.rst b/doc/training-guides/source/slides/slide-index.rst similarity index 93% rename from doc/training-guides/associate-guide/slide-index.rst rename to doc/training-guides/source/slides/slide-index.rst index 678a5a9f..db86986b 100644 --- a/doc/training-guides/associate-guide/slide-index.rst +++ b/doc/training-guides/source/slides/slide-index.rst @@ -2,7 +2,7 @@ OpenStack Training Guides - Associate Guide =========================================== -.. figure:: ../figures/os_background.png +.. figure:: figures/os_background.png :class: fill :width: 100% diff --git a/doc/training-guides/conf.py b/doc/training-guides/source/website/conf.py similarity index 99% rename from doc/training-guides/conf.py rename to doc/training-guides/source/website/conf.py index bd612774..2cd26302 100644 --- a/doc/training-guides/conf.py +++ b/doc/training-guides/source/website/conf.py @@ -84,7 +84,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag, # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['associate-guide', 'build'] +exclude_patterns = [] # The reST default role (used for this markup: `text`) to use for all # documents. @@ -281,4 +281,4 @@ texinfo_documents = [ # texinfo_no_detailmenu = False # -- Options for Internationalization output ------------------------------ -locale_dirs = ['source/locale/'] +locale_dirs = ['../locale/'] diff --git a/doc/training-guides/index.rst b/doc/training-guides/source/website/index.rst similarity index 100% rename from doc/training-guides/index.rst rename to doc/training-guides/source/website/index.rst diff --git a/doc/upstream-training/source/_assets/01-01-release.png b/doc/upstream-training/source/slides/_assets/01-01-release.png similarity index 100% rename from doc/upstream-training/source/_assets/01-01-release.png rename to doc/upstream-training/source/slides/_assets/01-01-release.png diff --git a/doc/upstream-training/source/_assets/02-01-relevant-actors.png b/doc/upstream-training/source/slides/_assets/02-01-relevant-actors.png similarity index 100% rename from doc/upstream-training/source/_assets/02-01-relevant-actors.png rename to doc/upstream-training/source/slides/_assets/02-01-relevant-actors.png diff --git a/doc/upstream-training/source/_assets/02-02-company-snapshot.png b/doc/upstream-training/source/slides/_assets/02-02-company-snapshot.png similarity index 100% rename from doc/upstream-training/source/_assets/02-02-company-snapshot.png rename to doc/upstream-training/source/slides/_assets/02-02-company-snapshot.png diff --git a/doc/upstream-training/source/_assets/02-02-relevance-metrics.png b/doc/upstream-training/source/slides/_assets/02-02-relevance-metrics.png similarity index 100% rename from doc/upstream-training/source/_assets/02-02-relevance-metrics.png rename to doc/upstream-training/source/slides/_assets/02-02-relevance-metrics.png diff --git a/doc/upstream-training/source/_assets/02-03-company-snapshot.png b/doc/upstream-training/source/slides/_assets/02-03-company-snapshot.png similarity index 100% rename from doc/upstream-training/source/_assets/02-03-company-snapshot.png rename to doc/upstream-training/source/slides/_assets/02-03-company-snapshot.png diff --git a/doc/upstream-training/source/_assets/02-04-individual-snapshot.png b/doc/upstream-training/source/slides/_assets/02-04-individual-snapshot.png similarity index 100% rename from doc/upstream-training/source/_assets/02-04-individual-snapshot.png rename to doc/upstream-training/source/slides/_assets/02-04-individual-snapshot.png diff --git a/doc/upstream-training/source/_assets/02-05-module-contributors.png b/doc/upstream-training/source/slides/_assets/02-05-module-contributors.png similarity index 100% rename from doc/upstream-training/source/_assets/02-05-module-contributors.png rename to doc/upstream-training/source/slides/_assets/02-05-module-contributors.png diff --git a/doc/upstream-training/source/_assets/02-06-your-management.jpg b/doc/upstream-training/source/slides/_assets/02-06-your-management.jpg similarity index 100% rename from doc/upstream-training/source/_assets/02-06-your-management.jpg rename to doc/upstream-training/source/slides/_assets/02-06-your-management.jpg diff --git a/doc/upstream-training/source/_assets/02-07-activity-dashboard.png b/doc/upstream-training/source/slides/_assets/02-07-activity-dashboard.png similarity index 100% rename from doc/upstream-training/source/_assets/02-07-activity-dashboard.png rename to doc/upstream-training/source/slides/_assets/02-07-activity-dashboard.png diff --git a/doc/upstream-training/source/_assets/02-08-activity-metrics.png b/doc/upstream-training/source/slides/_assets/02-08-activity-metrics.png similarity index 100% rename from doc/upstream-training/source/_assets/02-08-activity-metrics.png rename to doc/upstream-training/source/slides/_assets/02-08-activity-metrics.png diff --git a/doc/upstream-training/source/_assets/03-01-TC1.png b/doc/upstream-training/source/slides/_assets/03-01-TC1.png similarity index 100% rename from doc/upstream-training/source/_assets/03-01-TC1.png rename to doc/upstream-training/source/slides/_assets/03-01-TC1.png diff --git a/doc/upstream-training/source/_assets/03-01-TC2.png b/doc/upstream-training/source/slides/_assets/03-01-TC2.png similarity index 100% rename from doc/upstream-training/source/_assets/03-01-TC2.png rename to doc/upstream-training/source/slides/_assets/03-01-TC2.png diff --git a/doc/upstream-training/source/_assets/03-02-IRCmeeting.png b/doc/upstream-training/source/slides/_assets/03-02-IRCmeeting.png similarity index 100% rename from doc/upstream-training/source/_assets/03-02-IRCmeeting.png rename to doc/upstream-training/source/slides/_assets/03-02-IRCmeeting.png diff --git a/doc/upstream-training/source/_assets/04-01-lifecycle1.png b/doc/upstream-training/source/slides/_assets/04-01-lifecycle1.png similarity index 100% rename from doc/upstream-training/source/_assets/04-01-lifecycle1.png rename to doc/upstream-training/source/slides/_assets/04-01-lifecycle1.png diff --git a/doc/upstream-training/source/_assets/04-02-defcore.png b/doc/upstream-training/source/slides/_assets/04-02-defcore.png similarity index 100% rename from doc/upstream-training/source/_assets/04-02-defcore.png rename to doc/upstream-training/source/slides/_assets/04-02-defcore.png diff --git a/doc/upstream-training/source/_assets/04-03-lifecycle.png b/doc/upstream-training/source/slides/_assets/04-03-lifecycle.png similarity index 100% rename from doc/upstream-training/source/_assets/04-03-lifecycle.png rename to doc/upstream-training/source/slides/_assets/04-03-lifecycle.png diff --git a/doc/upstream-training/source/_assets/04-04-lifecycle.png b/doc/upstream-training/source/slides/_assets/04-04-lifecycle.png similarity index 100% rename from doc/upstream-training/source/_assets/04-04-lifecycle.png rename to doc/upstream-training/source/slides/_assets/04-04-lifecycle.png diff --git a/doc/upstream-training/source/_assets/04-05-stackforge.png b/doc/upstream-training/source/slides/_assets/04-05-stackforge.png similarity index 100% rename from doc/upstream-training/source/_assets/04-05-stackforge.png rename to doc/upstream-training/source/slides/_assets/04-05-stackforge.png diff --git a/doc/upstream-training/source/_assets/05-01-design-summit.png b/doc/upstream-training/source/slides/_assets/05-01-design-summit.png similarity index 100% rename from doc/upstream-training/source/_assets/05-01-design-summit.png rename to doc/upstream-training/source/slides/_assets/05-01-design-summit.png diff --git a/doc/upstream-training/source/_assets/05-02-design-summit.png b/doc/upstream-training/source/slides/_assets/05-02-design-summit.png similarity index 100% rename from doc/upstream-training/source/_assets/05-02-design-summit.png rename to doc/upstream-training/source/slides/_assets/05-02-design-summit.png diff --git a/doc/upstream-training/source/_assets/05-03-etherpads.png b/doc/upstream-training/source/slides/_assets/05-03-etherpads.png similarity index 100% rename from doc/upstream-training/source/_assets/05-03-etherpads.png rename to doc/upstream-training/source/slides/_assets/05-03-etherpads.png diff --git a/doc/upstream-training/source/_assets/05-05-sessions.png b/doc/upstream-training/source/slides/_assets/05-05-sessions.png similarity index 100% rename from doc/upstream-training/source/_assets/05-05-sessions.png rename to doc/upstream-training/source/slides/_assets/05-05-sessions.png diff --git a/doc/upstream-training/source/_assets/06-01-irc-meetings.png b/doc/upstream-training/source/slides/_assets/06-01-irc-meetings.png similarity index 100% rename from doc/upstream-training/source/_assets/06-01-irc-meetings.png rename to doc/upstream-training/source/slides/_assets/06-01-irc-meetings.png diff --git a/doc/upstream-training/source/_assets/06-02-irc-meetings-list.png b/doc/upstream-training/source/slides/_assets/06-02-irc-meetings-list.png similarity index 100% rename from doc/upstream-training/source/_assets/06-02-irc-meetings-list.png rename to doc/upstream-training/source/slides/_assets/06-02-irc-meetings-list.png diff --git a/doc/upstream-training/source/_assets/06-03-meeting-agenda.png b/doc/upstream-training/source/slides/_assets/06-03-meeting-agenda.png similarity index 100% rename from doc/upstream-training/source/_assets/06-03-meeting-agenda.png rename to doc/upstream-training/source/slides/_assets/06-03-meeting-agenda.png diff --git a/doc/upstream-training/source/_assets/06-04-meetbot.png b/doc/upstream-training/source/slides/_assets/06-04-meetbot.png similarity index 100% rename from doc/upstream-training/source/_assets/06-04-meetbot.png rename to doc/upstream-training/source/slides/_assets/06-04-meetbot.png diff --git a/doc/upstream-training/source/_assets/11-01-devstack.png b/doc/upstream-training/source/slides/_assets/11-01-devstack.png similarity index 100% rename from doc/upstream-training/source/_assets/11-01-devstack.png rename to doc/upstream-training/source/slides/_assets/11-01-devstack.png diff --git a/doc/upstream-training/source/_assets/11-03-http-localhost.png b/doc/upstream-training/source/slides/_assets/11-03-http-localhost.png similarity index 100% rename from doc/upstream-training/source/_assets/11-03-http-localhost.png rename to doc/upstream-training/source/slides/_assets/11-03-http-localhost.png diff --git a/doc/upstream-training/source/_assets/11-04-git.png b/doc/upstream-training/source/slides/_assets/11-04-git.png similarity index 100% rename from doc/upstream-training/source/_assets/11-04-git.png rename to doc/upstream-training/source/slides/_assets/11-04-git.png diff --git a/doc/upstream-training/source/_assets/12-01-launchpad-net.png b/doc/upstream-training/source/slides/_assets/12-01-launchpad-net.png similarity index 100% rename from doc/upstream-training/source/_assets/12-01-launchpad-net.png rename to doc/upstream-training/source/slides/_assets/12-01-launchpad-net.png diff --git a/doc/upstream-training/source/_assets/12-02-review.png b/doc/upstream-training/source/slides/_assets/12-02-review.png similarity index 100% rename from doc/upstream-training/source/_assets/12-02-review.png rename to doc/upstream-training/source/slides/_assets/12-02-review.png diff --git a/doc/upstream-training/source/_assets/12-03-signin.png b/doc/upstream-training/source/slides/_assets/12-03-signin.png similarity index 100% rename from doc/upstream-training/source/_assets/12-03-signin.png rename to doc/upstream-training/source/slides/_assets/12-03-signin.png diff --git a/doc/upstream-training/source/_assets/12-04-no-agreement.png b/doc/upstream-training/source/slides/_assets/12-04-no-agreement.png similarity index 100% rename from doc/upstream-training/source/_assets/12-04-no-agreement.png rename to doc/upstream-training/source/slides/_assets/12-04-no-agreement.png diff --git a/doc/upstream-training/source/_assets/12-05-new-agreement.png b/doc/upstream-training/source/slides/_assets/12-05-new-agreement.png similarity index 100% rename from doc/upstream-training/source/_assets/12-05-new-agreement.png rename to doc/upstream-training/source/slides/_assets/12-05-new-agreement.png diff --git a/doc/upstream-training/source/_assets/12-06-individual-agreement.png b/doc/upstream-training/source/slides/_assets/12-06-individual-agreement.png similarity index 100% rename from doc/upstream-training/source/_assets/12-06-individual-agreement.png rename to doc/upstream-training/source/slides/_assets/12-06-individual-agreement.png diff --git a/doc/upstream-training/source/_assets/12-07-signed-agreement.png b/doc/upstream-training/source/slides/_assets/12-07-signed-agreement.png similarity index 100% rename from doc/upstream-training/source/_assets/12-07-signed-agreement.png rename to doc/upstream-training/source/slides/_assets/12-07-signed-agreement.png diff --git a/doc/upstream-training/source/_assets/12-join-openstack-org.png b/doc/upstream-training/source/slides/_assets/12-join-openstack-org.png similarity index 100% rename from doc/upstream-training/source/_assets/12-join-openstack-org.png rename to doc/upstream-training/source/slides/_assets/12-join-openstack-org.png diff --git a/doc/upstream-training/source/_assets/13-01-launchpad.png b/doc/upstream-training/source/slides/_assets/13-01-launchpad.png similarity index 100% rename from doc/upstream-training/source/_assets/13-01-launchpad.png rename to doc/upstream-training/source/slides/_assets/13-01-launchpad.png diff --git a/doc/upstream-training/source/_assets/14-01-review.png b/doc/upstream-training/source/slides/_assets/14-01-review.png similarity index 100% rename from doc/upstream-training/source/_assets/14-01-review.png rename to doc/upstream-training/source/slides/_assets/14-01-review.png diff --git a/doc/upstream-training/source/_assets/14-02-gerrit-workflow.png b/doc/upstream-training/source/slides/_assets/14-02-gerrit-workflow.png similarity index 100% rename from doc/upstream-training/source/_assets/14-02-gerrit-workflow.png rename to doc/upstream-training/source/slides/_assets/14-02-gerrit-workflow.png diff --git a/doc/upstream-training/source/_assets/14-03-upload-ssh-key.png b/doc/upstream-training/source/slides/_assets/14-03-upload-ssh-key.png similarity index 100% rename from doc/upstream-training/source/_assets/14-03-upload-ssh-key.png rename to doc/upstream-training/source/slides/_assets/14-03-upload-ssh-key.png diff --git a/doc/upstream-training/source/_assets/14-04-git-config.png b/doc/upstream-training/source/slides/_assets/14-04-git-config.png similarity index 100% rename from doc/upstream-training/source/_assets/14-04-git-config.png rename to doc/upstream-training/source/slides/_assets/14-04-git-config.png diff --git a/doc/upstream-training/source/_assets/14-05-install.png b/doc/upstream-training/source/slides/_assets/14-05-install.png similarity index 100% rename from doc/upstream-training/source/_assets/14-05-install.png rename to doc/upstream-training/source/slides/_assets/14-05-install.png diff --git a/doc/upstream-training/source/_assets/14-06-git-clone.png b/doc/upstream-training/source/slides/_assets/14-06-git-clone.png similarity index 100% rename from doc/upstream-training/source/_assets/14-06-git-clone.png rename to doc/upstream-training/source/slides/_assets/14-06-git-clone.png diff --git a/doc/upstream-training/source/_assets/14-07-git-review-s.png b/doc/upstream-training/source/slides/_assets/14-07-git-review-s.png similarity index 100% rename from doc/upstream-training/source/_assets/14-07-git-review-s.png rename to doc/upstream-training/source/slides/_assets/14-07-git-review-s.png diff --git a/doc/upstream-training/source/_assets/14-08-git-checkout.png b/doc/upstream-training/source/slides/_assets/14-08-git-checkout.png similarity index 100% rename from doc/upstream-training/source/_assets/14-08-git-checkout.png rename to doc/upstream-training/source/slides/_assets/14-08-git-checkout.png diff --git a/doc/upstream-training/source/_assets/14-09-unit-tests.png b/doc/upstream-training/source/slides/_assets/14-09-unit-tests.png similarity index 100% rename from doc/upstream-training/source/_assets/14-09-unit-tests.png rename to doc/upstream-training/source/slides/_assets/14-09-unit-tests.png diff --git a/doc/upstream-training/source/_assets/14-11-invite-reviewers.png b/doc/upstream-training/source/slides/_assets/14-11-invite-reviewers.png similarity index 100% rename from doc/upstream-training/source/_assets/14-11-invite-reviewers.png rename to doc/upstream-training/source/slides/_assets/14-11-invite-reviewers.png diff --git a/doc/upstream-training/source/_assets/14-13-git-commit-amend.png b/doc/upstream-training/source/slides/_assets/14-13-git-commit-amend.png similarity index 100% rename from doc/upstream-training/source/_assets/14-13-git-commit-amend.png rename to doc/upstream-training/source/slides/_assets/14-13-git-commit-amend.png diff --git a/doc/upstream-training/source/_assets/14-15-patchset-history.png b/doc/upstream-training/source/slides/_assets/14-15-patchset-history.png similarity index 100% rename from doc/upstream-training/source/_assets/14-15-patchset-history.png rename to doc/upstream-training/source/slides/_assets/14-15-patchset-history.png diff --git a/doc/upstream-training/source/_assets/14-17-patchset-diffs.png b/doc/upstream-training/source/slides/_assets/14-17-patchset-diffs.png similarity index 100% rename from doc/upstream-training/source/_assets/14-17-patchset-diffs.png rename to doc/upstream-training/source/slides/_assets/14-17-patchset-diffs.png diff --git a/doc/upstream-training/source/_assets/15-01-inspired.png b/doc/upstream-training/source/slides/_assets/15-01-inspired.png similarity index 100% rename from doc/upstream-training/source/_assets/15-01-inspired.png rename to doc/upstream-training/source/slides/_assets/15-01-inspired.png diff --git a/doc/upstream-training/source/_assets/15-02-stable-branches.png b/doc/upstream-training/source/slides/_assets/15-02-stable-branches.png similarity index 100% rename from doc/upstream-training/source/_assets/15-02-stable-branches.png rename to doc/upstream-training/source/slides/_assets/15-02-stable-branches.png diff --git a/doc/upstream-training/source/_assets/15-03-branch-tags.png b/doc/upstream-training/source/slides/_assets/15-03-branch-tags.png similarity index 100% rename from doc/upstream-training/source/_assets/15-03-branch-tags.png rename to doc/upstream-training/source/slides/_assets/15-03-branch-tags.png diff --git a/doc/upstream-training/source/_assets/15-04-preparation.png b/doc/upstream-training/source/slides/_assets/15-04-preparation.png similarity index 100% rename from doc/upstream-training/source/_assets/15-04-preparation.png rename to doc/upstream-training/source/slides/_assets/15-04-preparation.png diff --git a/doc/upstream-training/source/_assets/15-05-review.png b/doc/upstream-training/source/slides/_assets/15-05-review.png similarity index 100% rename from doc/upstream-training/source/_assets/15-05-review.png rename to doc/upstream-training/source/slides/_assets/15-05-review.png diff --git a/doc/upstream-training/source/_assets/16-01-review-unified.png b/doc/upstream-training/source/slides/_assets/16-01-review-unified.png similarity index 100% rename from doc/upstream-training/source/_assets/16-01-review-unified.png rename to doc/upstream-training/source/slides/_assets/16-01-review-unified.png diff --git a/doc/upstream-training/source/_assets/16-03-inline-comments.png b/doc/upstream-training/source/slides/_assets/16-03-inline-comments.png similarity index 100% rename from doc/upstream-training/source/_assets/16-03-inline-comments.png rename to doc/upstream-training/source/slides/_assets/16-03-inline-comments.png diff --git a/doc/upstream-training/source/_assets/16-04-draft-inline-comments.png b/doc/upstream-training/source/slides/_assets/16-04-draft-inline-comments.png similarity index 100% rename from doc/upstream-training/source/_assets/16-04-draft-inline-comments.png rename to doc/upstream-training/source/slides/_assets/16-04-draft-inline-comments.png diff --git a/doc/upstream-training/source/_assets/16-05-regular-reviewer.png b/doc/upstream-training/source/slides/_assets/16-05-regular-reviewer.png similarity index 100% rename from doc/upstream-training/source/_assets/16-05-regular-reviewer.png rename to doc/upstream-training/source/slides/_assets/16-05-regular-reviewer.png diff --git a/doc/upstream-training/source/_assets/16-06-core-reviewer.png b/doc/upstream-training/source/slides/_assets/16-06-core-reviewer.png similarity index 100% rename from doc/upstream-training/source/_assets/16-06-core-reviewer.png rename to doc/upstream-training/source/slides/_assets/16-06-core-reviewer.png diff --git a/doc/upstream-training/source/_assets/17-01-bad-two.png b/doc/upstream-training/source/slides/_assets/17-01-bad-two.png similarity index 100% rename from doc/upstream-training/source/_assets/17-01-bad-two.png rename to doc/upstream-training/source/slides/_assets/17-01-bad-two.png diff --git a/doc/upstream-training/source/_assets/17-02-bad-new.png b/doc/upstream-training/source/slides/_assets/17-02-bad-new.png similarity index 100% rename from doc/upstream-training/source/_assets/17-02-bad-new.png rename to doc/upstream-training/source/slides/_assets/17-02-bad-new.png diff --git a/doc/upstream-training/source/_assets/17-03-good.png b/doc/upstream-training/source/slides/_assets/17-03-good.png similarity index 100% rename from doc/upstream-training/source/_assets/17-03-good.png rename to doc/upstream-training/source/slides/_assets/17-03-good.png diff --git a/doc/upstream-training/source/_assets/17-04-commit-message.png b/doc/upstream-training/source/slides/_assets/17-04-commit-message.png similarity index 100% rename from doc/upstream-training/source/_assets/17-04-commit-message.png rename to doc/upstream-training/source/slides/_assets/17-04-commit-message.png diff --git a/doc/upstream-training/source/_assets/18-01-triggered.png b/doc/upstream-training/source/slides/_assets/18-01-triggered.png similarity index 100% rename from doc/upstream-training/source/_assets/18-01-triggered.png rename to doc/upstream-training/source/slides/_assets/18-01-triggered.png diff --git a/doc/upstream-training/source/_assets/18-02-review.png b/doc/upstream-training/source/slides/_assets/18-02-review.png similarity index 100% rename from doc/upstream-training/source/_assets/18-02-review.png rename to doc/upstream-training/source/slides/_assets/18-02-review.png diff --git a/doc/upstream-training/source/_assets/18-03-error-report.png b/doc/upstream-training/source/slides/_assets/18-03-error-report.png similarity index 100% rename from doc/upstream-training/source/_assets/18-03-error-report.png rename to doc/upstream-training/source/slides/_assets/18-03-error-report.png diff --git a/doc/upstream-training/source/_assets/18-04-false-errors.png b/doc/upstream-training/source/slides/_assets/18-04-false-errors.png similarity index 100% rename from doc/upstream-training/source/_assets/18-04-false-errors.png rename to doc/upstream-training/source/slides/_assets/18-04-false-errors.png diff --git a/doc/upstream-training/source/_assets/18-05-recheck.png b/doc/upstream-training/source/slides/_assets/18-05-recheck.png similarity index 100% rename from doc/upstream-training/source/_assets/18-05-recheck.png rename to doc/upstream-training/source/slides/_assets/18-05-recheck.png diff --git a/doc/upstream-training/source/_assets/19-01-goodworkflow.png b/doc/upstream-training/source/slides/_assets/19-01-goodworkflow.png similarity index 100% rename from doc/upstream-training/source/_assets/19-01-goodworkflow.png rename to doc/upstream-training/source/slides/_assets/19-01-goodworkflow.png diff --git a/doc/upstream-training/source/_assets/19-02-badworkflow.png b/doc/upstream-training/source/slides/_assets/19-02-badworkflow.png similarity index 100% rename from doc/upstream-training/source/_assets/19-02-badworkflow.png rename to doc/upstream-training/source/slides/_assets/19-02-badworkflow.png diff --git a/doc/upstream-training/source/_assets/20-01-sprint.png b/doc/upstream-training/source/slides/_assets/20-01-sprint.png similarity index 100% rename from doc/upstream-training/source/_assets/20-01-sprint.png rename to doc/upstream-training/source/slides/_assets/20-01-sprint.png diff --git a/doc/upstream-training/source/_assets/20-git-review.png b/doc/upstream-training/source/slides/_assets/20-git-review.png similarity index 100% rename from doc/upstream-training/source/_assets/20-git-review.png rename to doc/upstream-training/source/slides/_assets/20-git-review.png diff --git a/doc/upstream-training/source/_assets/Lego_Austin.jpg b/doc/upstream-training/source/slides/_assets/Lego_Austin.jpg similarity index 100% rename from doc/upstream-training/source/_assets/Lego_Austin.jpg rename to doc/upstream-training/source/slides/_assets/Lego_Austin.jpg diff --git a/doc/upstream-training/source/_assets/big-tent-and-core-services.png b/doc/upstream-training/source/slides/_assets/big-tent-and-core-services.png similarity index 100% rename from doc/upstream-training/source/_assets/big-tent-and-core-services.png rename to doc/upstream-training/source/slides/_assets/big-tent-and-core-services.png diff --git a/doc/upstream-training/source/_assets/etsi-nfv-arch-framework.png b/doc/upstream-training/source/slides/_assets/etsi-nfv-arch-framework.png similarity index 100% rename from doc/upstream-training/source/_assets/etsi-nfv-arch-framework.png rename to doc/upstream-training/source/slides/_assets/etsi-nfv-arch-framework.png diff --git a/doc/upstream-training/source/_assets/os-software.png b/doc/upstream-training/source/slides/_assets/os-software.png similarity index 100% rename from doc/upstream-training/source/_assets/os-software.png rename to doc/upstream-training/source/slides/_assets/os-software.png diff --git a/doc/upstream-training/source/_assets/os_background.png b/doc/upstream-training/source/slides/_assets/os_background.png similarity index 100% rename from doc/upstream-training/source/_assets/os_background.png rename to doc/upstream-training/source/slides/_assets/os_background.png diff --git a/doc/upstream-training/source/_assets/stackalytics-module-open-reviews.png b/doc/upstream-training/source/slides/_assets/stackalytics-module-open-reviews.png similarity index 100% rename from doc/upstream-training/source/_assets/stackalytics-module-open-reviews.png rename to doc/upstream-training/source/slides/_assets/stackalytics-module-open-reviews.png diff --git a/doc/upstream-training/source/_static/custom.css b/doc/upstream-training/source/slides/_static/custom.css similarity index 100% rename from doc/upstream-training/source/_static/custom.css rename to doc/upstream-training/source/slides/_static/custom.css diff --git a/doc/upstream-training/source/_static/custom.js b/doc/upstream-training/source/slides/_static/custom.js similarity index 100% rename from doc/upstream-training/source/_static/custom.js rename to doc/upstream-training/source/slides/_static/custom.js diff --git a/doc/upstream-training/source/_static/os_logo_small.png b/doc/upstream-training/source/slides/_static/os_logo_small.png similarity index 100% rename from doc/upstream-training/source/_static/os_logo_small.png rename to doc/upstream-training/source/slides/_static/os_logo_small.png diff --git a/doc/upstream-training/source/_static/screen.css b/doc/upstream-training/source/slides/_static/screen.css similarity index 100% rename from doc/upstream-training/source/_static/screen.css rename to doc/upstream-training/source/slides/_static/screen.css diff --git a/doc/upstream-training/source/archive-training-agile-for-contributors.rst b/doc/upstream-training/source/slides/archive-training-agile-for-contributors.rst similarity index 100% rename from doc/upstream-training/source/archive-training-agile-for-contributors.rst rename to doc/upstream-training/source/slides/archive-training-agile-for-contributors.rst diff --git a/doc/upstream-training/source/branching-model.rst b/doc/upstream-training/source/slides/branching-model.rst similarity index 100% rename from doc/upstream-training/source/branching-model.rst rename to doc/upstream-training/source/slides/branching-model.rst diff --git a/doc/upstream-training/source/code-devstack.rst b/doc/upstream-training/source/slides/code-devstack.rst similarity index 100% rename from doc/upstream-training/source/code-devstack.rst rename to doc/upstream-training/source/slides/code-devstack.rst diff --git a/doc/upstream-training/source/conf.py b/doc/upstream-training/source/slides/conf.py similarity index 99% rename from doc/upstream-training/source/conf.py rename to doc/upstream-training/source/slides/conf.py index 50d7abc0..4e64f965 100644 --- a/doc/upstream-training/source/conf.py +++ b/doc/upstream-training/source/slides/conf.py @@ -288,4 +288,4 @@ slide_theme_options = { } # -- Options for Internationalization output ------------------------------ -locale_dirs = ['locale/'] +locale_dirs = ['../locale/'] diff --git a/doc/upstream-training/source/howitsmade-design-summit.rst b/doc/upstream-training/source/slides/howitsmade-design-summit.rst similarity index 100% rename from doc/upstream-training/source/howitsmade-design-summit.rst rename to doc/upstream-training/source/slides/howitsmade-design-summit.rst diff --git a/doc/upstream-training/source/howitsmade-irc-meetings.rst b/doc/upstream-training/source/slides/howitsmade-irc-meetings.rst similarity index 100% rename from doc/upstream-training/source/howitsmade-irc-meetings.rst rename to doc/upstream-training/source/slides/howitsmade-irc-meetings.rst diff --git a/doc/upstream-training/source/howitsmade-official-projects.rst b/doc/upstream-training/source/slides/howitsmade-official-projects.rst similarity index 100% rename from doc/upstream-training/source/howitsmade-official-projects.rst rename to doc/upstream-training/source/slides/howitsmade-official-projects.rst diff --git a/doc/upstream-training/source/howitsmade-release-cycle.rst b/doc/upstream-training/source/slides/howitsmade-release-cycle.rst similarity index 100% rename from doc/upstream-training/source/howitsmade-release-cycle.rst rename to doc/upstream-training/source/slides/howitsmade-release-cycle.rst diff --git a/doc/upstream-training/source/howitsmade-relevant-actors.rst b/doc/upstream-training/source/slides/howitsmade-relevant-actors.rst similarity index 100% rename from doc/upstream-training/source/howitsmade-relevant-actors.rst rename to doc/upstream-training/source/slides/howitsmade-relevant-actors.rst diff --git a/doc/upstream-training/source/howitsmade-technical-committee.rst b/doc/upstream-training/source/slides/howitsmade-technical-committee.rst similarity index 100% rename from doc/upstream-training/source/howitsmade-technical-committee.rst rename to doc/upstream-training/source/slides/howitsmade-technical-committee.rst diff --git a/doc/upstream-training/source/intro-introduction.rst b/doc/upstream-training/source/slides/intro-introduction.rst similarity index 100% rename from doc/upstream-training/source/intro-introduction.rst rename to doc/upstream-training/source/slides/intro-introduction.rst diff --git a/doc/upstream-training/source/intro-openstack-as-community.rst b/doc/upstream-training/source/slides/intro-openstack-as-community.rst similarity index 100% rename from doc/upstream-training/source/intro-openstack-as-community.rst rename to doc/upstream-training/source/slides/intro-openstack-as-community.rst diff --git a/doc/upstream-training/source/intro-openstack-as-software.rst b/doc/upstream-training/source/slides/intro-openstack-as-software.rst similarity index 100% rename from doc/upstream-training/source/intro-openstack-as-software.rst rename to doc/upstream-training/source/slides/intro-openstack-as-software.rst diff --git a/doc/upstream-training/source/slide-index.rst b/doc/upstream-training/source/slides/slide-index.rst similarity index 100% rename from doc/upstream-training/source/slide-index.rst rename to doc/upstream-training/source/slides/slide-index.rst diff --git a/doc/upstream-training/source/workflow-commit-message.rst b/doc/upstream-training/source/slides/workflow-commit-message.rst similarity index 100% rename from doc/upstream-training/source/workflow-commit-message.rst rename to doc/upstream-training/source/slides/workflow-commit-message.rst diff --git a/doc/upstream-training/source/workflow-gerrit.rst b/doc/upstream-training/source/slides/workflow-gerrit.rst similarity index 100% rename from doc/upstream-training/source/workflow-gerrit.rst rename to doc/upstream-training/source/slides/workflow-gerrit.rst diff --git a/doc/upstream-training/source/workflow-howtocontribute.rst b/doc/upstream-training/source/slides/workflow-howtocontribute.rst similarity index 100% rename from doc/upstream-training/source/workflow-howtocontribute.rst rename to doc/upstream-training/source/slides/workflow-howtocontribute.rst diff --git a/doc/upstream-training/source/workflow-jenkins.rst b/doc/upstream-training/source/slides/workflow-jenkins.rst similarity index 100% rename from doc/upstream-training/source/workflow-jenkins.rst rename to doc/upstream-training/source/slides/workflow-jenkins.rst diff --git a/doc/upstream-training/source/workflow-launchpad.rst b/doc/upstream-training/source/slides/workflow-launchpad.rst similarity index 100% rename from doc/upstream-training/source/workflow-launchpad.rst rename to doc/upstream-training/source/slides/workflow-launchpad.rst diff --git a/doc/upstream-training/source/workflow-reviewing.rst b/doc/upstream-training/source/slides/workflow-reviewing.rst similarity index 100% rename from doc/upstream-training/source/workflow-reviewing.rst rename to doc/upstream-training/source/slides/workflow-reviewing.rst diff --git a/doc/upstream-training/source/workflow-setup-and-first-patch.rst b/doc/upstream-training/source/slides/workflow-setup-and-first-patch.rst similarity index 100% rename from doc/upstream-training/source/workflow-setup-and-first-patch.rst rename to doc/upstream-training/source/slides/workflow-setup-and-first-patch.rst diff --git a/doc/upstream-training/source/workflow-training-contribution-process.rst b/doc/upstream-training/source/slides/workflow-training-contribution-process.rst similarity index 100% rename from doc/upstream-training/source/workflow-training-contribution-process.rst rename to doc/upstream-training/source/slides/workflow-training-contribution-process.rst diff --git a/doc/upstream-training/source/_assets/tools/account-setup/1.png b/doc/upstream-training/source/website/_assets/account-setup/1.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/account-setup/1.png rename to doc/upstream-training/source/website/_assets/account-setup/1.png diff --git a/doc/upstream-training/source/_assets/tools/account-setup/2.png b/doc/upstream-training/source/website/_assets/account-setup/2.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/account-setup/2.png rename to doc/upstream-training/source/website/_assets/account-setup/2.png diff --git a/doc/upstream-training/source/_assets/tools/account-setup/3.png b/doc/upstream-training/source/website/_assets/account-setup/3.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/account-setup/3.png rename to doc/upstream-training/source/website/_assets/account-setup/3.png diff --git a/doc/upstream-training/source/_assets/tools/account-setup/4.png b/doc/upstream-training/source/website/_assets/account-setup/4.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/account-setup/4.png rename to doc/upstream-training/source/website/_assets/account-setup/4.png diff --git a/doc/upstream-training/source/_assets/tools/irc/linux/1.png b/doc/upstream-training/source/website/_assets/irc/linux/1.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/linux/1.png rename to doc/upstream-training/source/website/_assets/irc/linux/1.png diff --git a/doc/upstream-training/source/_assets/tools/irc/linux/2.png b/doc/upstream-training/source/website/_assets/irc/linux/2.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/linux/2.png rename to doc/upstream-training/source/website/_assets/irc/linux/2.png diff --git a/doc/upstream-training/source/_assets/tools/irc/linux/3.png b/doc/upstream-training/source/website/_assets/irc/linux/3.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/linux/3.png rename to doc/upstream-training/source/website/_assets/irc/linux/3.png diff --git a/doc/upstream-training/source/_assets/tools/irc/linux/4.png b/doc/upstream-training/source/website/_assets/irc/linux/4.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/linux/4.png rename to doc/upstream-training/source/website/_assets/irc/linux/4.png diff --git a/doc/upstream-training/source/_assets/tools/irc/linux/5.png b/doc/upstream-training/source/website/_assets/irc/linux/5.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/linux/5.png rename to doc/upstream-training/source/website/_assets/irc/linux/5.png diff --git a/doc/upstream-training/source/_assets/tools/irc/macos/1.png b/doc/upstream-training/source/website/_assets/irc/macos/1.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/macos/1.png rename to doc/upstream-training/source/website/_assets/irc/macos/1.png diff --git a/doc/upstream-training/source/_assets/tools/irc/macos/2.png b/doc/upstream-training/source/website/_assets/irc/macos/2.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/macos/2.png rename to doc/upstream-training/source/website/_assets/irc/macos/2.png diff --git a/doc/upstream-training/source/_assets/tools/irc/macos/3.png b/doc/upstream-training/source/website/_assets/irc/macos/3.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/macos/3.png rename to doc/upstream-training/source/website/_assets/irc/macos/3.png diff --git a/doc/upstream-training/source/_assets/tools/irc/macos/4.png b/doc/upstream-training/source/website/_assets/irc/macos/4.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/macos/4.png rename to doc/upstream-training/source/website/_assets/irc/macos/4.png diff --git a/doc/upstream-training/source/_assets/tools/irc/macos/5.png b/doc/upstream-training/source/website/_assets/irc/macos/5.png similarity index 100% rename from doc/upstream-training/source/_assets/tools/irc/macos/5.png rename to doc/upstream-training/source/website/_assets/irc/macos/5.png diff --git a/doc/upstream-training/accounts.rst b/doc/upstream-training/source/website/accounts.rst similarity index 95% rename from doc/upstream-training/accounts.rst rename to doc/upstream-training/source/website/accounts.rst index da1058fc..d788a67c 100644 --- a/doc/upstream-training/accounts.rst +++ b/doc/upstream-training/source/website/accounts.rst @@ -19,7 +19,7 @@ Sign Up #. Fill in your email address, name, password, and accepting the terms of services. -.. image:: ./source/_assets/tools/account-setup/1.png +.. image:: _assets/account-setup/1.png Setup OpenStack Foundation Account @@ -49,7 +49,7 @@ Sign Up `_. #. Complete the application. -.. image:: ./source/_assets/tools/account-setup/2.png +.. image:: _assets/account-setup/2.png Setup Gerrit Account @@ -103,7 +103,7 @@ Individual Contributors #. In Gerrit's `settings `_ click the **New Contributor Agreement** link and sign the agreement. -.. image:: ./source/_assets/tools/account-setup/3.png +.. image:: _assets/account-setup/3.png Contributors From a Company or Organization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -115,7 +115,7 @@ If you are contributing on behalf of a company or organization. Contributor License Agreement `_. -.. image:: ./source/_assets/tools/account-setup/3.png +.. image:: _assets/account-setup/3.png .. note:: @@ -164,7 +164,7 @@ Register Contact Information you will see the line **"Contact information last updated ...."** just above the forms of mailing address. -.. image:: ./source/_assets/tools/account-setup/4.png +.. image:: _assets/account-setup/4.png .. note:: diff --git a/doc/upstream-training/conf.py b/doc/upstream-training/source/website/conf.py similarity index 99% rename from doc/upstream-training/conf.py rename to doc/upstream-training/source/website/conf.py index feb22206..86853a4e 100644 --- a/doc/upstream-training/conf.py +++ b/doc/upstream-training/source/website/conf.py @@ -84,7 +84,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag, # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['source', 'build', 'README.rst'] +exclude_patterns = [] # The reST default role (used for this markup: `text`) to use for all # documents. @@ -283,4 +283,4 @@ texinfo_documents = [ # texinfo_no_detailmenu = False # -- Options for Internationalization output ------------------------------ -locale_dirs = ['source/locale/'] +locale_dirs = ['../locale/'] diff --git a/doc/upstream-training/git.rst b/doc/upstream-training/source/website/git.rst similarity index 100% rename from doc/upstream-training/git.rst rename to doc/upstream-training/source/website/git.rst diff --git a/doc/upstream-training/index.rst b/doc/upstream-training/source/website/index.rst similarity index 100% rename from doc/upstream-training/index.rst rename to doc/upstream-training/source/website/index.rst diff --git a/doc/upstream-training/irc.rst b/doc/upstream-training/source/website/irc.rst similarity index 91% rename from doc/upstream-training/irc.rst rename to doc/upstream-training/source/website/irc.rst index c139aa5c..05be3991 100644 --- a/doc/upstream-training/irc.rst +++ b/doc/upstream-training/source/website/irc.rst @@ -33,7 +33,7 @@ Edit Nick Name Settings #. From the list of **Networks** you should see Freenode. Select that and click 'edit'. -.. image:: ./source/_assets/tools/irc/linux/1.png +.. image:: _assets/irc/linux/1.png Edit Server Settings @@ -42,7 +42,7 @@ Edit Server Settings #. Make sure that **Use SSL for all the servers on this network** is checked. -.. image:: ./source/_assets/tools/irc/linux/2.png +.. image:: _assets/irc/linux/2.png Troubleshooting ^^^^^^^^^^^^^^^ @@ -56,7 +56,7 @@ If all goes well we should get a dialog window indicating the connection to freenode has completed, and what to do next.. For now we'll select "Nothing, I'll join a channel later." -.. image:: ./source/_assets/tools/irc/linux/3.png +.. image:: _assets/irc/linux/3.png When you login to the server for the first time with your nickname, its being used by you, but it's still not registered yet. @@ -71,7 +71,7 @@ address:: /msg nickserv register mysecretpassword test@domain.com -.. image:: ./source/_assets/tools/irc/linux/4.png +.. image:: _assets/irc/linux/4.png If all goes well you should receive a message back instantly that the nick name is registered by you and an activation email will be sent to the email address @@ -90,7 +90,7 @@ need to tell Hexchat to communicate our password over upon connecting. #. In the **Password** put in the password we picked in the previous step and click close. -.. image:: ./source/_assets/tools/irc/linux/5.png +.. image:: _assets/irc/linux/5.png Done @@ -120,13 +120,13 @@ Add A New Connection #. For the **Chat Server Port** type in **6697** and check the **SSL Connection** box. -.. image:: ./source/_assets/tools/irc/macos/1.png +.. image:: _assets/irc/macos/1.png :width: 50% If all goes well in the second window we should see our our new connection and our client connected. -.. image:: ./source/_assets/tools/irc/macos/2.png +.. image:: _assets/irc/macos/2.png :width: 50% Troubleshooting @@ -138,7 +138,7 @@ Troubleshooting * Click **disconnect** and click **connect** to retry connecting with the new nick name. -.. image:: ./source/_assets/tools/irc/macos/3.png +.. image:: _assets/irc/macos/3.png :width: 50% @@ -164,7 +164,7 @@ your own password and email address:: register mysecretpassword test@domain.com -.. image:: ./source/_assets/tools/irc/macos/4.png +.. image:: _assets/irc/macos/4.png :width: 90% If all goes well you should receive a message back instantly that the nick name @@ -181,7 +181,7 @@ need to tell Colloquy to communicate our password over upon connecting. click the **info** icon. #. In the **Password** field type your password. -.. image:: ./source/_assets/tools/irc/macos/5.png +.. image:: _assets/irc/macos/5.png :width: 50% diff --git a/doc/upstream-training/upstream-archives.rst b/doc/upstream-training/source/website/upstream-archives.rst similarity index 100% rename from doc/upstream-training/upstream-archives.rst rename to doc/upstream-training/source/website/upstream-archives.rst diff --git a/doc/upstream-training/upstream-details.rst b/doc/upstream-training/source/website/upstream-details.rst similarity index 100% rename from doc/upstream-training/upstream-details.rst rename to doc/upstream-training/source/website/upstream-details.rst diff --git a/tools/buildlang.sh b/tools/buildlang.sh index 8aeebf32..f954e02c 100755 --- a/tools/buildlang.sh +++ b/tools/buildlang.sh @@ -30,10 +30,10 @@ MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID" # upstream-training contains the HTML and slides contents # build upstream-training slides -sphinx-build -j $NUMBER_OF_CORES -b slides -b gettext ${DIRECTORY}/source/ \ +sphinx-build -j $NUMBER_OF_CORES -b slides -b gettext ${DIRECTORY}/source/slides \ ${DIRECTORY}/source/locale/ # build upstream landing page index.html -sphinx-build -j $NUMBER_OF_CORES -b html -b gettext ${DIRECTORY}/ \ +sphinx-build -j $NUMBER_OF_CORES -b html -b gettext ${DIRECTORY}/source/website \ ${DIRECTORY}/source/locale/ # check all language translation resouce @@ -67,11 +67,11 @@ for locale in `find ${DIRECTORY}/source/locale/ -maxdepth 1 -type d` ; do # build upstream-training slides sphinx-build -j $NUMBER_OF_CORES -b slides -D language=${language} \ -d "${DIRECTORY}/build/slides.doctrees" \ - ${DIRECTORY}/source/ ${DIRECTORY}/build/slides/ + ${DIRECTORY}/source/slides ${DIRECTORY}/build/slides/ # build upstream landing page index.html sphinx-build -j $NUMBER_OF_CORES -b html -D language=${language} \ -d "${DIRECTORY}/build/slides.doctrees" \ - ${DIRECTORY}/ ${DIRECTORY}/build/slides/ + ${DIRECTORY}/source/website ${DIRECTORY}/build/slides/ # move built guide to publish directory mkdir -p publish-docs/${language}/${DOCNAME}/ diff --git a/tox.ini b/tox.ini index d95fbe55..33194ec8 100644 --- a/tox.ini +++ b/tox.ini @@ -25,17 +25,8 @@ ignore-path = doc/upstream-training/build/*,doc/training-guides/build/* [testenv:checkbuild] commands = - # Niceness test - doc8 doc/upstream-training - doc8 doc/training-guides - # Build upstream-training slides - sphinx-build -W -b slides -d doc/upstream-training/build/slides.doctrees doc/upstream-training/source/ doc/upstream-training/build/slides - # Build upstream landing page - sphinx-build -W -b html -d doc/upstream-training/build/slides.doctrees doc/upstream-training doc/upstream-training/build/slides - # Build training-guides slides - sphinx-build -W -b slides -d doc/training-guides/build/slides.doctrees/associate-guide doc/training-guides/associate-guide/ doc/training-guides/build/slides/associate-guide - # Build training-guides landing page - sphinx-build -b html -d doc/training-guides/build/slides.doctrees doc/training-guides doc/training-guides/build/slides doc/training-guides/index.rst + {[testenv:upstream-slides]commands} + {[testenv:training-slides]commands} # Publish for check site mkdir -p publish-docs/upstream-training mkdir -p publish-docs/training-guides @@ -45,14 +36,8 @@ commands = [testenv:publishdocs] passenv = ZUUL* commands = - # Build upstream-training slides - sphinx-build -W -b slides -d doc/upstream-training/build/slides.doctrees/ doc/upstream-training/source/ doc/upstream-training/build/slides - # Build upstream landing page - sphinx-build -W -b html -d doc/upstream-training/build/slides.doctrees/ doc/upstream-training doc/upstream-training/build/slides - # Build training-guides slides - sphinx-build -W -b slides -d doc/training-guides/build/slides.doctrees/associate-guide doc/training-guides/associate-guide/ doc/training-guides/build/slides/associate-guide - # Build training-guides landing page - sphinx-build -W -b html -d doc/training-guides/build/slides.doctrees doc/training-guides doc/training-guides/build/slides doc/training-guides/index.rst + {[testenv:upstream-slides]commands} + {[testenv:training-slides]commands} # Publish as draft mkdir -p publish-docs/draft/training-guides rsync -av doc/training-guides/build/slides/ publish-docs/draft/training-guides/ @@ -69,18 +54,18 @@ commands = # Niceness test doc8 doc/upstream-training # Build upstream-training slides - sphinx-build -W -b slides doc/upstream-training/source/ doc/upstream-training/build/slides + sphinx-build -W -b slides -d doc/upstream-training/build/slides.doctrees doc/upstream-training/source/slides doc/upstream-training/build/slides # Build upstream landing page index.html - sphinx-build -W -b html doc/upstream-training doc/upstream-training/build/slides + sphinx-build -W -b html -d doc/upstream-training/build/slides.doctrees doc/upstream-training/source/website doc/upstream-training/build/slides [testenv:training-slides] commands = # Niceness test doc8 doc/training-guides # Build training-guides slides - sphinx-build -W -b slides doc/training-guides/associate-guide/ doc/training-guides/build/slides/associate-guide + sphinx-build -W -b slides -d doc/training-guides/build/slides.doctrees/associate-guide doc/training-guides/source/slides doc/training-guides/build/slides/associate-guide # Build training-guides landing page index.html - sphinx-build -W -b html doc/training-guides doc/training-guides/build/slides doc/training-guides/index.rst + sphinx-build -b html -d doc/training-guides/build/slides.doctrees doc/training-guides/source/website doc/training-guides/build/slides [testenv:generatepot-training] # Generate POT files for translation