From 315af8e18b6ade15c372420cb256053697553716 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 27 Aug 2011 00:49:48 -0700 Subject: Edited readme to include the versioning approach we'll be striving to use --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 8ac5f78ff..8d0e693c9 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: + +`..` + +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 ----------- -- cgit v1.2.3 From f17fc367f724ef68e287c45c129558fb62fc6b8e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 Aug 2011 21:26:53 -0700 Subject: le merging conflicts --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 8ac5f78ff..8d0e693c9 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: + +`..` + +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 ----------- -- cgit v1.2.3 From a16dfb735aaa460c91e69f94679ca334e852225f Mon Sep 17 00:00:00 2001 From: David Haywood Smith Date: Tue, 30 Aug 2011 11:19:46 +0100 Subject: Fixed readme spelling mistake, closes #123 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 8d0e693c9..c0199d4b1 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/. -- cgit v1.2.3 From 4fb1c5bd4b527797183a60e752f0276b01637fd5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:34:19 -0700 Subject: rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index 8d0e693c9..76b6e4563 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here's what the LESS version looks like: Or if you prefer, the standard css way: - + For more info, refer to the docs! -- cgit v1.2.3