Merge lp:~dholbach/summit/1611 into lp:summit

[Daniel Holbach]

Change links to 1611 instead of 1605.

https://launchpad.net/sprints/uos-1611 exists, so let's get this online.

[lp:~dholbach/summit/1611]

577. By Daniel Holbach on 2016-09-21

remove Show & Tell

[Daniel Holbach (dholbach)]

Question: shall we remove Cloud too?

[lp:~dholbach/summit/1611]

578. By Daniel Holbach on 2016-10-28

remove appdev too

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/common/templates/common/join-a-session.html'
--- summit/common/templates/common/join-a-session.html	2016-04-27 10:22:10 +0000
+++ summit/common/templates/common/join-a-session.html	2016-10-28 12:37:52 +0000
@@ -16,8 +16,8 @@
 <p>This page explains not only how to join a session, but also how to run <a href="{% url propose-a-session %}">a session you have proposed</a>.</p>
 <h2>Finding a Session</h2>
 <p>Finding a session is simple.</p>
-<p>The first step is to <a href="/uos-1605/ ">browse the available sessions on the agenda</a>. Please note: the agenda may not be complete yet when you read this, so be sure to check back often.</p>
-<p>The agenda is broken down into a series of different <i>tracks</i>. Each track is a theme of sessions and you can <a href="/uos-1605/">view the sessions </a> within it.</p>
+<p>The first step is to <a href="/uos-1611/ ">browse the available sessions on the agenda</a>. Please note: the agenda may not be complete yet when you read this, so be sure to check back often.</p>
+<p>The agenda is broken down into a series of different <i>tracks</i>. Each track is a theme of sessions and you can <a href="/uos-1611/">view the sessions </a> within it.</p>
 <p>You can look at each day to see all tracks or read the individual tracks to see the sessions there. Now browse the sessions and pick one to join it at the scheduled time.</p>
 <h2>Joining a Session</h2>
 <p>When you select a session and join at the scheduled time, you will see a page with three key pieces:</p>

=== modified file 'summit/common/templates/common/propose-a-session.html'
--- summit/common/templates/common/propose-a-session.html	2016-04-27 10:22:10 +0000
+++ summit/common/templates/common/propose-a-session.html	2016-10-28 12:37:52 +0000
@@ -22,13 +22,13 @@
 <h2>Create a Discussion Session</h2>
 <p>If you want to have a presentation or discussion session that does not require a blueprint, simply follow these steps:</p>
 <ol>
-<li>Go to the <a href="/uos-1605/propose_meeting/" target="_blank">Propose Session</a> page and fill in the form.</li>
+<li>Go to the <a href="/uos-1611/propose_meeting/" target="_blank">Propose Session</a> page and fill in the form.</li>
 <li>When your session is proposed the track lead will review and accept/reject the session. Keep your eye on the schedule for an update!</li>
 <li>Be prepared to <a title="Instructions for starting a hangout" href="https://wiki.ubuntu.com/UDS/Sessions" target="_blank">start an On Air Hangout</a> about 10 minutes before the start of your session</li>
 </ol>
 <h2>Create a Blueprint Session</h2>
 <p>In Ubuntu we track work and projects using <i>blueprints</i>. These are web pages that track the status, deadlines, work items, and other details of projects. You should create a blueprint for all new pieces of work.</p>
-<p>To create a blueprint for the next Ubuntu Online Summit go to <strong><a href="https://blueprints.launchpad.net/sprints/uos-1605" target="_blank">Launchpad</a></strong> and then click the <i>Register a blueprint</i> link as shown below:</p>
+<p>To create a blueprint for the next Ubuntu Online Summit go to <strong><a href="https://blueprints.launchpad.net/sprints/uos-1611" target="_blank">Launchpad</a></strong> and then click the <i>Register a blueprint</i> link as shown below:</p>
 <p><img alt="" src="https://wiki.ubuntu.com/UDS/Create?action=AttachFile&amp;do=get&amp;target=register.png" /></p>
 <p>Now fill in the different fields in the blueprint:</p>
 <table>
@@ -46,12 +46,10 @@
 <td>The name is an important field. Choose which track you want your session on and then enter the following:<br />
 <span style="text-align: left;"></p>
 <ul>
-<li><strong>App &#038; Scope Development</strong> &#8211; <tt>appdev-1605-<i>your-session-name</i></tt></li>
-<li><strong>Community</strong> &#8211; <tt>community-1605-<i>your-session-name</i></tt></li>
-<li><strong>Cloud Devops</strong> &#8211; <tt>cloud-1605-<i>your-session-name</i></tt></li>
-<li><strong>Core</strong> &#8211; <tt>core-1605-<i>your-session-name</i></tt></li>
-<li><strong>Convergence</strong> &#8211; <tt>convergence-1605-<i>your-session-name</i></tt></li>
-<li><strong>Show &#038; Tell</strong> &#8211; <tt>showandtell-1605-<i>your-session-name</i></tt></li>
+<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>
 <p></span>
 </td>