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

Proposed by Daniel Holbach on 2016-11-11
Status: Approved
Approved by: Michael Hall on 2016-11-11
Approved revision: 577
Proposed branch: lp:~dholbach/summit/update-track-names
Merge into: lp:summit
Diff against target: 29 lines (+1/-4)
2 files modified
summit/common/templates/common/getinvolved.html (+1/-3)
summit/common/templates/common/propose-a-session.html (+0/-1)
To merge this branch: bzr merge lp:~dholbach/summit/update-track-names
Reviewer Review Type Date Requested Status
Michael Hall (community) 2016-11-11 Approve on 2016-11-11
Review via email: mp+310630@code.launchpad.net

Description of the change

Update track names again.

To post a comment you must log in.
Michael Hall (mhall119) :
review: Approve

Unmerged revisions

577. By Daniel Holbach on 2016-11-11

update track names again

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/common/templates/common/getinvolved.html'
2--- summit/common/templates/common/getinvolved.html 2015-10-12 17:19:39 +0000
3+++ summit/common/templates/common/getinvolved.html 2016-11-11 08:13:35 +0000
4@@ -70,12 +70,10 @@
5 <h4>How do the sessions work?</h4>
6 <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:
7 <ul>
8- <li>App Development</li>
9- <li>Cloud</li>
10 <li>Community</li>
11 <li>Convergence</li>
12 <li>Core</li>
13- <li>Show and Tell</li>
14+ <li>Overflow</li>
15 </ul>
16 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.
17
18
19=== modified file 'summit/common/templates/common/propose-a-session.html'
20--- summit/common/templates/common/propose-a-session.html 2016-10-28 12:37:40 +0000
21+++ summit/common/templates/common/propose-a-session.html 2016-11-11 08:13:35 +0000
22@@ -47,7 +47,6 @@
23 <span style="text-align: left;"></p>
24 <ul>
25 <li><strong>Community</strong> &#8211; <tt>community-1611-<i>your-session-name</i></tt></li>
26-<li><strong>Cloud Devops</strong> &#8211; <tt>cloud-1611-<i>your-session-name</i></tt></li>
27 <li><strong>Core</strong> &#8211; <tt>core-1611-<i>your-session-name</i></tt></li>
28 <li><strong>Convergence</strong> &#8211; <tt>convergence-1611-<i>your-session-name</i></tt></li>
29 </ul>

Subscribers

People subscribed via source and target branches