Merge branch 'master' into sass

[blog] / _config.yml

diff --git a/_config.yml b/_config.yml
index 49fbc1b6a6998924e53817c356f06df8f1295659..5a14f8e094358be0a4681f84fa193e0a439546fb 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -1,19 +1,34 @@
+# Dependencies
+markdown:            kramdown
+highlighter:         pygments
+
 # Permalinks
-permalink:        pretty
+#
+# Use of `relative_permalinks` ensures post links from the index work properly.
+permalink:           pretty
 relative_permalinks: true
 
 # Setup
-title:            Poole
-tagline:          The Jekyll Butler
-url:              http://getpoole.com
-paginate:         1
-basename:         ""
+title:               Poole
+tagline:             The Jekyll Butler
+url:                 http://getpoole.com
+paginate:            1
+baseurl:             ""
+
+# Assets
+#
+# We specify the directory for Jekyll so we can use @imports.
+sass:
+  sass_dir:          _sass
+  style:            :compressed
+
+# About/contact
 author:
-  name:           Mark Otto
-  url:            https://twitter.com/mdo
-  email:          markdotto@gmail.com
+  name:              Mark Otto
+  url:               https://twitter.com/mdo
+  email:             markdotto@gmail.com
 
 # Custom vars
-version:          1.0.0
+version:             1.0.0
 github:
-  repo:           https://github.com/poole/poole
+  repo:              https://github.com/poole/poole