47 files changed, 53 insertions, 1016 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..0bfd06e151
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+# based on http://www.paperplanes.de/2013/8/13/deploying-your-jekyll-blog-to-s3-with-travis-ci.html
+language: ruby
+rvm:
+  - 1.9.3
+script: bundle exec jekyll build -s spec/ -d build/spec
+install: bundle install
+# after_success: bundle exec s3_website push --headless
+\ No newline at end of file
diff --git a/16-references.md b/16-references.md
deleted file mode 100644
index d0410e748a..0000000000
--- a/16-references.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: References
-layout: default
-chapter: 14
----
-
-
-# References
-
-<!-- this is deliberately empty, and must be at the very end of the
-	 document as pandoc will inject all citation information here.
--->
-\ No newline at end of file
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000..53924a4381
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,7 @@
+# To build the spec on Travis CI
+source "https://rubygems.org"
+
+gem "jekyll", "2.0.0.alpha.2"
+gem "rouge"
+# gem 's3_website'
+# gem 'redcarpet'
diff --git a/LICENSE_HEURISTICA b/LICENSE_HEURISTICA
deleted file mode 100644
index 9693dc1db2..0000000000
--- a/LICENSE_HEURISTICA
+++ /dev/null
@@ -1,101 +0,0 @@
-Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
-Utopia is either a registered trademark or trademark of Adobe Systems
-Incorporated in the United States and/or other countries. Used under
-license. 
-
-Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net
-
-Copyright (c) 2008-2012, Andrey V. Panov (panov@canopus.iacp.dvo.ru),
-with Reserved Font Name Heuristica.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/LICENSE_LUXIMONO b/LICENSE_LUXIMONO
deleted file mode 100644
index 2f480f664e..0000000000
--- a/LICENSE_LUXIMONO
+++ /dev/null
@@ -1,15 +0,0 @@
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of these Fonts and associated documentation files (the "Font Software"), to deal in the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, sublicense, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may not be modified nor may additional glyphs or characters be added to the Fonts. This License becomes null and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes Inc. and URW++ GmbH. shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
-info@urwpp.de or design@bigelowandholmes.com
-\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3e0c90f74f..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,147 +0,0 @@
-MD_SOURCES := 01-title.md \
-             02-preface.md 03-lexical-syntax.md \
-             04-identifiers-names-and-scopes.md \
-             05-types.md \
-             06-basic-declarations-and-definitions.md \
-             07-classes-and-objects.md \
-             08-expressions.md \
-             09-implicit-parameters-and-views.md \
-             10-pattern-matching.md \
-             11-top-level-definitions.md \
-             12-xml-expressions-and-patterns.md \
-             13-user-defined-annotations.md \
-             14-the-scala-standard-library.md \
-             15-scala-syntax-summary.md \
-             16-references.md
-
-BUILD_DIR := build
-
-.PHONY: dirs all html mathml pdf tex epub2 epub3 md clean
-
-
-all: html mathml pdf tex epub2 epub3 md
-
-
-clean:
-	rm -rf $(BUILD_DIR)
-
-
-html: $(BUILD_DIR)/ScalaReference.html
-
-
-mathml: $(BUILD_DIR)/ScalaReference-mathml.html
-
-
-pdf: $(BUILD_DIR)/ScalaReference.pdf
-
-
-tex: $(BUILD_DIR)/ScalaReference.tex
-
-
-epub2: $(BUILD_DIR)/ScalaReference.epub2
-
-
-epub3: $(BUILD_DIR)/ScalaReference.epub3
-
-
-md: $(BUILD_DIR)/ScalaReference.md
-
-
-$(BUILD_DIR)/ScalaReference.epub2: Scala.bib $(BUILD_DIR)/ScalaReference.md
-	@echo "building EPUB2 spec to $(BUILD_DIR)/ScalaReference.epub2"
-	@pandoc -f markdown \
-       -t epub \
-      --standalone \
-      --toc \
-      --chapters \
-      --number-sections \
-      --bibliography=Scala.bib \
-      --self-contained \
-      -o build/ScalaReference.epub2 \
-      build/ScalaReference.md
-
-
-$(BUILD_DIR)/ScalaReference.epub3: Scala.bib $(BUILD_DIR)/ScalaReference.md
-	@echo "building EPUB3 spec to $(BUILD_DIR)/ScalaReference.epub3"
-	@pandoc -f markdown \
-       -t epub3 \
-      --standalone \
-      --toc \
-      --chapters \
-      --number-sections \
-      --bibliography=Scala.bib \
-      --self-contained \
-      -o build/ScalaReference.epub3 \
-      build/ScalaReference.md
-
-
-$(BUILD_DIR)/ScalaReference.pdf: Scala.bib $(BUILD_DIR)/ScalaReference.md
-	@echo "building PDF spec to $(BUILD_DIR)/ScalaReference.pdf"
-	@pandoc -f markdown \
-      --standalone \
-      --toc \
-      --chapters \
-      --number-sections \
-      --bibliography=Scala.bib \
-      --self-contained \
-      --latex-engine=xelatex \
-      --template=resources/scala-ref-template.latex \
-      -o build/ScalaReference.pdf \
-      build/ScalaReference.md
-
-$(BUILD_DIR)/ScalaReference.tex: Scala.bib $(BUILD_DIR)/ScalaReference.md
-	@echo "building LaTeX source to $(BUILD_DIR)/ScalaReference.tex"
-	@pandoc -f markdown \
-      --standalone \
-      --toc \
-      --chapters \
-      --number-sections \
-      --bibliography=Scala.bib \
-      --self-contained \
-      --latex-engine=xelatex \
-      --template=resources/scala-ref-template.latex \
-      -o build/ScalaReference.tex \
-      build/ScalaReference.md
-
-
-$(BUILD_DIR)/ScalaReference.html: Scala.bib $(BUILD_DIR)/ScalaReference.md
-	@echo "building HTML spec to $(BUILD_DIR)/ScalaReference.html"
-	@pandoc -f markdown \
-       -t html5 \
-       --standalone \
-       --toc \
-       --chapters \
-       --number-sections \
-       --bibliography=Scala.bib \
-       --template=resources/scala-ref-template.html5 \
-       --mathjax='http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML' \
-       -o build/ScalaReference.html \
-       build/ScalaReference.md
-
-$(BUILD_DIR)/ScalaReference-mathml.html: Scala.bib $(BUILD_DIR)/ScalaReference.md
-	@echo "building HTML spec to $(BUILD_DIR)/ScalaReference-mathml.html"
-	@pandoc -f markdown \
-       -t html5 \
-       --standalone \
-       --toc \
-       --chapters \
-       --number-sections \
-       --bibliography=Scala.bib \
-       --template=resources/scala-ref-template.html5 \
-       --mathml \
-       -o build/ScalaReference-mathml.html \
-       build/ScalaReference.md
-
-
-$(BUILD_DIR)/ScalaReference.md: dirs $(MD_SOURCES)
-	@echo "building Markdown source to $(BUILD_DIR)/ScalaReference.md"
-	@cat $(MD_SOURCES) > $(BUILD_DIR)/ScalaReference.md
-
-
-dirs: $(BUILD_DIR)
-
-
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
-	cp -R resources $(BUILD_DIR)/resources
-
diff --git a/resources/Heuristica-Bold.woff b/resources/Heuristica-Bold.woff
deleted file mode 100644
index 904579683d..0000000000
--- a/resources/Heuristica-Bold.woff
+++ /dev/null
diff --git a/resources/Heuristica-BoldItalic.woff b/resources/Heuristica-BoldItalic.woff
deleted file mode 100644
index a3c5234453..0000000000
--- a/resources/Heuristica-BoldItalic.woff
+++ /dev/null
diff --git a/resources/Heuristica-Regular.woff b/resources/Heuristica-Regular.woff
deleted file mode 100644
index f5c1f8b2db..0000000000
--- a/resources/Heuristica-Regular.woff
+++ /dev/null
diff --git a/resources/Heuristica-RegularItalic.woff b/resources/Heuristica-RegularItalic.woff
deleted file mode 100644
index d2c8664593..0000000000
--- a/resources/Heuristica-RegularItalic.woff
+++ /dev/null
diff --git a/resources/LuxiMono-Bold.woff b/resources/LuxiMono-Bold.woff
deleted file mode 100644
index 8581bb5aa4..0000000000
--- a/resources/LuxiMono-Bold.woff
+++ /dev/null
diff --git a/resources/LuxiMono-BoldOblique.woff b/resources/LuxiMono-BoldOblique.woff
deleted file mode 100644
index 607ccf5cd0..0000000000
--- a/resources/LuxiMono-BoldOblique.woff
+++ /dev/null
diff --git a/resources/LuxiMono-Regular.woff b/resources/LuxiMono-Regular.woff
deleted file mode 100644
index a478ad9ef2..0000000000
--- a/resources/LuxiMono-Regular.woff
+++ /dev/null
diff --git a/resources/LuxiMono-RegularOblique.woff b/resources/LuxiMono-RegularOblique.woff
deleted file mode 100644
index 26999f990f..0000000000
--- a/resources/LuxiMono-RegularOblique.woff
+++ /dev/null
diff --git a/resources/ScalaReference.js b/resources/ScalaReference.js
deleted file mode 100644
index 51be0cf05b..0000000000
--- a/resources/ScalaReference.js
+++ /dev/null
@@ -1,20 +0,0 @@
-$(function() {
-
-	var popoutTOC = $('<div>');
-	popoutTOC.attr('id', 'popoutTOC');
-	
-	var popoutTOChead = $('<span class="head">Jump to...</span>');
-	popoutTOChead.appendTo(popoutTOC);
-	
-	var content = $('<div class="links">');
-	$('#TOC > *').clone().appendTo(content);
-	content.appendTo(popoutTOC);
-	var enter = function() { content.css('display', 'block') };
-	var exit = function() { content.css('display', 'none') };
-
-	popoutTOC.hover(enter, exit);
-
-	// disabled for now, until better styled
-	// popoutTOC.appendTo($('body'));
-
-})
-\ No newline at end of file
diff --git a/resources/blueprint-print.css b/resources/blueprint-print.css
deleted file mode 100755
index d3a9055120..0000000000
--- a/resources/blueprint-print.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 1.0.1
- http://blueprintcss.org
-
-   * Copyright (c) 2007-Present. See LICENSE for more info.
-   * See README for instructions on how to use Blueprint.
-   * For credits and origins, see AUTHORS.
-   * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* print.css */
-body {line-height:1.5;font-family:Heuristica,Georgia,serif;color:#000;background:none;font-size:10pt;}
-.container {background:none;}
-hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-h1, h2, h3, h4, h5, h6 {font-family:Heuristica,Georgia,serif;}
-code {font:.9em "Luxi Mono", "Courier New", Monaco, Courier, monospace;}
-a img {border:none;}
-p img.top {margin-top:0;}
-blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;}
-.small {font-size:.9em;}
-.large {font-size:1.1em;}
-.quiet {color:#999;}
-.hide {display:none;}
-a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;}
-a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;}
diff --git a/resources/blueprint-screen.css b/resources/blueprint-screen.css
deleted file mode 100644
index 2e3600079f..0000000000
--- a/resources/blueprint-screen.css
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 1.0.1
- http://blueprintcss.org
-
-   * Copyright (c) 2007-Present. See LICENSE for more info.
-   * See README for instructions on how to use Blueprint.
-   * For credits and origins, see AUTHORS.
-   * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* reset.css */
-html {margin:0;padding:0;border:0;}
-body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;}
-article, aside, details, figcaption, figure, dialog, footer, header, hgroup, menu, nav, section {display:block;}
-body {line-height:1.5;background:white;}
-table {border-collapse:separate;border-spacing:0;}
-caption, th, td {text-align:left;font-weight:normal;float:none !important;}
-table, th, td {vertical-align:middle;}
-blockquote:before, blockquote:after, q:before, q:after {content:'';}
-blockquote, q {quotes:"" "";}
-a img {border:none;}
-:focus {outline:0;}
-
-/* typography.css */
-html {font-size:100.01%;}
-body {color:#222;background:#fff;font-family:Heuristica,Georgia,serif;}
-h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
-h1 {font-size:3em;line-height:1;margin-top:1em;margin-bottom:0.5em;}
-h2 {font-size:2em;margin-bottom:0.75em;}
-h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
-h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
-h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
-h6 {font-size:1em;font-weight:bold;}
-h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
-p {margin:0 0 0.5em;}
-.left {float:left !important;}
-p .left {margin:0.5em 0.5em 0.5em 0;padding:0;}
-.right {float:right !important;}
-p .right {margin:0.5em 0 0.5em 0.5em;padding:0;}
-a:focus, a:hover {color:#09f;text-decoration:underline;}
-a {color:#06c;text-decoration:none;}
-blockquote {margin:1.5em;color:#666;font-style:italic;}
-strong, dfn {font-weight:bold;}
-em, dfn {font-style:italic;}
-sup, sub {line-height:0;}
-abbr, acronym {border-bottom:1px dotted #666;}
-address {margin:0 0 1.5em;font-style:italic;}
-del {color:#666;}
-pre {margin:1.5em 0;white-space:pre;}
-pre, code, tt {font:90% "Luxi Mono", 'andale mono', 'lucida console', monospace;line-height:1.5;}
-li ul, li ol {margin:0;}
-ul, ol {margin:0 1.5em 1.5em 0;padding-left:1.5em;}
-ul {list-style-type:disc;}
-ol {list-style-type:decimal;}
-dl {margin:0 0 1.5em 0;}
-dl dt {font-weight:bold;}
-dd {margin-left:1.5em;}
-table {margin-bottom:1.4em;width:100%;}
-th {font-weight:bold;}
-thead th {background:#c3d9ff;}
-th, td, caption {padding:4px 10px 4px 5px;}
-tbody tr:nth-child(even) td, tbody tr.even td {background:#e5ecf9;}
-tfoot {font-style:italic;}
-caption {background:#eee;}
-.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
-.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
-.hide {display:none;}
-.quiet {color:#666;}
-.loud {color:#000;}
-.highlight {background:#ff0;}
-.added {background:#060;color:#fff;}
-.removed {background:#900;color:#fff;}
-.first {margin-left:0;padding-left:0;}
-.last {margin-right:0;padding-right:0;}
-.top {margin-top:0;padding-top:0;}
-.bottom {margin-bottom:0;padding-bottom:0;}
-
-/* forms.css */
-label {font-weight:bold;}
-fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
-legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;}
-fieldset, #IE8#HACK {padding-top:1.4em;}
-legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
-input[type=text], input[type=password], input[type=url], input[type=email], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;color:#000;}
-input[type=text]:focus, input[type=password]:focus, input[type=url]:focus, input[type=email]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;}
-select {background-color:#fff;border-width:1px;border-style:solid;}
-input[type=text], input[type=password], input[type=url], input[type=email], input.text, input.title, textarea, select {margin:0.5em 0;}
-input.text, input.title {width:300px;padding:5px;}
-input.title {font-size:1.5em;}
-textarea {width:390px;height:250px;padding:5px;}
-form.inline {line-height:3;}
-form.inline p {margin-bottom:0;}
-.error, .alert, .notice, .success, .info {padding:0.8em;margin-bottom:1em;border:2px solid #ddd;}
-.error, .alert {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
-.notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
-.success {background:#e6efc2;color:#264409;border-color:#c6d880;}
-.info {background:#d5edf8;color:#205791;border-color:#92cae4;}
-.error a, .alert a {color:#8a1f11;}
-.notice a {color:#514721;}
-.success a {color:#264409;}
-.info a {color:#205791;}
-
-/* grid.css */
-.container {width:710px;margin:0 auto;}
-.showgrid {background:url(grid.png);}
-.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18 {float:left;margin-right:10px;}
-.last {margin-right:0;}
-.span-1 {width:30px;}
-.span-2 {width:70px;}
-.span-3 {width:110px;}
-.span-4 {width:150px;}
-.span-5 {width:190px;}
-.span-6 {width:230px;}
-.span-7 {width:270px;}
-.span-8 {width:310px;}
-.span-9 {width:350px;}
-.span-10 {width:390px;}
-.span-11 {width:430px;}
-.span-12 {width:470px;}
-.span-13 {width:510px;}
-.span-14 {width:550px;}
-.span-15 {width:590px;}
-.span-16 {width:630px;}
-.span-17 {width:670px;}
-.span-18 {width:710px;margin-right:0;}
-input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18 {border-left-width:1px;border-right-width:1px;padding-left:5px;padding-right:5px;}
-input.span-1, textarea.span-1 {width:18px;}
-input.span-2, textarea.span-2 {width:58px;}
-input.span-3, textarea.span-3 {width:98px;}
-input.span-4, textarea.span-4 {width:138px;}
-input.span-5, textarea.span-5 {width:178px;}
-input.span-6, textarea.span-6 {width:218px;}
-input.span-7, textarea.span-7 {width:258px;}
-input.span-8, textarea.span-8 {width:298px;}
-input.span-9, textarea.span-9 {width:338px;}
-input.span-10, textarea.span-10 {width:378px;}
-input.span-11, textarea.span-11 {width:418px;}
-input.span-12, textarea.span-12 {width:458px;}
-input.span-13, textarea.span-13 {width:498px;}
-input.span-14, textarea.span-14 {width:538px;}
-input.span-15, textarea.span-15 {width:578px;}
-input.span-16, textarea.span-16 {width:618px;}
-input.span-17, textarea.span-17 {width:658px;}
-input.span-18, textarea.span-18 {width:698px;}
-.append-1 {padding-right:40px;}
-.append-2 {padding-right:80px;}
-.append-3 {padding-right:120px;}
-.append-4 {padding-right:160px;}
-.append-5 {padding-right:200px;}
-.append-6 {padding-right:240px;}
-.append-7 {padding-right:280px;}
-.append-8 {padding-right:320px;}
-.append-9 {padding-right:360px;}
-.append-10 {padding-right:400px;}
-.append-11 {padding-right:440px;}
-.append-12 {padding-right:480px;}
-.append-13 {padding-right:520px;}
-.append-14 {padding-right:560px;}
-.append-15 {padding-right:600px;}
-.append-16 {padding-right:640px;}
-.append-17 {padding-right:680px;}
-.append-18 {padding-right:720px;}
-.prepend-1 {padding-left:40px;}
-.prepend-2 {padding-left:80px;}
-.prepend-3 {padding-left:120px;}
-.prepend-4 {padding-left:160px;}
-.prepend-5 {padding-left:200px;}
-.prepend-6 {padding-left:240px;}
-.prepend-7 {padding-left:280px;}
-.prepend-8 {padding-left:320px;}
-.prepend-9 {padding-left:360px;}
-.prepend-10 {padding-left:400px;}
-.prepend-11 {padding-left:440px;}
-.prepend-12 {padding-left:480px;}
-.prepend-13 {padding-left:520px;}
-.prepend-14 {padding-left:560px;}
-.prepend-15 {padding-left:600px;}
-.prepend-16 {padding-left:640px;}
-.prepend-17 {padding-left:680px;}
-.prepend-18 {padding-left:720px;}
-.border {padding-right:4px;margin-right:5px;border-right:1px solid #ddd;}
-.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #ddd;}
-.pull-1 {margin-left:-40px;}
-.pull-2 {margin-left:-80px;}
-.pull-3 {margin-left:-120px;}
-.pull-4 {margin-left:-160px;}
-.pull-5 {margin-left:-200px;}
-.pull-6 {margin-left:-240px;}
-.pull-7 {margin-left:-280px;}
-.pull-8 {margin-left:-320px;}
-.pull-9 {margin-left:-360px;}
-.pull-10 {margin-left:-400px;}
-.pull-11 {margin-left:-440px;}
-.pull-12 {margin-left:-480px;}
-.pull-13 {margin-left:-520px;}
-.pull-14 {margin-left:-560px;}
-.pull-15 {margin-left:-600px;}
-.pull-16 {margin-left:-640px;}
-.pull-17 {margin-left:-680px;}
-.pull-18 {margin-left:-720px;}
-.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18 {float:left;position:relative;}
-.push-1 {margin:0 -40px 1.5em 40px;}
-.push-2 {margin:0 -80px 1.5em 80px;}
-.push-3 {margin:0 -120px 1.5em 120px;}
-.push-4 {margin:0 -160px 1.5em 160px;}
-.push-5 {margin:0 -200px 1.5em 200px;}
-.push-6 {margin:0 -240px 1.5em 240px;}
-.push-7 {margin:0 -280px 1.5em 280px;}
-.push-8 {margin:0 -320px 1.5em 320px;}
-.push-9 {margin:0 -360px 1.5em 360px;}
-.push-10 {margin:0 -400px 1.5em 400px;}
-.push-11 {margin:0 -440px 1.5em 440px;}
-.push-12 {margin:0 -480px 1.5em 480px;}
-.push-13 {margin:0 -520px 1.5em 520px;}
-.push-14 {margin:0 -560px 1.5em 560px;}
-.push-15 {margin:0 -600px 1.5em 600px;}
-.push-16 {margin:0 -640px 1.5em 640px;}
-.push-17 {margin:0 -680px 1.5em 680px;}
-.push-18 {margin:0 -720px 1.5em 720px;}
-.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18 {float:left;position:relative;}
-div.prepend-top, .prepend-top {margin-top:1.5em;}
-div.append-bottom, .append-bottom {margin-bottom:1.5em;}
-.box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;}
-hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 17px;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
-.clearfix, .container {display:block;}
-.clear {clear:both;}
diff --git a/resources/fonts.css b/resources/fonts.css
deleted file mode 100644
index a47d453f29..0000000000
--- a/resources/fonts.css
+++ /dev/null
@@ -1,57 +0,0 @@
-@font-face {
-    font-family: 'Luxi Mono';
-    src: local('Luxi Mono Regular'),
-         url('LuxiMono-Regular.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'Luxi Mono';
-    src: local('Luxi Mono Oblique'),
-         url('LuxiMono-BoldOblique.woff') format('woff');
-    font-weight: normal;
-    font-style: oblique;
-}
-@font-face {
-    font-family: 'Luxi Mono';
-    src: local('Luxi Mono Bold'),
-         url('LuxiMono-Bold.woff') format('woff');
-    font-weight: bold;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'Luxi Mono';
-    src: local('Luxi Mono Bold Oblique'),
-         url('LuxiMono-BoldOblique.woff') format('woff');
-    font-weight: bold;
-    font-style: oblique;
-}
-
-@font-face {
-    font-family: 'Heuristica';
-    src: local('Heuristica Regular'),
-         url('Heuristica-Regular.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'Heuristica';
-    src: local('Heuristica Italic'),
-         url('Heuristica-RegularItalic.woff') format('woff');
-    font-weight: normal;
-    font-style: italic;
-}
-@font-face {
-    font-family: 'Heuristica';
-    src: local('Heuristica Bold'),
-         url('Heuristica-Bold.woff') format('woff');
-    font-weight: bold;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'Heuristica';
-    src: local('Heuristica Bold Italic'),
-         url('Heuristica-BoldItalic.woff') format('woff');
-    font-weight: bold;
-    font-style: italic;
-}
diff --git a/resources/grid.png b/resources/grid.png
deleted file mode 100755
index 4ceb110426..0000000000
--- a/resources/grid.png
+++ /dev/null
diff --git a/resources/ie.css b/resources/ie.css
deleted file mode 100755
index f01539959a..0000000000
--- a/resources/ie.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 1.0.1
- http://blueprintcss.org
-
-   * Copyright (c) 2007-Present. See LICENSE for more info.
-   * See README for instructions on how to use Blueprint.
-   * For credits and origins, see AUTHORS.
-   * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* ie.css */
-body {text-align:center;}
-.container {text-align:left;}
-* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
-* html legend {margin:0px -8px 16px 0;padding:0;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-html>body p code {*white-space:normal;}
-hr {margin:-8px auto 11px;}
-img {-ms-interpolation-mode:bicubic;}
-.clearfix, .container {display:inline-block;}
-* html .clearfix, * html .container {height:1%;}
-fieldset {padding-top:0;}
-legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;}
-textarea {overflow:auto;}
-label {vertical-align:middle;position:relative;top:-0.25em;}
-input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
-input.text:focus, input.title:focus {border-color:#666;}
-input.text, input.title, textarea, select {margin:0.5em 0;}
-input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline div, form.inline p {vertical-align:middle;}
-form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
-button, input.button {position:relative;top:0.25em;}
-\ No newline at end of file
diff --git a/resources/scala-ref-template.html5 b/resources/scala-ref-template.html5
deleted file mode 100644
index 2ff8991df1..0000000000
--- a/resources/scala-ref-template.html5
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html$if(lang)$ lang="$lang$"$endif$>
-<head>
-  <meta charset="utf-8">
-  <meta name="generator" content="pandoc">
-$for(author-meta)$
-  <meta name="author" content="$author-meta$">
-$endfor$
-$if(date-meta)$
-  <meta name="dcterms.date" content="$date-meta$">
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title>
-  <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-$if(quotes)$
-  <style type="text/css">
-    q { quotes: "“" "”" "‘" "’"; }
-  </style>
-$endif$
-$if(highlighting-css)$
-  <style type="text/css">
-$highlighting-css$
-  </style>
-$endif$
-$for(css)$
-  <link rel="stylesheet" href="$css$">
-$endfor$
-  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-  <script type="text/javascript" src="resources/ScalaReference.js"></script>
-  <script type="text/x-mathjax-config">
-      MathJax.Hub.Config({
-        tex2jax: {
-            skipTags: ["script", "noscript", "style", "textarea"],
-            inlineMath: [ ["$$", "$$"], ["\\(", "\\)"] ],
-            processEscapes: true
-        }
-    });
-  </script>
-$if(math)$
-  $math$
-$endif$
-$for(header-includes)$
-  $header-includes$
-$endfor$
-
-  <link rel="stylesheet" href="resources/blueprint-screen.css" type="text/css" media="screen, projection">
-  <link rel="stylesheet" href="resources/blueprint-print.css" type="text/css" media="print">
-  <!--[if lt IE 8]>
-    <link rel="stylesheet" href="resources/blueprint-ie.css" type="text/css" media="screen, projection">
-  <![endif]-->
-  <link rel="stylesheet" href="resources/style.css" type="text/css" media="screen, projection"/>
-  <link rel="stylesheet" href="resources/fonts.css" type="text/css" media="screen, projection"/>
-
-</head>
-<body>
-<div class="container">
-$for(include-before)$
-$include-before$
-$endfor$
-$if(title)$
-<header>
-<h1 class="title">$title$</h1>
-$if(date)$
-<h3 class="date">$date$</h3>
-$endif$
-</header>
-<hr>
-$endif$
-$if(toc)$
-<nav id="$idprefix$TOC">
-$toc$
-</nav>
-$endif$
-$body$
-$for(include-after)$
-$include-after$
-$endfor$
-</div>
-</body>
-</html>
diff --git a/resources/scala-ref-template.latex b/resources/scala-ref-template.latex
deleted file mode 100644
index 077a0dc2a0..0000000000
--- a/resources/scala-ref-template.latex
+++ /dev/null
@@ -1,164 +0,0 @@
-\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$]{$documentclass$}
-
-\usepackage{mathrsfs}
-\usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
-\usepackage{fixltx2e} % provides \textsubscript
-% use microtype if available
-\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
-% use upquote if available, for straight quotes in verbatim environments
-\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
-  \usepackage[utf8]{inputenc}
-$if(euro)$
-  \usepackage{eurosym}
-$endif$
-\else % if luatex or xelatex
-  \usepackage{fontspec}
-  \ifxetex
-    \usepackage{xltxtra,xunicode}
-  \fi
-  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
-  \newcommand{\euro}{€}
-  \setmainfont{Heuristica Regular}
-  \setmonofont[Scale=0.8]{Luxi Mono}
-$if(sansfont)$
-    \setsansfont{$sansfont$}
-$endif$
-$if(mathfont)$
-    \setmathfont{$mathfont$}
-$endif$
-\fi
-$if(geometry)$
-\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
-$endif$
-$if(natbib)$
-\usepackage{natbib}
-\bibliographystyle{plainnat}
-$endif$
-$if(biblatex)$
-\usepackage{biblatex}
-$if(biblio-files)$
-\bibliography{$biblio-files$}
-$endif$
-$endif$
-$if(listings)$
-\usepackage{listings}
-$endif$
-$if(lhs)$
-\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
-$endif$
-$if(highlighting-macros)$
-$highlighting-macros$
-$endif$
-$if(verbatim-in-note)$
-\usepackage{fancyvrb}
-$endif$
-$if(tables)$
-\usepackage{longtable}
-$endif$
-$if(graphics)$
-\usepackage{graphicx}
-% We will generate all images so they have a width \maxwidth. This means
-% that they will get their normal width if they fit onto the page, but
-% are scaled down if they would overflow the margins.
-\makeatletter
-\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth
-\else\Gin@nat@width\fi}
-\makeatother
-\let\Oldincludegraphics\includegraphics
-\renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}}
-$endif$
-\ifxetex
-  \usepackage[setpagesize=false, % page size defined by xetex
-              unicode=false, % unicode breaks when used with xetex
-              xetex]{hyperref}
-\else
-  \usepackage[unicode=true]{hyperref}
-\fi
-\hypersetup{breaklinks=true,
-            bookmarks=true,
-            pdfauthor={$author-meta$},
-            pdftitle={$title-meta$},
-            colorlinks=true,
-            urlcolor=$if(urlcolor)$$urlcolor$$else$blue$endif$,
-            linkcolor=$if(linkcolor)$$linkcolor$$else$magenta$endif$,
-            pdfborder={0 0 0}}
-\urlstyle{same}  % don't use monospace font for urls
-$if(links-as-notes)$
-% Make links footnotes instead of hotlinks:
-\renewcommand{\href}[2]{#2\footnote{\url{#1}}}
-$endif$
-$if(strikeout)$
-\usepackage[normalem]{ulem}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
-$endif$
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{6pt plus 2pt minus 1pt}
-\setlength{\emergencystretch}{3em}  % prevent overfull lines
-$if(numbersections)$
-$else$
-\setcounter{secnumdepth}{0}
-$endif$
-$if(verbatim-in-note)$
-\VerbatimFootnotes % allows verbatim text in footnotes
-$endif$
-$if(lang)$
-\ifxetex
-  \usepackage{polyglossia}
-  \setmainlanguage{$mainlang$}
-\else
-  \usepackage[$lang$]{babel}
-\fi
-$endif$
-$for(header-includes)$
-$header-includes$
-$endfor$
-
-$if(title)$
-\title{$title$}
-$endif$
-%\author{$for(author)$$author$$sep$ \and $endfor$}
-\date{$date$}
-
-\begin{document}
-$if(title)$
-\maketitle
-$endif$
-
-$for(include-before)$
-$include-before$
-
-$endfor$
-$if(toc)$
-{
-\hypersetup{linkcolor=black}
-\setcounter{tocdepth}{$toc-depth$}
-\tableofcontents
-}
-$endif$
-$body$
-
-$if(natbib)$
-$if(biblio-files)$
-$if(biblio-title)$
-$if(book-class)$
-\renewcommand\bibname{$biblio-title$}
-$else$
-\renewcommand\refname{$biblio-title$}
-$endif$
-$endif$
-\bibliography{$biblio-files$}
-
-$endif$
-$endif$
-$if(biblatex)$
-\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
-
-$endif$
-$for(include-after)$
-$include-after$
-
-$endfor$
-\end{document}
diff --git a/resources/style.css b/resources/style.css
deleted file mode 100644
index 17d13741a7..0000000000
--- a/resources/style.css
+++ /dev/null
@@ -1,93 +0,0 @@
-header h1 {
-	text-align: center;
-}
-
-header .date {
-	text-align: center;
-}
-
-nav ul {
-	list-style-type: none;
-}
-
-.container > h1 a, 
-.container > h2 a, 
-.container > h3 a, 
-.container > h4 a, 
-.container > h5 a,
-.container > h6 a {
-	text-decoration: none;
-	color: #111;
-}
-
-p {
-	-moz-font-feature-settings:    "onum";
-	-ms-font-feature-settings:     "onum";
-	-webkit-font-feature-settings: "onum";
-	font-feature-settings:         "onum";
-}
-
-pre {
-	margin-left: 1em;
-	margin-right: 1em;
-	padding: 1em;
-	background-color: #EEE;
-}
-
-pre.math {
-	margin: 0;
-	padding: 0;
-	background-color: transparent;
-	border: 0;
-}
-
-pre[class="grammar"]:before {
-	content: "Syntax\A";
-	font-family: Heuristica;
-	font-size:110%;
-	font-weight:bold;
-}
-
-code > span {
-	font-weight: normal !important;
-}
-
-code {
-	padding-left: 0.1em;
-	padding-right: 0.1em;
-}
-
-/* examples */
-ol[type="1"] {
-	list-style-type: none;
-	margin-left: 1em;
-	margin-right: 1em;
-	padding: 0;
-}
-
-ol[type="1"] > li {
-	margin-top: 1em;
-	padding: 1em;
-	background-color: #E5ECF9;
-}
-
-ol[type="1"] > li:before {
-	content: "Example";
-	font-weight:bold;
-}
-
-#popoutTOC {
-	position: fixed;
-	top: 0;
-	left: 0;
-	margin: 0;
-	padding: 0;
-}
-
-#popoutTOC .head {
-
-}
-
-#popoutTOC .links {
-	display: none;
-}
diff --git a/01-title.md b/spec/01-title.md
index c43908e61c..c43908e61c 100644
--- a/01-title.md
+++ b/spec/01-title.md
diff --git a/02-preface.md b/spec/02-preface.md
index 50e25d6c00..50e25d6c00 100644
--- a/02-preface.md
+++ b/spec/02-preface.md
diff --git a/03-lexical-syntax.md b/spec/03-lexical-syntax.md
index c1b4d7f4ba..c1b4d7f4ba 100644
--- a/03-lexical-syntax.md
+++ b/spec/03-lexical-syntax.md
diff --git a/04-identifiers-names-and-scopes.md b/spec/04-identifiers-names-and-scopes.md
index 0a3f9ca3cf..0a3f9ca3cf 100644
--- a/04-identifiers-names-and-scopes.md
+++ b/spec/04-identifiers-names-and-scopes.md
diff --git a/05-types.md b/spec/05-types.md
index f614d15f8f..f614d15f8f 100644
--- a/05-types.md
+++ b/spec/05-types.md
diff --git a/06-basic-declarations-and-definitions.md b/spec/06-basic-declarations-and-definitions.md
index e0fdf051c2..e0fdf051c2 100644
--- a/06-basic-declarations-and-definitions.md
+++ b/spec/06-basic-declarations-and-definitions.md
diff --git a/07-classes-and-objects.md b/spec/07-classes-and-objects.md
index 4ad637f517..4ad637f517 100644
--- a/07-classes-and-objects.md
+++ b/spec/07-classes-and-objects.md
diff --git a/08-expressions.md b/spec/08-expressions.md
index db1bd182cd..db1bd182cd 100644
--- a/08-expressions.md
+++ b/spec/08-expressions.md
diff --git a/09-implicit-parameters-and-views.md b/spec/09-implicit-parameters-and-views.md
index 3e821ec9fa..3e821ec9fa 100644
--- a/09-implicit-parameters-and-views.md
+++ b/spec/09-implicit-parameters-and-views.md
diff --git a/10-pattern-matching.md b/spec/10-pattern-matching.md
index 19182c757b..19182c757b 100644
--- a/10-pattern-matching.md
+++ b/spec/10-pattern-matching.md
diff --git a/11-top-level-definitions.md b/spec/11-top-level-definitions.md
index cfb2c98adb..cfb2c98adb 100644
--- a/11-top-level-definitions.md
+++ b/spec/11-top-level-definitions.md
diff --git a/12-xml-expressions-and-patterns.md b/spec/12-xml-expressions-and-patterns.md
index 7aab3380d4..7aab3380d4 100644
--- a/12-xml-expressions-and-patterns.md
+++ b/spec/12-xml-expressions-and-patterns.md
diff --git a/13-user-defined-annotations.md b/spec/13-user-defined-annotations.md
index a9f3e0f1de..a9f3e0f1de 100644
--- a/13-user-defined-annotations.md
+++ b/spec/13-user-defined-annotations.md
diff --git a/14-the-scala-standard-library.md b/spec/14-the-scala-standard-library.md
index d0d06c25b2..4b79fd3285 100644
--- a/14-the-scala-standard-library.md
+++ b/spec/14-the-scala-standard-library.md
@@ -10,7 +10,7 @@ The Scala standard library consists of the package `scala` with a
 number of classes and modules. Some of these classes are described in
 the following.
 
-![Class hierarchy of Scala](resources/classhierarchy.pdf)
+![Class hierarchy of Scala](public/images/classhierarchy.pdf)
 
 ## Root Classes
 
diff --git a/15-syntax-summary.md b/spec/15-syntax-summary.md
index 3eecc26eb4..3eecc26eb4 100644
--- a/15-syntax-summary.md
+++ b/spec/15-syntax-summary.md
diff --git a/Scala.bib b/spec/16-references.md
index cb91c46418..3535a384fb 100644
--- a/Scala.bib
+++ b/spec/16-references.md
@@ -1,16 +1,26 @@
+---
+title: References
+layout: default
+chapter: 14
+---
+
+
+# References
+
+<!-- TODO
 
 
 %% Article
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-@article{milner:polymorphism, 
-  author	= {Robin Milner}, 
-  title		= {A {T}heory of {T}ype {P}olymorphism in {P}rogramming}, 
-  journal	= {Journal of Computer and System Sciences}, 
-  year		= {1978}, 
-  month		= {Dec}, 
-  volume	= {17}, 
-  pages		= {348--375}, 
+@article{milner:polymorphism,
+  author	= {Robin Milner},
+  title		= {A {T}heory of {T}ype {P}olymorphism in {P}rogramming},
+  journal	= {Journal of Computer and System Sciences},
+  year		= {1978},
+  month		= {Dec},
+  volume	= {17},
+  pages		= {348-375},
   folder	= { 2-1}
 }
 
@@ -32,7 +42,7 @@ for syntactic definitions?",
 @Book{abelson-sussman:structure,
   author	= {Harold Abelson and Gerald Jay Sussman and Julie Sussman},
   title		= {The Structure and Interpretation of Computer Programs, 2nd
-		  edition},
+                  edition},
   publisher	= {MIT Press},
   address	= {Cambridge, Massachusetts},
   year		= {1996},
@@ -63,7 +73,7 @@ for syntactic definitions?",
   year		= "2003",
   month		= "sep",
   note		= {ISBN 0-954-16178-5\hspace*{\fill}\\
-		  \verb@http://www.python.org/doc/current/ref/ref.html@}
+                  \verb@http://www.python.org/doc/current/ref/ref.html@}
 }
 
 @Manual{odersky:scala-reference,
@@ -98,13 +108,13 @@ for syntactic definitions?",
 
 @InProceedings{odersky-et-al:fool10,
   author	= {Martin Odersky and Vincent Cremet and Christine R\"ockl
-		  and Matthias Zenger},
+                  and Matthias Zenger},
   title		= {A {N}ominal {T}heory of {O}bjects with {D}ependent {T}ypes},
   booktitle	= {Proc. FOOL 10},
   year		= 2003,
   month		= jan,
   note		= {\hspace*{\fill}\\
-		  \verb@http://www.cis.upenn.edu/~bcpierce/FOOL/FOOL10.html@}		  
+                  \verb@http://www.cis.upenn.edu/~bcpierce/FOOL/FOOL10.html@}
 }
 
 
@@ -115,14 +125,14 @@ for syntactic definitions?",
   author	= {W3C},
   title		= {Document Object Model ({DOM})},
   howpublished	= {\hspace*{\fill}\\
-		  \verb@http://www.w3.org/DOM/@}
+                  \verb@http://www.w3.org/DOM/@}
 }
 
 @Misc{w3c:xml,
   author	= {W3C},
   title		= {Extensible {M}arkup {L}anguage ({XML})},
   howpublished	= {\hspace*{\fill}\\
-		  \verb@http://www.w3.org/TR/REC-xml@}
+                  \verb@http://www.w3.org/TR/REC-xml@}
 }
 
 @TechReport{scala-overview-tech-report,
@@ -151,7 +161,7 @@ for syntactic definitions?",
 
 @InCollection{cremet-odersky:pilib,
   author =       {Vincent Cremet and Martin Odersky},
-  title =        {{PiLib} - A {H}osted {L}anguage for {P}i-{C}alculus {S}tyle {C}oncurrency},
+  title =        {PiLib} - A {H}osted {L}anguage for {P}i-{C}alculus {S}tyle {C}oncurrency},
   booktitle =    {Domain-Specific Program Generation},
   publisher =    {Springer},
   year =         2005,
@@ -170,7 +180,7 @@ for syntactic definitions?",
 
 @InProceedings{odersky:scala-experiment,
   author =       {Martin Odersky},
-  title =        {The {S}cala {E}xperiment -- {C}an {W}e {P}rovide {B}etter {L}anguage {S}upport for {C}omponent {S}ystems?},
+  title =        {The {S}cala {E}xperiment - {C}an {W}e {P}rovide {B}etter {L}anguage {S}upport for {C}omponent {S}ystems?},
   booktitle =    {Proc. ACM Symposium on Principles of Programming Languages},
   year =         2006
 }
@@ -191,3 +201,7 @@ for syntactic definitions?",
   note =         {SID-9}
 }
 
+
+
+
+-->
+\ No newline at end of file
diff --git a/README.md b/spec/README.md
index 84e9d6abc9..84e9d6abc9 100644
--- a/README.md
+++ b/spec/README.md
diff --git a/_config.yml b/spec/_config.yml
index 906ded51f5..2867e48a11 100644
--- a/_config.yml
+++ b/spec/_config.yml
@@ -1,6 +1,6 @@
 safe: true
 lsi: false
-highlighter: pygments
+highlighter: null
 markdown: redcarpet
 encoding: utf-8
 redcarpet:
diff --git a/_includes/numbering.css b/spec/_includes/numbering.css
index 86b946354d..86b946354d 100644
--- a/_includes/numbering.css
+++ b/spec/_includes/numbering.css
diff --git a/_layouts/default.yml b/spec/_layouts/default.yml
index 814bc511a9..7f17ba30b0 100644
--- a/_layouts/default.yml
+++ b/spec/_layouts/default.yml
@@ -24,8 +24,7 @@
     $( document ).ready(function(){ $("h3[id*='example']").text("") })
   </script>
 
-  <link rel="stylesheet" type="text/css" href="resources/style.css">
-  <link rel="stylesheet" type="text/css" href="resources/github.css">
+  <link rel="stylesheet" type="text/css" href="public/stylesheets/screen.css">
 
 </head>
 
diff --git a/index.md b/spec/index.md
index 3cadbdee83..3cadbdee83 100644
--- a/index.md
+++ b/spec/index.md
diff --git a/resources/classhierarchy.pdf b/spec/public/images/classhierarchy.pdf
index 58e050174b..58e050174b 100644
--- a/resources/classhierarchy.pdf
+++ b/spec/public/images/classhierarchy.pdf
diff --git a/resources/github.css b/spec/public/stylesheets/screen.css
index bf8df4bb03..863591ed77 100644
--- a/resources/github.css
+++ b/spec/public/stylesheets/screen.css
@@ -1,3 +1,5 @@
+/* from https://gist.github.com/andyferra/2554919 */
+
 body {
   font-family: Helvetica, arial, sans-serif;
   font-size: 14px;
@@ -100,9 +102,11 @@ h6 {
 
 p, blockquote, ul, ol, dl, li, table, pre {
   margin: 15px 0;
+  -moz-font-feature-settings: "onum";
+  -ms-font-feature-settings: "onum";
+  -webkit-font-feature-settings: "onum";
+  font-feature-settings: "onum";
 }
-<script type="text/javascript" src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 
 hr {
   background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0;
diff --git a/test.html b/test.html
deleted file mode 100644
index 37a5b3d865..0000000000
--- a/test.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-	<code class="scala">private def omg(x : Int) : Int = x</code>
-</body>
-</html>
-\ No newline at end of file