diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
index 8a1d9eff..1b831e8a 100644
--- a/doc-src/content/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -15,6 +15,8 @@ COMPASS CHANGELOG
 * Make it easier to disable the asset cache buster: `asset_cache_buster :none`
 * Can now set `$padding` to `false` to make the `horizontal-list` mixin skip the
   padding properties.
+* It is now possible to disable support for legacy IE browsers.
+  See [the docs](/docs/reference/compass/support/) for more information.
 
 0.10.5 (08/29/2010)
 -------------------
diff --git a/doc-src/content/reference/compass/support.haml b/doc-src/content/reference/compass/support.haml
new file mode 100644
index 00000000..f224af13
--- /dev/null
+++ b/doc-src/content/reference/compass/support.haml
@@ -0,0 +1,17 @@
+--- 
+title: Compass Cross-Browser Support Configuration
+crumb: Browser Support
+framework: compass
+stylesheet: compass/_support.scss
+classnames:
+  - reference
+  - core
+  - support
+meta_description: Provides configuration options for the Compass Browser Support Matrix.
+layout: core
+nav_stylesheet: _compass.scss
+---
+- render 'reference' do
+  %p
+    You can configure the compass default browser support matrix by
+    setting these variables as needed.
diff --git a/doc-src/content/stylesheets/screen.sass b/doc-src/content/stylesheets/screen.sass
index 7c0b13ed..e6b43054 100644
--- a/doc-src/content/stylesheets/screen.sass
+++ b/doc-src/content/stylesheets/screen.sass
@@ -1,7 +1,7 @@
 /* Welcome to Susy. Use this file to define screen styles.
  * Import this file using the following HTML or equivalent:
  * <link href="/stylesheets/screen.css" media="screen" rel="stylesheet" type="text/css" />
-
+@charset "UTF-8"
 @import defaults
 @import slideshow
 @import shared
@@ -213,6 +213,8 @@ aside[role="sidebar"] + article
       margin-right: 1.5em
       &:first-child
         +alpha
+  a.selected:before
+    content: "▸"
   + #page
     +leader(1.5)
 
diff --git a/doc-src/layouts/simple_core.scss b/doc-src/layouts/simple_core.scss
new file mode 100644
index 00000000..cca0d610
--- /dev/null
+++ b/doc-src/layouts/simple_core.scss
@@ -0,0 +1,7 @@
+- render 'main' do
+  - content_for :module_nav do
+    %ul= item_tree(reference_item(:stylesheet => "compass.scss"), :depth => 1, :omit_self => true, :headings => false)
+  %aside(role="sidebar")
+    %nav#local-nav
+      = item_tree(reference_item(:stylesheet => (@item[:nav_stylesheet] || @default_stylesheet)), :depth => 2, :omit_self => get_var(:omit_self){false}, :heading_level => get_var(:heading_level){1})
+  %article= yield
\ No newline at end of file
diff --git a/doc-src/lib/stylesheets.rb b/doc-src/lib/stylesheets.rb
index 69348aa6..113baa20 100644
--- a/doc-src/lib/stylesheets.rb
+++ b/doc-src/lib/stylesheets.rb
@@ -136,7 +136,7 @@ def constants(item)
       comment = nil
     end
   end
-  constants
+  constants.reject{|c| c.comment =~ /@private/}
 end
 
 def all_constants
diff --git a/frameworks/compass/stylesheets/compass/_support.scss b/frameworks/compass/stylesheets/compass/_support.scss
index d98bd60b..ec87aeaf 100644
--- a/frameworks/compass/stylesheets/compass/_support.scss
+++ b/frameworks/compass/stylesheets/compass/_support.scss
@@ -7,12 +7,11 @@ $legacy-support-for-ie6: $legacy-support-for-ie !default;
 // Setting this to false will result in smaller output, but no support for ie7
 $legacy-support-for-ie7: $legacy-support-for-ie !default;
 
-// @doc off
+// @private
 // The user can simply set $legacy-support-for-ie and 6 & 7 will be set accordingly,
 // But in case the user set either of those explicitly, we need to sync the value of
 // this combined variable.
 $legacy-support-for-ie: $legacy-support-for-ie6 or $legacy-support-for-ie7;
-// @doc on
 
 // Support for mozilla in experimental css3 properties.
 $experimental-support-for-mozilla   : true !default;