From df8b65445c332c6fa68858a8f839c24f8b4413ad Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 26 Aug 2011 19:31:50 -0700
Subject: [PATCH 1/4] small typo in offset generation

---
 bootstrap-1.1.1.css     | 4 ++--
 bootstrap-1.1.1.min.css | 2 +-
 lib/scaffolding.less    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css
index 9ece1008d4..9f422a2431 100644
--- a/bootstrap-1.1.1.css
+++ b/bootstrap-1.1.1.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Aug 26 15:21:30 PDT 2011
+ * Date: Fri Aug 26 19:31:44 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -373,7 +373,7 @@ table {
   margin-left: 500px;
 }
 .row .offset9 {
-  margin-left: 500px;
+  margin-left: 560px;
 }
 .row .offset10 {
   margin-left: 620px;
diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css
index 06bff3eb77..8d8a00b958 100644
--- a/bootstrap-1.1.1.min.css
+++ b/bootstrap-1.1.1.min.css
@@ -56,7 +56,7 @@ table{border-collapse:collapse;border-spacing:0;}
 .row .offset6{margin-left:380px;}
 .row .offset7{margin-left:440px;}
 .row .offset8{margin-left:500px;}
-.row .offset9{margin-left:500px;}
+.row .offset9{margin-left:560px;}
 .row .offset10{margin-left:620px;}
 .row .offset11{margin-left:680px;}
 .row .offset12{margin-left:740px;}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index d1b621c13e..ded9a1e5f1 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -60,7 +60,7 @@
   .offset6   { .offset(6); }
   .offset7   { .offset(7); }
   .offset8   { .offset(8); }
-  .offset9   { .offset(8); }
+  .offset9   { .offset(9); }
   .offset10  { .offset(10); }
   .offset11  { .offset(11); }
   .offset12  { .offset(12); }

From 315af8e18b6ade15c372420cb256053697553716 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 27 Aug 2011 00:49:48 -0700
Subject: [PATCH 2/4] Edited readme to include the versioning approach we'll be
 striving to use

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 8ac5f78ff5..8d0e693c97 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,24 @@ Or if you prefer, the standard css way:
 For more info, refer to the docs!
 
 
+Versioning
+----------
+
+For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
+
+Releases will be numbered with the follow format:
+
+`<major>.<minor>.<patch>`
+
+And constructed with the following guidelines:
+
+* Breaking backwards compatibility bumps the major
+* New additions without breaking backwards compatibility bumpbs the minor
+* Bug fixes and misc changes bump the patch
+
+For more information on SemVer, please visit http://semver.org/.
+
+
 Bug Tracker
 -----------
 

From a16dfb735aaa460c91e69f94679ca334e852225f Mon Sep 17 00:00:00 2001
From: David Haywood Smith <davehs@gmail.com>
Date: Tue, 30 Aug 2011 11:19:46 +0100
Subject: [PATCH 3/4] Fixed readme spelling mistake, closes #123

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8d0e693c97..c0199d4b14 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Releases will be numbered with the follow format:
 And constructed with the following guidelines:
 
 * Breaking backwards compatibility bumps the major
-* New additions without breaking backwards compatibility bumpbs the minor
+* New additions without breaking backwards compatibility bumps the minor
 * Bug fixes and misc changes bump the patch
 
 For more information on SemVer, please visit http://semver.org/.

From 55022228bcdfea8d87eefb0c21249e6a9e219263 Mon Sep 17 00:00:00 2001
From: David Haywood Smith <davehs@gmail.com>
Date: Tue, 30 Aug 2011 11:47:40 +0100
Subject: [PATCH 4/4] Fixed duplicate element ids

Also updated labels where required
---
 docs/index.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index bc0e216aba..b04e352920 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -651,9 +651,9 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput2">X-Large Input</label>
             <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
             </div>
           </div><!-- /clearfix -->
@@ -688,7 +688,7 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
-            <label for="xlInput">File Input</label>
+            <label for="fileInput">File Input</label>
             <div class="input">
               <input class="input-file" id="fileInput" name="fileInput" type="file" />
             </div>
@@ -791,9 +791,9 @@
         <fieldset>
           <legend>Example form legend</legend>
           <div class="clearfix">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput3">X-Large Input</label>
             <div class="input">
-              <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" />
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
@@ -812,9 +812,9 @@
         <fieldset>
           <legend>Example form legend</legend>
           <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput4">X-Large Input</label>
             <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
             </div>
           </div><!-- /clearfix -->