Merge lp:~dholbach/summit/uds-to-uos into lp:summit

[Daniel Holbach]

UDS -> UOS
make dpm the replacement jonobacon :-)

[lp:~dholbach/summit/uds-to-uos]

573. By Daniel Holbach on 2015-10-27

Ubuntu Developer Summit -> Ubuntu Online Summit

[Chris Johnston (cjohnston)]

2 inline comments.

[lp:~dholbach/summit/uds-to-uos]

574. By Daniel Holbach on 2015-10-27

update current/past usage, remove comment about Joey Stanford at Linaro Connect

[Daniel Holbach (dholbach)]

Updated with Chris' comments, thanks.

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'docs/index.rst'
--- docs/index.rst	2012-07-13 18:09:46 +0000
+++ docs/index.rst	2015-10-27 13:47:02 +0000
@@ -6,7 +6,7 @@
 Welcome to The Summit Scheduler documentation!
 ==============================================
 
-The Summit Scheduler is a highly agile scheduling solution for conferences. Built originally for use at Ubuntu Developer Summits, the Summit Scheduler is now also used by Linaro at Linaro Connect and at the Linux Plumbers Conference.
+The Summit Scheduler is a highly agile scheduling solution for conferences. Built originally for use at Ubuntu Developer Summits, the Summit Scheduler is now being used by the Ubuntu Online Summit, and Linaro at Linaro Connect and at the Linux Plumbers Conference in the past.
 
 If you are interested in using the Summit Scheduler at your conference, please contact Chris Johnston <[e-mail]>.
 

=== modified file 'docs/scheduling.rst'
--- docs/scheduling.rst	2012-05-12 18:18:07 +0000
+++ docs/scheduling.rst	2015-10-27 13:47:02 +0000
@@ -39,7 +39,7 @@
 
 If none of the existing blueprints match your topic, you may register a new Blueprint by selecting the "Register a blueprint." 
 
-When creating a blueprint, please use the naming convention below. Keep in mind that the name of a blueprint is very important as it affects how your meeting will appear in the scheduling tool at UDS. 
+When creating a blueprint, please use the naming convention below. Keep in mind that the name of a blueprint is very important as it affects how your meeting will appear in the scheduling tool at UOS. 
 
 The format is either:
 
@@ -60,11 +60,11 @@
 
 **For**
 
-When registering a blueprint for UDS, the project will be "ubuntu."
+When registering a blueprint for UOS, the project will be "ubuntu."
 
 **Name**
 
-The name is important as it determines how your meeting will appear in the scheduling tool at UDS, here are the track names:
+The name is important as it determines how your meeting will appear in the scheduling tool at UOS, here are the track names:
 
 consumer community design desktop foundations hardware security serverandcloud ubuntu-arm
 
@@ -87,7 +87,7 @@
 
 http://pad.ubuntu.com/serverandcloud-p-openstack-integration
 
-Don't worry, the system will autocreate your etherpad during UDS.
+Don't worry, the system will autocreate your etherpad during UOS.
 
 **Definition**
 
@@ -105,15 +105,11 @@
 
 If your blueprint is not on the schedule during the week before the summit, please ask your track lead to approve it. If they don't have it then it means you didn't submit it to the correct sprint (see the video). Track leads will be approving specs on a regular basis, so if you don't see your meetings on the schedule it's up to YOU to bother the track lead.
 
-Ubuntu Developer Summit
------------------------
-
-Jono Bacon and Michael Hall keep an eye on the incoming specs for UDS, so if a track lead is particularly swamped we help keep the submissions going smoothly, but it helps tremendously when you check.
-
-Linaro Connect
----------------
-
-Joey Stanford fills the role of monitoring incoming specs for Linaro Connect.
+Ubuntu Online Summit
+--------------------
+
+David Planella and Michael Hall keep an eye on the incoming specs for UOS, so if a track lead is particularly swamped we help keep the submissions going smoothly, but it helps tremendously when you check.
+
 
 ------------------
 Tips

=== modified file 'docs/using.rst'
--- docs/using.rst	2012-05-12 18:10:57 +0000
+++ docs/using.rst	2015-10-27 13:47:02 +0000
@@ -2,7 +2,7 @@
 Using The Summit Scheduler
 ==========================
 
-The Summit Scheduler is a web tool utilized at Ubuntu Developer Summit and Linaro Connect.
+The Summit Scheduler is a web tool utilized at Ubuntu Online Summit and has been used at Linaro Connect and elsewhere.
 
 Registering to Attend a Summit
 ==============================

=== modified file 'summit/common/templates/common/home.html'
--- summit/common/templates/common/home.html	2015-10-12 18:05:58 +0000
+++ summit/common/templates/common/home.html	2015-10-27 13:47:02 +0000
@@ -16,15 +16,15 @@
 
 <div class="row row-principles">
     <div class="span-12">
-        <h2>Ubuntu Developer Summit Principles</h2>
+        <h2>Ubuntu Online Summit Principles</h2>
         <ul class="clearfix">
             <li class="principle-collaboration">
                 <h3>Collaboration</h3>
-                <p>UDS brings together a diverse range of participants and provides the perfect environment for mutual collaboration and best practice.</p>
+                <p>UOS brings together a diverse range of participants and provides the perfect environment for mutual collaboration and best practice.</p>
             </li>
             <li class="principle-ideas">
                 <h3>Ideas</h3>
-                <p>UDS is a hotbed of ideas. It&rsquo;s where we get together to find creative solutions to common problems. The result? A better Ubuntu for everyone.</p>
+                <p>UOS is a hotbed of ideas. It&rsquo;s where we get together to find creative solutions to common problems. The result? A better Ubuntu for everyone.</p>
             </li>
             <li class="principle-planning">
                 <h3>Planning</h3>
@@ -32,7 +32,7 @@
             </li>
             <li class="principle-discussion">
                 <h3>Discussion</h3>
-                <p>The bulk of UDS is discussion sessions. We explore problems and develop solutions together, pooling our collective experience.</p>
+                <p>The bulk of UOS is discussion sessions. We explore problems and develop solutions together, pooling our collective experience.</p>
             </li>
         </ul>
     </div>

=== modified file 'summit/media/css/uds.css'
--- summit/media/css/uds.css	2015-10-12 17:19:39 +0000
+++ summit/media/css/uds.css	2015-10-27 13:47:02 +0000
@@ -1,10 +1,10 @@
 @charset "UTF-8";
 /**
- * Ubuntu Developer Summit
- *
- * Main CSS file for the Ubuntu Developer Summit site
- *
- * @project		Ubuntu Developer Summit
+ * Ubuntu Online Summit
+ *
+ * Main CSS file for the Ubuntu Online Summit site
+ *
+ * @project		Ubuntu Online Summit
  * @author		Web Team at Canonical Ltd
  * @copyright	2012 Canonical Ltd
  *