Merge branch 'master' into docs_derp

Conflicts:
	_config.yml

diff --cc _config.yml
index baa1344c9091f84f07935dd2685ba78e53f6c892,693f22a205c1dd28c48f819544b2d1e553201454..ae7b5a1e6f76a1512ebfc2d6aeac9a53e9215411
--- 1/_config.yml
--- 2/_config.yml
+++ b/_config.yml
@@@ -7,16 -7,30 +7,31 @@@ permalink:        prett
  
  # Server
  destination:      ./_gh_pages
- exclude:          [".editorconfig", ".gitignore", "bower.json", "composer.json", "CONTRIBUTING.md", "CNAME", "LICENSE", "Gruntfile.js", "package.json", "node_modules", "README.md", "less"]
  port:             9001
+ exclude:
+ - ".editorconfig"
+ - ".gitignore"
+ - "bower.json"
+ - "CNAME"
+ - "composer.json"
+ - "CONTRIBUTING.md"
+ - "DOCS-LICENSE"
+ - "Gruntfile.js"
+ - "less"
+ - "LICENSE"
+ - "node_modules"
+ - "package.json"
+ - "README.md"
+ - "sauce_browsers.yml"
+ - "test-infra"
  
  # Custom vars
- current_version:  3.1.0
+ current_version:  3.0.3
  repo:             https://github.com/twbs/bootstrap
  
- download_source:  https://github.com/twbs/bootstrap/archive/v3.1.0.zip
- download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.1.0/bootstrap-3.1.0-dist.zip
- download_sass:    https://github.com/twbs/bootstrap-sass/archive/v3.1.0.0.tar.gz
+ download_source:  https://github.com/twbs/bootstrap/archive/v3.0.3.zip
+ download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip
++download_sass:    https://github.com/twbs/bootstrap-sass/archive/v3.0.3.0.tar.gz
  
  blog:             http://blog.getbootstrap.com
  expo:             http://expo.getbootstrap.com

diff --cc _includes/nav-css.html
index 02ac821bda5d91dbf65c313fc7200700a9fd14c0,a7ca471bd1d50d36afb2aadc7096d50b9628e03a..970f5731ddcb2dfeafd58f02a81ddc44bfa3417d
--- 1/_includes/nav-css.html
--- 2/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@@ -110,9 -110,8 +110,9 @@@
    </ul>
  </li>
  <li>
-   <a href="#less">Using LESS</a>
+   <a href="#less">Using Less</a>
    <ul class="nav">
 +    <li><a href="#less-bootstrap">Compiling Bootstrap</a></li>
      <li><a href="#less-variables">Variables</a></li>
      <li><a href="#less-mixins-vendor">Vendor mixins</a></li>
      <li><a href="#less-mixins-utility">Utility mixins</a></li>

diff --cc _layouts/default.html
index f35d6935c0ade29bbb22ff348fe77717b2829b01,c6ecbc50767f13853ca0b8bb7443aa74021d2300..da2376855b2fbfd1f11e796e316afb6d8d41893c
--- 1/_layouts/default.html
--- 2/_layouts/default.html
+++ b/_layouts/default.html
@@@ -19,11 -19,12 +19,12 @@@
        </div>
      </div>
  
 -    <!-- Callout for the old docs link -->
 -    {% include old-bs-docs.html %}
 -
      <div class="container bs-docs-container">
+ 
        <div class="row">
 +        <div class="col-md-9" role="main">
 +          {{ content }}
 +        </div>
          <div class="col-md-3">
            <div class="bs-sidebar hidden-print" role="complementary">
              <ul class="nav bs-sidenav">

diff --cc about.html
Simple merge

diff --cc components.html
Simple merge

diff --cc css.html
Simple merge

diff --cc docs-assets/css/docs.css
Simple merge

diff --cc docs-assets/js/application.js
Simple merge

diff --cc getting-started.html
Simple merge