Merge "[upstream] Updates to Intro Slide Decks"

doc/upstream-training/source/slides/intro-introduction.rst

@@ -75,44 +75,21 @@ Agenda - Day 2, afternoon
 
 - Closing exercise
 
-Introductions
-=============
+Exercise
+========
 
-- Say a few words about yourself
+Introduce yourself to the others at your table! Who you are,
+what experience you have with OpenStack if any, what company
+you are at and what your role is there, why you are attending
+the course, etc.
 
-  - Name, current role, company
-  - Experience with OpenStack if any
-  - Areas of interest
-  - Why you're attending the course? What are your expectations?
-
-- Trainers
-- Mentors/helpers
-- Attendees
-
-- Add your details to the class etherpad (Specified on the actual training)
-
-Team up
-=======
-
-- Form groups of 4 (Actual group size depends on the class size)
-
-  - People with similar area of interest
-  - Different level of experience
-
-- Sit together
-- Have one mentor sit together with each group
-
-- Let's get started!!!
+.. note::
+   We will introduce ourselves first and then turn it over to them
+   to talk to each other at their tables.
 
 Jump on IRC
 ===========
 
-- We are new age people with some good old technology around
-- IRC
-
-  - Text based chat
-  - Freenode
-
 - Join the #openstack-101 channel
 
   - Ask questions during the class

doc/upstream-training/source/slides/intro-openstack-as-community.rst

@@ -11,9 +11,12 @@ OpenStack as a Community
 
 - Mission
 
-  To produce the ubiquitous Open Source Cloud Computing platform that will meet
-  the needs of public and private clouds regardless of size, by being simple to
-  implement and massively scalable.
+::
+
+  To produce a ubiquitous Open Source Cloud Computing platform that is
+  easy to use, simple to implement, interoperable between deployments,
+  works well at all scales, and meets the needs of users and operators
+  of both public and private clouds.
 
 Four "open"s
 ============
@@ -42,21 +45,18 @@ Framework
 
   - Wiki
   - IRC
-  - Etherpad
+  - Etherpad/Ethercalc
 
 Life in and around OpenStack
 ============================
 
-- Projects under a "Big Tent"
-
-  - Code
-  - Documentation
-
+- Official & Unofficial Projects
 - Working groups
 - User groups
 - Events
 
-  - Summits
+  - Summits/Forums
+  - Project Teams Gatherings (PTGs)
   - Operators' meet ups
   - OpenStack Days