Merge branch 'master' into boulox-responsive-embed

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

1 files changed, 19 insertions, 21 deletions

diff --git a/docs/customize.html b/docs/customize.html
index 3f6987c4b..f7ca32ab3 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -2,17 +2,16 @@
 layout: default
 title: Customize and download
 slug: customize
-lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to get your very own version.
+lead: Customize Bootstrap's components, Less variables, and jQuery plugins to get your very own version.
 ---
 
 <!-- Customizer form -->
 <form class="bs-customizer" role="form">
   <div class="bs-docs-section" id="less-section">
-    <div class="page-header">
-      <button class="btn btn-default toggle" type="button">Toggle all</button>
-      <h1 id="less">LESS files</h1>
-    </div>
-    <p class="lead">Choose which LESS files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the <a href="../css/">CSS</a> and <a href="../components/">Components</a> pages in the docs.</p>
+    <button class="btn btn-default toggle" type="button">Toggle all</button>
+    <h1 id="less" class="page-header">Less files</h1>
+
+    <p class="lead">Choose which Less files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the <a href="../css/">CSS</a> and <a href="../components/">Components</a> pages in the docs.</p>
 
     <div class="row">
       <div class="col-xs-6 col-sm-4">
@@ -71,13 +70,13 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
         </div>
         <div class="checkbox">
           <label>
-            <input type="checkbox" checked value="button-groups.less" data-dependency="buttons.less">
+            <input type="checkbox" checked value="button-groups.less" data-dependencies="buttons.less">
             Button groups
           </label>
         </div>
         <div class="checkbox">
           <label>
-            <input type="checkbox" checked value="input-groups.less" data-dependency="forms.less">
+            <input type="checkbox" checked value="input-groups.less" data-dependencies="forms.less">
             Input groups
           </label>
         </div>
@@ -238,10 +237,9 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
 
   <div class="bs-docs-section" id="plugin-section">
-    <div class="page-header">
-      <button class="btn btn-default toggle" type="button">Toggle all</button>
-      <h1 id="plugins">jQuery plugins</h1>
-    </div>
+    <button class="btn btn-default toggle" type="button">Toggle all</button>
+    <h1 id="plugins" class="page-header">jQuery plugins</h1>
+
     <p class="lead">Choose which jQuery plugins should be included in your custom JavaScript files. Unsure what to include? Read the <a href="../javascript/">JavaScript</a> page in the docs.</p>
     <div class="row">
       <div class="col-lg-6">
@@ -284,7 +282,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
         </div>
         <div class="checkbox">
           <label>
-            <input type="checkbox" checked value="popover.js" data-dependency="tooltip.js">
+            <input type="checkbox" checked value="popover.js" data-dependencies="tooltip.js">
             Popovers <small>(requires Tooltips)</small>
           </label>
         </div>
@@ -338,18 +336,18 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
 
 
   <div class="bs-docs-section" id="less-variables-section">
-    <div class="page-header">
-      <button class="btn btn-default toggle" type="button">Reset to defaults</button>
-      <h1 id="less-variables">LESS variables</h1>
-    </div>
-    <p class="lead">Customize LESS variables to define colors, sizes and more inside your custom CSS stylesheets.</p>
+    <button class="btn btn-default toggle" type="button">Reset to defaults</button>
+    <h1 id="less-variables" class="page-header">Less variables</h1>
+
+    <p class="lead">Customize Less variables to define colors, sizes and more inside your custom CSS stylesheets.</p>
     {% include customizer-variables.html %}
   </div>
 
+
+
   <div class="bs-docs-section">
-    <div class="page-header">
-      <h1 id="download">Download</h1>
-    </div>
+    <h1 id="download" class="page-header">Download</h1>
+
     <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p>
     <div class="bs-customize-download">
       <button type="submit" id="btn-compile" class="btn btn-block btn-lg btn-outline" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Compile and Download</button>