jekyll 1.1.2 → 1.2.0

data/site/docs/index.md

@@ -48,5 +48,5 @@ hazardous. Here’s what to look out for.
 
 If you come across anything along the way that we haven’t covered, or if you
 know of a tip you think others would find handy, please [file an
-issue](https://github.com/mojombo/jekyll/issues/new) and we’ll see about
+issue]({{ site.repository }}/issues/new) and we’ll see about
 including it in this guide.

data/site/docs/installation.md

@@ -8,7 +8,7 @@ permalink: /docs/installation/
 
 Getting Jekyll installed and ready-to-go should only take a few minutes. If it
 ever becomes a pain in the ass, please [file an
-issue](https://github.com/mojombo/jekyll/issues/new) (or submit a pull request)
+issue]({{ site.repository }}/issues/new) (or submit a pull request)
 describing the issue you encountered and how we might make the process easier.
 
 ### Requirements
@@ -42,8 +42,8 @@ $ gem install jekyll
 
 All of Jekyll’s gem dependencies are automatically installed by the above
 command, so you won’t have to worry about them at all. If you have problems
-installing Jekyll, check out the [troubleshooting](../troubleshooting) page or
-[report an issue](https://github.com/mojombo/jekyll/issues/new) so the Jekyll
+installing Jekyll, check out the [troubleshooting](../troubleshooting/) page or
+[report an issue]({{ site.repository }}/issues/new) so the Jekyll
 community can improve the experience for everyone.
 
 ## Optional Extras
@@ -51,7 +51,7 @@ community can improve the experience for everyone.
 There are a number of (optional) extra features that Jekyll supports that you
 may want to install, depending on how you plan to use Jekyll. These extras
 include LaTeX support, and the use of alternative content rendering engines.
-Check out [the extras page](../extras) for more information.
+Check out [the extras page](../extras/) for more information.
 
 <div class="note">
   <h5>ProTip™: Enable Syntax Highlighting</h5>

data/site/docs/migrations.md

@@ -49,10 +49,10 @@ Where IMPORTER is the name of the specific importer.
 
 ## WordPress
 
-### Wordpress export files
+### WordPress export files
 
 If hpricot is not already installed, you will need to run `gem install hpricot`.
-Next, export your blog using the Wordpress export utility. Assuming that the
+Next, export your blog using the WordPress export utility. Assuming that the
 exported file is saved as `wordpress.xml`, here is the command you need to run:
 
 {% highlight bash %}
@@ -61,13 +61,16 @@ $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpressdotcom";
 {% endhighlight %}
 
 <div class="note">
-  <h5>ProTip™: Wordpress.com Export Tool</h5>
-  <p markdown="1">If you are migrating from a Wordpress.com account, you can access the export tool at the following URL: `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.</p>
+  <h5>ProTip™: WordPress.com Export Tool</h5>
+  <p markdown="1">If you are migrating from a WordPress.com account, you can
+  access the export tool at the following URL:
+  `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.</p>
 </div>
 
-### Using Wordpress MySQL server connection
+### Using WordPress MySQL server connection
 
-If you want to import using a direct connection to the Wordpress MySQL server, here's how:
+If you want to import using a direct connection to the WordPress MySQL server,
+here's how:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
@@ -85,23 +88,23 @@ $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
     JekyllImport::WordPress.process("database", "user", "pass", "127.0.0.1")'
 {% endhighlight %}
 
-### Further Wordpress migration alternatives
+### Further WordPress migration alternatives
 
 While the above methods work, they do not import much of the metadata that is
-usually stored in Wordpress posts and pages. If you need to export things like
+usually stored in WordPress posts and pages. If you need to export things like
 pages, tags, custom fields, image attachments and so on, the following resources
 might be useful to you:
 
 - [Exitwp](https://github.com/thomasf/exitwp) is a configurable tool written in
-  Python for migrating one or more Wordpress blogs into Jekyll (Markdown) format
+  Python for migrating one or more WordPress blogs into Jekyll (Markdown) format
   while keeping as much metadata as possible. Exitwp also downloads attachments
   and pages.
 - [A great
   article](http://vitobotta.com/how-to-migrate-from-wordpress-to-jekyll/) with a
-  step-by-step guide for migrating a Wordpress blog to Jekyll while keeping most
+  step-by-step guide for migrating a WordPress blog to Jekyll while keeping most
   of the structure and metadata.
 - [wpXml2Jekyll](https://github.com/theaob/wpXml2Jekyll) is an executable
-  windows application for creating Markdown posts from your Wordpress XML file.
+  windows application for creating Markdown posts from your WordPress XML file.
 
 ## Drupal
 

data/site/docs/pages.md

@@ -6,7 +6,7 @@ next_section: variables
 permalink: /docs/pages/
 ---
 
-In addition to [writing posts](../posts), another thing you may want to do with
+In addition to [writing posts](../posts/), another thing you may want to do with
 your Jekyll site is create static pages. By taking advantage of the way Jekyll
 copies files and directories, this is easy to do.
 

data/site/docs/pagination.md

@@ -16,7 +16,7 @@ folders you need for paginated listings.
   <p>
     Pagination does not work with Markdown or Textile files in your Jekyll site.
     It will only work when used within HTML files. Since you’ll likely be using
-    this for the list of Posts, this shouldn't be an issue.
+    this for the list of Posts, this shouldn’t be an issue.
   </p>
 </div>
 

data/site/docs/permalinks.md

@@ -7,8 +7,8 @@ permalink: /docs/permalinks/
 ---
 
 Jekyll supports a flexible way to build your site’s URLs. You can specify the
-permalinks for your site through the [Configuration](../configuration) or in the
-[YAML Front Matter](../frontmatter) for each post. You’re free to choose one of
+permalinks for your site through the [Configuration](../configuration/) or in the
+[YAML Front Matter](../frontmatter/) for each post. You’re free to choose one of
 the built-in styles to create your links or craft your own. The default style is
 `date`.
 

data/site/docs/plugins.md

@@ -13,11 +13,11 @@ having to modify the Jekyll source itself.
 <div class="note info">
   <h5>Plugins on GitHub Pages</h5>
   <p>
-    <a href="http://pages.github.com">GitHub Pages</a> is powered by Jekyll,
+    <a href="http://pages.github.com/">GitHub Pages</a> is powered by Jekyll,
     however all Pages sites are generated using the <code>--safe</code> option
     to disable custom plugins for security reasons. Unfortunately, this means
     your plugins won’t work if you’re deploying to GitHub Pages.<br><br>
-    You can still use GitHub Pages to publish your site, but you'll need to
+    You can still use GitHub Pages to publish your site, but you’ll need to
     convert the site locally and push the generated static files to your GitHub
     repository instead of the Jekyll source files.
   </p>
@@ -156,8 +156,8 @@ Converters should implement at a minimum 3 methods:
         <p><code>matches</code></p>
       </td>
       <td><p>
-        Does the given extension match this converter's list of acceptable
-        extensions? Takes one argument: the file's extension (including the
+        Does the given extension match this converter’s list of acceptable
+        extensions? Takes one argument: the file’s extension (including the
         dot). Must return <code>true</code> if it matches, <code>false</code>
         otherwise.
       </p></td>
@@ -313,8 +313,8 @@ There are two flags to be aware of when writing a plugin:
           allowed. This is used by GitHub Pages to determine which core plugins
           may be used, and which are unsafe to run. If your plugin does not
           allow for arbitrary code, execution, set this to <code>true</code>.
-          GitHub Pages still won't load your plugin, but if you submit it for
-          inclusion in core, it's best for this to be correct!
+          GitHub Pages still won’t load your plugin, but if you submit it for
+          inclusion in core, it’s best for this to be correct!
         </p>
       </td>
     </tr>
@@ -360,14 +360,16 @@ You can find a few useful plugins at the following locations:
 - [Sitemap.xml Generator by Michael Levin](https://github.com/kinnetica/jekyll-plugins): Generates a sitemap.xml file by traversing all of the available posts and pages.
 - [Full-text search by Pascal Widdershoven](https://github.com/PascalW/jekyll_indextank): Adds full-text search to your Jekyll site with a plugin and a bit of JavaScript.
 - [AliasGenerator by Thomas Mango](https://github.com/tsmango/jekyll_alias_generator): Generates redirect pages for posts when an alias is specified in the YAML Front Matter.
+- [Pageless Redirect Generator by Nick Quinlan](https://github.com/nquinlan/jekyll-pageless-redirects): Generates redirects based on files in the Jekyll root, with support for htaccess style redirects.
 - [Projectlist by Frederic Hemberger](https://github.com/fhemberger/jekyll-projectlist): Renders files in a directory as a single page instead of separate posts.
+- [RssGenerator by Assaf Gelber](https://github.com/agelber/jekyll-rss): Automatically creates an RSS 2.0 feed from your posts.
 
 #### Converters
 
 - [Jade plugin by John Papandriopoulos](https://github.com/snappylabs/jade-jekyll-plugin): Jade converter for Jekyll.
 - [HAML plugin by Sam Z](https://gist.github.com/517556): HAML converter for Jekyll.
 - [HAML-Sass Converter by Adam Pearson](https://gist.github.com/481456): Simple HAML-Sass converter for Jekyll. [Fork](https://gist.github.com/528642) by Sam X.
-- [Sass SCSS Converter by Mark Wolfe](https://gist.github.com/960150): Sass converter which uses the new CSS compatible syntax, based Sam X's fork above.
+- [Sass SCSS Converter by Mark Wolfe](https://gist.github.com/960150): Sass converter which uses the new CSS compatible syntax, based Sam X’s fork above.
 - [LESS Converter by Jason Graham](https://gist.github.com/639920): Convert LESS files to CSS.
 - [LESS Converter by Josh Brown](https://gist.github.com/760265): Simple LESS converter.
 - [Upcase Converter by Blake Smith](https://gist.github.com/449463): An example Jekyll converter.
@@ -376,7 +378,7 @@ You can find a few useful plugins at the following locations:
 - [Stylus Converter](https://gist.github.com/988201): Convert .styl to .css.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
 - [Jekyll-pandoc-plugin](https://github.com/dsanson/jekyll-pandoc-plugin): Use pandoc for rendering markdown.
-- [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc's markdown extensions.
+- [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
 - [Transform Layouts](https://gist.github.com/1472645): Allows HAML layouts (you need a HAML Converter plugin for this to work).
 
@@ -391,6 +393,9 @@ You can find a few useful plugins at the following locations:
 - [Smilify](https://github.com/SaswatPadhi/jekyll_smilify) by [SaswatPadhi](https://github.com/SaswatPadhi): Convert text emoticons in your content to themeable smiley pics ([Demo](http://saswatpadhi.github.com/)).
 - [Read in X Minutes](https://gist.github.com/zachleat/5792681) by [zachleat](https://github.com/zachleat): Estimates the reading time of a string (for blog post content).
 - [Jekyll-timeago](https://github.com/markets/jekyll-timeago): Converts a time value to the time ago in words.
+- [pluralize](https://github.com/bdesham/pluralize): Easily combine a number and a word into a gramatically-correct amount like “1 minute” or “2 minute**s**”.
+- [reading_time](https://github.com/bdesham/reading_time): Count words and estimate reading time for a piece of text, ignoring HTML elements that are unlikely to contain running text.
+- [Table of Content Generator](https://github.com/dafi/jekyll-toc-generator): Generate the HTML code containing a table of content (TOC), the TOC can be customized in many way, for example you can decide which pages can be without TOC.
 
 #### Tags
 
@@ -421,8 +426,10 @@ You can find a few useful plugins at the following locations:
 - [JekyllGalleryTag](https://github.com/redwallhp/JekyllGalleryTag) by [redwallhp](https://github.com/redwallhp): Generates thumbnails from a directory of images and displays them in a grid.
 - [Youku and Tudou Embed](https://gist.github.com/Yexiaoxing/5891929): Liquid plugin for embedding Youku and Tudou videos.
 - [Jekyll-swfobject](https://github.com/sectore/jekyll-swfobject): Liquid plugin for embedding Adobe Flash files (.swf) using [SWFObject](http://code.google.com/p/swfobject/).
-- [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [`<picture>`](http://picture.responsiveimages.org/) element, polyfilled with Scott Jelh's [Picturefill](https://github.com/scottjehl/picturefill).
+- [Jekyll Picture Tag](https://github.com/robwierzbowski/jekyll-picture-tag): Easy responsive images for Jekyll. Based on the proposed [`<picture>`](http://picture.responsiveimages.org/) element, polyfilled with Scott Jehl’s [Picturefill](https://github.com/scottjehl/picturefill).
 - [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes.
+- [Ditaa Tag](https://github.com/matze/jekyll-ditaa) by [matze](https://github.com/matze): Renders ASCII diagram art into PNG images and inserts a figure tag.
+- [Good Include](https://github.com/penibelst/jekyll-good-include) by [Anatol Broder](http://penibelst.de/): Strips newlines and whitespaces from the end of include files before processing.
 
 #### Collections
 
@@ -450,12 +457,13 @@ You can find a few useful plugins at the following locations:
 - [Singlepage-jekyll](https://github.com/JCB-K/singlepage-jekyll) by [JCB-K](https://github.com/JCB-K): Turns Jekyll into a dynamic one-page website.
 - [generator-jekyllrb](https://github.com/robwierzbowski/generator-jekyllrb): A generator that wraps Jekyll in [Yeoman](http://yeoman.io/), a tool collection and workflow for builing modern web apps.
 - [grunt-jekyll](https://github.com/dannygarcia/grunt-jekyll): A straightforward [Grunt](http://gruntjs.com/) plugin for Jekyll.
+- [jekyll-postfiles](https://github.com/indirect/jekyll-postfiles): Add `_postfiles` directory and {% raw %}`{{ postfile }}`{% endraw %} tag so the files a post refers to will always be right there inside your repo.
 
 <div class="note info">
   <h5>Jekyll Plugins Wanted</h5>
   <p>
     If you have a Jekyll plugin that you would like to see added to this list,
-    you should <a href="../contributing">read the contributing page</a> to find
+    you should <a href="../contributing/">read the contributing page</a> to find
     out how to make that happen.
   </p>
 </div>

data/site/docs/posts.md

@@ -15,11 +15,11 @@ and web-based CMS systems, this will be a welcome change!
 
 ## The Posts Folder
 
-As explained on the [directory structure](../structure) page, the `_posts`
+As explained on the [directory structure](../structure/) page, the `_posts`
 folder is where your blog posts will live. These files can be either
 [Markdown](http://daringfireball.net/projects/markdown/) or
 [Textile](http://textile.sitemonks.com/) formatted text files, and as long as
-they have [YAML front-matter](../frontmatter), they will be converted from their
+they have [YAML front-matter](../frontmatter/), they will be converted from their
 source format into an HTML page that is part of your static site.
 
 ### Creating Post Files
@@ -43,7 +43,7 @@ file. For example, the following are examples of valid post filenames:
 
 ### Content Formats
 
-All blog post files must begin with [YAML front- matter](../frontmatter). After
+All blog post files must begin with [YAML front- matter](../frontmatter/). After
 that, it's simply a matter of deciding which format you prefer. Jekyll supports
 two popular content markup formats:
 [Markdown](http://daringfireball.net/projects/markdown/) and
@@ -95,7 +95,7 @@ Linking to a PDF for readers to download:
 
 It’s all well and good to have posts in a folder, but a blog is no use unless
 you have a list of posts somewhere. Creating an index of posts on another page
-(or in a [template](../templates)) is easy, thanks to the [Liquid template
+(or in a [template](../templates/)) is easy, thanks to the [Liquid template
 language](http://wiki.shopify.com/Liquid) and its tags. Here’s a basic example of how
 to create a list of links to your blog posts:
 
@@ -111,7 +111,7 @@ to create a list of links to your blog posts:
 
 Of course, you have full control over how (and where) you display your posts,
 and how you structure your site. You should read more about [how templates
-work](../templates) with Jekyll if you want to know more.
+work](../templates/) with Jekyll if you want to know more.
 
 ## Post excerpts
 
@@ -133,7 +133,8 @@ posts:
 {% endhighlight %}
 
 If you don't like the automatically-generated post excerpt, it can be overridden by adding
-`excerpt` to your post's YAML front-matter.
+`excerpt` to your post's YAML front-matter. Completely disable it by setting
+your `excerpt_separator` to `""`.
 
 ## Highlighting code snippets
 
@@ -176,5 +177,5 @@ end
 
 These basics should be enough to get you started writing your first posts. When
 you’re ready to dig into what else is possible, you might be interested in doing
-things like [customizing post permalinks](../permalinks) or using [custom
-variables](../variables) in your posts and elsewhere on your site.
+things like [customizing post permalinks](../permalinks/) or using [custom
+variables](../variables/) in your posts and elsewhere on your site.

data/site/docs/resources.md

@@ -30,9 +30,9 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext
 #### Other hacks
 
 - [Integrating Twitter with Jekyll](http://www.justkez.com/integrating-twitter-with-jekyll/)
-  > “Having migrated Justkez.com to be based on Jekyll, I was pondering how I might include my recent twitterings on the front page of the site. In the Wordpress world, this would have been done via a plugin which may or may not have hung the loading of the page, might have employed caching, but would certainly have had some overheads. … Not in Jekyll.”
+  > “Having migrated Justkez.com to be based on Jekyll, I was pondering how I might include my recent twitterings on the front page of the site. In the WordPress world, this would have been done via a plugin which may or may not have hung the loading of the page, might have employed caching, but would certainly have had some overheads. … Not in Jekyll.”
 - [‘My Jekyll Fork’, by Mike West](http://mikewest.org/2009/11/my-jekyll-fork)
-  > “Jekyll is a well-architected throwback to a time before Wordpress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.”
+  > “Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.”
 - [‘About this Website’, by Carter Allen](http://cartera.me/2010/08/12/about-this-website/)
   > “Jekyll is everything that I ever wanted in a blogging engine. Really. It isn’t perfect, but what’s excellent about it is that if there’s something wrong, I know exactly how it works and how to fix it. It runs on the your machine only, and is essentially an added”build" step between you and the browser. I coded this entire site in TextMate using standard HTML5 and CSS3, and then at the end I added just a few little variables to the markup. Presto-chango, my site is built and I am at peace with the world.”
 - [Generating a Tag Cloud in Jekyll](http://www.justkez.com/generating-a-tag-cloud-in-jekyll/)

data/site/docs/sites.md

@@ -26,4 +26,4 @@ learning purposes.
 If you would like to explore more examples, you can find a list of sites
 and their sources on the ["Sites" page in the Jekyll wiki][jekyll-sites].
 
-[jekyll-sites]: https://github.com/mojombo/jekyll/wiki/Sites
+[jekyll-sites]: {{ site.repository }}/wiki/Sites

data/site/docs/structure.md

@@ -53,7 +53,7 @@ An overview of what each of these does:
       <td>
         <p>
 
-          Stores <a href="../configuration">configuration</a> data. Many of
+          Stores <a href="../configuration/">configuration</a> data. Many of
           these options can be specified from the command line executable but
           it’s easier to specify them here so you don’t have to remember them.
 
@@ -67,7 +67,7 @@ An overview of what each of these does:
       <td>
         <p>
 
-          Drafts are unpublished posts. The format of these files is without a date: <code>title.MARKUP</code>. Learn how to <a href="../drafts">work with drafts</a>.
+          Drafts are unpublished posts. The format of these files is without a date: <code>title.MARKUP</code>. Learn how to <a href="../drafts/">work with drafts</a>.
 
         </p>
       </td>
@@ -96,7 +96,7 @@ An overview of what each of these does:
         <p>
 
           These are the templates that wrap posts. Layouts are chosen on a post-
-          by-post basis in the <a href="../frontmatter">YAML front matter</a>,
+          by-post basis in the <a href="../frontmatter/">YAML front matter</a>,
           which is described in the next section. The liquid tag
           <code>{% raw %}{{ content }}{% endraw %}</code>
           is used to inject content into the web page.
@@ -114,7 +114,7 @@ An overview of what each of these does:
           Your dynamic content, so to speak. The format of these files is
           important, and must follow the format:
           <code>YEAR-MONTH-DAY-title.MARKUP</code>.
-          The <a href="../permalinks">permalinks</a> can be customized for each
+          The <a href="../permalinks/">permalinks</a> can be customized for each
           post, but the date and markup language are determined solely by the
           file name.
 
@@ -129,7 +129,7 @@ An overview of what each of these does:
         <p>
 
           This is where the generated site will be placed (by default) once
-          Jekyll is done transforming it. It's probably a good idea to add this
+          Jekyll is done transforming it. It’s probably a good idea to add this
           to your <code>.gitignore</code> file.
 
         </p>
@@ -142,10 +142,10 @@ An overview of what each of these does:
       <td>
         <p>
 
-          Provided that the file has a <a href="../frontmatter">YAML Front
+          Provided that the file has a <a href="../frontmatter/">YAML Front
           Matter</a> section, it will be transformed by Jekyll. The same will
           happen for any <code>.html</code>, <code>.markdown</code>,
-          <code>.md</code>, or <code>.textile</code> file in your site's root
+          <code>.md</code>, or <code>.textile</code> file in your site’s root
           directory or directories not listed above.
 
         </p>
@@ -161,8 +161,8 @@ An overview of what each of these does:
           Every other directory and file except for those listed above—such as
           <code>css</code> and <code>images</code> folders,
           <code>favicon.ico</code> files, and so forth—will be copied verbatim
-          to the generated site. There are plenty of <a href="../sites">sites
-          already using Jekyll</a> if you're curious to see how they're laid
+          to the generated site. There are plenty of <a href="../sites/">sites
+          already using Jekyll</a> if you’re curious to see how they’re laid
           out.
 
         </p>

data/site/docs/templates.md

@@ -26,7 +26,7 @@ common tasks easier.
     <tr>
       <td>
         <p class='name'><strong>Date to XML Schema</strong></p>
-        <p>Convert a Date into XML Schema format.</p>
+        <p>Convert a Date into XML Schema (ISO 8601) format.</p>
       </td>
       <td class='align-center'>
         <p>
@@ -294,11 +294,12 @@ You may also optionally specify the filename in the gist to display:
 {% endraw %}
 {% endhighlight %}
 
-The `gist` tag also works with private gists:
+The `gist` tag also works with private gists, which require the gist owner's
+github username:
 
 {% highlight text %}
 {% raw %}
-{% gist 931c1c8d465a04042403 %}
+{% gist parkr/931c1c8d465a04042403 %}
 {% endraw %}
 {% endhighlight %}
 

data/site/docs/troubleshooting.md

@@ -8,7 +8,7 @@ permalink: /docs/troubleshooting/
 
 If you ever run into problems installing or using Jekyll, here's a few tips
 that might be of help. If the problem you’re experiencing isn’t covered below,
-please [report an issue](https://github.com/mojombo/jekyll/issues/new) so the
+please [report an issue]({{ site.repository }}/issues/new) so the
 Jekyll community can make everyone’s experience better.
 
 ## Installation Problems
@@ -84,7 +84,7 @@ http://localhost:4000/blog
 
 ## Configuration problems
 
-The order of precedence for conflicting [configuration settings](../configuration)
+The order of precedence for conflicting [configuration settings](../configuration/)
 is as follows:
 
 1.  Command-line flags
@@ -136,7 +136,15 @@ following error:
 '{{ "{{" }}' was not properly terminated with regexp: /\}\}/  (Liquid::SyntaxError)
 {% endhighlight %}
 
+### Excerpts
+
+Since v1.0.0, Jekyll has had automatically-generated post excerpts. Since
+v1.1.0, Jekyll also passes these excerpts through Liquid, which can cause
+strange errors where references don't exist or a tag hasn't been closed. If you
+run into these errors, try setting `excerpt_separator: ""` in your
+`_config.yml`, or set it to some nonsense string.
+
 <div class="note">
   <h5>Please report issues you encounter!</h5>
-  <p>If you come across a bug, please <a href="https://github.com/mojombo/jekyll/issues/new">create an issue</a> on GitHub describing the problem and any work-arounds you find so we can document it here for others.</p>
+  <p>If you come across a bug, please <a href="{{ site.repository }}/issues/new">create an issue</a> on GitHub describing the problem and any work-arounds you find so we can document it here for others.</p>
 </div>

data/site/docs/usage.md

@@ -31,11 +31,16 @@ preview what the generated site will look like in your browser locally.
 $ jekyll serve
 # => A development server will run at http://localhost:4000/
 
+$ jekyll serve --detach
+# => Same as `jekyll serve` but will detach from the current terminal.
+#    If you need to kill the server, you can `kill -9 1234` where "1234" is the PID.
+#    If you cannot find the PID, then do, `ps aux | grep jekyll` and kill the instance. [Read more](http://unixhelp.ed.ac.uk/shell/jobz5.html).
+
 $ jekyll serve --watch
-# => As above, but watch for changes and regenerate automatically.
+# => Same as `jekyll serve`, but watch for changes and regenerate automatically.
 {% endhighlight %}
 
-This is just a few of the available [configuration options](../configuration).
+This is just a few of the available [configuration options](../configuration/).
 Many configuration options can either be specified as flags on the command line,
 or alternatively (and more commonly) they can be specified in a `_config.yml`
 file at the root of the source directory. Jekyll will automatically use the
@@ -55,4 +60,4 @@ $ jekyll build --source _source --destination _deploy
 {% endhighlight %}
 
 For more about the possible configuration options, see the
-[configuration](../configuration) page.
+[configuration](../configuration/) page.