Merge branch 'master' of github.com:spf13/hugo

4 files changed, 73 insertions, 21 deletions

diff --git a/docs/content/meta/release-notes.md b/docs/content/meta/release-notes.md
index 669df8eb8..ab69fd31d 100644
--- a/docs/content/meta/release-notes.md
+++ b/docs/content/meta/release-notes.md
@@ -15,14 +15,14 @@ weight: 10
 A lot has happened since Hugo v0.12.0 was released. 
 
 * Changes to docs:
-	* New Troubleshooting section is added
-	* It's now searchable through Google Custom Search
+	* A new [Troubleshooting](/troubleshooting/overview) section is added
+	* It's now searchable through Google Custom Search ([#753][])
 	* Some new great tutorials:
-		* [Automated deployments](/tutorials/automated-deployments)
+		* [Automated deployments with Wercker](/tutorials/automated-deployments)
 		* [Creating a new theme](/tutorials/creating-a-new-theme)
 * Several improvements to the [template functions](/templates/functions):
-	* `where` is now even more powerful and accepts SQL-like syntax with the operators `==, eq, !=, <>, ne, >=, ge, >, gt, <=, le, <, lt, in, not in`
-	* `where` template function now also accepts dot chaining key argument (i.e. `Params.foo.bar`)
+	* `where` is now even more powerful and accepts SQL-like syntax with the operators `==`, `eq`; `!=`, `<>`, `ne`; `>=`, `ge`; `>`, `gt`; `<=`, `le`; `<`, `lt`; `in`, `not in`
+	* `where` template function now also accepts dot chaining key argument (e.g. `"Params.foo.bar"`)
 * New template functions:
 	* `apply`
 	* `chomp`
@@ -41,22 +41,29 @@ A lot has happened since Hugo v0.12.0 was released.
 * Support for [cross-references](/extras/crossreferences)
 * A new, generic Next/Prev functionality is added to all lists of pages (sections, taxonomies, etc)
 * Add in-section [Next/Prev](/templates/variables) content pointers
-* Several improvements related to Markdown rendering:
+* Several [configurable improvements related to Markdown rendering](/overview/configuration/#configure-blackfriday-rendering:a66b35d20295cb764719ac8bd35837ec):
 	* Configuration of footnote rendering
-	* Optional support for angled quotes
+	* Optional support for smart angled quotes, e.g. `"Hugo"` → «Hugo»
 	* Enable descriptive header IDs
 * The content is now copied from archetype on `hugo new` (in addition to the front matter metadata)
 * Improved unit test coverage
 * Hugo has undergone a major refactoring, with a new handler system and a generic file system. This sounds and is technical, but will pave the way for new features and make Hugo even speedier
-* Ace templates support
+* [Ace](http://ace.yoss.si/) template engine support ([#541][])
 * Fixed a lot of Windows-related path issues
 * Improved error messages for template and rendering errors
-* Various fixes in RSS feed generation
-* Enabled soft livereload of CSS and images
-* URLs in XML output is now correctly canonified
+* Enabled soft LiveReload of CSS and images ([#490][])
+* Various fixes in RSS feed generation ([#789][])
+* URLs in XML output is now correctly canonified ([#725][], [#728][], and part of [#789][])
 * `HasMenuCurrent` and `IsMenuCurrent` is now supported on Nodes
 * A bunch of [bug fixes](https://github.com/spf13/hugo/commits/master)
 
+[#490]: https://github.com/spf13/hugo/pull/490 "Pull Request #490: Livereload CSS and images without browser refresh"
+[#541]: https://github.com/spf13/hugo/pull/541 "Pull Request #541: Add Ace template engine support"
+[#725]: https://github.com/spf13/hugo/issues/725 "Issue #725: CanonifyUrls does not canonicalize urls in RSS"
+[#728]: https://github.com/spf13/hugo/issues/728 "Pull Request #728: Add ability to canonify URLs in rendered XML output."
+[#753]: https://github.com/spf13/hugo/issues/753 "Add search to documentation"
+[#789]: https://github.com/spf13/hugo/issues/789 "Issue #789: RSS feeds do not validate"
+
 
 ## **0.12.0** Sept 1, 2014
 
diff --git a/docs/content/overview/configuration.md b/docs/content/overview/configuration.md
index ac40ab4aa..4e4b750c1 100644
--- a/docs/content/overview/configuration.md
+++ b/docs/content/overview/configuration.md
@@ -88,7 +88,7 @@ But Hugo does expose some options---as listed in the table below, matched with t
 </tr>
 <tr>
 <td class="purpose-title">Purpose:</td>
-<td class="purpose-description" colspan="2">Enable angled double quotes (<code>« »</code>)</td>
+<td class="purpose-description" colspan="2">Enable smart angled double quotes <small>(e.g.&nbsp;<code>"Hugo"</code> renders to «Hugo» instead of “Hugo”)</small></td>
 </tr>
 
 <tr>
@@ -98,19 +98,29 @@ But Hugo does expose some options---as listed in the table below, matched with t
 </tr>
 <tr>
 <td class="purpose-title">Purpose:</td>
-<td class="purpose-description" colspan="2">If <code>true</code>, then header and footnote IDs are generated without the document ID <small>(so,&nbsp;<code>#my-header</code> instead of <code>#my-header:bec3ed8ba720b9073ab75abcf3ba5d97</code>)</small></td>
+<td class="purpose-description" colspan="2">If <code>true</code>, then header and footnote IDs are generated without the document ID <small>(e.g.&nbsp;<code>#my-header</code> instead of <code>#my-header:bec3ed8ba720b9073ab75abcf3ba5d97</code>)</small></td>
 </tr>
 </tbody>
 </table>
 
 
-**Note** that these flags must be grouped under the `blackfriday` key and can be set on **both site and page level**. If set on page, it will override the site setting.
+**Note** that these flags must be grouped under the `blackfriday` key and can be set on **both site and page level**. If set on page, it will override the site setting.  Example:
 
-```
-blackfriday:
-  angledQuotes = true
-  plainIdAnchors = true
-```
+<table class="table">
+<tr>
+<th>TOML</th><th>YAML</th>
+</tr>
+<tr>
+<td><pre><code>[blackfriday]
+    angledQuotes = true
+    plainIdAnchors = true
+</code></pre></td>
+<td><pre><code>blackfriday:
+  angledQuotes: true
+  plainIdAnchors: true
+</code></pre></td>
+</tr>
+</table>
 
 ## Notes
 
diff --git a/docs/content/templates/functions.md b/docs/content/templates/functions.md
index 1b759e066..e1499f82b 100644
--- a/docs/content/templates/functions.md
+++ b/docs/content/templates/functions.md
@@ -76,7 +76,7 @@ e.g.
     +++
 
     {{ range where .Site.Recent "Params.series" "golang" }}
-       {{ .Content}}
+       {{ .Content }}
     {{ end }}
 
 It can also be used with an operator like `!=`, `>=`, `in` etc. Without an operator (like above), `where` compares a given field with a matching value in a way like `=` is specified.
@@ -84,7 +84,7 @@ It can also be used with an operator like `!=`, `>=`, `in` etc. Without an opera
 e.g.
 
     {{ range where .Data.Pages "Section" "!=" "post" }}
-       {{ .Content}}
+       {{ .Content }}
     {{ end }}
 
 Following operators are now available
@@ -111,6 +111,7 @@ Maps will be sorted by the keys, and only a slice of the values will be returned
 Works on [lists](/templates/list/), [taxonomies](/taxonomies/displaying/), [terms](/templates/terms/), [groups](/templates/list/)
 
 e.g.
+
     // Front matter
     +++
     tags: [ "tag1", "tag2", "tag3" ]
@@ -132,6 +133,7 @@ Sorts maps, arrays and slices, returning a sorted slice. A sorted array of map v
 Works on [lists](/templates/list/), [taxonomies](/taxonomies/displaying/), [terms](/templates/terms/), [groups](/templates/list/)
 
 e.g.
+
     // Front matter
     +++
     tags: [ "tag3", "tag1", "tag2" ]
diff --git a/docs/content/troubleshooting/overview.md b/docs/content/troubleshooting/overview.md
new file mode 100644
index 000000000..5397604ba
--- /dev/null
+++ b/docs/content/troubleshooting/overview.md
@@ -0,0 +1,33 @@
+---
+date: 2015-01-18T02:41:52-07:00
+menu:
+  main:
+    parent: troubleshooting
+title: Troubleshooting Overview
+weight: 0
+---
+
+Got stuck?  Worry not!  Chances are other users have encountered
+the exact same problem as you have, brought it up for
+[discussion](http://discuss.gohugo.io/), and have likely found a solution
+through the collective wisdom of our vibrant Hugo community!
+
+Here are some examples:
+
+* [`hugo new` aborts with cryptic EOF error](/troubleshooting/strange-eof-error/) (affects v0.12 and lower)
+* [Categories with accented characters inaccessible](/troubleshooting/categories-with-accented-characters/) (affects Mac OS&nbsp;X users)
+* [My CSS files aren't loaded!](http://discuss.gohugo.io/t/deployment-workflow/90/15)
+* [How do I include an image gallery on my website?](http://discuss.gohugo.io/t/image-gallery/594)
+* ... And a lot more!
+
+Indeed, you may find many questions and solutions
+to problems in our [discussion forum](http://discuss.gohugo.io/),
+and you may find the [support](http://discuss.gohugo.io/category/support)
+and [tips & tricks](http://discuss.gohugo.io/category/tips-tricks)
+categories particularly helpful.
+
+Can't find anything?  Please write on the forum and post your questions
+and comments!  Sometimes, your feedback may lead to the discovery of
+existing bugs in the code or in the documentation, and may even spur
+the interest of adding new features to the next Hugo version, improving
+Hugo for everybody!  (Thank you!)  See you on the forum!