Merge branch 'master' of https://github.com/poole/poole

diff --git a/_config.yml b/_config.yml
index 463c92d9c7693b40a9b095da7fd7d8c162a438bb..8bd7786eb5dbb986f769ff8cb74c7517cf22a6df 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,6 @@
 # Dependencies
 markdown:         redcarpet
-pygments:         true
+highlighter:      pygments
 
 # Permalinks
 permalink:        pretty

diff --git a/_includes/head.html b/_includes/head.html
index fd6e2069e0b93b53c88d2eeb511c32537657f697..09ebbf91d3c7a00f1a4e4cebb8e1c0d54b30bd93 100644 (file)
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -22,5 +22,5 @@
   <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
 
   <!-- RSS -->
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
+  <link rel="alternate" type="application/atom+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
 </head>