From b9ad060b5d5d2df594a497633b4c3bf8fa9ebf66 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Fri, 1 Jul 2011 17:13:21 -0400
Subject: 1. Updated config so blog categories get ouput to /blog/categories 2.
 Increased default pagination to 10 posts per page 3. Explained email address
 for RSS feed better

---
 .themes/classic/source/archives.html      | 17 -----------------
 .themes/classic/source/blog/archives.html | 17 +++++++++++++++++
 _config.yml                               |  9 +++++----
 3 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 .themes/classic/source/archives.html
 create mode 100644 .themes/classic/source/blog/archives.html

diff --git a/.themes/classic/source/archives.html b/.themes/classic/source/archives.html
deleted file mode 100644
index ebf447c9..00000000
--- a/.themes/classic/source/archives.html
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: post
-title: Blog Archive
-no_meta: true
----
-<div class="blog-archives">
-{% for post in site.posts reverse %}
-{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
-{% unless year == this_year %}
-  {% assign year = this_year %}
-  <h2>{{ year }}</h2>
-{% endunless %}
-<article>
-  {% include archive_post.html %}
-</article>
-{% endfor %}
-</div>
diff --git a/.themes/classic/source/blog/archives.html b/.themes/classic/source/blog/archives.html
new file mode 100644
index 00000000..ebf447c9
--- /dev/null
+++ b/.themes/classic/source/blog/archives.html
@@ -0,0 +1,17 @@
+---
+layout: post
+title: Blog Archive
+no_meta: true
+---
+<div class="blog-archives">
+{% for post in site.posts reverse %}
+{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
+{% unless year == this_year %}
+  {% assign year = this_year %}
+  <h2>{{ year }}</h2>
+{% endunless %}
+<article>
+  {% include archive_post.html %}
+</article>
+{% endfor %}
+</div>
diff --git a/_config.yml b/_config.yml
index a9e14285..d6201f19 100644
--- a/_config.yml
+++ b/_config.yml
@@ -9,20 +9,21 @@ title: My Octopress Blog
 permalink: /blog/:year/:month/:day/:title
 subtitle: A blogging framework for hackers.
 author: Your Name
+
+# RSS / Email (optional) subscription links (change if using something like Feedburner)
 subscribe_rss: /atom.xml
 subscribe_email:
 
 markdown: rdiscount
 pygments: true
-#posts_per_page: 10
-paginate: 5
+paginate: 10
 recent_posts: 5
-category_dir: category
+category_dir: blog/categories
 simple_search: http://google.com/search
 
 # Optional configurations
 
-# For RSS Feed
+# RSS feeds can list your email address if you like
 email:
 
 # Twitter
-- 
cgit v1.2.1