From 4646851d79ab3b39cce5b8f0bc5173de4f135b79 Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <hi@ricostacruz.com>
Date: Wed, 11 Mar 2015 16:15:23 +0800
Subject: [PATCH] Update middleman

---
 jekyll.md    | 47 ++++++++++++++++++++++++++++++++++++++---------
 middleman.md |  4 +++-
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/jekyll.md b/jekyll.md
index ebd3146a19..91e8507b67 100644
--- a/jekyll.md
+++ b/jekyll.md
@@ -49,18 +49,13 @@ jekyll_escape: true
     categories: ['html', 'css']
     tags: ['html', 'css']
 
-Configuration
--------------
+## [Configuration](http://jekyllrb.com/docs/configuration/)
 
     source: .
     destination: _site
     exclude: [dir, file, ...]
     include: ['.htaccess']
 
-### Reference
-
- * [Configuration](http://jekyllrb.com/docs/configuration/)
-
 ## [Variables](http://jekyllrb.com/docs/variables/)
 
     {{ site }}       - from config.yml
@@ -157,12 +152,11 @@ Markup
 
     {% include header.html %}
 
-Blogging
---------
+## [Blogging](http://jekyllrb.com/docs/posts/)
 
     _posts/YEAR-MONTH-DAY-title.md
 
-### Image paths
+### [Image paths](http://jekyllrb.com/docs/posts/#including-images-and-resources)
     
     ![My helpful screenshot]({{ site.url }}/assets/screenshot.jpg)
 
@@ -171,6 +165,21 @@ Blogging
     vi _drafts/a-draft-post.md
     jekyll build --drafts
 
+### [Excerpts](http://jekyllrb.com/docs/posts/#post-excerpts)
+
+    {{ post.excerpt | remove: '<p>' | remove: '</p>' }}
+    {{ post.excerpt | strip_html }}
+
+### Excerpt separator
+
+    ---
+    excerpt_separator: <!--more-->
+    ---
+
+    Excerpt
+    <!--more-->
+    Out-of-excerpt
+
 ### [Permalinks](http://jekyllrb.com/docs/permalinks/)
 
     # _config.yml
@@ -185,6 +194,26 @@ Blogging
 
     {% for member in site.data.members %}
 
+## [Collections](http://jekyllrb.com/docs/collections/)
+
+```yaml
+# _config.yml
+collections:
+  - authors
+```
+
+```yaml
+# _/authors/a-n-roquelaire.md
+---
+name: A. N. Roquelaire
+real_name: Anne Rice
+---
+```
+
+```
+{% for author in site.authors %}
+```
+
 Helpers and Filters
 -------------------
 
diff --git a/middleman.md b/middleman.md
index 8f4bb64188..3df86267a2 100644
--- a/middleman.md
+++ b/middleman.md
@@ -1,8 +1,10 @@
 ---
-title: Middleman
+title: Middleman 3
 layout: default
 ---
 
+**NB:** This is for Middleman 3, not Middleman 4+.
+
 ### Compass config
 
     compass_config do |config|