Merge branch 'master' into PR-rss

README.md

@@ -107,6 +107,10 @@ paginate = 5
   # Show reading time in minutes for posts
   showReadingTime = false
 
+  # Show table of contents at the top of your posts (defaults to false)
+  # Alternatively, add this param to post front matter for specific posts
+  # toc = true
+
   # Show full page content in RSS feed items
   #(default is Description or Summary metadata in the front matter)
   # rssFullText = true

layouts/_default/single.html

@@ -40,6 +40,10 @@
     {{ end }}
 
     <div class="post-content">
+      {{ if or .Params.Toc $.Site.Params.Toc }}
+        <h2>Table of Contents</h2>
+        <aside class="table-of-contents">{{ .TableOfContents }}</aside>
+      {{ end }}
       {{ .Content }}
     </div>
     {{ if eq .Type $.Site.Params.contentTypeName }}