From b71ff071422e181ba5ad6e5ae12b3231443e5d53 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sat, 3 Mar 2012 17:39:22 -0500
Subject: [PATCH 01/12] More info on browsers, redirect to /info

---
 help.html      | 2 +-
 marketing.html | 2 +-
 mitx_help.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/help.html b/help.html
index 175c6a9252..0a88b9b55e 100644
--- a/help.html
+++ b/help.html
@@ -22,7 +22,7 @@
 
       <dl>
         <dt>System-related questions</dt>
-        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
+        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> -- For technical questions, please make sure you are using a current version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome/">Chrome</a>, and include browser and version in your e-mail, as well as screenshots or other pertinent details. </dd>
         <dt>Content-related questions</dt>
         <dd><a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></dd>
         <dt>Bug reports</dt>
diff --git a/marketing.html b/marketing.html
index 8cbbb3e2fc..88ff5199e1 100644
--- a/marketing.html
+++ b/marketing.html
@@ -134,7 +134,7 @@ $(document).ready(function(){
       submit_data,
       function(json) {
         if(json.success) {
-          location.href="/courseware";
+          location.href="/info";
         } else if($('#login_error').length == 0) {
         $('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
         } else {
diff --git a/mitx_help.html b/mitx_help.html
index a9ec20eb44..64c22cfff4 100644
--- a/mitx_help.html
+++ b/mitx_help.html
@@ -11,7 +11,7 @@
       reach us at:</p>
       <dl>
         <dt>System-related questions</dt>
-        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
+        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a>  -- For technical questions, please make sure you are using a current version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome/">Chrome</a>, and include browser and version in your e-mail, as well as screenshots or other pertinent details. </dd>
         <dt>Content-related questions</dt>
         <dd><a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></dd>
         <dt>Bug reports</dt>

From d321eb873a354bf9d648e1500dc8f6f490cae1cd Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sat, 3 Mar 2012 18:02:16 -0500
Subject: [PATCH 02/12] info files now referenced explicitly instead of symlink

---
 info.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/info.html b/info.html
index 4f5336432b..6171e90b0c 100644
--- a/info.html
+++ b/info.html
@@ -5,10 +5,10 @@
 <section class="main-content">
   <div class="info-wrapper">
     <section class="updates">
-      <%include file="info_files/updates.html" />
+      <%include file="updates.html" />
     </section>
     <section class="handouts">
-      <%include file="info_files/handouts.html" />
+      <%include file="handouts.html" />
     </section>
   </div>
 </section>

From c636264196ab085815507785fdf9d9e4458a7b4a Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Sat, 3 Mar 2012 23:49:20 -0500
Subject: [PATCH 03/12] Changed the wiki titles to say 6.002x (they were
 missing the x)

---
 simplewiki_create.html        | 2 +-
 simplewiki_edit.html          | 2 +-
 simplewiki_error.html         | 2 +-
 simplewiki_history.html       | 2 +-
 simplewiki_searchresults.html | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/simplewiki_create.html b/simplewiki_create.html
index 6903c5ecd2..9c29c214b2 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Create Article - MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
 <h1>Create article</h1>
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 50cc33d20c..435870071d 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
 <h1>${ wiki_article.title }</h1>
diff --git a/simplewiki_error.html b/simplewiki_error.html
index 73408349eb..cdb46c1a0f 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -6,7 +6,7 @@
     from django.core.urlresolvers import reverse
 %>
 
-<%block name="title"><title>Oops... - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Oops... - MITx 6.002x Wiki</title></%block>
 
 
 <%block name="wiki_page_title">
diff --git a/simplewiki_history.html b/simplewiki_history.html
index 9b7c9e11db..9385ff8d87 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 0b47bc08a2..fa4f699d9f 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Search Results - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Search Results - MITx 6.002x Wiki</title></%block>
 
 <%!
 from django.core.urlresolvers import reverse

From ad8969746deee7107c51ae43569e742f46e6e8d3 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 10:17:20 -0500
Subject: [PATCH 04/12] Remove info files, change Youtube to use https

---
 info_files    | 1 -
 video_init.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 120000 info_files

diff --git a/info_files b/info_files
deleted file mode 120000
index d5782be16c..0000000000
--- a/info_files
+++ /dev/null
@@ -1 +0,0 @@
-../data/info/
\ No newline at end of file
diff --git a/video_init.js b/video_init.js
index 5ed773b98f..897f4cfd85 100644
--- a/video_init.js
+++ b/video_init.js
@@ -5,7 +5,7 @@ var atts = { id: "myytplayer" };
 // If the user doesn't have flash, use the HTML5 Video instead. YouTube's
 // iFrame API which supports HTML5 is still developmental so it is not default
 if (swfobject.hasFlashPlayerVersion("10.1")){
-  swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
+  swfobject.embedSWF(document.location.protocol +  "//www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
         "ytapiplayer", "640", "385", "8", null, null, params, atts);
 } else {
 
@@ -14,7 +14,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){
   $("#html5_player").show();
 
   var tag = document.createElement('script');
-  tag.src = "http://www.youtube.com/player_api";
+  tag.src = document.location.protocol +  "//www.youtube.com/player_api";
   var firstScriptTag = document.getElementsByTagName('script')[0];
   firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
   // Make sure the callback is called once API ready, YT seems to be buggy

From 2c81042f992defe46aacbbbd8428abfca537dd0d Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 10:46:44 -0500
Subject: [PATCH 05/12] Help text clarification

---
 help.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/help.html b/help.html
index 0a88b9b55e..cc962a6fc7 100644
--- a/help.html
+++ b/help.html
@@ -22,7 +22,7 @@
 
       <dl>
         <dt>System-related questions</dt>
-        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> -- For technical questions, please make sure you are using a current version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome/">Chrome</a>, and include browser and version in your e-mail, as well as screenshots or other pertinent details. </dd>
+        <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
         <dt>Content-related questions</dt>
         <dd><a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></dd>
         <dt>Bug reports</dt>
@@ -31,7 +31,12 @@
         <dd><a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></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. For technical
+        questions, please make sure you are using the latest version
+        of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a>
+        or <a href="https://www.google.com/chrome/">Chrome</a>, and
+        include browser and version in your e-mail, as well as
+        screenshots or other pertinent details. </p>
     </section>
 </section>

From 83eab20221a1fa922873e4002d3decea93d22ac9 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 11:34:14 -0500
Subject: [PATCH 06/12] 6002->6002x

---
 simplewiki_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplewiki_view.html b/simplewiki_view.html
index 0421214a59..1f45515a6d 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
   <h1>${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}</h1>

From 84e23af9f4c831c7b77c425c9eadf7a58c09d391 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 12:03:24 -0500
Subject: [PATCH 07/12] More self-help

---
 6002x-faq.html | 23 +++++++++++++++++++++--
 help.html      |  9 ++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/6002x-faq.html b/6002x-faq.html
index d01c011a6d..964d01b87f 100644
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -26,13 +26,31 @@ someone else already signed up with that username. Try a different,
 more unique username. For example, try adding a random number to the
 end.</p>
 
+<h2> I forgot my password </h2> 
+
+<p> The log-in form will have a link to reset your password once the
+course opens. </p>
+
+<h2> The videos stall out </h2>
+
+<p> You should confirm your internet connection is fast enough to stream
+videos, and that Youtube is not blocked by your internet
+provider. Since the videos are hosted by YouTube, we have no control
+over most technical problems with video playback (aside from those
+related specifically to our player). </p>
+
+<p> You should also confirm you have a current version of Flash
+installed. While our player supports YouTube's HTML5 API (which allows
+playback without Flash), this support is experimental, and YouTube can
+(and occasionally does) introduce bugs. </p>
+
 <a name="othercourses" ></a>
 <h2> I am interested in a different subject. What other courses do
 you offer? </h2>
 
 <p> 6.002x is the pilot course for MITx. While we plan to offer a
 range of courses in the future, at present, 6.002x is the only course
-available.</p>
+available. Specific future offerings will be announced later. </p>
 
 <a name="start" ></a>
 <h2>How will I know that the course has started?</h2>
@@ -64,7 +82,8 @@ of acknowledgement that I have enrolled.</h2>
 most common issues are:
 <ul>
 <li> Typo in e-mail address
-<li> Old browser. We recommend trying a modern version of Firefox or Chrome
+<li> Old browser. We recommend downloading the current version of
+Firefox or Chrome. The course requires a modern browser. 
 <li> JavaScript disabled
 <li> Activation e-mail in spam folder. Check spam folder.
 <li> Non-unique username. Try adding a random string at the end.
diff --git a/help.html b/help.html
index cc962a6fc7..b542829c1b 100644
--- a/help.html
+++ b/help.html
@@ -9,7 +9,14 @@
     <h2>Self-help</h2>
 
     <ul>
-      <li>Ask on the <a href="/discussion">discussion forums</a></li>
+      <li>Read
+      the <a href="http://mitx.mit.edu/6002x-faq.html">FAQ</a>
+      carefully</li>
+      <li>Check the <a href="/info">course updates</a> -- we will
+      announce major errors and issues there </li>
+      <li>Check whether the issues has been asked on
+      the <a href="/discussion">discussion forums</a>, and if not,
+      ask</li>
       <li>Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]</li>
       <li>Check the <a href="/info">course handouts.</a></li>
     </ul>

From ecfd3ace0724e678f1da4d412cbde27755173a9d Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 12:22:12 -0500
Subject: [PATCH 08/12] Anant's better phrasing for video

---
 6002x-faq.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/6002x-faq.html b/6002x-faq.html
index 964d01b87f..5d4319ca96 100644
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -39,10 +39,9 @@ provider. Since the videos are hosted by YouTube, we have no control
 over most technical problems with video playback (aside from those
 related specifically to our player). </p>
 
-<p> You should also confirm you have a current version of Flash
-installed. While our player supports YouTube's HTML5 API (which allows
-playback without Flash), this support is experimental, and YouTube can
-(and occasionally does) introduce bugs. </p>
+<p> You should also confirm you have a current version of Flash installed.
+While our player supports YouTube's HTML5 API (which allows playback without
+Flash), this support is experimental.</p>
 
 <a name="othercourses" ></a>
 <h2> I am interested in a different subject. What other courses do

From 1ee30d28a42f68f5e60accdbcf8f4666fc17aa9a Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 12:53:31 -0500
Subject: [PATCH 09/12] No course credit

---
 6002x-faq.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/6002x-faq.html b/6002x-faq.html
index 5d4319ca96..cd817014a6 100644
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -302,10 +302,11 @@ What is a credential?
 <p>
 Any learner who successfully completes 6.002x will receive an
 electronic certificate indicating a grade. This certificate will
-indicate that you earned it from <i>MITx</i>&rsquo;s pilot course. In this
-prototype version, <i>MITx</i> will not require that you be tested in a
-testing center or otherwise have your identity certified in order to
-receive this certificate.
+indicate that you earned it from <i>MITx</i>&rsquo;s pilot course. In
+this prototype version, <i>MITx</i> will not require that you be
+tested in a testing center or otherwise have your identity certified
+in order to receive this certificate. MITx certificates are not
+planned to count towards MIT course credit.
 </p>
 
 <a name="whograding" ></a>

From 8ebb6273d90a4d30bb3e4c92a051f90ad058f270 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 4 Mar 2012 13:01:11 -0500
Subject: [PATCH 10/12] Can't log in updated

---
 6002x-faq.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/6002x-faq.html b/6002x-faq.html
index cd817014a6..73e04e8a7e 100644
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -61,10 +61,13 @@ so you can login, begin to get familiar with the site and start the
 course.</p>
 
 <a name="login" ></a>
-<h2> Why is there no log-in button?</h2>
+<h2> I can't log in</h2>
 
 <p> You will not be able to log into the course until either the
-starting date, or shortly before.</p>
+starting date, or shortly before. If you have problems logging in once
+the course has started, please verify that you are using the latest
+version of either Firefox or Google Chrome, and have JavaScript and
+cookies enabled. </p>
 
 <a name="schedule" ></a>
 <h2> Does the class have a schedule?</h2>

From 845063336f140eea618d35dac8400eb1150c19ce Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 5 Mar 2012 08:34:56 -0500
Subject: [PATCH 11/12] Welcome e-mails

---
 emails/welcome_body.txt    | 25 +++++++++++++++++++++++++
 emails/welcome_subject.txt |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 emails/welcome_body.txt
 create mode 100644 emails/welcome_subject.txt

diff --git a/emails/welcome_body.txt b/emails/welcome_body.txt
new file mode 100644
index 0000000000..bc859c88cf
--- /dev/null
+++ b/emails/welcome_body.txt
@@ -0,0 +1,25 @@
+MITx's prototype offering, 6.002x, is now open. To log in, visit
+
+ https://6002x.mitx.mit.edu
+
+where you will find a login button at the top right-hand corner of the
+window.
+
+Please make sure you're using the latest version of Google Chrome or
+Firefox. If you've forgotten your password, the log-in form has a
+place to reset it.
+
+Once you log in, we recommend that you start the course by reviewing
+the "System Usage Sequence" in the Overview section, and the "6.002x
+At-a-Glance (Calendar)" handout under the Course Info tab. After you
+familiarize yourself with the various features of the MITx platform,
+you can jump right into the coursework by working on "Administrivia
+and Circuit Elements", the first Lecture Sequence in Week 1.
+
+Thanks for joining us for the ride!
+
+The 6.002x team
+
+(Please note that this e-mail address does not receive e-mails --
+if you need assistance, please use the help section of the web
+site)
diff --git a/emails/welcome_subject.txt b/emails/welcome_subject.txt
new file mode 100644
index 0000000000..a905585689
--- /dev/null
+++ b/emails/welcome_subject.txt
@@ -0,0 +1 @@
+Welcome to 6.002x!

From 465a52d93d7a4624043b3d3b9f39bd2699b7aae3 Mon Sep 17 00:00:00 2001
From: Reda Lemeden <reda@thoughtbot.com>
Date: Mon, 5 Mar 2012 11:56:41 -0500
Subject: [PATCH 12/12] Added style to answer and question content

---
 sass/discussion/_forms.scss         | 15 ++++++++++++++-
 sass/discussion/_question-view.scss | 12 ++++++++++++
 sass/discussion/_questions.scss     |  2 ++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss
index 068e439b7d..aacae3662e 100644
--- a/sass/discussion/_forms.scss
+++ b/sass/discussion/_forms.scss
@@ -86,8 +86,21 @@ form.answer-form {
       font-size: 14px;
     }
 
+    blockquote {
+      margin-left: 2.5%;
+      padding-left: 1.5%;
+      border-left: 1px dashed #ddd;
+      color: $mit-red;;
+    }
+
+    ul, ol, pre {
+      margin-left: 3%;
+      margin-bottom: 20px;
+    }
+
+
     pre {
-      background-color: #E7F1F8;
+      background-color: #eee;
     }
 
     blockquote {
diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss
index 70fd3c7cd8..894570a0c4 100644
--- a/sass/discussion/_question-view.scss
+++ b/sass/discussion/_question-view.scss
@@ -101,8 +101,20 @@ div.question-header {
         margin-right: flex-gutter(8);
         width: flex-grid(6.2,8);
 
+      blockquote {
+        margin-left: 2.5%;
+        padding-left: 1.5%;
+        border-left: 1px dashed #ddd;
+        color: $mit-red;;
       }
 
+      ul, ol, pre {
+        margin-left: 6%;
+        margin-bottom: 20px;
+      }
+    }
+
+
       div.post-update-container {
         display: inline-block;
         float: left;
diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss
index 72e4e69444..17fc2056dc 100644
--- a/sass/discussion/_questions.scss
+++ b/sass/discussion/_questions.scss
@@ -136,6 +136,7 @@ ul.question-list, div#question-list {
         h2 {
           font-size: 16px;
           font-weight: bold;
+          letter-spacing: 0;
           margin: 0px 0 15px 0;
           text-transform: none;
         }
@@ -144,6 +145,7 @@ ul.question-list, div#question-list {
           color: #777;
         }
 
+
         div.user-info {
           display: inline-block;
           vertical-align: top;