From fdad24cec94c7ffaf07b2bf45c9f7f3b51f3b126 Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Tue, 19 Jan 2016 21:07:30 -0500
Subject: [PATCH] Update Octopress config - Remove _octopress.yml and move
 settings into _config.yml as per Octopress' documentation - Close #163

---
 _config.yml          | 14 ++++++++++++++
 _octopress.yml       | 10 ----------
 theme-setup/index.md |  6 +++---
 3 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 _octopress.yml

diff --git a/_config.yml b/_config.yml
index 08e0ce1..a6c14cd 100644
--- a/_config.yml
+++ b/_config.yml
@@ -24,6 +24,20 @@ kramdown:
   use_coderay: false
 
 
+# Octopress
+
+# Default extensions
+post_ext: md
+page_ext: md
+
+# Found in _templates/
+post_layout: post
+page_layout: page
+
+# Format titles with titlecase?
+titlecase: true
+
+
 # Site owner
 owner:
   name: Your Name
diff --git a/_octopress.yml b/_octopress.yml
deleted file mode 100644
index 3223f5e..0000000
--- a/_octopress.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default extensions
-post_ext: md
-page_ext: md
-
-# Found in _templates/
-post_layout: post
-page_layout: page
-
-# Format titles with titlecase?
-titlecase: true
diff --git a/theme-setup/index.md b/theme-setup/index.md
index 4ea0149..b2d51fd 100644
--- a/theme-setup/index.md
+++ b/theme-setup/index.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Theme Setup
-modified: 2014-07-31T13:23:02.362000-04:00
+modified: 2016-01-19
 excerpt: "Instructions on how to install and customize the Jekyll theme Minimal Mistakes."
 image:
   feature: sample-image-3.jpg
@@ -145,7 +145,7 @@ To set what links appear in the top navigation edit `_data/navigation.yml`. Use
 While completely optional, I've included Octopress and some starter templates to automate the creation of new posts and pages. To take advantage of it start by installing the [Octopress](https://github.com/octopress/octopress) gem if it isn't already.
 
 {% highlight bash %}
-$ gem install octopress --pre
+$ gem install octopress
 {% endhighlight %}
 
 ### New Post
@@ -159,7 +159,7 @@ $ octopress new post "Post Title"
 Default works great if you want all your posts in one directory, but if you're like me and want to group them into subfolders like `/posts`, `/portfolio`, etc. Then this is the command for you. By specifying the DIR it will create a new post in that folder and populate the `categories:` YAML with the same value.
 
 {% highlight bash %}
-$ octopress new post "New Post Title" --dir posts
+$ octopress new post "New Portfolio Post Title" --dir portfolio
 {% endhighlight %}
 
 ### New Page
-- 
2.43.0