From 59512cac3ea9528ee9b9a1b80dfb8056d3247309 Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Wed, 28 Sep 2016 16:51:35 +0900
Subject: [PATCH] [upstream] cleanup confusable content

Change-Id: I0817e2e0aa2270c6b8b3f2801b355c68be25e298
Closes-Bug: #1628089
---
 doc/upstream-training/index.rst | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/upstream-training/index.rst b/doc/upstream-training/index.rst
index 04a01f75..e8d5bc5c 100644
--- a/doc/upstream-training/index.rst
+++ b/doc/upstream-training/index.rst
@@ -57,14 +57,20 @@ How to prepare
 Staff
 =====
 
-Marton Kiss will lead the next training in Austin, in English. Tools and
-processes for mentors and staff are kept on the `admin
-<https://wiki.openstack.org/wiki/OpenStack_Upstream_Training/Admin>`_ page.
+The trainers for the upcoming training in Barcelona:
 
-**Still looking for help: please**
-`register <https://openstackfoundation.formstack.com/forms/mentoring>`_
+Ildiko Vancsa, Kendall Nelson, Mark Korondi, and Marton Kiss
 
-For more information about the past trainings and local upstream trainings,
+We would like to make as many matches before the Barcelona Summit as we can
+so you can meet with your mentee/mentor there if you are both attending.
+
+`Sign-up to get involved here
+<https://openstackfoundation.formstack.com/forms/mentor_mentee_signup_pre_barcelona>`__.
+
+Archives
+========
+
+For more information about the past trainings and the local upstream trainings,
 see :doc:`upstream-archives`.
 
 Outline and online slide index