update nanoc version.

doc-src/Gemfile

@@ -1,8 +1,7 @@
 source :gemcutter
 
-#gem 'cri', '~> 1.0.1'
-gem 'adsf'
-gem 'nanoc3' #, :git => "git://github.com/chriseppstein/nanoc.git"
+gem 'nanoc3'
+gem 'asdf'
 gem 'rdiscount'
 gem 'thor'
 gem 'rack'

doc-src/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    compass (0.12.alpha.0.4fba960)
+    compass (0.12.alpha.0.64c21f6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
@@ -18,13 +18,13 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.10)
-    adsf (1.0.1)
-      rack (>= 1.0.0)
+    asdf (0.5.0)
+      rack (~> 1.2.1)
     builder (3.0.0)
     chunky_png (1.2.5)
-    coderay (0.9.8)
-    compass-susy-plugin (0.9)
-      compass (>= 0.11.1)
+    coderay (0.9.7)
+    compass-susy-plugin (0.9.beta.3)
+      compass (>= 0.11.beta.3)
     cri (2.0.2)
     css-slideshow (0.2.0)
       compass (>= 0.10.0.rc3)
@@ -34,15 +34,15 @@ GEM
     i18n (0.4.2)
     json (1.5.4)
     mime-types (1.16)
-    nanoc3 (3.2.1)
+    nanoc3 (3.2.2)
       cri (~> 2.0)
-    nokogiri (1.5.0)
-    rack (1.2.3)
+    nokogiri (1.4.4)
+    rack (1.2.2)
     rake (0.9.2)
-    rb-fsevent (0.4.3.1)
+    rb-fsevent (0.4.0)
     rdiscount (1.6.8)
     ruby-prof (0.10.8)
-    sass (3.1.8)
+    sass (3.1.10)
     serve (1.0.0)
       activesupport (~> 3.0.1)
       i18n (~> 0.4.1)
@@ -56,7 +56,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 3.0.10)
-  adsf
+  asdf
   builder
   coderay
   compass!

doc-src/content/install.haml

@@ -68,7 +68,7 @@ body_id: install
 %p.note Note: <code>$</code> is a placeholder for your terminal's prompt. You don't type it.
 %h4 Then follow the instructions that compass provides in the output.
 
-%h4 Or you can buy a <a href="http://compass.handlino.com/">GUI for Compass</a> from Handlino.
+%h4 Or you can buy a <a href="http://compass.handlino.com/">GUI for Compass</a> from Handlino or get <a href="http://mhs.github.com/scout-app/"> Scout</a>, another GUI for Compass.
 
 %h2 Next Steps
 %ul

doc-src/lib/stylesheets/sass_extensions.rb

@@ -86,7 +86,9 @@ module Sass
         docstring.gsub(/@doc off(.*?)@doc on/m, '')
       end
       def docstring
-        value.gsub(PRE_COMMENT, '').gsub(POST_COMMENT, '')
+        v = value
+        v = v.join("\n") if v.respond_to?(:join)
+        v.gsub(PRE_COMMENT, '').gsub(POST_COMMENT, '')
       end
       def doc
         if value == "@doc off"