Merge branch 'stable'

Conflicts:
	.gitmodules
	CHANGELOG.md
	CONTRIBUTING
	README.md
	VERSION
	haml.gemspec

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "test/haml-spec"]
 	path = test/haml-spec
 	url = git://github.com/haml/haml-spec.git
+[submodule "vendor/sass"]
+	path = vendor/sass
+	url = git://github.com/nex3/sass.git

CHANGELOG.md

@@ -1,8 +1,5 @@
 # Haml Changelog
 
-* Table of contents
-{:toc}
-
 ## 3.2.0 (Unreleased)
 
 * Add Kramdown support to Markdown filter.
@@ -1013,7 +1010,7 @@ Haml 2.2 introduces a new syntax for attributes
 based on the HTML syntax.
 For example:
 
-    %a(href="http://haml-lang.com" title="Haml's so cool!")
+    %a(href="http://haml.info" title="Haml's so cool!")
       %img(src="/images/haml.png" alt="Haml")
 
 There are two main reasons for this.

FAQ.md

@@ -1,8 +1,5 @@
 # Frequently Asked Questions
 
-* Table of contents
-{:toc}
-
 ## Haml
 
 ### Why is my markup indented properly in development mode, but not in production?
@@ -154,7 +151,7 @@ For other plugins, a little searching will probably turn up a way to fix them as
 
 ## You still haven't answered my question!
 
-Sorry! Try looking at the [Haml](http://haml-lang.com/docs/yardoc/HAML_REFERENCE.md.html) reference,
+Sorry! Try looking at the [Haml](http://haml.info/docs/yardoc/HAML_REFERENCE.md.html) reference,
 If you can't find an answer there,
 feel free to ask in `#haml` on irc.freenode.net
-or send an email to the [mailing list](http://groups.google.com/group/haml?hl=en).
+or send an email to the [mailing list](http://groups.google.com/group/haml).

README.md

@@ -21,7 +21,7 @@ to compile it to HTML. For more information on these commands, check out
     haml --help
 
 To use Haml programatically, check out the [YARD
-documentation](http://haml-lang.com/docs/yardoc/).
+documentation](http://haml.info/docs/yardoc/).
 
 ## Using Haml with Rails
 
@@ -88,7 +88,7 @@ output the result. You can even use control statements like `if` and `while`:
         = "Happy new " + "year!"
 
 Haml provides far more tools than those presented here. Check out the [reference
-documentation](http://beta.haml-lang.com/docs/yardoc/file.REFERENCE.html)
+documentation](http://haml.info/docs/yardoc/file.REFERENCE.html)
 for full details.
 
 ### Indentation
@@ -100,7 +100,7 @@ can't be mixed, and the same number of tabs or spaces must be used throughout.
 ## Contributing
 
 Contributions are welcomed, but before you get started please read the
-[guidelines](http://haml-lang.com/development.html#contributing).
+[guidelines](http://haml.info/development.html#contributing).
 
 After forking and then cloning the repo locally, install Bundler and then use it
 to install the development gem dependecies:

REFERENCE.md

@@ -1,8 +1,5 @@
 # Haml (XHTML Abstraction Markup Language)
 
-* Table of contents
-{:toc}
-
 Haml is a markup language
 that's used to cleanly and simply describe the XHTML of any web document,
 without the use of inline code.

haml.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.executables = ['haml', 'html2haml']
   spec.files       = Dir['rails/init.rb', 'lib/**/*', 'bin/*', 'test/**/*',
                          'extra/**/*', 'Rakefile', 'init.rb', '.yardopts'] + readmes
-  spec.homepage    = 'http://haml-lang.com/'
+  spec.homepage    = 'http://haml.info/'
   spec.has_rdoc    = false
   spec.test_files  = Dir["test/**/*_test.rb"]
 

test/engine_test.rb

@@ -192,11 +192,11 @@ def test_colon_in_id_attr
   def test_dynamic_attributes_with_no_content
     assert_equal(<<HTML, render(<<HAML))
 <p>
-  <a href='http://haml-lang.com'></a>
+  <a href='http://haml.info'></a>
 </p>
 HTML
 %p
-  %a{:href => "http://" + "haml-lang.com"}
+  %a{:href => "http://" + "haml.info"}
 HAML
   end