diff --git a/doc/upstream-training/01-release-cycle.rst b/doc/upstream-training/01-release-cycle.rst index 374e0a11..4b903d41 100644 --- a/doc/upstream-training/01-release-cycle.rst +++ b/doc/upstream-training/01-release-cycle.rst @@ -35,7 +35,7 @@ Planning : Discuss Planning : Target ================= -- file new blueprints +- file new blueprints and/or specs - set a target milestone - when in the cycle they intend to complete it - PTLs triage the submitted blueprints and set priority diff --git a/doc/upstream-training/04-program-ecosystem.rst b/doc/upstream-training/04-program-ecosystem.rst index 87ba1961..ede90cab 100644 --- a/doc/upstream-training/04-program-ecosystem.rst +++ b/doc/upstream-training/04-program-ecosystem.rst @@ -58,7 +58,7 @@ Core (or What is OpenStack) =========================== - DefCore initiative, sponsored by the Board of Directors -- TODO +- Currently work in progress for qualifying APIs ---- diff --git a/doc/upstream-training/05-design-summit.rst b/doc/upstream-training/05-design-summit.rst index 707171b4..b376fd93 100644 --- a/doc/upstream-training/05-design-summit.rst +++ b/doc/upstream-training/05-design-summit.rst @@ -43,12 +43,12 @@ Etherpads Proposing a session =================== -.. image:: ./_assets/05-04-sessions.png +- https://wiki.openstack.org/wiki/Summit/Kilo ---- -List of sessions -================ +List of sessions (formerly) +=========================== .. image:: ./_assets/05-05-sessions.png @@ -57,10 +57,8 @@ List of sessions Selection of sessions ===================== -- #Scheduled#: Your suggestion was accepted and has been scheduled -- #Preapproved#: Your suggestion was accepted and should be scheduled (or merged with another session) soon -- #Incomplete#: Your suggestion needs to be fixed before it can be accepted, please address reviewers comments -- #Refused#: Your suggestion has been rejected, see reviewers comments for an explanation +- TC votes for sessions in cross-project and other-projects tracks +- PTLs vote for sessions in project tracks ---- diff --git a/doc/upstream-training/13-launchpad.rst b/doc/upstream-training/13-launchpad.rst index e589860a..0ae1a26f 100644 --- a/doc/upstream-training/13-launchpad.rst +++ b/doc/upstream-training/13-launchpad.rst @@ -14,7 +14,7 @@ Blueprint - a title - a description - longer-form go on a wiki page -- Nova and Neutron manage blueprints on a git repo +- Most of the projects now manage blueprints on a git repo called specs - https://wiki.openstack.org/wiki/Blueprints#Nova - https://wiki.openstack.org/wiki/Blueprints#Neutron diff --git a/doc/upstream-training/14-gerrit.rst b/doc/upstream-training/14-gerrit.rst index 3005b2e9..e36f1331 100644 --- a/doc/upstream-training/14-gerrit.rst +++ b/doc/upstream-training/14-gerrit.rst @@ -36,7 +36,7 @@ git config Install git review ================== -- apt-get / yum / … git review +- apt-get / yum / pip install … git review .. image:: ./_assets/14-05-install.png @@ -70,13 +70,6 @@ running unit tests ---- -git review -D -============= - -.. image:: ./_assets/14-10-git-review.png - ----- - invite reviewers ================ @@ -99,13 +92,6 @@ git commit --amend ---- -git review -D ( repush ) -======================== - -.. image:: ./_assets/14-14-git-repush.png - ----- - gerrit patchset history ======================= @@ -130,5 +116,5 @@ patchset diffs Exercise ======== -Push a work in progress (wip) or draft and invite reviewers. +Push a work in progress (wip) and invite reviewers. diff --git a/doc/upstream-training/17-commit-message.rst b/doc/upstream-training/17-commit-message.rst index 803f688e..d71b4b5a 100644 --- a/doc/upstream-training/17-commit-message.rst +++ b/doc/upstream-training/17-commit-message.rst @@ -6,6 +6,7 @@ Commit messages - anyone doing Gerrit code review can act as the stick - review the commit message, not just the code - Developers read mostly, write occasionally +- https://wiki.openstack.org/wiki/GitCommitMessages ---- diff --git a/doc/upstream-training/_assets/05-04-sessions.png b/doc/upstream-training/_assets/05-04-sessions.png deleted file mode 100644 index 07892fca..00000000 Binary files a/doc/upstream-training/_assets/05-04-sessions.png and /dev/null differ diff --git a/doc/upstream-training/_assets/14-10-git-review.png b/doc/upstream-training/_assets/14-10-git-review.png deleted file mode 100644 index 49028483..00000000 Binary files a/doc/upstream-training/_assets/14-10-git-review.png and /dev/null differ diff --git a/doc/upstream-training/_assets/14-14-git-repush.png b/doc/upstream-training/_assets/14-14-git-repush.png deleted file mode 100644 index fdeed546..00000000 Binary files a/doc/upstream-training/_assets/14-14-git-repush.png and /dev/null differ