Update history to reflect merge of jekyll#6677 [ci skip]

localheinz · Jan 7, 2018 · d1e88f0 · d1e88f0
1 parent 6a82754
commit d1e88f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/History.markdown b/History.markdown
@@ -7,6 +7,7 @@
 ### Site Enhancements
 
   * Display latest version in header (#6676)
+  * Update version in `config.yml` via YAML load / dump (#6677)
 
 ## 3.7.0 / 2018-01-02
 

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
@@ -55,6 +55,12 @@ defaults:
   in <code>my_collections/_recipes</code> for the <code>recipes</code> collection.</p>
 </div>
 
+<div class="note warning">
+  <h5>Be sure to move posts into custom collection directory</h5>
+
+  <p>If you specify a directory to store all your collections in the same place with <code>collections_dir: my_collections</code>, then you will need to move your <code>_posts</code> directory to <code>my_collections/_post</code>.</p>
+</div>
+
 ### Step 2: Add your content {#step2}
 
 Create a corresponding folder (e.g. `<source>/_my_collection`) and add