jekyll 2.0.0.alpha.1 → 2.0.0.alpha.2

data/lib/site_template/feed.xml

@@ -0,0 +1,21 @@
+---
+layout: none
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ site.name | xml_escape }}</title>
+    <description>{{ site.description | xml_escape }}</description>
+    <link>{{ site.url }}</link>
+    <atom:link href="{{ site.url }}/feed.xml" rel="self" type="application/rss+xml" />
+    {% for post in site.posts limit:10 %}
+      <item>
+        <title>{{ post.title | xml_escape }}</title>
+        <description>{{ post.content | xml_escape }}</description>
+        <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
+        <link>{{ site.url }}/{{ post.url }}</link>
+        <guid isPermaLink="true">{{ site.url }}/{{ post.url }}</guid>
+      </item>
+    {% endfor %}
+  </channel>
+</rss>

data/lib/site_template/index.html

@@ -1,13 +1,17 @@
 ---
 layout: default
-title: Your New Jekyll Site
 ---
 
-<div id="home">
-  <h1>Blog Posts</h1>
+<div class="home">
+
+  <h1>Posts</h1>
+
   <ul class="posts">
     {% for post in site.posts %}
-      <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
+      <li><span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span> <a class="post-link" href="{{ post.url }}">{{ post.title }}</a></li>
     {% endfor %}
   </ul>
+
+  <p class="rss-subscribe">subscribe <a href="/feed.xml">via RSS</a></p>
+
 </div>

data/lib/site_template/projects/index.md

@@ -0,0 +1,14 @@
+---
+layout: page
+title: Projects
+---
+
+Just a sample of another page that you could include for some purpose in the primary navigation.
+
+This could be a great place to list your own projects. But to get you started, here's some handy links:
+
+- [List of Jekyll-powered websites](https://github.com/jekyll/jekyll/wiki/Sites)
+- [Octopress, a Jekyll based blog framework](https://github.com/octopress/)
+- [Jekyll documentation](http://jekyllrb.com/)
+- [Jekyll source on GitHub](https://github.com/jekyll/jekyll)
+- [Available plugins](http://jekyllrb.com/docs/plugins/#available_plugins)

data/script/cibuild

@@ -1,5 +1,4 @@
 #! /bin/bash
 
 script/branding
-script/bootstrap > /dev/null 2>&1
 bundle exec rake

data/script/rebund

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # rebund(1)
-# 
+#
 # Author: Julien Letessier
 # Homepage: https://github.com/mezis/rebund
 # License:

data/site/_includes/analytics.html

@@ -1,6 +1,6 @@
 {% if site.gauges_id %}
   <!-- Gauges (http://gaug.es/) -->
-  <script type="text/javascript">
+  <script>
     var _gauges = _gauges || [];
     (function() {
       var t   = document.createElement('script');
@@ -17,7 +17,7 @@
 
 {% if site.google_analytics_id %}
   <!-- Google Analytics (http://google.com/analytics) -->
-  <script type="text/javascript">
+  <script>
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '{{ site.google_analytics_id }}']);
     _gaq.push(['_setDomainName', '{{ site.url }}']); // Multiple sub-domains

data/site/_includes/css/normalize.css

@@ -1 +1 @@
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:0.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}

data/site/_includes/css/style.css

@@ -157,8 +157,6 @@ body > footer img {
   position: relative;
   top: 8px;
   margin-left: 5px;
-  width: 100px;
-  height: 30px;
   opacity: .8;
   padding: 1px;
   -webkit-transition: opacity .2s;
@@ -591,8 +589,6 @@ article h2:first-child {
 }
 
 .avatar {
-  width: 24px;
-  height: 24px;
   border-radius: 3px;
   display: inline-block;
   vertical-align: middle;
@@ -904,6 +900,19 @@ code.option, code.flag, code.filter, code.output {
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9e2812', endColorstr='#6f0d0d',GradientType=0 );
 }
 
+.unreleased {
+  background: rgb(205,146,57); /* Old browsers */
+  /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+  background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NkOTIzOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNhMjc1MjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+  background: -moz-linear-gradient(top,  rgba(205,146,57,1) 0%, rgba(162,117,40,1) 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(205,146,57,1)), color-stop(100%,rgba(162,117,40,1))); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* IE10+ */
+  background: linear-gradient(to bottom,  rgba(205,146,57,1) 0%,rgba(162,117,40,1) 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cd9239', endColorstr='#a27528',GradientType=0 ); /* IE6-8 */
+}
+
 .info:before {
   border-color: transparent #00617f #00617f transparent;
 }
@@ -912,6 +921,10 @@ code.option, code.flag, code.filter, code.output {
   border-color: transparent #6f0d0d #6f0d0d transparent;
 }
 
+.unreleased:before {
+  border-color: transparent #664719 #664719 transparent;
+}
+
 .note:after {
   content: "★";
   color: #fc0;
@@ -945,6 +958,17 @@ code.option, code.flag, code.filter, code.output {
   text-shadow: 0 -1px 0 rgba(0,0,0,.5);
 }
 
+.unreleased:after {
+  content: "⚒";
+  color: #2b2a12;
+  position: absolute;
+  top: 8px;
+  left: 15px;
+  font-size: 38px;
+  font-weight: bold;
+  text-shadow: 0 1px 0 rgba(255,255,255,.25);
+}
+
 /* Responsive tables */
 
 @media (max-width: 768px){

data/site/_includes/docs_option.html

@@ -1,7 +1,7 @@
 {% assign items = include.items %}
 
 {% for item in items %}
-  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+  {% assign item_url = item | prepend:"/docs/" | append:"/" %}
 
   {% for p in site.pages %}
     {% if p.url == item_url %}

data/site/_includes/docs_ul.html

@@ -2,12 +2,12 @@
 
 <ul>
 {% for item in items %}
-  {% assign item_url = item | prepend:'/docs/' | append:'/' %}
+  {% assign item_url = item | prepend:"/docs/" | append:"/" %}
 
   {% if item_url == page.url %}
-    {% assign c = 'current' %}
+    {% assign c = "current" %}
   {% else %}
-    {% assign c = '' %}
+    {% assign c = "" %}
   {% endif %}
 
   {% for p in site.pages %}

data/site/_includes/footer.html

@@ -7,7 +7,7 @@
       <p>
         Proudly hosted by
         <a href="https://github.com">
-          <img src="{{ site.url }}/img/footer-logo.png" alt="GitHub • Social coding">
+          <img src="/img/footer-logo.png" width="100" height="30" alt="GitHub • Social coding">
         </a>
       </p>
     </div>

data/site/_includes/header.html

@@ -5,9 +5,9 @@
   <div class="grid">
     <div class="unit one-third center-on-mobiles">
       <h1>
-        <a href="{{ site.url }}/">
+        <a href="/">
           <span>Jekyll</span>
-          <img src="{{ site.url }}/img/logo-2x.png" width="249" height="115" alt="">
+          <img src="/img/logo-2x.png" width="249" height="115" alt="Logo">
         </a>
       </h1>
     </div>

data/site/_includes/news_item.html

@@ -14,7 +14,7 @@
       {{ post.date | date_to_string }}
     </span>
     <a href="https://github.com/{{ post.author }}" class="post-author">
-      <img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }}"/>
+      <img src="https://github.com/{{ post.author }}.png" class="avatar" alt="{{ post.author }}" width="24" height="24">
       {{ post.author }}
     </a>
   </div>

data/site/_includes/primary-nav-items.html

@@ -1,14 +1,14 @@
 <ul>
   <li class="{% if page.overview %}current{% endif %}">
-    <a href="{{ site.url }}/">Overview</a>
+    <a href="/">Overview</a>
   </li>
   <li class="{% if page.url contains '/docs/' %}current{% endif %}">
-    <a href="{{ site.url }}/docs/home/">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
+    <a href="/docs/home/">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
   </li>
   <li class="{% if page.author %}current{% endif %}">
-    <a href="{{ site.url }}/news/">News</a>
+    <a href="/news/">News</a>
   </li>
-  <li class="">
+  <li>
     <a href="{{ site.repository }}"><span class="hide-on-mobiles">View on </span>GitHub</a>
   </li>
 </ul>

data/site/_includes/section_nav.html

@@ -1,7 +1,7 @@
 <div class="section-nav">
   <div class="left align-right">
     {% if page.prev_section != null %}
-      <a href="{{ site.url }}/docs/{{ page.prev_section }}/" class="prev">
+      <a href="/docs/{{ page.prev_section }}/" class="prev">
         Back
       </a>
     {% else %}
@@ -10,7 +10,7 @@
   </div>
   <div class="right align-left">
     {% if page.next_section != null %}
-      <a href="{{ site.url }}/docs/{{ page.next_section }}/" class="next">
+      <a href="/docs/{{ page.next_section }}/" class="next">
         Next
       </a>
     {% else %}

data/site/_includes/top.html

@@ -4,11 +4,10 @@
   <meta charset="UTF-8">
   <title>{{ page.title }}</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <link rel="alternate" type="application/rss+xml" title="Jekyll • Simple, blog-aware, static sites - Feed" href="/feed.xml" />
-  <link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="{{ site.repository }}/commits/master.atom" />
-  <link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
-  <link href='http://fonts.googleapis.com/css?family=Arizonia' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="{{ site.url }}/css/screen.css" />
-  <link rel="icon" type="image/png" href="{{ site.url }}/favicon.png" />
-  <script src="{{ site.url }}/js/modernizr-2.5.3.min.js"></script>
+  <link rel="alternate" type="application/rss+xml" title="Jekyll • Simple, blog-aware, static sites - Feed" href="/feed.xml">
+  <link rel="alternate" type="application/atom+xml" title="Recent commits to Jekyll’s master branch" href="{{ site.repository }}/commits/master.atom">
+  <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic">
+  <link rel="stylesheet" href="/css/screen.css">
+  <link rel="icon" type="image/png" href="/favicon.png">
+  <script src="/js/modernizr-2.7.1.min.js"></script>
 </head>

data/site/_layouts/news_item.html

@@ -17,7 +17,7 @@ layout: news
       {{ page.date | date_to_string }}
     </span>
     <a href="https://github.com/{{ page.author }}" class="post-author">
-      <img src="https://github.com/{{ page.author }}.png" class="avatar" />
+      <img src="https://github.com/{{ page.author }}.png" class="avatar" alt="{{ page.author }}" width="24" height="24">
       {{ page.author }}
     </a>
   </div>

data/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown

@@ -9,7 +9,7 @@ categories: [release]
 
 Version 1.0.4 fixes a minor, but nonetheless important security vulnerability affecting several third-party Jekyll plugins. If your Jekyll site does not use plugins, you may, but are not required to upgrade at this time.
 
-Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system. 
+Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system.
 
 We recommend you upgrade to Jekyll v1.0.4 immediately if you use `Liquid::Drop` plugins on your Jekyll site.
 

data/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown

@@ -9,7 +9,7 @@ categories: [release]
 
 Version 1.1.2 fixes a minor, but nonetheless important security vulnerability affecting several third-party Jekyll plugins. If your Jekyll site does not use plugins, you may, but are not required to upgrade at this time.
 
-Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system. 
+Community and custom plugins extending the `Liquid::Drop` class may inadvertently disclose some system information such as directory structure or software configuration to users with access to the Liquid templating system.
 
 We recommend you upgrade to Jekyll v1.1.2 immediately if you use `Liquid::Drop` plugins on your Jekyll site.
 

data/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown

@@ -9,7 +9,7 @@ categories: [release]
 
 Quick turnover, anyone? A [recent incompatibility with Liquid
 v2.5.2](https://github.com/jekyll/jekyll/pull/1525) produced a nasty bug in
-which `include` tags were not rendered properly within `if` blocks. 
+which `include` tags were not rendered properly within `if` blocks.
 
 This release also includes a better handling of detached servers (prints pid and
 the command for killing the process). **Note**: the `--detach` flag and

data/site/_posts/2014-03-24-jekyll-1-5-0-released.markdown

@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Jekyll 1.5.0 Released'
+date: 2014-03-24 20:37:59 -0400
+author: parkr
+version: 1.5.0
+categories: [release]
+---
+
+As work continues on Jekyll 2.0.0, we felt it was important to address two key
+issues of Jekyll 1.4.3, namely the `safe_yaml` dependency below 1.0 and the
+inability to use Jekyll 1.4.3 on Windows due to a [fun issue with path sanitizing][].
+
+For a full changelog, check out our [history][] page.
+
+Now, back to work on 2.0.0!
+
+[fun issue with path sanitizing]: https://github.com/jekyll/jekyll/issues/1948
+[history]: /docs/history/#150__20140324

data/site/docs/assets.md

@@ -6,6 +6,14 @@ next_section: migrations
 permalink: /docs/assets/
 ---
 
+<div class="note unreleased">
+  <h5>Sass and CoffeeScript support is currently unreleased.</h5>
+  <p>
+  In order to use this feature, <a href="/docs/installation/#pre-releases">
+  install the latest development version of Jekyll</a>.
+  </p>
+</div>
+
 Jekyll provides built-in support for Sass and CoffeeScript. In order to use
 them, create a file with the proper extension name (one of `.sass`, `.scss`,
 or `.coffee`) and start the file with two lines of triple dashes, like this:
@@ -19,6 +27,12 @@ or `.coffee`) and start the file with two lines of triple dashes, like this:
   font-size: 1.2em
 {% endhighlight %}
 
+Jekyll treats these files the same a regular page, in that the output file
+will be placed in the same directory that it came from. For instance, if you
+have a file named `/css/styles.scss` in your site's source folder, Jekyll
+will process it and put it in your site's destination folder under
+`/css/styles.css`.
+
 ## Sass/SCSS
 
 Jekyll allows you to customize your Sass conversion in certain ways.

data/site/docs/configuration.md

@@ -31,65 +31,65 @@ class="flag">flags</code> (specified on the command-line) that control them.
     </tr>
   </thead>
   <tbody>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Site Source</strong></p>
-        <p class='description'>Change the directory where Jekyll will read files</p>
+        <p class="name"><strong>Site Source</strong></p>
+        <p class="description">Change the directory where Jekyll will read files</p>
       </td>
       <td class="align-center">
         <p><code class="option">source: DIR</code></p>
         <p><code class="flag">-s, --source DIR</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Site Destination</strong></p>
-        <p class='description'>Change the directory where Jekyll will write files</p>
+        <p class="name"><strong>Site Destination</strong></p>
+        <p class="description">Change the directory where Jekyll will write files</p>
       </td>
       <td class="align-center">
         <p><code class="option">destination: DIR</code></p>
         <p><code class="flag">-d, --destination DIR</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Safe</strong></p>
-        <p class='description'>Disable <a href="../plugins/">custom plugins</a>.</p>
+        <p class="name"><strong>Safe</strong></p>
+        <p class="description">Disable <a href="../plugins/">custom plugins, and ignore symbolic links</a>.</p>
       </td>
       <td class="align-center">
         <p><code class="option">safe: BOOL</code></p>
         <p><code class="flag">--safe</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Exclude</strong></p>
+        <p class="name"><strong>Exclude</strong></p>
         <p class="description">
           Exclude directories and/or files from the
           conversion. These exclusions are relative to the site's
           source directory and cannot be outside the source directory.
         </p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">exclude: [DIR, FILE, ...]</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Include</strong></p>
+        <p class="name"><strong>Include</strong></p>
         <p class="description">
           Force inclusion of directories and/or files in the conversion.
           <code>.htaccess</code> is a good example since dotfiles are excluded
           by default.
         </p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">include: [DIR, FILE, ...]</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Time Zone</strong></p>
+        <p class="name"><strong>Time Zone</strong></p>
         <p class="description">
             Set the time zone for site generation. This sets the <code>TZ</code>
             environment variable, which Ruby uses to handle time and date
@@ -99,23 +99,24 @@ class="flag">flags</code> (specified on the command-line) that control them.
             is the local time zone, as set by your operating system.
         </p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">timezone: TIMEZONE</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Encoding</strong></p>
+        <p class="name"><strong>Encoding</strong></p>
         <p class="description">
             Set the encoding of files by name. Only available for Ruby
             1.9 or later).
-            The default value is nil, which use Ruby default,
-            <code>ASCII-8BIT</code>.
-            Available encoding for the ruby in use, can be shown by
-            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>
+            The default value is <code>utf-8</code> starting in 2.0.0,
+            and <code>nil</code> before 2.0.0, which will yield the Ruby
+            default of <code>ASCII-8BIT</code>.
+            Available encodings can be shown by the
+            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>.
         </p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">encoding: ENCODING</code></p>
       </td>
     </tr>
@@ -134,59 +135,59 @@ class="flag">flags</code> (specified on the command-line) that control them.
     </tr>
   </thead>
   <tbody>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Regeneration</strong></p>
-        <p class='description'>Enable auto-regeneration of the site when files are modified.</p>
+        <p class="name"><strong>Regeneration</strong></p>
+        <p class="description">Enable auto-regeneration of the site when files are modified.</p>
       </td>
       <td class="align-center">
         <p><code class="flag">-w, --watch</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Configuration</strong></p>
+        <p class="name"><strong>Configuration</strong></p>
         <p class="description">Specify config files instead of using <code>_config.yml</code> automatically. Settings in later files override settings in earlier files.</p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="flag">--config FILE1[,FILE2,...]</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Drafts</strong></p>
+        <p class="name"><strong>Drafts</strong></p>
         <p class="description">Process and render draft posts.</p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="flag">--drafts</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Future</strong></p>
+        <p class="name"><strong>Future</strong></p>
         <p class="description">Publish posts with a future date.</p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">future: BOOL</code></p>
         <p><code class="flag">--future</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>LSI</strong></p>
+        <p class="name"><strong>LSI</strong></p>
         <p class="description">Produce an index for related posts.</p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">lsi: BOOL</code></p>
         <p><code class="flag">--lsi</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Limit Posts</strong></p>
+        <p class="name"><strong>Limit Posts</strong></p>
         <p class="description">Limit the number of posts to parse and publish.</p>
       </td>
-      <td class='align-center'>
+      <td class="align-center">
         <p><code class="option">limit_posts: NUM</code></p>
         <p><code class="flag">--limit_posts NUM</code></p>
       </td>
@@ -210,40 +211,40 @@ before your site is served.
     </tr>
   </thead>
   <tbody>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Local Server Port</strong></p>
-        <p class='description'>Listen on the given port.</p>
+        <p class="name"><strong>Local Server Port</strong></p>
+        <p class="description">Listen on the given port.</p>
       </td>
       <td class="align-center">
         <p><code class="option">port: PORT</code></p>
         <p><code class="flag">--port PORT</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Local Server Hostname</strong></p>
-        <p class='description'>Listen at the given hostname.</p>
+        <p class="name"><strong>Local Server Hostname</strong></p>
+        <p class="description">Listen at the given hostname.</p>
       </td>
       <td class="align-center">
         <p><code class="option">host: HOSTNAME</code></p>
         <p><code class="flag">--host HOSTNAME</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Base URL</strong></p>
-        <p class='description'>Serve the website from the given base URL</p>
+        <p class="name"><strong>Base URL</strong></p>
+        <p class="description">Serve the website from the given base URL</p>
       </td>
       <td class="align-center">
         <p><code class="option">baseurl: URL</code></p>
         <p><code class="flag">--baseurl URL</code></p>
       </td>
     </tr>
-    <tr class='setting'>
+    <tr class="setting">
       <td>
-        <p class='name'><strong>Detach</strong></p>
-        <p class='description'>Detach the server from the terminal</p>
+        <p class="name"><strong>Detach</strong></p>
+        <p class="description">Detach the server from the terminal</p>
       </td>
       <td class="align-center">
         <p><code class="option">detach: BOOL</code></p>
@@ -301,7 +302,7 @@ paginate_path: 'page:num'
 paginate:      nil
 
 markdown:      kramdown
-markdown_ext:  markdown,mkd,mkdn,md
+markdown_ext:  markdown,mkdown,mkdn,mkd,md
 textile_ext:   textile
 
 excerpt_separator: "\n\n"
@@ -349,6 +350,14 @@ redcloth:
   hard_breaks: true
 {% endhighlight %}
 
+<div class="note unreleased">
+  <h5>Kramdown as the default is currently unreleased.</h5>
+  <p>
+    In the latest development releases, we've deprecated Maruku and will default to
+    Kramdown instead of Maruku. All versions below this will use Maruku as the
+    default.
+  </p>
+</div>
 
 ## Markdown Options