fixed merge

doc-src/layouts/article.haml

@@ -12,7 +12,7 @@
           Version:
           %a.number(href="/CHANGELOG/")= compass_version
       %article= yield
-      -#comments= render "partials/disqus_comments"
+      -comments= render "partials/disqus_comments"
     %footer(role="contentinfo")= render "partials/footer"
   = @item[:content_for_javascripts]
   = render "partials/analytics"

doc-src/layouts/example.haml

@@ -14,7 +14,7 @@
           Version:
           %a.number(href="/CHANGELOG/")= compass_version
       %article= yield
-      -#comments= render "partials/disqus_comments"
+      -comments= render "partials/disqus_comments"
     %footer(role="contentinfo")= render "partials/footer"
   = @item[:content_for_javascripts]
   = render "partials/analytics"

doc-src/lib/search.rb

@@ -1,35 +1,35 @@
 require 'json'
 
 STOP_WORDS = %w{
-  a about above across after afterwards again against all almost 
-  alone along already also although always am among amongst amoungst 
-  amount an and another any anyhow anyone anything anyway anywhere 
-  are around as at back be became because become becomes becoming 
-  been before beforehand behind being below beside besides between 
-  beyond bill both bottom but by call can cannot cant co computer con 
-  could couldnt cry de describe detail do done down due during each 
-  eg eight either eleven else elsewhere empty enough etc even ever 
-  every everyone everything everywhere except few fifteen fify fill 
-  find fire first five for former formerly forty found four from 
-  front full further get give go had has hasnt have he hence her here 
-  hereafter hereby herein hereupon hers herself him himself his how 
-  however hundred i ie if in inc indeed interest into is it its 
-  itself keep last latter latterly least less ltd made many may me 
-  meanwhile might mill mine more moreover most mostly move much must 
-  my myself name namely neither never nevertheless next nine no 
-  nobody none noone nor not nothing now nowhere of off often on once 
-  one only onto or other others otherwise our ours ourselves out over 
-  own part per perhaps please put rather re same see seem seemed 
-  seeming seems serious several she should show side since sincere 
-  six sixty so some somehow someone something sometime sometimes 
-  somewhere still such system take ten than that the their them 
-  themselves then thence there thereafter thereby therefore therein 
-  thereupon these they thick thin third this those though three 
-  through throughout thru thus to together too top toward towards 
-  twelve twenty two un under until up upon us very via was we well 
-  were what whatever when whence whenever where whereafter whereas 
-  whereby wherein whereupon wherever whether which while whither who 
-  whoever whole whom whose why will with within without would yet you 
+  a about above across after afterwards again against all almost
+  alone along already also although always am among amongst amoungst
+  amount an and another any anyhow anyone anything anyway anywhere
+  are around as at back be became because become becomes becoming
+  been before beforehand behind being below beside besides between
+  beyond bill both bottom but by call can cannot cant co computer con
+  could couldnt cry de describe detail do done down due during each
+  eg eight either eleven else elsewhere empty enough etc even ever
+  every everyone everything everywhere except few fifteen fify fill
+  find fire first five for former formerly forty found four from
+  front full further get give go had has hasnt have he hence her here
+  hereafter hereby herein hereupon hers herself him himself his how
+  however hundred i ie if in inc indeed interest into is it its
+  itself keep last latter latterly least less ltd made many may me
+  meanwhile might mill mine more moreover most mostly move much must
+  my myself name namely neither never nevertheless next nine no
+  nobody none noone nor not nothing now nowhere of off often on once
+  one only onto or other others otherwise our ours ourselves out over
+  own part per perhaps please put rather re same see seem seemed
+  seeming seems serious several she should show side since sincere
+  six sixty so some somehow someone something sometime sometimes
+  somewhere still such system take ten than that the their them
+  themselves then thence there thereafter thereby therefore therein
+  thereupon these they thick thin third this those though three
+  through throughout thru thus to together too top toward towards
+  twelve twenty two un under until up upon us very via was we well
+  were what whatever when whence whenever where whereafter whereas
+  whereby wherein whereupon wherever whether which while whither who
+  whoever whole whom whose why will with within without would yet you
   your yours yourself yourselves
 } unless defined?(STOP_WORDS)