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

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css

1 files changed, 12 insertions, 12 deletions

diff --git a/docs/components/forms.md b/docs/components/forms.md
index eeec71355..b2e2263b6 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -23,7 +23,7 @@ Remember, since Bootstrap utilizies the HTML5 doctype, **all inputs must have a
   </fieldset>
   <fieldset class="form-group">
     <label for="exampleSelect1">Example select</label>
-    <select class="form-control">
+    <select class="form-control" id="exampleSelect1">
       <option>1</option>
       <option>2</option>
       <option>3</option>
@@ -33,7 +33,7 @@ Remember, since Bootstrap utilizies the HTML5 doctype, **all inputs must have a
   </fieldset>
   <fieldset class="form-group">
     <label for="exampleSelect2">Example multiple select</label>
-    <select multiple class="form-control">
+    <select multiple class="form-control" id="exampleSelect2">
       <option>1</option>
       <option>2</option>
       <option>3</option>
@@ -167,11 +167,11 @@ The `.form-group` class is the easiest way to add some structure to forms. It's
 {% example html %}
 <form>
   <fieldset class="form-group">
-    <label for="formGroupExampleLabel">Example label</label>
+    <label for="formGroupExampleInput">Example label</label>
     <input type="text" class="form-control" id="formGroupExampleInput" placeholder="Example input">
   </fieldset>
   <fieldset class="form-group">
-    <label for="formGroupExampleLabel2">Another label</label>
+    <label for="formGroupExampleInput2">Another label</label>
     <input type="text" class="form-control" id="formGroupExampleInput2" placeholder="Another input">
   </fieldset>
 </form>
@@ -257,30 +257,30 @@ For more structured form layouts, you can utilize Bootstrap's predefined grid cl
     </div>
   </div>
   <div class="form-group row">
-    <label class="col-sm-2" for="">Radios</label>
+    <label class="col-sm-2">Radios</label>
     <div class="col-sm-10">
       <div class="radio">
         <label>
-          <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
+          <input type="radio" name="gridRadios" id="gridRadios1" value="option1" checked>
           Option one is this and that&mdash;be sure to include why it's great
         </label>
       </div>
       <div class="radio">
         <label>
-          <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+          <input type="radio" name="gridRadios" id="gridRadios2" value="option2">
           Option two can be something else and selecting it will deselect option one
         </label>
       </div>
       <div class="radio disabled">
         <label>
-          <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
+          <input type="radio" name="gridRadios" id="gridRadios3" value="option3" disabled>
           Option three is disabled
         </label>
       </div>
     </div>
   </div>
   <div class="form-group row">
-    <label class="col-sm-2" for="">Checkbox</label>
+    <label class="col-sm-2">Checkbox</label>
     <div class="col-sm-10">
       <div class="checkbox">
         <label>
@@ -321,19 +321,19 @@ A checkbox or radio with the `disabled` attribute will be styled appropriately.
 
 <div class="radio">
   <label>
-    <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
+    <input type="radio" name="exampleRadios" id="exampleRadios1" value="option1" checked>
     Option one is this and that&mdash;be sure to include why it's great
   </label>
 </div>
 <div class="radio">
   <label>
-    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+    <input type="radio" name="exampleRadios" id="exampleRadios2" value="option2">
     Option two can be something else and selecting it will deselect option one
   </label>
 </div>
 <div class="radio disabled">
   <label>
-    <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
+    <input type="radio" name="exampleRadios" id="exampleRadios3" value="option3" disabled>
     Option three is disabled
   </label>
 </div>