Merge branch 'master' into stable

cool-RR · cool-RR · commit 7648c0ff88b7 · 2011-09-29T13:32:33.000+02:00
diff --git a/garlicsim/docs/intro/installation/developers/index.txt b/garlicsim/docs/intro/installation/developers/index.txt
@@ -10,7 +10,7 @@
 Installing GarlicSim
 ====================
 
-Do you prefer Python 2.x or Python 3.x? If you're not sure, choose 2.x.
+Do you prefer Python **2.x** or Python **3.x**? Choose below. If you're not sure, choose **2.x**.
 
 .. toctree::
    :maxdepth: 1
diff --git a/garlicsim/docs/intro/installation/end_users/index.txt b/garlicsim/docs/intro/installation/end_users/index.txt
@@ -24,4 +24,4 @@ way. (Currently Windows only.)
 This installer will give you :mod:`garlicsim`, :mod:`garlicsim_lib` and
 :mod:`garlicsim_wx`.
 
-A similiar end-user installer for Mac will become available in 2011.
+End-user installers for Mac and Linux will become available in the future.
diff --git a/garlicsim/docs/theme/layout.html b/garlicsim/docs/theme/layout.html
@@ -197,7 +197,8 @@ <h3>{{ _('Quick search') }}</h3>
     {%- endif %}
     </div>
 {%- endblock %}
-<script type="text/javascript">
+        <!-- Begin Google Analytics -->
+        <script type="text/javascript">
             var _gaq = _gaq || [];
             _gaq.push(['_setAccount', 'UA-1136525-7']);
             _gaq.push(['_trackPageview']);
@@ -211,5 +212,9 @@ <h3>{{ _('Quick search') }}</h3>
                 s.parentNode.insertBefore(ga, s);
             })();
         </script>
+        <!-- End Google Analytics -->
+        <!-- Chatty Loader Code --> 
+        <script id="chatty_loader_script" type="text/javascript" language="javascript" src="http://app.chattybar.com/chatty-loader.js?room_id=106&site_id=106"></script>
+        <!-- End Chatty Loader Code -->
   </body>
 </html>
