Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

4 files changed, 8 insertions, 9 deletions

diff --git a/docs/_plugins/callout.rb b/docs/_plugins/callout.rb
index 29ecbc99d..536ca588e 100644
--- a/docs/_plugins/callout.rb
+++ b/docs/_plugins/callout.rb
@@ -6,12 +6,11 @@ module Jekyll
 
       def initialize(tag_name, type, tokens)
         super
-        @type = type
-        if type == "danger"
-          @type = "danger"
-        elsif type == "warning"
-          @type = "warning"
-        elsif type == "info"
+        type.strip!
+        if %w(info danger warning).include?(type)
+          @type = type
+        else
+          puts "#{type} callout not supported. Defaulting to info"
           @type = "info"
         end
       end
diff --git a/docs/components/card.md b/docs/components/card.md
index 715c5eb3e..2dfc68c84 100644
--- a/docs/components/card.md
+++ b/docs/components/card.md
@@ -21,7 +21,7 @@ Cards require very little markup, but do require some additional classes to give
 
 ### Sizing
 
-Cards are block-leve by default, so they'll fill the available horizontal space. Constrain their widths via custom styles, our predefined grid classes, or our grid mixins.
+Cards are block-level by default, so they'll fill the available horizontal space. Constrain their widths via custom styles, our predefined grid classes, or our grid mixins.
 
 {% example html %}
 <div class="card" style="width: 20rem;">
diff --git a/docs/components/forms.md b/docs/components/forms.md
index 827912cb5..bf72dbd3c 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -185,7 +185,7 @@ Use the `.inline-form` class to to display a series of labels, form controls, an
 - Controls receive `width: auto` to override the Bootstrap default `width: 100%`.
 - Controls **only appear inline in viewports that are at least 768px wide** to account for narrow viewports on mobile devices.
 
-Because of this, you may need to manually adddres the width and alignment of individual form controls. Lastly, as shown below, you should always include a `<label>` with each form control.
+Because of this, you may need to manually address the width and alignment of individual form controls. Lastly, as shown below, you should always include a `<label>` with each form control.
 
 #### Visible labels
 
diff --git a/docs/components/reboot.md b/docs/components/reboot.md
index d41e4e303..baed24d1e 100644
--- a/docs/components/reboot.md
+++ b/docs/components/reboot.md
@@ -118,7 +118,7 @@ Tables are slightly adjusted to style `<caption>`s and ensure consistent `text-a
 <div class="bd-example">
   <table>
     <caption>
-      This is an example table, and this is it's caption to describe the contents.
+      This is an example table, and this is its caption to describe the contents.
     </caption>
     <thead>
       <tr>