Merge branch 'release/1.1.0'

.dependencies

@@ -2,51 +2,51 @@ git:
     archives:
         url: https://github.com/getgrav/grav-plugin-archives
         path: user/plugins/archives
-        branch: develop
+        branch: master
     breadcrumbs:
         url: https://github.com/getgrav/grav-plugin-breadcrumbs
         path: user/plugins/breadcrumbs
-        branch: develop
+        branch: master
     error:
         url: https://github.com/getgrav/grav-plugin-error
         path: user/plugins/error
-        branch: develop
+        branch: master
     feed:
         url: https://github.com/getgrav/grav-plugin-feed
         path: user/plugins/feed
-        branch: develop
+        branch: master
     pagination:
         url: https://github.com/getgrav/grav-plugin-pagination
         path: user/plugins/pagination
-        branch: develop
+        branch: master
     problems:
         url: https://github.com/getgrav/grav-plugin-problems
         path: user/plugins/problems
-        branch: develop
+        branch: master
     random:
         url: https://github.com/getgrav/grav-plugin-random
         path: user/plugins/random
-        branch: develop
+        branch: master
     relatedpages:
         url: https://github.com/getgrav/grav-plugin-relatedpages
         path: user/plugins/relatedpages
-        branch: develop    
+        branch: master    
     simplesearch:
         url: https://github.com/getgrav/grav-plugin-simplesearch
         path: user/plugins/simplesearch
-        branch: develop
+        branch: master
     sitemap:
         url: https://github.com/getgrav/grav-plugin-sitemap
         path: user/plugins/sitemap
-        branch: develop
+        branch: master
     taxonomylist:
         url: https://github.com/getgrav/grav-plugin-taxonomylist
         path: user/plugins/taxonomylist
-        branch: develop
+        branch: master
     antimatter:
         url: https://github.com/getgrav/grav-theme-antimatter
         path: user/themes/antimatter
-        branch: develop
+        branch: master
 links:
     archives:
         src: grav-plugin-archives

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.1.0
+## 12/11/2015
+
+1. [](#new)
+	* Added some redirect examples
+1. [](#improved)
+    * removed deprecated `markdown_extra` setting
+
 # v1.0.1
 ## 01/23/2015
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Blog Site
-version: 1.0.1
+version: 1.1.0
 description: "The **Blog Skeleton** provides you with sample blog content and plugins including: **Pagination**, **Breadcrumbs**, and **Taxonomy List**."
 icon: comments
 author:

config/site.yaml

@@ -7,4 +7,9 @@ blog:
 metadata:
     description: 'Grav is an easy to use, yet powerful, open source flat-file CMS'
 taxonomies: [category,tag,month]
+redirects:
+    /changelog: /blog/the-urban-jungle
+routes:
+    /something/else: /blog/focus-and-blur
+    /another/one/(.*): /blog/$1
 

config/system.yaml

@@ -3,7 +3,6 @@ home:
 
 pages:
   theme: antimatter
-  markdown_extra: false
   process:
     markdown: true
     twig: false