Merge branch 'master' into v4

Conflicts:
	docs/_includes/js/collapse.html

docs/javascript/collapse.md

@@ -87,23 +87,12 @@ Extend the default collapse behavior to create an accordion with the panel compo
 </div>
 {% endexample %}
 
-You can also use the plugin without the accordion markup. Make a button toggle the expanding and collapsing of another element.
-
 <div class="bs-callout bs-callout-warning">
   <h4>Make expand/collapse controls accessible</h4>
   <p>Be sure to add <code>aria-expanded</code> to the control element. This attribute explicitly defines the current state of the collapsible element to screen readers and similar assistive technologies. If the collapsible element is closed by default, it should have a value of <code>aria-expanded="false"</code>. If you've set the collapsible element to be open by default using the <code>in</code> class, set <code>aria-expanded="true"</code> on the control instead. The plugin will automatically toggle this attribute based on whether or not the collapsible element has been opened or closed.</p>
   <p>Additionally, if your control element is targetting a single collapsible element – i.e. the <code>data-target</code> attribute is pointing to an <code>id</code> selector – you may add an additional <code>aria-controls</code> attribute to the control element, containing the <code>id</code> of the collapsible element. Modern screen readers and similar assistive technologies make use of this attribute to provide users with additional shortcuts to navigate directly to the collapsible element itself.</p>
 </div>
 
-{% highlight html %}
-<button type="button" class="btn btn-danger" data-toggle="collapse" data-target="#demo">
-  simple collapsible
-</button>
-
-<div id="demo" class="collapse in">...</div>
-{% endhighlight %}
-
-
 ## Usage
 
 The collapse plugin utilizes a few classes to handle the heavy lifting: