Merge branch 'master' into site

This commit is contained in:
Brandon Mathis 2011-07-31 19:34:33 -04:00
commit e4f3de17ae
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ layout: nil
{% endif %}
</author>
{% for post in site.posts %}
{% for post in site.posts limit: 20 %}
<entry>
<title>{{ post.title }}</title>
<link href="{{ site.url }}{{ post.url }}"/>

View File

@ -35,7 +35,7 @@ paginate: 10 # Posts per page on the blog index
recent_posts: 5 # Posts in the sidebar Recent Posts section
# list each of the sidebar modules you want to include, in the order you want them to appear.
# To add custom asides, create files in /source/_includes/asides/custom/ and add them to the list like 'asides/custom/custom_aside_name.html'
# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
default_asides: [asides/recent_posts.html, asides/twitter.html, asides/delicious.html, asides/pinboard.html]
# Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below