Merge branch '2.1' into site-2.1

This commit is contained in:
Brandon Mathis 2012-05-20 16:23:30 -05:00
commit 996ab81e88

View File

@ -36,7 +36,7 @@ module Jekyll
@name = 'index.html' @name = 'index.html'
self.process(@name) self.process(@name)
# Read the YAML data from the layout page. # Read the YAML data from the layout page.
self.read_yaml(File.join(base, '_layouts'), 'category_feed.xml') self.read_yaml(File.join(base, '_layouts'), 'category_index.html')
self.data['category'] = category self.data['category'] = category
# Set the title for this page. # Set the title for this page.
title_prefix = site.config['category_title_prefix'] || 'Category: ' title_prefix = site.config['category_title_prefix'] || 'Category: '