Merge branch 'master' into pr/11536

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 37 insertions, 9 deletions

diff --git a/getting-started.html b/getting-started.html
index 5a735b68c..b65fc497f 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -62,9 +62,15 @@ base_url: "../"
     <div class="page-header">
       <h1 id="whats-included">What's included</h1>
     </div>
-    <p class="lead">Within the download you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.</p>
-    <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
+    <p class="lead">Bootstrap is downloadable in two forms, within which you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.</p>
+
+    <div class="bs-callout bs-callout-warning" id="jquery-required">
+      <h4>jQuery required</h4>
+      <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>. <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p>
+    </div>
 
+    <h2 id="whats-included-precompiled">Precompiled Bootstrap</h2>
+    <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
 <!-- NOTE: This info is intentionally duplicated in the README.
 Copy any changes made here over to the README too. -->
 {% highlight bash %}
@@ -85,11 +91,24 @@ bootstrap/
 {% endhighlight %}
 
     <p>This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p>
-    <div class="bs-callout bs-callout-danger" id="jquery-required">
-      <h4>jQuery required</h4>
-      <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>. <a href="{{ site.repo }}/blob/v{{ site.current_version }}/bower.json">Consult our <code>bower.json</code></a> to see which versions of jQuery are supported.</p>
-    </div>
+
+    <h2 id="whats-included-source">Bootstrap source code</h2>
+    <p>The Bootstrap source code download includes the precompiled CSS, JavaScript, and font assets, along with source LESS, JavaScript, and documentation. More specifically, it includes the following and more:</p>
+{% highlight bash %}
+bootstrap/
+├── less/
+├── js/
+├── fonts/
+├── dist/
+│   ├── css/
+│   ├── js/
+│   └── fonts/
+├── docs-assets/
+├── examples/
+└── *.html
+{% endhighlight %}
   </div>
+  <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. <code>docs-assets/</code>, <code>examples/</code>, and all <code>*.html</code> files are for our documentation. Beyond that, any other included file provides support for packages, license information, and development.</p>
 
 
   <!-- Template
@@ -379,7 +398,7 @@ bootstrap/
           </tr>
           <tr>
             <td><code>.visible-desktop</code></td>
-            <td><code>.visible-md</code></td>
+            <td>Split into <code>.visible-md .visible-lg</code></td>
           </tr>
           <tr>
             <td><code>.hidden-phone</code></td>
@@ -391,7 +410,7 @@ bootstrap/
           </tr>
           <tr>
             <td><code>.hidden-desktop</code></td>
-            <td><code>.hidden-md</code></td>
+            <td>Split into <code>.hidden-md .hidden-lg</code></td>
           </tr>
           <tr>
             <td><code>.input-small</code></td>
@@ -406,6 +425,10 @@ bootstrap/
             <td><code>.form-group</code></td>
           </tr>
           <tr>
+            <td><code>.control-group.warning .control-group.error .control-group.success</code></td>
+            <td><code>.form-group.has-*</code></td>
+          </tr>
+          <tr>
             <td><code>.checkbox.inline</code> <code>.radio.inline</code></td>
             <td><code>.checkbox-inline</code> <code>.radio-inline</code></td>
           </tr>
@@ -612,6 +635,11 @@ bootstrap/
             <td class="text-muted">N/A</td>
           </tr>
           <tr>
+            <td>Form group with info</td>
+            <td><code>.control-group.info</code></td>
+            <td class="text-muted">N/A</td>
+          </tr>
+          <tr>
             <td>Fluid container</td>
             <td><code>.container-fluid</code></td>
             <td><code>.container</code> (no more fixed grid)</td>
@@ -674,7 +702,7 @@ bootstrap/
       <li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li>
       <li>Modal markup has changed significantly. The <code>.modal-header</code>, <code>.modal-body</code>, and <code>.modal-footer</code> sections are now wrapped in <code>.modal-content</code> and <code>.modal-dialog</code> for better mobile styling and behavior.</li>
       <li>The HTML loaded by the <code>remote</code> modal option is now injected into the <code>.modal</code> instead of into the <code>.modal-body</code>. This allows you to also easily vary the header and footer of the modal, not just the modal body.</li>
-      <li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc..</li>
+      <li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc.</li>
     </ul>
     <p>For more information on upgrading to v3.0, and code snippets from the community, see <a href="http://bootply.com/">Bootply</a>.</p>
   </div>