Merge branch 'master' into derp

Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less

1 files changed, 10 insertions, 10 deletions

diff --git a/docs/layout/media.md b/docs/layout/media.md
index 4ebe8d05f..431805c9e 100644
--- a/docs/layout/media.md
+++ b/docs/layout/media.md
@@ -11,7 +11,7 @@ The default media allow to float a media object (images, video, audio) to the le
 
 {% example html %}
 <div class="media">
-  <a class="pull-left" href="#">
+  <a class="media-left" href="#">
     <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
   </a>
   <div class="media-body">
@@ -21,20 +21,20 @@ The default media allow to float a media object (images, video, audio) to the le
 </div>
 {% endexample %}
 
-### Nested media
+### Nesting
 
 Media components can also be nested.
 
 {% example html %}
 <div class="media">
-  <a class="pull-left" href="#">
+  <a class="media-left" href="#">
     <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
   </a>
   <div class="media-body">
     <h4 class="media-heading">Media heading</h4>
     Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
     <div class="media">
-      <a class="pull-left" href="#">
+      <a class="media-left" href="#">
         <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
@@ -46,7 +46,7 @@ Media components can also be nested.
 </div>
 {% endexample %}
 
-### Media alignment
+### Alignment
 
 The images or other media can be aligned top, middle, or bottom. The default is top aligned.
 
@@ -96,7 +96,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
 {% example html %}
 <ul class="media-list">
   <li class="media">
-    <a class="pull-left" href="#">
+    <a class="media-left" href="#">
       <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
     </a>
     <div class="media-body">
@@ -104,7 +104,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
       <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
       <!-- Nested media object -->
       <div class="media">
-        <a class="pull-left" href="#">
+        <a class="media-left" href="#">
           <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
@@ -112,7 +112,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
           Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
           <!-- Nested media object -->
           <div class="media">
-            <a class="pull-left" href="#">
+            <a class="media-left" href="#">
               <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
@@ -124,7 +124,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
       </div>
       <!-- Nested media object -->
       <div class="media">
-        <a class="pull-left" href="#">
+        <a class="media-left" href="#">
           <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
@@ -135,7 +135,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
     </div>
   </li>
   <li class="media">
-    <a class="pull-right" href="#">
+    <a class="media-right" href="#">
       <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
     </a>
     <div class="media-body">