Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	css.html

diff --cc css.html
index a07567620c1ba2662f98c1c0636f7c315f4bdc87,d4c19a91cbc1b325cfb605385a877332423faa58..01b1aa2e1a201454d22364f0a77414f11aee8472
--- 1/css.html
--- 2/css.html
+++ b/css.html
@@@ -1824,30 -1802,28 +1824,30 @@@ For example, <code>&lt;section&gt;</cod
        <p>While Bootstrap will apply these styles in all browsers, Internet Explorer 9 and below don't actually support the <code>disabled</code> attribute on a <code>&lt;fieldset&gt;</code>. Use custom JavaScript to disable the fieldset in these browsers.</p>
      </div>
  
 -    <form class="bs-example" role="form">
 -      <fieldset disabled>
 -        <div class="form-group">
 -          <label for="disabledTextInput">Disabled input</label>
 -          <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
 -        </div>
 -        <div class="form-group">
 -          <label for="disabledSelect">Disabled select menu</label>
 -          <select id="disabledSelect" class="form-control">
 -            <option>Disabled select</option>
 -          </select>
 -        </div>
 -        <div class="checkbox">
 -          <label>
 -            <input type="checkbox"> Can't check this
 -          </label>
 -        </div>
 -        <button type="submit" class="btn btn-primary">Submit</button>
 -      </fieldset>
 -    </form>
 +    <div class="bs-example">
 +      <form role="form">
 +        <fieldset disabled>
 +          <div class="form-group">
 +            <label for="disabledTextInput">Disabled input</label>
 +            <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
 +          </div>
 +          <div class="form-group">
 +            <label for="disabledSelect">Disabled select menu</label>
 +            <select id="disabledSelect" class="form-control">
 +              <option>Disabled select</option>
 +            </select>
 +          </div>
 +          <div class="checkbox">
 +            <label>
 +              <input type="checkbox"> Can't check this
 +            </label>
 +          </div>
 +          <button type="submit" class="btn btn-primary">Submit</button>
 +        </fieldset>
 +      </form>
 +    </div><!-- /.bs-example -->
  {% highlight html %}
- <form class="form-inline" role="form">
+ <form role="form">
    <fieldset disabled>
      <div class="form-group">
        <label for="disabledTextInput">Disabled input</label>