From d1e88f0beea780145d510247a40172ea879aaaa1 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sat, 6 Jan 2018 11:10:33 -0500
Subject: [PATCH] Update history to reflect merge of #6677 [ci skip]

---
 History.markdown          | 1 +
 docs/_docs/collections.md | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/History.markdown b/History.markdown
index 2af5aad93bd..59b5942ec1c 100644
--- 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
index 30ea5592c65..2a5697827da 100644
--- 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