From 726093e63850053db69e730e5e6d1780c94c0069 Mon Sep 17 00:00:00 2001 From: davegandy Date: Wed, 8 May 2013 23:28:34 -0400 Subject: [PATCH] updating readme with versioning information, updating license in less files --- README.md | 30 ++++++++++++++----- .../font-awesome/css/font-awesome-ie7.css | 2 +- .../assets/font-awesome/css/font-awesome.css | 2 +- .../font-awesome/less/font-awesome-ie7.less | 2 +- .../font-awesome/less/font-awesome.less | 2 +- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b286c0da1..8f63ee345 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ #Font Awesome 3.1.0 -##the iconic font designed for use with Twitter Bootstrap +##the iconic font designed for Bootstrap -The full suite of pictographic icons, examples, and documentation can be found at: -http://fortawesome.github.com/Font-Awesome/ +The full suite of pictographic icons, examples, documentation, and full license details can be found at: +http://fontawesome.io ##License -- The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL +- The Font Awesome font is licensed under the SIL OFL 1.1 - http://scripts.sil.org/OFL - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - http://opensource.org/licenses/mit-license.html -- The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ -- Attribution is no longer required in Font Awesome 3.0, but much appreciated: "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" +- The Font Awesome documentation is licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ +- Attribution is no longer required as of Font Awesome 3.0, but much appreciated: "Font Awesome by Dave Gandy - http://fontawesome.io" ##Contact -- Email: dave@davegandy.com +- Email: dave@fontawesome.io - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyru.us @@ -20,4 +20,18 @@ http://fortawesome.github.com/Font-Awesome/ - v3.0.0 - all icons redesigned from scratch, optimized for Bootstrap's 14px default - v3.0.1 - much improved rendering in webkit, various bugfixes - v3.0.2 - much improved rendering and alignment in IE7 -- v3.1.0 - Added XX icons +- v3.1.0 - Added 47 icons, icon stacking styles, flipping and rotating icons + +##Versioning + +Font Awesome will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format: + +`..` + +And constructed with the following guidelines: + +* Breaking backward compatibility bumps the major (and resets the minor and patch) +* New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch) +* Bug fixes and misc changes bumps the patch + +For more information on SemVer, please visit [http://semver.org/](http://semver.org/). \ No newline at end of file diff --git a/build/assets/font-awesome/css/font-awesome-ie7.css b/build/assets/font-awesome/css/font-awesome-ie7.css index 2072c87b6..32f078782 100644 --- a/build/assets/font-awesome/css/font-awesome-ie7.css +++ b/build/assets/font-awesome/css/font-awesome-ie7.css @@ -18,7 +18,7 @@ * Contact * ------------------------------------------------------- - * Email: dave@davegandy.com + * Email: dave@fontawesome.io * Twitter: http://twitter.com/fortaweso_me * Work: Lead Product Designer @ http://kyruus.com */ diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css index a914ac156..33612009c 100644 --- a/build/assets/font-awesome/css/font-awesome.css +++ b/build/assets/font-awesome/css/font-awesome.css @@ -18,7 +18,7 @@ * Contact * ------------------------------------------------------- - * Email: dave@davegandy.com + * Email: dave@fontawesome.io * Twitter: http://twitter.com/fortaweso_me * Work: Lead Product Designer @ http://kyruus.com */ diff --git a/build/assets/font-awesome/less/font-awesome-ie7.less b/build/assets/font-awesome/less/font-awesome-ie7.less index 18d0b1725..4d899e746 100644 --- a/build/assets/font-awesome/less/font-awesome-ie7.less +++ b/build/assets/font-awesome/less/font-awesome-ie7.less @@ -18,7 +18,7 @@ * Contact * ------------------------------------------------------- - * Email: dave@davegandy.com + * Email: dave@fontawesome.io * Twitter: http://twitter.com/fortaweso_me * Work: Lead Product Designer @ http://kyruus.com */ diff --git a/build/assets/font-awesome/less/font-awesome.less b/build/assets/font-awesome/less/font-awesome.less index 04023c411..0a9518e51 100644 --- a/build/assets/font-awesome/less/font-awesome.less +++ b/build/assets/font-awesome/less/font-awesome.less @@ -18,7 +18,7 @@ * Contact * ------------------------------------------------------- - * Email: dave@davegandy.com + * Email: dave@fontawesome.io * Twitter: http://twitter.com/fortaweso_me * Work: Lead Product Designer @ http://kyruus.com */