From 79227bc36ca4af9457c1d25e78833fccee06db43 Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Mon, 24 Oct 2016 17:18:57 +0900
Subject: [PATCH] [upstream] add account summary

Also, prioritize OpenStack Foundation account

Change-Id: I064dcfac6b7d7875ab4a18890f55c964bb617632
---
 .../slides/workflow-reg-and-accounts.rst      | 19 +++++++--
 .../source/website/accounts.rst               | 40 +++++++++----------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst b/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst
index afc7ce5a..60c8f7fa 100644
--- a/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst
+++ b/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst
@@ -7,11 +7,16 @@ Registration and Accounts
    :width: 100%
 
 
-http://launchpad.net/
-=====================
+Accounts
+========
 
-.. image:: ./_assets/12-01-launchpad-net.png
-  :width: 75%
+- OpenStack Foundation Account
+
+  - code contributions, wiki, vote, presentations
+
+- Launchpad
+
+  - bug tracking, blueprints
 
 https://www.openstack.org/join/
 ===============================
@@ -19,6 +24,12 @@ https://www.openstack.org/join/
 .. image:: ./_assets/12-join-openstack-org.png
   :width: 100%
 
+http://launchpad.net/
+=====================
+
+.. image:: ./_assets/12-01-launchpad-net.png
+  :width: 75%
+
 http://review.openstack.org
 ===========================
 
diff --git a/doc/upstream-training/source/website/accounts.rst b/doc/upstream-training/source/website/accounts.rst
index d788a67c..15dbd889 100644
--- a/doc/upstream-training/source/website/accounts.rst
+++ b/doc/upstream-training/source/website/accounts.rst
@@ -2,26 +2,6 @@
 Account Setup
 #############
 
-Setup Launchpad
-===============
-
-What is Launchpad?
-------------------
-Launchpad is how the OpenStack community does tracking for things like bug
-reports. This account is also how we will identify ourselves in OpenStack's
-code review system.
-
-Sign Up
--------
-#. Go to the `Launchpad login or create account page
-   <https://launchpad.net/+login>`_
-#. Click the **I am a new Ubuntu One user**.
-#. Fill in your email address, name, password, and accepting the terms of
-   services.
-
-.. image:: _assets/account-setup/1.png
-
-
 Setup OpenStack Foundation Account
 ==================================
 
@@ -52,6 +32,26 @@ Sign Up
 .. image:: _assets/account-setup/2.png
 
 
+Setup Launchpad
+===============
+
+What is Launchpad?
+------------------
+Launchpad is how the OpenStack community does tracking for things like bug
+reports. This account is also how we will identify ourselves in OpenStack's
+code review system.
+
+Sign Up
+-------
+#. Go to the `Launchpad login or create account page
+   <https://launchpad.net/+login>`_
+#. Click the **I am a new Ubuntu One user**.
+#. Fill in your email address, name, password, and accepting the terms of
+   services.
+
+.. image:: _assets/account-setup/1.png
+
+
 Setup Gerrit Account
 ====================