updating main font, css, less, & license info

docto · Jan 2, 2013 · f985867 · f985867
1 parent 6883e41
commit f985867
Show file tree

Hide file tree

Showing 23 changed files with 1,147 additions and 1,016 deletions.
diff --git a/FontAwesome.ttf b/FontAwesome.ttf
diff --git a/README.md b/README.md
@@ -1,18 +1,17 @@
-#Font Awesome 2.0
+#Font Awesome 3.0
 ##the iconic font designed for use with Twitter Bootstrap
 
 The full suite of pictographic icons, examples, and documentation can be found at:
 http://fortawesome.github.com/Font-Awesome/
 
+
+##License
+- The Font Awesome font is licensed under the SIL Open Font License - 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"
+
 ##Contact
 - Email: dave@davegandy.com
 - Twitter: http://twitter.com/fortaweso_me
 - Work: Lead Product Designer @ http://kyru.us
-
-##License
-Version 2.0 of the Font Awesome font, CSS, and LESS files are licensed under CC BY 3.0:
-http://creativecommons.org/licenses/by/3.0/
-A mention of 'Font Awesome - http://fortawesome.github.com/Font-Awesome'
-in human-readable source code is considered acceptable attribution (most common on the
-web). If human readable source code is not available to the end user, a mention in an 'About' 
-or 'Credits' screen is considered acceptable (most common in desktop or mobile software).