Added Disqus comments, and synced with Josh's changes

Author: heathermiller

_includes/disqus.txt

@@ -0,0 +1,11 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+
+    var disqus_shortname = 'scala-lang'; // required: replace example with your forum shortname
+
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>

_includes/sips-topbar.txt

@@ -7,7 +7,7 @@
           <ul class="nav">
            <li><a href="{{ site.baseurl }}/sips/sip-submission.html">Submitting a new SIP</a></li>
            <li><a href="{{ site.baseurl }}/sips/sip-list.html">SIP List</a></li>
-           <li><a href="{{ site.baseurl }}/sips/sip-tutorial.html">Writing a SIP Tutorial</a></li>
+           <li><a href="{{ site.baseurl }}/sips/sip-tutorial.html">How to Write a SIP</a></li>
           </ul>
         </div>
       </div>

_layouts/default.html

@@ -8,6 +8,8 @@
     {% endif %}
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
+    <link rel="icon" type="image/png" href="{{ site.baseurl }}/favicon.ico">
+
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="{{ site.baseurl }}/stylesheets/bootstrap.css" type="text/css" />
 
@@ -52,6 +54,7 @@ <h1>{{ site.title }}</h1>
       {% if page.title %}<h1>{{ page.title }}</h1>{% endif %}
         <div class="span12">
           {{ content }}
+	  {% if page.type == 'sip' %}{% include disqus.txt %}{% endif %}
 	</div>
 	{% if page.type == 'sip' %}
 	<div class="span4">

sips/pending/.DS_Store renamed to sips/.DS_Store

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-2 Scala Compiler Phase and Plug-In Initialization for Scala 2.8
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/2)

sips/completed/_posts/2009-05-28-scala-compiler-phase-plugin-in.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sid
+title: SID-4 - Early Member Definitions
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/4)

sips/completed/_posts/2009-06-02-early-member-definitions.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-8 - Scala Swing Overview
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/8)

sips/completed/_posts/2009-11-02-scala-swing-overview.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-1 Named and Default Arguments
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/1)

sips/completed/_posts/2010-01-22-named-and-default-arguments.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-7 - Scala 2.8 Arrays
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/7)

sips/completed/_posts/2010-01-22-scala-2-8-arrays.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-5 - Internals of Scala Annotations
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/5)

sips/completed/_posts/2010-01-27-internals-of-scala-annotations.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-9 - Scala Specialization
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/9)

sips/completed/_posts/2010-05-06-scala-specialization.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-10 - Storage of pickled Scala signatures in class files
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/10)

sips/completed/_posts/2010-06-01-picked-signatures.md

@@ -0,0 +1,7 @@
+---
+layout: default
+type: sip
+title: SID-3 - New Collection classes
+---
+
+This was an older SID that can be found [here](http://www.scala-lang.org/sid/3)

sips/completed/_posts/2010-07-20-new-collection-classes.md

@@ -9,4 +9,6 @@ title: Scala Improvement Process
 
 This is the landing page for the Scala Improvement Process.
 
+This process has been changed since the old SID (Scala Improvement Document) days, however the old completed SID documents are available in the [completed section of the SIP list](sip-list.html).
+
 

sips/pending/_posts/2011-10-12-implicit-classes.md renamed to sips/draft/_posts/2011-10-12-implicit-classes.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 type: sip
-title: String Interpolation
+title: SIP-11 String Interpolation
 ---
 ### Martin Odersky ###
 

sips/pending/_posts/2011-10-12-inline-classes.md renamed to sips/draft/_posts/2011-10-12-inline-classes.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 type: sip
-title: Uncluttering Scala’s syntax for control structures.
+title: SIP-12 Uncluttering Scala’s syntax for control structures.
 ---
 
 __Motivation__: The more Scala code I write the more I get tripped up by the need to write conditions in  if-then-else expressions and other control constructs in parentheses. I normally would not advocate syntax changes at this level, except that this has been the single syntax decision that feels worse for me the longer I use it.

sips/index.md

@@ -1,19 +1,26 @@
 ---
 layout: default
 type: sip
-title: Completed SIP list
+title: List of SIPs
 ---
 
+### Draft SIPs ###
+<ul class="post-list">
+  {% for post in site.categories.draft %}
+    <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span></li>
+  {% endfor %}      
+</ul>
+
 ### Completed SIPs ###
 <ul class="post-list">
   {% for post in site.categories.completed %}
-    <li><a href="/scala-docs/sips/{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span></li>
+    <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span></li>
   {% endfor %}      
 </ul>
 
 ### Rejected SIPs ###
 <ul class="post-list">
   {% for post in site.categories.rejected %}
-    <li><a href="/scala-docs/sips/{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span></li>
+    <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> <span class="date">( {{ post.date | date: "%b %Y" }} )</span></li>
   {% endfor %}      
 </ul>