Merge branch 'noahblon-master' into 2.0.1-wip

Conflicts:
	docs/assets/bootstrap.zip

7 files changed, 18 insertions, 18 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 32afa3a02..91279e1ac 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/base-css.html b/docs/base-css.html
index 1e9f6e8c4..7f409e019 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1014,9 +1014,9 @@ For example, <code>section</code> should be wrapped as inline.
             </div>
           </div>
           <div class="control-group warning">
-            <label class="control-label" for="inputError">Input with warning</label>
+            <label class="control-label" for="inputWarning">Input with warning</label>
             <div class="controls">
-              <input type="text" id="inputError">
+              <input type="text" id="inputWarning">
               <span class="help-inline">Something may have gone wrong</span>
             </div>
           </div>
@@ -1028,9 +1028,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
             </div>
           </div>
           <div class="control-group success">
-            <label class="control-label" for="inputError">Input with success</label>
+            <label class="control-label" for="inputSuccess">Input with success</label>
             <div class="controls">
-              <input type="text" id="inputError">
+              <input type="text" id="inputSuccess">
               <span class="help-inline">Woohoo!</span>
             </div>
           </div>
@@ -1534,11 +1534,11 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     <div class="span4">
       <form>
         <div class="control-group">
-          <label class="control-label" for="prependedInput">Email address</label>
+          <label class="control-label" for="inputIcon">Email address</label>
           <div class="controls">
             <div class="input-prepend">
               <span class="add-on"><i class="icon-envelope"></i></span>
-              <input class="span2" id="iconInput" type="text">
+              <input class="span2" id="inputIcon" type="text">
             </div>
           </div>
         </div>
diff --git a/docs/download.html b/docs/download.html
index 8442dcad1..c385046dd 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -93,7 +93,7 @@
   <div class="page-header">
     <a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
     <h1>
-      1. Chose components
+      1. Choose components
       <small>Get just the CSS you need</small>
     </h1>
   </div>
diff --git a/docs/javascript.html b/docs/javascript.html
index 5d505eb4f..e3e274b2f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -923,7 +923,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <hr>
           <h2>Using bootstrap-alerts.js</h2>
           <p>Enable dismissal of an alert via javascript:</p>
-          <pre class="prettyprint linenums">$(".alert-message").alert()</pre>
+          <pre class="prettyprint linenums">$(".alert").alert()</pre>
           <h3>Markup</h3>
           <p>Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.</p>
           <pre class="prettyprint linenums">&lt;a class="close" data-dismiss="alert" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
@@ -932,7 +932,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <p>Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the <code>.fade</code> and <code>.in</code> class already applied to them.</p>
           <h4>.alert('close')</h4>
           <p>Closes an alert.</p>
-          <pre class="prettyprint linenums">$(".alert-message").alert('close')</pre>
+          <pre class="prettyprint linenums">$(".alert").alert('close')</pre>
           <h3>Events</h3>
           <p>Bootstrap's alert class exposes a few events for hooking into alert functionality.</p>
           <table class="table table-bordered table-striped">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index fd9a82f50..443d5ca92 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -938,9 +938,9 @@
             </div>
           </div>
           <div class="control-group warning">
-            <label class="control-label" for="inputError">{{_i}}Input with warning{{/i}}</label>
+            <label class="control-label" for="inputWarning">{{_i}}Input with warning{{/i}}</label>
             <div class="controls">
-              <input type="text" id="inputError">
+              <input type="text" id="inputWarning">
               <span class="help-inline">{{_i}}Something may have gone wrong{{/i}}</span>
             </div>
           </div>
@@ -952,9 +952,9 @@
             </div>
           </div>
           <div class="control-group success">
-            <label class="control-label" for="inputError">{{_i}}Input with success{{/i}}</label>
+            <label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label>
             <div class="controls">
-              <input type="text" id="inputError">
+              <input type="text" id="inputSuccess">
               <span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
             </div>
           </div>
@@ -1458,11 +1458,11 @@
     <div class="span4">
       <form>
         <div class="control-group">
-          <label class="control-label" for="prependedInput">{{_i}}Email address{{/i}}</label>
+          <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
           <div class="controls">
             <div class="input-prepend">
               <span class="add-on"><i class="icon-envelope"></i></span>
-              <input class="span2" id="iconInput" type="text">
+              <input class="span2" id="inputIcon" type="text">
             </div>
           </div>
         </div>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index f6d319d6a..fe38d1450 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -17,7 +17,7 @@
   <div class="page-header">
     <a class="btn btn-small pull-right toggle-all" href="#">{{_i}}Toggle all{{/i}}</a>
     <h1>
-      {{_i}}1. Chose components{{/i}}
+      {{_i}}1. Choose components{{/i}}
       <small>{{_i}}Get just the CSS you need{{/i}}</small>
     </h1>
   </div>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 67bc83a1c..9850335c4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -847,7 +847,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <hr>
           <h2>{{_i}}Using bootstrap-alerts.js{{/i}}</h2>
           <p>{{_i}}Enable dismissal of an alert via javascript:{{/i}}</p>
-          <pre class="prettyprint linenums">$(".alert-message").alert()</pre>
+          <pre class="prettyprint linenums">$(".alert").alert()</pre>
           <h3>{{_i}}Markup{{/i}}</h3>
           <p>{{_i}}Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.{{/i}}</p>
           <pre class="prettyprint linenums">&lt;a class="close" data-dismiss="alert" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
@@ -856,7 +856,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <p>{{_i}}Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the <code>.fade</code> and <code>.in</code> class already applied to them.{{/i}}</p>
           <h4>.alert('close')</h4>
           <p>{{_i}}Closes an alert.{{/i}}</p>
-          <pre class="prettyprint linenums">$(".alert-message").alert('close')</pre>
+          <pre class="prettyprint linenums">$(".alert").alert('close')</pre>
           <h3>{{_i}}Events{{/i}}</h3>
           <p>{{_i}}Bootstrap's alert class exposes a few events for hooking into alert functionality.{{/i}}</p>
           <table class="table table-bordered table-striped">