From fcdb3bf30834c54b117f49bcf6f67fcf3e73f522 Mon Sep 17 00:00:00 2001
From: "Ian Y. Choi" <ianyrchoi@gmail.com>
Date: Mon, 21 Nov 2016 23:46:45 +0900
Subject: [PATCH] [upstream] updates archives with changes

- Staff section in index referred Barcelona, not Boston
  upstream training.
- Adds ildikov's name on the description who led upstream trainings
  in upstream-archives.
- Mentions an article for Barcelona upstream training with mentors
  in upstream-archives.

Change-Id: I94e82ea6814f71158150a1e88b7821a85c98600b
---
 .../source/website/index.rst                  |  3 ++-
 .../source/website/upstream-archives.rst      | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/doc/upstream-training/source/website/index.rst b/doc/upstream-training/source/website/index.rst
index 277b963a..fa1e5c4d 100644
--- a/doc/upstream-training/source/website/index.rst
+++ b/doc/upstream-training/source/website/index.rst
@@ -79,7 +79,8 @@ How to prepare
 Staff
 =====
 
-The trainers for the upcoming training in Barcelona:
+The trainers have led the training in Barcelona and will lead the next training
+in Boston, in English:
 
 Ildiko Vancsa, Kendall Nelson, Mark Korondi, and Marton Kiss
 
diff --git a/doc/upstream-training/source/website/upstream-archives.rst b/doc/upstream-training/source/website/upstream-archives.rst
index 6b2a3296..83edcb8b 100644
--- a/doc/upstream-training/source/website/upstream-archives.rst
+++ b/doc/upstream-training/source/website/upstream-archives.rst
@@ -9,9 +9,33 @@ Besides this "official" event, some user groups hold the local
 Upstream trainings.
 
 A big thank you to everyone that has made this possible, especially
-Loic Dachary, Stefano Maffulli, Tim Freund, and Marton Kiss
+Loic Dachary, Stefano Maffulli, Tim Freund, Marton Kiss, and Ildikó Váncsa
 who lead the trainings.
 
+2016 Barcelona, Spain
+=====================
+
+`What’s new with OpenStack Upstream Training
+<http://superuser.openstack.org/articles/openstack-upstream-training-revamp/>`_.
+
+**Mentors**
+
+* Ildikó Váncsa – The OpenStack Foundation
+* Márk Korondi – IBM Research Zürich
+* Kendall Nelson – The OpenStack Foundation
+* Victoria Martinez de la Cruz – Red Hat
+* Márton Kiss – Aptira
+* Jay Bryant – IBM
+* Patrick East – PureStorage
+* Xing Yang – Dell EMC
+* Ghanshyam Mann – NEC
+* Gergely Csatári – Nokia
+* Melvin Hillsman – OSIC
+* Christian Berendt – B1 Systems GmbH
+* Anne Gentle – Cisco
+* Jirayut Nimsaeng- Kaidee
+* Kato Tomoyuki- Fujitsu
+
 2016 Austin, USA
 ================