From a12c19b3c8e07516a38302feb4e8aa7c94600a4d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 23:05:16 -0700 Subject: [PATCH] updated package and readme --- README.md | 10 ++++++---- package.json | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 22bf33f71789..f6f1b54633a9 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) ================= -Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter. +Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter. -To get started, checkout http://twitter.github.com/bootstrap! +To get started, checkout http://getbootstrap.com! @@ -36,7 +36,7 @@ For more information on SemVer, please visit http://semver.org/. Bug tracker ----------- -Have a bug? Please create an issue here on GitHub! Also, when filing please make sure you're familiar with [necolas's guidelines](https://github.com/necolas/issue-guidelines). thanks! <3 +Have a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines). https://github.com/twitter/bootstrap/issues @@ -98,10 +98,12 @@ Runs jshint and qunit tests headlessly in [phatomjs] (http://code.google.com/p/p This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem. + Contributing ------------ -Please make all pull requests against wip-* branches. Also, if your unit test contains javascript patches or features - you must include relevant unit tests. Thanks! +Please submit all pull requests against *-wip branches. If your unit test contains javascript patches or features, you must include relevant unit tests. Thanks! + Authors diff --git a/package.json b/package.json index 2e69156ae1b3..1e85f927bd93 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap" - , "description": "HTML, CSS, and JS toolkit from Twitter." - , "version": "2.0.4" + , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." + , "version": "2.1.0" , "keywords": ["bootstrap", "css"] , "homepage": "http://twitter.github.com/bootstrap/" , "author": "Twitter Inc."