From 11319f6da9f9a19ec40743cdfe868ac732698149 Mon Sep 17 00:00:00 2001 From: TannerNMO Date: Wed, 1 Feb 2012 14:14:49 -0700 Subject: [PATCH 1/4] Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7dc9038a8c..b0f35480da 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ To get started -- checkout http://twitter.github.com/bootstrap! 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. +For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the follow format: @@ -17,8 +17,8 @@ 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 bumps the minor +* Breaking backward compatibility bumps the major +* New additions without breaking backward compatibility bumps the minor * Bug fixes and misc changes bump the patch For more information on SemVer, please visit http://semver.org/. From 6738042c61f72ade97107f47f48b3c9f1b276de4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 1 Feb 2012 22:21:29 -0800 Subject: [PATCH 2/4] rebuild with correct zip --- docs/assets/bootstrap.zip | Bin 56824 -> 52355 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index a1ef66887a2519eefd21b7c204095108882073fa..1c0f62fb848987b8ac9e93852b3de83b1f189502 100644 GIT binary patch delta 1219 zcmeydo4I)=Gf#jwGYc032&~>Tkw;NEQCrJD35ZK8xEUB(zA`c}u!sO9QIrL!Dua~Z zPzF-Y0W@v$ljFAhXzDf_oH)qA1eE)H!4X5w`Jw|m7cGz05KlGH{m>9j24*~7g1hy9zB9UIn*$391VFYOZm`9W z<8Lei%Qa6_Au23RO*FvpFXyC33Lx{}ZZg4;GuXUJgolwyjv3~o$^AE^%-%YJA}T3A zzofXND6s(OJywYKFk%Zu>-`&2p>G{sP_!l&7elmTjYW`lSlBo^e7s}Uu%3f~L0^-B zL5)EIf-Uv&CJsSx&!PB zg4!J&-J`XetOaQ^_7FIUv$4s#hKx%OyaFAEeB=m$q&a+%0t?m2inl?b@jHL=#@i~sy5$*} zC8>G^dFlA06sFtJp=F8U=>!2_BnTqn1Qahz8uw4$a9d9iXIQ}9|NpjB*jvZ?iOBBH zB0f>*DxWpJpa6`GoeT_;C?R=la{e7f+yMyl!{m*3Kq2sQ)8v9Xk|vjLp(cb9BWax&tRUIutPclrv)o z8YaiUpf))`PZVnE3I0VQ{zMapBFD&4mWG`?AdlKYPm@6U+3Iv#d0dTs( z7DG5&4+jIWzaFyt&YuM**62FDo(12C>;*rF@h z_~al5NcVD1M|3G*_&KoiFfz$8!-8V+yW>&{KOBLvz>t)mUs7CBlvto28o~+;dW453 z2b>lGnP_)H%Ib%s3yRw0;$nz;tf>WL6+9^OPD(Lun7sCcjFuiy7rG^gl!(v-wDbH) zDV7b5iiVRnoRFOS-;v7+=rjUWVI(dF36TF7fHp8}Xyl5A8pY~|oY+7G0~sr=hh`=y8A6i{I23`Y1{jLWKO9$24m>61fE38stW2Kl=wMWJ_;{QE(CLB< z3_4INLB840_&J|p@|_0d$<_rtDyR{L-K@#KPD!zDXx!ca(x%CWss-e_`V^pjAhThB z7jB;b!w<*uiO7j0i@10P8L6v$*7$+~1B3ET1_nu#P}_%M6JZ2$`Jskl#Es*?h}2aiXvXA!CqOCl`30bI)ya1_IdyQQ UOjb5fc=7>ZA}a$!;|&lG07^}KDF6Tf From e1deb4e767e927bb70633cdd577de3fda3919f0a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 1 Feb 2012 22:27:46 -0800 Subject: [PATCH 3/4] fix makefile to reset zips --- Makefile | 2 ++ docs/assets/bootstrap.zip | Bin 52355 -> 52355 bytes docs/base-css.html | 15 +++++++++++++++ docs/components.html | 15 +++++++++++++++ docs/download.html | 15 +++++++++++++++ docs/examples.html | 15 +++++++++++++++ docs/index.html | 15 +++++++++++++++ docs/javascript.html | 15 +++++++++++++++ docs/less.html | 15 +++++++++++++++ docs/scaffolding.html | 15 +++++++++++++++ docs/upgrading.html | 15 +++++++++++++++ 11 files changed, 137 insertions(+) diff --git a/Makefile b/Makefile index 617fcd34a6..923c0ced34 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ WATCHR ?= `which watchr` # docs: bootstrap + rm docs/assets/bootstrap.zip zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @@ -42,6 +43,7 @@ bootstrap: # gh-pages: docs + rm -f ../bootstrap-gh-pages/assets/bootstrap.zip node docs/build production cp -r docs/* ../bootstrap-gh-pages diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1c0f62fb848987b8ac9e93852b3de83b1f189502..5b15c4d272632a342ed929907786e12c2e777334 100644 GIT binary patch delta 442 zcmZpk$=p1XnJ2)TnT3l11Tr^IUs-xw942VlBxEUB(zA`c}u!sO9QIrL!vO$zh ztd?d1YMWsT<{#DBc>5FwP+;>wdWK_i$@rC_uHNa&iQ8B9pXX|*oM zqyU-8xAQr{qQ`U~rcY)saE2)hD5w+w={(&4vvD(DV>MW)d!h=ewo4NYpaPpYCcRbw zY5Tg#gbn1kqdJ@QH}4ez3B5b6&vaC0@`jV*ljBaafkf<17(+y4LA*&PypeeSPWU77 z@=iJ+@y?%gf$)$_l9?QEN*qZ|$EiRh-mgudX#FIGV#B@w&a?BZZ E060OcD*ylh delta 442 zcmZpk$=p1XnJ2)TnT3l11XgdF$fKy7sIBFn1jMBk+zgB?Ul|z~SVVx5D9Qp<*+5E? zv?o?eGXb^Du!ZtB-af?v6qvl6(-A7N`5k8aLhp|2GbL(I-f&WUa@=V)kciz0W2PjKh%AUV>4Y~D@81c3 zBwpT02Z&y<%JU~(AaY11$xIG7C61(~<5VCL@7F1BG`rJI8zGs$^RyijPvVRdh!=B4 F9RO;8q#ghO diff --git a/docs/base-css.html b/docs/base-css.html index a198064f81..5176c3ecf0 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1577,6 +1577,21 @@ For example, <code>section</code> should be wrapped as inline. + + diff --git a/docs/components.html b/docs/components.html index c40d55613f..a71788eca3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1512,6 +1512,21 @@ + + diff --git a/docs/download.html b/docs/download.html index 1765b8a7d1..4e41341f45 100644 --- a/docs/download.html +++ b/docs/download.html @@ -357,6 +357,21 @@ + + diff --git a/docs/examples.html b/docs/examples.html index 42faf93c0a..92528767af 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -140,6 +140,21 @@ + + diff --git a/docs/index.html b/docs/index.html index dcf39a7929..0189733415 100644 --- a/docs/index.html +++ b/docs/index.html @@ -244,6 +244,21 @@ + + diff --git a/docs/javascript.html b/docs/javascript.html index 92e327d19f..db69483924 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1460,6 +1460,21 @@ $('.myCarousel').carousel({ + + diff --git a/docs/less.html b/docs/less.html index bb033cfa38..739ebf2cd5 100644 --- a/docs/less.html +++ b/docs/less.html @@ -790,6 +790,21 @@ + + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 4ed4a36c86..cc89b5932f 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -433,6 +433,21 @@ + + diff --git a/docs/upgrading.html b/docs/upgrading.html index 4d8328b7c2..098bcbdc9a 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -292,6 +292,21 @@ + + From e26da36b9afa513c605731b2111d44b9c05a65c9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 1 Feb 2012 22:30:51 -0800 Subject: [PATCH 4/4] remove 2.0-wip ref --- docs/assets/js/application.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index b29b63aeef..732bed4586 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -135,8 +135,7 @@ , url: 'http://bootstrap.herokuapp.com' , dataType: 'jsonpi' , params: { - branch: '2.0-wip' - , js: js + js: js , css: css , vars: vars , img: img