Merge

help.html

@@ -1,13 +1,19 @@
 <%inherit file="main.html" />
 
-<%include file="navigation.html" />
+<%include file="navigation.html" args="active_page='help'"/>
 
 <section class="help main-content">
   <h1>Help</h1>
 
-  <p> If you need help, first try <a href="/discussion">asking a question in the forums</a> and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.</p>
+  <p> If you need help:
+    <ul>
+      <li> Ask on the <a href="/discussion">discussion forums</a>
+      <li> Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]
+      <li> Check the <a href="/info">course handouts.</a>
+    </ul>
 
-  <p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
+  <p> If you can't solve your problems with self-help, we have several
+  e-mail addresses set up:</p>
 
   <dl>
     <dt> technical@mitx.mit.edu</dt>
@@ -20,5 +26,6 @@
     <dd> Suggestions</dd>
   </dl>
 
-  <p> Please bear in mind that while we read them, we do not expect to have time to respond to all e-mails.</p>
+  <p> Please bear in mind that while we read them, we do not expect to
+  have time to respond to all e-mails.</p>
 </section>

main.html

@@ -74,7 +74,7 @@
       <input type="text" id="calculator_output" readonly>
 
       <p>Supported suffixes: %kMGTcmunp</p>
-      <p>Supported operations: ^ * / + - || ()</p>
+      <p>Supported operations: ^ * / + - ()</p>
     </div>
 
 <script>