Merge lp:~dholbach/summit/update-track-names into lp:summit

[Daniel Holbach]

Update track names again.

[Michael Hall (mhall119)]

review: Approve

Unmerged revisions

577. By Daniel Holbach on 2016-11-11

update track names again

=== modified file 'summit/common/templates/common/getinvolved.html'
--- summit/common/templates/common/getinvolved.html	2015-10-12 17:19:39 +0000
+++ summit/common/templates/common/getinvolved.html	2016-11-11 08:13:35 +0000
@@ -70,12 +70,10 @@
 						<h4>How do the sessions work?</h4>
 						<p>All of the sessions will be available on <a href="/">summit.ubuntu.com</a> before the event. The event is split into the  following tracks:
 <ul>
-	<li>App Development</li>
-	<li>Cloud</li>
 	<li>Community</li>
 	<li>Convergence</li>
         <li>Core</li>
-        <li>Show and Tell</li>
+        <li>Overflow</li>
 </ul>
 To participate in a session, simply choose the sessions you are most interested in at their scheduled times and you will see the integrated hangout, IRC channel, notes, and related links. You can interact with the session using the integrated IRC channel. 
 

=== modified file 'summit/common/templates/common/propose-a-session.html'
--- summit/common/templates/common/propose-a-session.html	2016-10-28 12:37:40 +0000
+++ summit/common/templates/common/propose-a-session.html	2016-11-11 08:13:35 +0000
@@ -47,7 +47,6 @@
 <span style="text-align: left;"></p>
 <ul>
 <li><strong>Community</strong> &#8211; <tt>community-1611-<i>your-session-name</i></tt></li>
-<li><strong>Cloud Devops</strong> &#8211; <tt>cloud-1611-<i>your-session-name</i></tt></li>
 <li><strong>Core</strong> &#8211; <tt>core-1611-<i>your-session-name</i></tt></li>
 <li><strong>Convergence</strong> &#8211; <tt>convergence-1611-<i>your-session-name</i></tt></li>
 </ul>