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/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/. diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4647e747bf..faef1d7ea0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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