From 44bedd120221a9f2614e078a0e899469a3534e50 Mon Sep 17 00:00:00 2001 From: Kendall Nelson Date: Sat, 1 Oct 2016 16:40:51 -0500 Subject: [PATCH] [upstream] Reordering Content This patch removed the broken numbering system from the slide rst files and makes the other necessary updates. This patch also modifies the order of the modules to give the education a better flow. Change-Id: I02714be3253c503a418b2556101dd21afb5e47d9 --- doc/upstream-training/index.rst | 56 ++++++++++--------- ...chive-training-agile-for-contributors.rst} | 0 ...ranching-model.rst => branching-model.rst} | 0 .../{11-devstack.rst => code-devstack.rst} | 0 ...ummit.rst => howitsmade-design-summit.rst} | 0 ...etings.rst => howitsmade-irc-meetings.rst} | 0 ...s.rst => howitsmade-official-projects.rst} | 0 ...cycle.rst => howitsmade-release-cycle.rst} | 0 ...ors.rst => howitsmade-relevant-actors.rst} | 0 ...rst => howitsmade-technical-committee.rst} | 0 ...ntroduction.rst => intro-introduction.rst} | 0 ...y.rst => intro-openstack-as-community.rst} | 0 ...re.rst => intro-openstack-as-software.rst} | 0 doc/upstream-training/source/slide-index.rst | 55 ++++++++++-------- ...essage.rst => workflow-commit-message.rst} | 0 .../{14-gerrit.rst => workflow-gerrit.rst} | 0 ...ibute.rst => workflow-howtocontribute.rst} | 0 .../{18-jenkins.rst => workflow-jenkins.rst} | 0 ...3-launchpad.rst => workflow-launchpad.rst} | 0 ...6-reviewing.rst => workflow-reviewing.rst} | 0 ...rst => workflow-setup-and-first-patch.rst} | 0 ...orkflow-training-contribution-process.rst} | 0 22 files changed, 60 insertions(+), 51 deletions(-) rename doc/upstream-training/source/{21-training-agile-for-contributors.rst => archive-training-agile-for-contributors.rst} (100%) rename doc/upstream-training/source/{15-branching-model.rst => branching-model.rst} (100%) rename doc/upstream-training/source/{11-devstack.rst => code-devstack.rst} (100%) rename doc/upstream-training/source/{05-design-summit.rst => howitsmade-design-summit.rst} (100%) rename doc/upstream-training/source/{06-irc-meetings.rst => howitsmade-irc-meetings.rst} (100%) rename doc/upstream-training/source/{04-official-openstack-projects.rst => howitsmade-official-projects.rst} (100%) rename doc/upstream-training/source/{01-release-cycle.rst => howitsmade-release-cycle.rst} (100%) rename doc/upstream-training/source/{02-relevant-actors.rst => howitsmade-relevant-actors.rst} (100%) rename doc/upstream-training/source/{03-technical-committee.rst => howitsmade-technical-committee.rst} (100%) rename doc/upstream-training/source/{00-00-introduction.rst => intro-introduction.rst} (100%) rename doc/upstream-training/source/{00-02-openstack-as-community.rst => intro-openstack-as-community.rst} (100%) rename doc/upstream-training/source/{00-01-openstack-as-software.rst => intro-openstack-as-software.rst} (100%) rename doc/upstream-training/source/{17-commit-message.rst => workflow-commit-message.rst} (100%) rename doc/upstream-training/source/{14-gerrit.rst => workflow-gerrit.rst} (100%) rename doc/upstream-training/source/{12-howtocontribute.rst => workflow-howtocontribute.rst} (100%) rename doc/upstream-training/source/{18-jenkins.rst => workflow-jenkins.rst} (100%) rename doc/upstream-training/source/{13-launchpad.rst => workflow-launchpad.rst} (100%) rename doc/upstream-training/source/{16-reviewing.rst => workflow-reviewing.rst} (100%) rename doc/upstream-training/source/{20-setup-and-first-patch.rst => workflow-setup-and-first-patch.rst} (100%) rename doc/upstream-training/source/{19-training-contribution-process.rst => workflow-training-contribution-process.rst} (100%) diff --git a/doc/upstream-training/index.rst b/doc/upstream-training/index.rst index 31bd4737..755a4845 100644 --- a/doc/upstream-training/index.rst +++ b/doc/upstream-training/index.rst @@ -99,40 +99,42 @@ Outline and online slide index Introduction ------------ -* `Introduction <00-00-introduction.html>`_ -* `Introducing OpenStack as a Software <00-01-openstack-as-software.html>`_ -* `Introducing OpenStack as a Community <00-02-openstack-as-community.html>`_ +* `Introduction `_ +* `Introducing OpenStack as a Software `_ +* `Introducing OpenStack as a Community `_ -How OpenStack is made +How OpenStack is Made --------------------- -* `Release cycle <01-release-cycle.html>`_ -* `Relevant actors <02-relevant-actors.html>`_ -* `OpenStack Governance <03-technical-committee.html>`_ -* `Official OpenStack projects <04-official-openstack-projects.html>`_ -* `OpenStack Design Summit <05-design-summit.html>`_ -* `IRC meetings <06-irc-meetings.html>`_ +* `Official OpenStack projects `_ +* `OpenStack Design Summit `_ +* `Relevant actors `_ +* `Release cycle `_ +* `OpenStack Governance `_ +* `IRC meetings `_ -Workflow of an OpenStack contribution and tools ------------------------------------------------ - -* `devstack.org <11-devstack.html>`_ -* `How to contribute <12-howtocontribute.html>`_ -* `launchpad.net <13-launchpad.html>`_ -* `review.openstack.org <14-gerrit.html>`_ -* `Branching model <15-branching-model.html>`_ -* `Reviewing <16-reviewing.html>`_ -* `Commit messages <17-commit-message.html>`_ -* `Jenkins <18-jenkins.html>`_ - -The Contribution Process ------------------------- +Workflow and Tools for Participation +------------------------------------ * `Overview of the contribution process - <19-training-contribution-process.html>`_ + `_ +* `How to Contribute `_ +* `Tracking `_ +* `Gerrit `_ +* `Reviewing `_ +* `Commit Messages `_ +* `Jenkins `_ * `Guide to SetUp and Push First Patch - <20-setup-and-first-patch.html>`_ + `_ + +Code Deep Dive +-------------- +* `devstack.org `_ + +Archive +------- * `Lego applied to Free Software contributions - <21-training-agile-for-contributors.html>`_ + `_ + `Complete index in slide format only `_ diff --git a/doc/upstream-training/source/21-training-agile-for-contributors.rst b/doc/upstream-training/source/archive-training-agile-for-contributors.rst similarity index 100% rename from doc/upstream-training/source/21-training-agile-for-contributors.rst rename to doc/upstream-training/source/archive-training-agile-for-contributors.rst diff --git a/doc/upstream-training/source/15-branching-model.rst b/doc/upstream-training/source/branching-model.rst similarity index 100% rename from doc/upstream-training/source/15-branching-model.rst rename to doc/upstream-training/source/branching-model.rst diff --git a/doc/upstream-training/source/11-devstack.rst b/doc/upstream-training/source/code-devstack.rst similarity index 100% rename from doc/upstream-training/source/11-devstack.rst rename to doc/upstream-training/source/code-devstack.rst diff --git a/doc/upstream-training/source/05-design-summit.rst b/doc/upstream-training/source/howitsmade-design-summit.rst similarity index 100% rename from doc/upstream-training/source/05-design-summit.rst rename to doc/upstream-training/source/howitsmade-design-summit.rst diff --git a/doc/upstream-training/source/06-irc-meetings.rst b/doc/upstream-training/source/howitsmade-irc-meetings.rst similarity index 100% rename from doc/upstream-training/source/06-irc-meetings.rst rename to doc/upstream-training/source/howitsmade-irc-meetings.rst diff --git a/doc/upstream-training/source/04-official-openstack-projects.rst b/doc/upstream-training/source/howitsmade-official-projects.rst similarity index 100% rename from doc/upstream-training/source/04-official-openstack-projects.rst rename to doc/upstream-training/source/howitsmade-official-projects.rst diff --git a/doc/upstream-training/source/01-release-cycle.rst b/doc/upstream-training/source/howitsmade-release-cycle.rst similarity index 100% rename from doc/upstream-training/source/01-release-cycle.rst rename to doc/upstream-training/source/howitsmade-release-cycle.rst diff --git a/doc/upstream-training/source/02-relevant-actors.rst b/doc/upstream-training/source/howitsmade-relevant-actors.rst similarity index 100% rename from doc/upstream-training/source/02-relevant-actors.rst rename to doc/upstream-training/source/howitsmade-relevant-actors.rst diff --git a/doc/upstream-training/source/03-technical-committee.rst b/doc/upstream-training/source/howitsmade-technical-committee.rst similarity index 100% rename from doc/upstream-training/source/03-technical-committee.rst rename to doc/upstream-training/source/howitsmade-technical-committee.rst diff --git a/doc/upstream-training/source/00-00-introduction.rst b/doc/upstream-training/source/intro-introduction.rst similarity index 100% rename from doc/upstream-training/source/00-00-introduction.rst rename to doc/upstream-training/source/intro-introduction.rst diff --git a/doc/upstream-training/source/00-02-openstack-as-community.rst b/doc/upstream-training/source/intro-openstack-as-community.rst similarity index 100% rename from doc/upstream-training/source/00-02-openstack-as-community.rst rename to doc/upstream-training/source/intro-openstack-as-community.rst diff --git a/doc/upstream-training/source/00-01-openstack-as-software.rst b/doc/upstream-training/source/intro-openstack-as-software.rst similarity index 100% rename from doc/upstream-training/source/00-01-openstack-as-software.rst rename to doc/upstream-training/source/intro-openstack-as-software.rst diff --git a/doc/upstream-training/source/slide-index.rst b/doc/upstream-training/source/slide-index.rst index 3d4e6918..4a7b2a15 100644 --- a/doc/upstream-training/source/slide-index.rst +++ b/doc/upstream-training/source/slide-index.rst @@ -12,44 +12,51 @@ Introduction .. toctree:: :maxdepth: 1 - 00-00-introduction.rst - 00-01-openstack-as-software.rst - 00-02-openstack-as-community.rst + intro-introduction.rst + intro-openstack-as-software.rst + intro-openstack-as-community.rst -How OpenStack is made +How OpenStack is Made ===================== .. toctree:: :maxdepth: 1 - 01-release-cycle.rst - 02-relevant-actors - 03-technical-committee - 04-official-openstack-projects - 05-design-summit - 06-irc-meetings + howitsmade-official-projects.rst + howitsmade-design-summit.rst + howitsmade-relevant-actors.rst + howitsmade-release-cycle.rst + howitsmade-technical-committee.rst + howitsmade-irc-meetings.rst + branching-model.rst -Workflow of an OpenStack contribution and tools +Workflow and Tools for Participation =============================================== .. toctree:: :maxdepth: 1 - 11-devstack - 12-howtocontribute - 13-launchpad - 14-gerrit - 15-branching-model - 16-reviewing - 17-commit-message - 18-jenkins + workflow-training-contribution-process.rst + workflow-howtocontribute.rst + workflow-launchpad.rst + workflow-gerrit.rst + workflow-reviewing.rst + workflow-commit-message.rst + workflow-jenkins.rst + workflow-setup-and-first-patch.rst -The Contribution Process -======================== +Code Deep Dive +============== .. toctree:: :maxdepth: 1 - 19-training-contribution-process - 20-setup-and-first-patch - 21-training-agile-for-contributors + code-devstack.rst + +Archive +======= + +.. toctree:: + :maxdepth: 1 + + archive-training-agile-for-contributors.rst diff --git a/doc/upstream-training/source/17-commit-message.rst b/doc/upstream-training/source/workflow-commit-message.rst similarity index 100% rename from doc/upstream-training/source/17-commit-message.rst rename to doc/upstream-training/source/workflow-commit-message.rst diff --git a/doc/upstream-training/source/14-gerrit.rst b/doc/upstream-training/source/workflow-gerrit.rst similarity index 100% rename from doc/upstream-training/source/14-gerrit.rst rename to doc/upstream-training/source/workflow-gerrit.rst diff --git a/doc/upstream-training/source/12-howtocontribute.rst b/doc/upstream-training/source/workflow-howtocontribute.rst similarity index 100% rename from doc/upstream-training/source/12-howtocontribute.rst rename to doc/upstream-training/source/workflow-howtocontribute.rst diff --git a/doc/upstream-training/source/18-jenkins.rst b/doc/upstream-training/source/workflow-jenkins.rst similarity index 100% rename from doc/upstream-training/source/18-jenkins.rst rename to doc/upstream-training/source/workflow-jenkins.rst diff --git a/doc/upstream-training/source/13-launchpad.rst b/doc/upstream-training/source/workflow-launchpad.rst similarity index 100% rename from doc/upstream-training/source/13-launchpad.rst rename to doc/upstream-training/source/workflow-launchpad.rst diff --git a/doc/upstream-training/source/16-reviewing.rst b/doc/upstream-training/source/workflow-reviewing.rst similarity index 100% rename from doc/upstream-training/source/16-reviewing.rst rename to doc/upstream-training/source/workflow-reviewing.rst diff --git a/doc/upstream-training/source/20-setup-and-first-patch.rst b/doc/upstream-training/source/workflow-setup-and-first-patch.rst similarity index 100% rename from doc/upstream-training/source/20-setup-and-first-patch.rst rename to doc/upstream-training/source/workflow-setup-and-first-patch.rst diff --git a/doc/upstream-training/source/19-training-contribution-process.rst b/doc/upstream-training/source/workflow-training-contribution-process.rst similarity index 100% rename from doc/upstream-training/source/19-training-contribution-process.rst rename to doc/upstream-training/source/workflow-training-contribution-process.rst