diff --git a/site/docs/posts.md b/site/docs/posts.md
index ed048f10..3dc74710 100644
--- a/site/docs/posts.md
+++ b/site/docs/posts.md
@@ -133,7 +133,8 @@ posts:
 {% endhighlight %}
 
 If you don't like the automatically-generated post excerpt, it can be overridden by adding
-`excerpt` to your post's YAML front-matter.
+`excerpt` to your post's YAML front-matter. Completely disable it by setting
+your `excerpt_separator` to `""`.
 
 ## Highlighting code snippets
 
diff --git a/site/docs/troubleshooting.md b/site/docs/troubleshooting.md
index 8ac580e5..6ea19bd9 100644
--- a/site/docs/troubleshooting.md
+++ b/site/docs/troubleshooting.md
@@ -136,6 +136,14 @@ following error:
 '{{ "{{" }}' was not properly terminated with regexp: /\}\}/  (Liquid::SyntaxError)
 {% endhighlight %}
 
+### Excerpts
+
+Since v1.0.0, Jekyll has had automatically-generated post excerpts. Since
+v1.1.0, Jekyll also passes these excerpts through Liquid, which can cause
+strange errors where references don't exist or a tag hasn't been closed. If you
+run into these errors, try setting `excerpt_separator: ""` in your
+`_config.yml`, or set it to some nonsense string.
+
 <div class="note">
   <h5>Please report issues you encounter!</h5>
   <p>If you come across a bug, please <a href="https://github.com/mojombo/jekyll/issues/new">create an issue</a> on GitHub describing the problem and any work-arounds you find so we can document it here for others.</p>