diff --git a/site/_includes/docs_contents.html b/site/_includes/docs_contents.html
index 35904fbf..57b6b32c 100644
--- a/site/_includes/docs_contents.html
+++ b/site/_includes/docs_contents.html
@@ -3,94 +3,94 @@
     <h4>Getting Started</h4>
     <ul>
       <li class="{% if page.title == 'Welcome' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/home">Welcome</a>
+        <a href="{{ site.url }}/docs/home/">Welcome</a>
       </li>
       <li class="{% if page.title == 'Quick-start guide' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/quickstart">Quick-start guide</a>
+        <a href="{{ site.url }}/docs/quickstart/">Quick-start guide</a>
       </li>
       <li class="{% if page.title == 'Installation' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/installation">Installation</a>
+        <a href="{{ site.url }}/docs/installation/">Installation</a>
       </li>
       <li class="{% if page.title == 'Basic Usage' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/usage">Basic Usage</a>
+        <a href="{{ site.url }}/docs/usage/">Basic Usage</a>
       </li>
       <li class="{% if page.title == 'Directory structure' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/structure">Directory structure</a>
+        <a href="{{ site.url }}/docs/structure/">Directory structure</a>
       </li>
       <li class="{% if page.title == 'Configuration' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/configuration">Configuration</a>
+        <a href="{{ site.url }}/docs/configuration/">Configuration</a>
       </li>
     </ul>
     <h4>Your Content</h4>
     <ul>
       <li class="{% if page.title == 'Front-matter' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/frontmatter">Front-matter</a>
+        <a href="{{ site.url }}/docs/frontmatter/">Front-matter</a>
       </li>
       <li class="{% if page.title == 'Writing posts' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/posts">Writing posts</a>
+        <a href="{{ site.url }}/docs/posts/">Writing posts</a>
       </li>
       <li class="{% if page.title == 'Working with drafts' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/drafts">Working with drafts</a>
+        <a href="{{ site.url }}/docs/drafts/">Working with drafts</a>
       </li>
       <li class="{% if page.title == 'Creating pages' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/pages">Creating pages</a>
+        <a href="{{ site.url }}/docs/pages/">Creating pages</a>
       </li>
       <li class="{% if page.title == 'Variables' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/variables">Variables</a>
+        <a href="{{ site.url }}/docs/variables/">Variables</a>
       </li>
       <li class="{% if page.title == 'Blog migrations' %}current{% endif %}">
-        <a href="{{ site.url }}/docs/migrations">Blog migrations</a>
+        <a href="{{ site.url }}/docs/migrations/">Blog migrations</a>
       </li>
     </ul>
     <h4>Customization</h4>
     <ul>
-      <li class="{% if page.title == "Templates" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/templates">Templates</a>
+      <li class="{% if page.title == 'Templates' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/templates/">Templates</a>
       </li>
-      <li class="{% if page.title == "Permalinks" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/permalinks">Permalinks</a>
+      <li class="{% if page.title == 'Permalinks' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/permalinks/">Permalinks</a>
       </li>
-      <li class="{% if page.title == "Pagination" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/pagination">Pagination</a>
+      <li class="{% if page.title == 'Pagination' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/pagination/">Pagination</a>
       </li>
-      <li class="{% if page.title == "Plugins" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/plugins">Plugins</a>
+      <li class="{% if page.title == 'Plugins' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/plugins/">Plugins</a>
       </li>
-      <li class="{% if page.title == "Extras" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/extras">Extras</a>
+      <li class="{% if page.title == 'Extras' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/extras/">Extras</a>
       </li>
     </ul>
     <h4>Deployment</h4>
     <ul>
-      <li class="{% if page.title == "GitHub Pages" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/github-pages">GitHub Pages</a>
+      <li class="{% if page.title == 'GitHub Pages' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/github-pages/">GitHub Pages</a>
       </li>
-      <li class="{% if page.title == "Deployment methods" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/deployment-methods">Other methods</a>
+      <li class="{% if page.title == 'Deployment methods' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/deployment-methods/">Other methods</a>
       </li>
     </ul>
     <h4>Miscellaneous</h4>
     <ul>
-      <li class="{% if page.title == "Troubleshooting" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/troubleshooting">Troubleshooting</a>
+      <li class="{% if page.title == 'Troubleshooting' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/troubleshooting/">Troubleshooting</a>
       </li>
-      <li class="{% if page.title == "Sites using Jekyll" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/sites">Sites using Jekyll</a>
+      <li class="{% if page.title == 'Sites using Jekyll' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/sites/">Sites using Jekyll</a>
       </li>
-      <li class="{% if page.title == "Resources" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/resources">Resources</a>
+      <li class="{% if page.title == 'Resources' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/resources/">Resources</a>
       </li>
-      <li class="{% if page.title == "Upgrading" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/upgrading">Upgrading</a>
+      <li class="{% if page.title == 'Upgrading' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/upgrading/">Upgrading</a>
       </li>
     </ul>
     <h4>Meta</h4>
     <ul>
-      <li class="{% if page.title == "Contributing" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/contributing">Contributing</a>
+      <li class="{% if page.title == 'Contributing' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/contributing/">Contributing</a>
       </li>
-      <li class="{% if page.title == "History" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/history">History</a>
+      <li class="{% if page.title == 'History' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/history/">History</a>
       </li>
     </ul>
   </aside>
diff --git a/site/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html
index 4d45a4d5..18be2227 100644
--- a/site/_includes/docs_contents_mobile.html
+++ b/site/_includes/docs_contents_mobile.html
@@ -2,41 +2,41 @@
   <select onchange="if (this.value) window.location.href=this.value">
     <option value="">Navigate the docs…</option>
     <optgroup label="Getting started">
-      <option value="{{ site.url }}/docs/home">Welcome</option>
-      <option value="{{ site.url }}/docs/quickstart">Quick-start guide</option>
-      <option value="{{ site.url }}/docs/installation">Installation</option>
-      <option value="{{ site.url }}/docs/usage">Basic Usage</option>
-      <option value="{{ site.url }}/docs/structure">Directory structure</option>
-      <option value="{{ site.url }}/docs/configuration">Configuration</option>
+      <option value="{{ site.url }}/docs/home/">Welcome</option>
+      <option value="{{ site.url }}/docs/quickstart/">Quick-start guide</option>
+      <option value="{{ site.url }}/docs/installation/">Installation</option>
+      <option value="{{ site.url }}/docs/usage/">Basic Usage</option>
+      <option value="{{ site.url }}/docs/structure/">Directory structure</option>
+      <option value="{{ site.url }}/docs/configuration/">Configuration</option>
     </optgroup>
     <optgroup label="Your Content">
-      <option value="{{ site.url }}/docs/frontmatter">Front-matter</option>
-      <option value="{{ site.url }}/docs/posts">Writing posts</option>
-      <option value="{{ site.url }}/docs/drafts">Working with drafts</option>
-      <option value="{{ site.url }}/docs/pages">Creating pages</option>
-      <option value="{{ site.url }}/docs/variables">Variables</option>
-      <option value="{{ site.url }}/docs/migrations">Blog migrations</option>
+      <option value="{{ site.url }}/docs/frontmatter/">Front-matter</option>
+      <option value="{{ site.url }}/docs/posts/">Writing posts</option>
+      <option value="{{ site.url }}/docs/drafts/">Working with drafts</option>
+      <option value="{{ site.url }}/docs/pages/">Creating pages</option>
+      <option value="{{ site.url }}/docs/variables/">Variables</option>
+      <option value="{{ site.url }}/docs/migrations/">Blog migrations</option>
     </optgroup>
     <optgroup label="Customization">
-      <option value="{{ site.url }}/docs/templates">Templates</option>
-      <option value="{{ site.url }}/docs/permalinks">Permalinks</option>
-      <option value="{{ site.url }}/docs/pagination">Pagination</option>
-      <option value="{{ site.url }}/docs/plugins">Plugins</option>
-      <option value="{{ site.url }}/docs/extras">Extras</option>
+      <option value="{{ site.url }}/docs/templates/">Templates</option>
+      <option value="{{ site.url }}/docs/permalinks/">Permalinks</option>
+      <option value="{{ site.url }}/docs/pagination/">Pagination</option>
+      <option value="{{ site.url }}/docs/plugins/">Plugins</option>
+      <option value="{{ site.url }}/docs/extras/">Extras</option>
     </optgroup>
     <optgroup label="Deployment">
-      <option value="{{ site.url }}/docs/github-pages">GitHub Pages</option>
-      <option value="{{ site.url }}/docs/deployment-methods">Other methods</option>
+      <option value="{{ site.url }}/docs/github-pages/">GitHub Pages</option>
+      <option value="{{ site.url }}/docs/deployment-methods/">Other methods</option>
     </optgroup>
     <optgroup label="Miscellaneous">
-      <option value="{{ site.url }}/docs/troubleshooting">Troubleshooting</option>
-      <option value="{{ site.url }}/docs/sites">Sites using Jekyll</option>
-      <option value="{{ site.url }}/docs/resources">Resources</option>
-      <option value="{{ site.url }}/docs/upgrading">Upgrading</option>
+      <option value="{{ site.url }}/docs/troubleshooting/">Troubleshooting</option>
+      <option value="{{ site.url }}/docs/sites/">Sites using Jekyll</option>
+      <option value="{{ site.url }}/docs/resources/">Resources</option>
+      <option value="{{ site.url }}/docs/upgrading/">Upgrading</option>
     </optgroup>
     <optgroup label="Meta">
-      <option value="{{ site.url }}/docs/contributing">Contributing</option>
-      <option value="{{ site.url }}/docs/history">History</option>
+      <option value="{{ site.url }}/docs/contributing/">Contributing</option>
+      <option value="{{ site.url }}/docs/history/">History</option>
     </optgroup>
   </select>
 </div>
diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index 06b17c1b..5e41f67d 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -3,10 +3,10 @@
     <a href="{{ site.url }}/">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="{{ site.url }}/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="{{ site.url }}/news/">News</a>
   </li>
   <li class="">
     <a href="https://github.com/mojombo/jekyll"><span class="hide-on-mobiles">View on </span>GitHub</a>
diff --git a/site/docs/configuration.md b/site/docs/configuration.md
index 956433e8..3713e2e7 100644
--- a/site/docs/configuration.md
+++ b/site/docs/configuration.md
@@ -54,7 +54,7 @@ class="flag">flags</code> (specified on the command-line) that control them.
     <tr class='setting'>
       <td>
         <p class='name'><strong>Safe</strong></p>
-        <p class='description'>Disable <a href="../plugins">custom plugins</a>.</p>
+        <p class='description'>Disable <a href="../plugins/">custom plugins</a>.</p>
       </td>
       <td class="align-center">
         <p><code class="option">safe: BOOL</code></p>
diff --git a/site/docs/deployment-methods.md b/site/docs/deployment-methods.md
index 368c020f..41c5472e 100644
--- a/site/docs/deployment-methods.md
+++ b/site/docs/deployment-methods.md
@@ -23,7 +23,7 @@ If you have direct access yourself to the deployment web server yourself, the pr
 
 ## Automated methods
 
-There are also a number of ways to easily automate the deployment of a Jekyll site. If you’ve got another method that isn’t listed below, we’d love it if you [contributed](../contributing) so that everyone else can benefit too.
+There are also a number of ways to easily automate the deployment of a Jekyll site. If you’ve got another method that isn’t listed below, we’d love it if you [contributed](../contributing/) so that everyone else can benefit too.
 
 ### Git post-update hook
 
@@ -105,5 +105,5 @@ low-volume blogs as you only pay for what you use.
 
 <div class="note">
   <h5>ProTip™: Use GitHub Pages for zero-hassle Jekyll hosting</h5>
-  <p>GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to <a href="../github-pages">host your Jekyll-powered website for free</a>.</p>
+  <p>GitHub Pages are powered by Jekyll behind the scenes, so if you’re looking for a zero-hassle, zero-cost solution, GitHub Pages are a great way to <a href="../github-pages/">host your Jekyll-powered website for free</a>.</p>
 </div>
diff --git a/site/docs/frontmatter.md b/site/docs/frontmatter.md
index d2848915..5704bfc0 100644
--- a/site/docs/frontmatter.md
+++ b/site/docs/frontmatter.md
@@ -37,7 +37,7 @@ relies on.
 <div class="note">
   <h5>ProTip™: Front Matter Variables Are Optional</h5>
   <p>
-    If you want to use <a href="../variables">Liquid tags and variables</a> but
+    If you want to use <a href="../variables/">Liquid tags and variables</a> but
     don't need anything in your front-matter, just leave it empty! The set of
     triple-dashed lines with nothing in between will still get Jekyll to process
     your file. (This is useful for things like CSS and RSS feeds!)
diff --git a/site/docs/installation.md b/site/docs/installation.md
index b2d1fa96..1bf1b8cb 100644
--- a/site/docs/installation.md
+++ b/site/docs/installation.md
@@ -42,7 +42,7 @@ $ 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
+installing Jekyll, check out the [troubleshooting](../troubleshooting/) page or
 [report an issue](https://github.com/mojombo/jekyll/issues/new) so the Jekyll
 community can improve the experience for everyone.
 
@@ -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>
diff --git a/site/docs/pages.md b/site/docs/pages.md
index 2949b736..50388522 100644
--- a/site/docs/pages.md
+++ b/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.
 
diff --git a/site/docs/permalinks.md b/site/docs/permalinks.md
index a77282a8..c38ad945 100644
--- a/site/docs/permalinks.md
+++ b/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`.
 
diff --git a/site/docs/plugins.md b/site/docs/plugins.md
index 201bf397..d715249d 100644
--- a/site/docs/plugins.md
+++ b/site/docs/plugins.md
@@ -13,7 +13,7 @@ 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>
@@ -458,7 +458,7 @@ You can find a few useful plugins at the following locations:
   <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>
diff --git a/site/docs/posts.md b/site/docs/posts.md
index 3dc74710..3c57c217 100644
--- a/site/docs/posts.md
+++ b/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
 
@@ -177,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.
diff --git a/site/docs/structure.md b/site/docs/structure.md
index aade3127..742ce370 100644
--- a/site/docs/structure.md
+++ b/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.
 
@@ -142,7 +142,7 @@ 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
@@ -161,7 +161,7 @@ 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
+          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.
 
diff --git a/site/docs/troubleshooting.md b/site/docs/troubleshooting.md
index 6ea19bd9..6bd14da0 100644
--- a/site/docs/troubleshooting.md
+++ b/site/docs/troubleshooting.md
@@ -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
diff --git a/site/docs/usage.md b/site/docs/usage.md
index b62144d1..ac09c40a 100644
--- a/site/docs/usage.md
+++ b/site/docs/usage.md
@@ -35,7 +35,7 @@ $ jekyll serve --watch
 # => As above, 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 +55,4 @@ $ jekyll build --source _source --destination _deploy
 {% endhighlight %}
 
 For more about the possible configuration options, see the
-[configuration](../configuration) page.
+[configuration](../configuration/) page.
diff --git a/site/docs/variables.md b/site/docs/variables.md
index 410a4c83..763ad387 100644
--- a/site/docs/variables.md
+++ b/site/docs/variables.md
@@ -7,7 +7,7 @@ permalink: /docs/variables/
 ---
 
 Jekyll traverses your site looking for files to process. Any files with [YAML
-Front Matter](../frontmatter) are subject to processing. For each of these
+Front Matter](../frontmatter/) are subject to processing. For each of these
 files, Jekyll makes a variety of data available via the [Liquid templating
 system](http://wiki.github.com/shopify/liquid/liquid-for-designers). The
 following is a reference of the available data.
@@ -36,7 +36,7 @@ following is a reference of the available data.
       <td><p><code>page</code></p></td>
       <td><p>
 
-        Page specific information + the <a href="../frontmatter">YAML Front
+        Page specific information + the <a href="../frontmatter/">YAML Front
         Matter</a>. Custom variables set via the YAML front matter will be
         available here. See below for details.
 
@@ -57,7 +57,7 @@ following is a reference of the available data.
 
         When the <code>paginate</code> configuration option is set, this
         variable becomes available for use. See <a
-        href="../pagination">Pagination</a> for details.
+        href="../pagination/">Pagination</a> for details.
 
       </p></td>
     </tr>
@@ -221,7 +221,7 @@ following is a reference of the available data.
         directory. For example, a post at
         <code>/work/code/_posts/2008-12-24-closures.md</code> would have this
         field set to <code>['work', 'code']</code>. These can also be specified
-        in the <a href="../frontmatter">YAML Front Matter</a>.
+        in the <a href="../frontmatter/">YAML Front Matter</a>.
 
       </p></td>
     </tr>
@@ -230,7 +230,7 @@ following is a reference of the available data.
       <td><p>
 
         The list of tags to which this post belongs. These can be specified in
-        the <a href="../frontmatter">YAML Front Matter</a>.
+        the <a href="../frontmatter/">YAML Front Matter</a>.
 
       </p></td>
     </tr>
@@ -240,7 +240,7 @@ following is a reference of the available data.
 
         The path to the raw post or page. Example usage: Linking back to the
         page or post's source on GitHub. This can be overridden in the
-        <a href="../frontmatter">YAML Front Matter</a>.
+        <a href="../frontmatter/">YAML Front Matter</a>.
 
       </p></td>
     </tr>
diff --git a/site/index.html b/site/index.html
index a015de93..fb8e802a 100644
--- a/site/index.html
+++ b/site/index.html
@@ -18,19 +18,19 @@ overview: true
       <p>
         No more databases, comment moderation, or pesky updates to install—just <em>your content</em>.
       </p>
-      <a href="/docs/usage" class="">How Jekyll works &rarr;</a>
+      <a href="/docs/usage/" class="">How Jekyll works &rarr;</a>
     </div>
     <div class="unit one-third">
       <h2>Static</h2>
       <p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&amp;</span> CSS go in. Static sites come out ready for deployment.</p>
-      <a href="/docs/templates" class="">Jekyll template guide &rarr;</a>
+      <a href="/docs/templates/" class="">Jekyll template guide &rarr;</a>
     </div>
     <div class="unit one-third">
       <h2>Blog-aware</h2>
       <p>
         Permalinks, categories, pages, posts, and custom layouts are all first-class citizens here.
       </p>
-      <a href="/docs/migrations" class="">Migrate your blog &rarr;</a>
+      <a href="/docs/migrations/" class="">Migrate your blog &rarr;</a>
     </div>
     <div class="clear"></div>
   </div>