Refactored, to allow for easy versioning per language release in the future.

Author: heathermiller

_includes/frontpage-content.txt

@@ -8,19 +8,19 @@
 		<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide1.jpg" />
 		<p class="slide_title"><strong>Overviews and Guides</strong></p>
 		<p class="slide_content">Collections, Actors, Swing, and more.</p>
-		<p class="slide_button"><a href="{{ site.baseurl}}/2.9.1/overviews">Go there</a></p>
+		<p class="slide_button"><a href="{{ site.baseurl}}/overviews">Go there</a></p>
 	</li>
 	<li>
 		<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide2.jpg" />
 		<p class="slide_title"><strong>Tutorials</strong></p>
 		<p class="slide_content">Coming from Java? Python? Ruby? Tutorials which help the transition from language XYZ to Scala.</p>
-		<p class="slide_button"><a href="{{ site.baseurl}}/2.9.1/tutorials">Go there</a></p>
+		<p class="slide_button"><a href="{{ site.baseurl}}/tutorials">Go there</a></p>
 	</li>
 	<li>
 		<img class="slide_thumb" alt="Thumbnail" src="{{ site.baseurl }}/resources/images/slide3.jpg" />
 		<p class="slide_title"><strong>Glossary</strong></p>
 		<p class="slide_content">Lost on some terminology? Check the glossary, direct from the book, <em>Programming in Scala</em>. </p>
-		<p class="slide_button"><a href="{{ site.baseurl}}/2.9.1/glossary">Go there</a></p>
+		<p class="slide_button"><a href="{{ site.baseurl}}/glossary">Go there</a></p>
 	</li>
 </ul>
 </header>
@@ -37,19 +37,19 @@
 		<h3><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a> <span class="label success">Available</span></h3>
 		<p>Read language improvement proposals, participate in discussions surrounding submitted proposals, or submit your own improvement proposal.</p>
 
-		<h3><a href="{{ site.baseurl }}/2.9.1/overviews">Guides and Overviews</a> <span class="label success">Some Available</span></h3>
+		<h3><a href="{{ site.baseurl }}/overviews">Guides and Overviews</a> <span class="label success">Some Available</span></h3>
 		<p>Some guides, such as Martin Odersky's Collections Overview are already available. Others are currently being converted to markdown markup for inclusion here.</p>
 
-		<h3><a href="{{ site.baseurl }}/2.9.1/tutorials">Tutorials</a> <span class="label success">Some Available</span></h3>
+		<h3><a href="{{ site.baseurl }}/tutorials">Tutorials</a> <span class="label success">Some Available</span></h3>
 		<p>Some tutorials, such as the <em>Scala for Java Programmers</em> guide is already available. Others are currently being converted to markdown markup for inclusion here.</p>
 
-		<h3><a href="{{ site.baseurl }}/2.9.1/glossary">Glossary</a> <span class="label warning">Pending Permission</span></h3>
+		<h3><a href="{{ site.baseurl }}/glossary">Glossary</a> <span class="label warning">Pending Permission</span></h3>
 		<p>Pending permission from Artima Inc., we'd like to include the glossary from <em>Programming in Scala</em> here, for quick and easy reference.</p>				
 
-		<h3>Cheatsheets <span class="label important">In Progress</span></h3>
+		<h3><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a> <span class="label important">In Progress</span></h3>
 		<p>We're working on a section of the site devoted to cheatsheets. Contributed cheatsheets more than welcome!</p>
 
-		<h3>Scala Style Guide <span class="label important">In Progress</span></h3>
+		<h3><a href="{{ site.baseurl }}/style">Scala Style Guide</a> <span class="label important">In Progress</span></h3>
 		<p>Daniel Spiewak and David Copland's <em>Scala Style Guide</em> will soon be ported here, thanks to Simon Ochsenreither's conversion to markdown.</p>		
 
 		<h3>Language Specification <span class="label notice">Just an Idea</span></h3>

_includes/topbar.txt

@@ -16,11 +16,11 @@
                       </ul>
                 </li>
 
-                <li><a href="{{ site.baseurl }}/2.9.1/overviews">Guides</a></li>
-                <li><a href="{{ site.baseurl }}/2.9.1/tutorials">Tutorials</a></li>
-                <li><a href="{{ site.baseurl }}/2.9.1/glossary">Glossary</a></li>
-                <li><a href="{{ site.baseurl }}/2.9.1/cheatsheets">Cheatsheets</a></li>
-                <li><a href="{{ site.baseurl }}/2.9.1/style">Style Guide</a></li>
+                <li><a href="{{ site.baseurl }}/overviews">Guides</a></li>
+                <li><a href="{{ site.baseurl }}/tutorials">Tutorials</a></li>
+                <li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
+                <li><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a></li>
+                <li><a href="{{ site.baseurl }}/style">Style Guide</a></li>
           </ul>
 <!-- commented until search functionality integrated
           <form action="">

cheatsheets/index.md

@@ -0,0 +1,7 @@
+---
+layout: index
+title: Cheatsheets
+---
+
+We currently only have one cheatsheet! (Soon to be included). Hang on for instructions on how to make and contribute a cheatsheet to scala-lang.org.
+

2.9.1/glossary/index.md renamed to glossary/index.md

@@ -7,13 +7,13 @@ title: The Architecture of Scala Collections
 
 These pages describe the architecture of the Scala collections
 framework in detail. Compared to
-[the Scala 2.8 Collections API](http://scala.github.com/2.9.1/overviews/collections.html) you
+[the Scala 2.8 Collections API](http://scala.github.com/overviews/collections.html) you
 will find out more about the internal workings of the framework. You
 will also learn how this architecture helps you define your own
 collections in a few lines of code, while reusing the overwhelming
 part of collection functionality from the framework.
 
-[The Scala 2.8 Collections API](http://scala.github.com/2.9.1/overviews/collections.html)
+[The Scala 2.8 Collections API](http://scala.github.com/overviews/collections.html)
 contains a large number of collection
 operations, which exist uniformly on many different collection
 implementations. Implementing every collection operation anew for

2.9.1/overviews/actors.md renamed to overviews/actors.md

@@ -0,0 +1,8 @@
+---
+layout: index
+title: Scala Style Guide
+---
+
+Shortly you'll find the Scala Style Guide here, currently available at [http://davetron5000.github.com/scala-style/](http://davetron5000.github.com/scala-style/). A big thank you to Daniel Spiewak and David Copeland for putting it together, and to Simon Ochsenreither for converting it to markdown!
+
+