Explorar el Código

Merge branch '4.0.1-wip' of github.com:FortAwesome/Font-Awesome into 4.0.1-wip

* '4.0.1-wip' of github.com:FortAwesome/Font-Awesome:
  Updated the icon count in the readme
  adding pointer to rtfm for syntax changes
  adding upgrade wiki page to documentation
Geremia Taglialatela hace 11 años
padre
commit
c0a24d9b58
Se han modificado 3 ficheros con 12 adiciones y 1 borrados
  1. 1 1
      README.md
  2. 10 0
      src/_includes/new-upgrading.html
  3. 1 0
      src/whats-new.html

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 #[Font Awesome v4.0.1](http://fontawesome.io)
 ###the iconic font designed for Bootstrap
 
-Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
+Font Awesome is a full suite of 370 pictographic icons for easy scalable vector graphics on websites, created and
 maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 
 Get started at http://fontawesome.io!

+ 10 - 0
src/_includes/new-upgrading.html

@@ -0,0 +1,10 @@
+<section id="new-upgrading">
+  <h2 class="page-header">Upgrading from 3.2.1?</h2>
+  <p>
+    For complete documentation of the syntax changes in {{ site.fontawesome.minor_version }}, check out the
+    <a href="{{ page.relative_path }}examples">examples</a>. For the changes to icon names,
+    <a href="https://twitter.com/gtagliala">@gtagliala</a> has put together a
+    <a href="{{ site.fontawesome.github.url }}/wiki/Upgrading-from-3.2.1-to-4">great wiki page</a> that
+    documents all the changes.
+  </p>
+</section>

+ 1 - 0
src/whats-new.html

@@ -13,5 +13,6 @@ relative_path: ../
 <div class="container">
   {% include new-features.html %}
   {% include new-naming.html %}
+  {% include new-upgrading.html %}
   {% include icons/new.html %}
 </div>