From 1299ac89cda23ca7015395da21b8286b591135a0 Mon Sep 17 00:00:00 2001
From: Kendall Nelson <kennelson11@gmail.com>
Date: Thu, 6 Apr 2017 11:03:19 -0500
Subject: [PATCH] [upstream] Updates to Intro Slide Decks

This patch updates the mission statement to the current one while removing
classroom introductions to save time. It also removes intro info about IRC
since we will go deeper into that later on and they should have some of the
cursory info from their setup that is required before the class.

Change-Id: Ic03a432fb0fc42c28cfb16cf5608847ed040dd4b
---
 .../source/slides/intro-introduction.rst      | 41 ++++---------------
 .../slides/intro-openstack-as-community.rst   | 20 ++++-----
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/doc/upstream-training/source/slides/intro-introduction.rst b/doc/upstream-training/source/slides/intro-introduction.rst
index 4c391f9c..ae204ef2 100644
--- a/doc/upstream-training/source/slides/intro-introduction.rst
+++ b/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
diff --git a/doc/upstream-training/source/slides/intro-openstack-as-community.rst b/doc/upstream-training/source/slides/intro-openstack-as-community.rst
index 6b8138a2..7f31b5ab 100644
--- a/doc/upstream-training/source/slides/intro-openstack-as-community.rst
+++ b/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