Merge branch 'documenttoliquid' of https://github.com/budparr/jekyll into documenttoliquid

Conflicts: lib/jekyll/document.rb
2014-06-01 22:36:20 -04:00 · 2014-06-01 22:36:20 -04:00 · 69aae64133
parent 00ab79b7cf
commit 69aae64133
1 changed files with 10 additions and 0 deletions
--- a/site/docs/collections.md
+++ b/site/docs/collections.md
@ -244,6 +244,16 @@ In addition to any YAML front-matter provided in the document's corresponding fi
        </p>
      </td>
    </tr>
+    <tr>
+      <td>
+        <p><code>label</code></p>
+      </td>
+      <td>
+        <p>
+          The name of the document's collection.
+        </p>
+      </td>
+    </tr>
  </tbody>
 </table>
 </div>