Merge

activation_active.html

@@ -8,6 +8,6 @@
   <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
   <p> This account has already been activated. We will notify you as
   soon as the course starts.</p>
-  <p>For now you can go to the <a href="https://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
+  <p>For now you can go to the <a href="http://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
 </div>
 </section>

activation_complete.html

@@ -5,6 +5,6 @@
   <h1>Activation Complete!</h1>
   <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
   <p>Thanks for activating your email. We will notify you as soon as the course starts.</p>
-  <p>For now you can go to the <a href="https://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
+  <p>For now you can go to the <a href="http://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
 </div>
 </section>

index.html

@@ -27,7 +27,6 @@
 
 <p>The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10  hours per week on the course.</p>
 
-      <!-- <p> The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. San Mateo, CA: Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant section will be provided electronically as part of the on-line course.</p> -->
     </section>
 
     <section class="on-mitx">