From: Mark Otto <markdotto@gmail.com>
Date: Thu, 1 Jun 2017 04:29:23 +0000 (-0700)
Subject: Merge branch 'v4-dev' into form-tweaks
X-Git-Tag: v4.0.0-beta~147^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f13eb5194019b460eb01cdb251c81c76b2e7d5d0;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into form-tweaks
---

f13eb5194019b460eb01cdb251c81c76b2e7d5d0
diff --cc docs/4.0/components/forms.md
index 32b937172d,87f47a7baf..8fe2a9d263
--- a/docs/4.0/components/forms.md
+++ b/docs/4.0/components/forms.md
@@@ -1,24 -1,16 +1,18 @@@
  ---
  layout: docs
  title: Forms
- description: Examples and usage guidelines for form controls, form layouts, and custom forms.
+ description: Examples and usage guidelines for form control styles, layout options, and custom components for creating a wide variety of forms.
  group: components
+ toc: true
  ---
  
- Bootstrap provides several form control styles, layout options, and custom components for creating a wide variety of forms.
- 
- ## Contents
- 
- * Will be replaced with the ToC, excluding the "Contents" header
- {:toc}
- 
  ## Form controls
  
- Bootstrap's form controls expand on [our Rebooted form styles]({{ site.baseurl }}/content/reboot/#forms) with classes. Use these classes to opt into their customized displays for a more consistent rendering across browsers and devices. The example form below demonstrates common HTML form elements that receive updated styles from Bootstrap with additional classes.
+ Bootstrap's form controls expand on [our Rebooted form styles]({{ site.baseurl }}/docs/{{ site.docs_version }}/content/reboot/#forms) with classes. Use these classes to opt into their customized displays for a more consistent rendering across browsers and devices. The example form below demonstrates common HTML form elements that receive updated styles from Bootstrap with additional classes.
  
 -Remember, since Bootstrap utilizes the HTML5 doctype, **all inputs must have a `type` attribute**.
 +Be sure to use an appropriate `type` attribute on all inputs (e.g., `email` for email address or `number` for numerical information).
 +
 +### Example
  
  {% example html %}
  <form>