From ec83b06d55e6685e70426758ea3f048c91199352 Mon Sep 17 00:00:00 2001
From: Caleb Land <caleb@land.fm>
Date: Wed, 26 Aug 2015 23:47:50 -0400
Subject: Update static form control example

Use the `row` class on the `form-group`, and change the `control-label` class to `form-control-label`
---
 docs/components/forms.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/components/forms.md')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index f45f207ca..1ebd3ade1 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -397,14 +397,14 @@ When you need to place plain text next to a form label within a form, use the `.
 
 {% example html %}
 <form class="form-horizontal">
-  <div class="form-group">
-    <label class="col-sm-2 control-label">Email</label>
+  <div class="form-group row">
+    <label class="col-sm-2 form-control-label">Email</label>
     <div class="col-sm-10">
       <p class="form-control-static">email@example.com</p>
     </div>
   </div>
-  <div class="form-group">
-    <label for="inputPassword" class="col-sm-2 control-label">Password</label>
+  <div class="form-group row">
+    <label for="inputPassword" class="col-sm-2 form-control-label">Password</label>
     <div class="col-sm-10">
       <input type="password" class="form-control" id="inputPassword" placeholder="Password">
     </div>
-- 
cgit v1.2.3


From 83283442125170dd55a875254245bd63255844b9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 26 Aug 2015 22:11:44 +0300
Subject: Use `https` when possible.

[ci skip]
---
 docs/components/forms.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components/forms.md')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index f45f207ca..2bf223b4d 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -603,7 +603,7 @@ We hide the default `<input>` with `opacity` and use the `.c-indicator` to build
 
 With the sibling selector (`~`), we use the `:checked` state to trigger a makeshift checked state on the custom control.
 
-In the checked states, we use **base64 embedded SVG icons** from [Open Iconic](http://useiconic.com/open). This provides us the best control for styling and positioning across browsers and devices.
+In the checked states, we use **base64 embedded SVG icons** from [Open Iconic](https://useiconic.com/open). This provides us the best control for styling and positioning across browsers and devices.
 
 #### Checkboxes
 
-- 
cgit v1.2.3


From b424626e97eea74166e9dd8ebc2be1573a0c3c94 Mon Sep 17 00:00:00 2001
From: Andrew Smith <andrew@intellihr.com.au>
Date: Tue, 25 Aug 2015 17:12:18 +1000
Subject: Update all usages of 'control-label' with 'form-control-label' in
 docs

---
 docs/components/forms.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/components/forms.md')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 94588c79f..7f5d1496c 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -535,7 +535,7 @@ Block help text—for below inputs or for longer lines of help text—can be eas
 
 ## Validation
 
-Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
+Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
 
 {% comment %}
 {% callout warning %}
@@ -549,15 +549,15 @@ Ensure that an alternative indication of state is also provided. For instance, y
 
 {% example html %}
 <div class="form-group has-success">
-  <label class="control-label" for="inputSuccess1">Input with success</label>
+  <label class="form-control-label" for="inputSuccess1">Input with success</label>
   <input type="text" class="form-control form-control-success" id="inputSuccess1">
 </div>
 <div class="form-group has-warning">
-  <label class="control-label" for="inputWarning1">Input with warning</label>
+  <label class="form-control-label" for="inputWarning1">Input with warning</label>
   <input type="text" class="form-control form-control-warning" id="inputWarning1">
 </div>
 <div class="form-group has-error">
-  <label class="control-label" for="inputError1">Input with error</label>
+  <label class="form-control-label" for="inputError1">Input with error</label>
   <input type="text" class="form-control form-control-error" id="inputError1">
 </div>
 
-- 
cgit v1.2.3


From 88d004f6e11a6dc6c94b40e1eee7f9ef54c42077 Mon Sep 17 00:00:00 2001
From: vsn4ik <vsn4ik@gmail.com>
Date: Thu, 3 Sep 2015 07:48:15 +0300
Subject: Remove dropped form-horizontal from forms.md

---
 docs/components/forms.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components/forms.md')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 7f5d1496c..7ebefae30 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -396,7 +396,7 @@ Should you have no text within the `<label>`, the input is positioned as you'd e
 When you need to place plain text next to a form label within a form, use the `.form-control-static` class on a `<p>`.
 
 {% example html %}
-<form class="form-horizontal">
+<form>
   <div class="form-group row">
     <label class="col-sm-2 form-control-label">Email</label>
     <div class="col-sm-10">
-- 
cgit v1.2.3


From 8e29c43c467c25cbb30ca9be0223c08571d54f65 Mon Sep 17 00:00:00 2001
From: Zearin <tgoodchild@gmail.com>
Date: Mon, 7 Sep 2015 10:07:35 -0400
Subject: =?UTF-8?q?Fix=20usage=20of=20=E2=80=9Cits=E2=80=9D=20and=20?=
 =?UTF-8?q?=E2=80=9Cit=E2=80=99s=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/components/forms.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components/forms.md')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 7ebefae30..4c46c9999 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -169,7 +169,7 @@ Since Bootstrap applies `display: block` and `width: 100%` to almost all our for
 
 ### Form groups
 
-The `.form-group` class is the easiest way to add some structure to forms. It's only purpose is to provide `margin-bottom` around a label and control pairing. As a bonus, since it's a class you can use it with `<fieldset>`s, `<div>`s, or nearly any other element.
+The `.form-group` class is the easiest way to add some structure to forms. Its only purpose is to provide `margin-bottom` around a label and control pairing. As a bonus, since it's a class you can use it with `<fieldset>`s, `<div>`s, or nearly any other element.
 
 {% example html %}
 <form>
-- 
cgit v1.2.3


From 99aadb92f8b7b7b6c8734931da9fbc33aafbb3d8 Mon Sep 17 00:00:00 2001
From: Rolandas Barysas <hello@rbrs.io>
Date: Thu, 10 Sep 2015 10:46:26 +0300
Subject: v4 - fixed incorrect inline form class in docs

---
 docs/components/forms.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components/forms.md')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 4c46c9999..90f3e38dc 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -186,7 +186,7 @@ The `.form-group` class is the easiest way to add some structure to forms. Its o
 
 ### Inline forms
 
-Use the `.inline-form` class to to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently:
+Use the `.form-inline` class to to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently:
 
 - Controls are `display: inline-block` to provide alignment control via `vertical-align` and `margin`.
 - Controls receive `width: auto` to override the Bootstrap default `width: 100%`.
-- 
cgit v1.2.3