added setup instructions for third party integrations

2 files changed, 23 insertions, 3 deletions

diff --git a/README.markdown b/README.markdown
index ef08cd6b..782fcd70 100644
--- a/README.markdown
+++ b/README.markdown
@@ -49,6 +49,26 @@ Kills the local web server process.
 
 *There are more but these are the ones you'll use the most. Read the Rakefile if you want to learn more*
 
+## Third Party Integration
+### Twitter
+To configure your twitter feed, edit twitter.js where you can set:
+
+- Account for the feed
+- Number of tweets to show
+- Show Mentions (true/false)
+
+### Disqus Comments
+Octopress has built in support for the Disqus commenting system, using the "universal code" installation method. First register your site at [http://disqus.com/comments/register/](http://disqus.com/comments/register/) Then, to enable Disqus comments on your blog, edit the YAML block at the top of the default layout:
+
+1. Add your site's Disqus shortname
+2. Add your site's full url eg: http://yoursite.com
+
+### Google Site Search
+First setup sitesearch for your site at [http://google.com/sitesearch/](http://google.com/sitesearch/) then add your site\_search\_id to the YAML block in the default layout.
+
+### Google Analytics
+The analytics tracking scripts are already integrated into Octopress, all you have to do is register your site at [http://google.com/analytics/](http://google.com/analytics/).
+
 ## Style Configuration
 ### What you need to know
 Octopress's stylesheets are written in [SASS](http://sass-lang.com). If you haven't learned SASS, you should. It's the future. Octopress also uses [Compass](http://compass-style.org) which is a framework for SASS and contains a great library of SASS mixins which make it trivial to write complicated CSS. This is also the future.
diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml
index 0ab168d3..ed6415f4 100644
--- a/source/_layouts/default.haml
+++ b/source/_layouts/default.haml
@@ -2,7 +2,7 @@
 blog_title: My Octopress Blog
 full_url:
 google_site_search_id: 
-disqus_site: designenthusiast
+disqus_short_name: designenthusiast
 ---
 
 !!! 1.1 Transitional
@@ -53,7 +53,7 @@ disqus_site: designenthusiast
                 var disqus_url = "#{page.full_url}/#{page.url}";
               %noscript
                 %a(href="http://designenthusiast.disqus.com/?url=ref") View the discussion thread
-              %script(type="text/javascript" src="http://disqus.com/forums/#{page.disqus_site}/embed.js")
+              %script(type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/embed.js")
           - else
             = content
         #sidebar
@@ -74,7 +74,7 @@ disqus_site: designenthusiast
               query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
             }
           }
-          document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/#{page.disqus_site}/get_num_replies.js' + query + '"></' + 'script>');
+          document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/get_num_replies.js' + query + '"></' + 'script>');
         })();
     //Google Analytics code
     :javascript