From 31abeec0f2d84b3861d0c80c56c3112546bf0bfd Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 00:05:01 -0800
Subject: [PATCH] manually handle #1703 for note on horizontal forms

---
 docs/assets/bootstrap.zip               | Bin 52391 -> 52391 bytes
 docs/templates/pages/upgrading.mustache |   1 +
 docs/upgrading.html                     |   1 +
 3 files changed, 2 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 99ff15c06cf4cd7b17c0e6cc6140f53ae3ce9ba0..d43ca5f9aa55438afa4fb6d1c51926162661323a 100644
GIT binary patch
delta 469
zcmZ2JlX>|}X5IjAW)?065SYZ^I+0gFMZ`kSUlfQ-E4UdLS-vweFtCUKWfAHo1Jwnp
zuz}QwT1@6EkY)yn%(Q`uY`lGn10*te1*Zd4X!ASHKz3%J`IDUl4cQ<TY_1f{F#wCb
za5RO9DLd`c1&K`zl%D)QpA#w!wgaSFr@#p;Bx13-q@Yp&touWQ4NT0av04CZ^M;Aa
zXwIAbeWE_hF*=i8D}a?rZ8nC91#jLf0ya+ggdUTK#pM5|#3u)wVgoCSJS9E3?u0lK
z(6j$f$%2KppYTHFDxdU&aY4?Ue9|6bhAh~~FDIRmjRdKPJY|HeV(qB_WUl;aFJuj%
au<Sl<2(tmiy?5FcnQME-5yWjcqYePll#(O>

delta 469
zcmZ2JlX>|}X5IjAW)?065K!3fGLct7#oJ8J-xr8WE4UdLS-vweFtCUKWl_}ys<8Qh
z)lKFrkY)zyoM{6U*?9XD2S{Y{3Qh;8(B^lXf$U&0CqY9tkOe+wn=1u#48US998F>B
zl%4kJf=vsQp8P+b6RgzN3}(k<odPGA?vjE^0kG~54K^?_qsD58*oKM9XwIAbeWE_h
z5}iq}6_^!)4wTw#%m(tQui56{&3i?_#tEO$WAZke{Qs2r<bYFbV4=uU(v#~>h%@<s
zgk`}(+fR5QbCpl}A#*36w1=1hQT*kkGej2INF!twYfl9rbLCHap}V2`v>~z$_fFfw
RxFC<%o^fOX22;ZsbpXvNpuGS9

diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index d92cc04dd3..56b0d4bf78 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -82,6 +82,7 @@
     <li>{{_i}}Default form style is now vertical (stacked) to use less CSS and add greater flexibility{{/i}}</li>
     <li>{{_i}}Form classes standardized with <code>.form-</code> required as a prefix{{/i}}</li>
     <li>{{_i}}New built-in form defaults for search, inline, and horizontal forms{{/i}}</li>
+    <li>{{_i}}For horizontal forms, previous classes <code>.clearfix</code> and <code>.input</code> are equivalent to the new <code>.control-group</code> and <code>.controls</code>.{{/i}}</li>
     <li>{{_i}}More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code>{{/i}}</li>
     <li>{{_i}}Form states: colors updated and customizable via new LESS variables{{/i}}</li>
   </ul>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index ad3236f2b8..5a7b0d2f6f 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -158,6 +158,7 @@
     <li>Default form style is now vertical (stacked) to use less CSS and add greater flexibility</li>
     <li>Form classes standardized with <code>.form-</code> required as a prefix</li>
     <li>New built-in form defaults for search, inline, and horizontal forms</li>
+    <li>For horizontal forms, previous classes <code>.clearfix</code> and <code>.input</code> are equivalent to the new <code>.control-group</code> and <code>.controls</code>.</li>
     <li>More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code></li>
     <li>Form states: colors updated and customizable via new LESS variables</li>
   </ul>