fix sub-org deadline, explain zulip more clearly

Author: terriko

index.html

@@ -67,10 +67,26 @@ <h2>Getting in Touch</h2>
 href="https://mail.python.org/mailman/listinfo/gsoc-general">gsoc-general(at)python.org</a>
 mailing list to get updates, reminders, and to discuss questions.</li>
 
-<li>Stop by #python-gsoc on irc.freenode.net to chat and ask questions in
-realtime.  </li>
-
-<li>If you are uncomfortable with IRC, you may try our Zulip instance at <a href="https://zulip.python-gsoc.org">https://zulip.python-gsoc.org</a>.  We are working on IRC integration, but for now they are two separate instances so please be aware of that.</li>
+<li>This year, we have two realtime chat options:
+<ol>
+<li><a
+href="http://webchat.freenode.net/?channels=python-gsoc">#python-gsoc on
+irc.freenode.net</a> is our IRC channel.  IRC is an older protocol very
+popular among open source projects, and it's worth learning to use it if
+you're going to be involved in open source long term.  Please remember to
+stick around a while for an answer, as many open source people use IRC for
+work and aren't always available to respond immediately.</li>
+
+<li>We also have a Zulip server at <a
+href="https://zulip.python-gsoc.org">https://zulip.python-gsoc.org</a>. Zulip
+is open source chat software similar to the popular Slack.  These channels
+are logged so that you can catch up on older conversations and see what
+people have already asked, and if you set up a valid email, the server will
+email you if someone answers your question after you've had to leave.
+
+<li>We are working on IRC-Zulip integration so that chats will show in both
+places, but for now they are two separate chat rooms.</li>
+</ol>
 
 <li>Found a typo?  Want to improve this page? <a
 href="https://github.com/python-gsoc/python-gsoc.github.io">The source code
@@ -82,15 +98,15 @@ <h2>Getting in Touch</h2>
 asking a question.  We have tried to answer a lot of common questions in
 advance!</p>
 
-<p><strong>Do plan to stay for a while if you want answers on IRC</strong>:
+<p><strong>Don't forget be patient</strong>:
 Our mentors generally have day-jobs and are not always paying attention to
 IRC (especially during GSoC off-season: expect more active mentors after Feb
 27th). Please ask questions directly on channel (you don't need to introduce
 yourself or say hi first) and please be patient while waiting for an answer.
-You could wind up waiting an hour or much longer for answers if all the
+You could wind up waiting an hour or much longer for "realtime" answers if all the
 mentors are in meetings at work or otherwise occupied. If you can't stay that
 long, stay as long as you can and then send email to the mailing list instead
-so mentors have some way to reach you.</p>
+so mentors have some way to reach you.  We try to answer emails within 48h.</p>
 
 <p>There are some great resources at http://irchelp.org/ if you need help
 finding a client or learning how to use IRC.
@@ -128,10 +144,12 @@ <h2>Getting Started</h2>
 
 <li>Look through <a
 href="/moin/SummerOfCode/2016#Python_Sub-orgs_and_Project_Ideas">our list of
-GSoC 2016 sub-orgs</a> to get a sense of who might participate in 2017.  This
-page will be updated when we know, with a complete list sometime late in
-February.
-</li>
+GSoC 2016 sub-orgs</a> to get a sense of who might participate in 2017.  <a
+href="#ideas">Our ideas list</a> will be updated as soon as orgs tell us
+they're interested in participating this year. If your favourite org isn't on
+the list and you'd like them to be, contact them directly!  Assuming Google
+accepts us, we'll accept sub-orgs until <a href="#dates">the dates lisetd in
+our schedule</a>.</li>
 
 </ul>
 </li>
@@ -462,14 +480,16 @@ <h2>Schedule</h2>
 
 <p>Some Python-specific dates:
 <ul>
-<li><strong>February 9</strong> - Python sub-orgs should get ideas pages to
+<li><strong>February 7</strong> - Python sub-orgs should get ideas pages to
 gsoc-admins(at)python.org if at all possible.  This lets us showcase all
 your great ideas when Google looks at our application and increases our
-chances of acceptance.</li>
+chances of acceptance.  Terri is getting on a plane on Feb 8, so please don't
+miss this deadline!</li>
 
 <li><strong>March 3</strong> - Last day for Python sub-orgs to apply to
 participate with the PSF.  (Assuming we get accepted by Google and can
-support sub-orgs, of course!)</li>
+support sub-orgs, of course!)  This deadline is for orgs who applies on their
+own and didn't make it, but still wish to participate under the umbrella.</li>
 </ul>