Merge branch '2.1' into site-2.1

This commit is contained in:
Brandon Mathis 2012-05-20 17:27:34 -05:00
commit 91cfd16d38
2 changed files with 2 additions and 0 deletions

View File

@ -2,6 +2,7 @@
{% if site.disqus_short_name and page.comments != false %}
<script type="text/javascript">
var disqus_shortname = '{{ site.disqus_short_name }}';
var disqus_developer = '{{ site.disqus_developer }}';
{% if page.comments == true %}
{% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
// var disqus_developer = 1;

View File

@ -100,6 +100,7 @@ delicious_count: 3
# Disqus Comments
disqus_short_name:
disqus_show_comment_count: false
disqus_developer: 0
# Google Analytics
google_analytics_tracking_id: UA-10876422-2