Merge branch '2.1' into site-2.1

This commit is contained in:
Brandon Mathis 2012-05-21 23:58:36 -05:00
commit 0f1be647cf
3 changed files with 3 additions and 2 deletions

View File

@ -3,6 +3,6 @@ layout: page
title: Page Not Found
---
Oops, I couldnt find that page! Sorry about that.
Oops, I couldn't find that page! Sorry about that.
Maybe try the search box (top right), or look through the [archives](/archives)?

View File

@ -6,6 +6,7 @@
<meta charset="utf-8">
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
<meta name="author" content="{{ site.author }}">
<meta name="Generator" content="Jekyll & Octopress (http://octopress.org)">
{% capture description %}{% if page.description %}{{ page.description }}{% elsif site.description %}{{ site.description }}{% endif %}{% endcapture %}{% if description.length %}
<meta name="description" content="{{ description }}">{% endif %}

View File

@ -46,7 +46,7 @@ module Jekyll
SITEMAP_FILE_NAME = "sitemap.xml"
# Any files to exclude from being included in the sitemap.xml
EXCLUDED_FILES = ["atom.xml, 404.html"]
EXCLUDED_FILES = ["atom.xml", "404.markdown"]
# Any files that include posts, so that when a new post is added, the last
# modified date of these pages should take that into account