5 files changed, 69 insertions, 43 deletions
diff --git a/library/font_awesome/src/_includes/accessibility/accessibility-facdn.html b/library/font_awesome/src/_includes/accessibility/accessibility-facdn.html
new file mode 100644
index 000000000..624e0fcec
--- /dev/null
+++ b/library/font_awesome/src/_includes/accessibility/accessibility-facdn.html
@@ -0,0 +1,21 @@
+<section id="accessibility-cdn" class="accessibility-cdn">
+  <div class="row">
+    <div class="col-md-8">
+      <h3>
+        <i class="gg-col fa fa-magic text-muted fa-lg padding-right" aria-hidden="true"></i>
+        Use Font Awesome CDN's auto accessibility
+      </h3>
+
+      <p><a href="{{ page.relative_path }}get-started/#get-started-cdn">Font Awesome CDN</a> helps you automate accessibility support more easily so your icons work for the most people possible. You only need turn on a setting, <a href="https://cdn.fontawesome.com/help#qa-autoa11y">use our simple syntax</a>, and any icons you use will have all of the best practices and manual techniques below <strong>applied automatically</strong>.</p>
+    </div>
+
+    <div class="col-md-4">
+      <a href="{{ page.relative_path }}get-started/#get-started-cdn" class="btn btn-success btn-block btn-lg margin-top-lg margin-bottom">Automate Your Icons' Accessibility</a>
+
+      <p class="text-sm text-center margin-bottom-none">
+        <a href="https://cdn.fontawesome.com/help#qa-autoa11y">Read more about our auto accessibility</a>
+      </p>
+    </div>
+  </div>
+
+</section>
diff --git a/library/font_awesome/src/_includes/accessibility/using-with-accessibility.html b/library/font_awesome/src/_includes/accessibility/accessibility-manual.html
index 86e6d609c..c886ba85b 100644
--- a/library/font_awesome/src/_includes/accessibility/using-with-accessibility.html
+++ b/library/font_awesome/src/_includes/accessibility/accessibility-manual.html
@@ -1,13 +1,14 @@
-<div id="using-with-accessibility">
-  <h2 class="page-header">Using Font Awesome with Acessibility in mind</h2>
-  <p>
-    When using icons in your UI, there are ways to help assistive technology either ignore or better understand Font Awesome.
-  </p>
+<section id="accessibility-manual" class="accessibility-manual">
 
-  <h3>Icons used for pure decoration or visual styling</h3>
-  <p>
-    If you're using an icon to add some extra decoration or branding, it does not need to be announced to users as they are navigating your site or app aurally. Additionally, if you're using an icon to visually re-emphasize or add styling to content already present in your HTML, it does not need to be repeated to an assistive technology-using user. You can make sure this is not read by adding the <code>aria-hidden="true"</code> to your Font Awesome markup.
-  </p>
+  <h3>
+    <i class="gg-col fa fa-wrench text-muted fa-lg padding-right" aria-hidden="true"></i>
+    Manually make your icons accessible
+  </h3>
+
+  <p>When using icons in your UI, there are manual techniques and ways to help assistive technology either ignore or better understand Font Awesome.</p>
+
+  <h4 class="margin-top-xl">Icons used for pure decoration or visual styling</h4>
+  <p>If you're using an icon to add some extra decoration or branding, it does not need to be announced to users as they are navigating your site or app aurally. Additionally, if you're using an icon to visually re-emphasize or add styling to content already present in your HTML, it does not need to be repeated to an assistive technology-using user. You can make sure this is not read by adding the <code>aria-hidden="true"</code> to your Font Awesome markup.</p>
 
   <div class="margin-top-lg margin-bottom-lg">
 {% highlight html %}
@@ -33,12 +34,12 @@
 <small class="text-muted">an icon being used in front of link text</small>
   </div>
 
-  <h3>Icons with semantic or interactive purpose</h3>
+  <h4 class="margin-top-xl">Icons with semantic or interactive purpose</h4>
   <p>
     If you're using an icon to convey meaning (rather than only as a decorative element), ensure that this meaning is also conveyed to assistive technologies. This goes for content you're abbreviating via icons as well as interactive controls (buttons, form elements, toggles, etc.). There are a few techniques to accomplish this:
   </p>
 
-  <h4>If an icon is <strong>not</strong> an interactive element</h4>
+  <h4 class="margin-top-xl text-muted">If an icon is <strong>not</strong> an interactive element</h4>
   <p>
     The simplest way to provide a text alternative is to use the <code>aria-hidden="true"</code> attribute on the icon and to include the text with an additional element, such as a <code>&lt;span&gt;</code>, with appropriate CSS to visually hide the element while keeping it accessible to assistive technologies. In addition, you can add a <code>title</code> attribute on the icon to provide a tooltip for sighted mouse users.
   </p>
@@ -76,14 +77,14 @@
     <small class="text-muted">an icon being used to denote time remaining</small>
   </div>
 
-  <h4>If an icon represents an interactive element</h4>
+  <h4 class="margin-top-xl text-muted">If an icon represents an interactive element</h4>
   <p>
-    In the case of focusable interactive elements, there are various options to include an alternative text or label to the element, without the need for any visually hidden <code>&lt;span&gt;</code> or similar. For instance, simply adding the <code>title</code> attribute to the interactive element itself will be sufficient to provide an accessible alternative name for the element, as well as providing the mouse tooltip.
+    In the case of focusable interactive elements, there are various options to include an alternative text or label to the element, without the need for any visually hidden <code>&lt;span&gt;</code> or similar. For instance, simply adding the <code>aria-label</code> attribute with a text description to the interactive element itself will be sufficient to provide an accessible alternative name for the element. If you need to provide a visual tooltip on mouseover/focus, we recommend additionally using the <code>title</code> attribute or a <a href="https://github.com/chinchang/hint.css">custom tooltip</a> solution.
   </p>
 
   <div class="margin-bottom-lg margin-top-lg">
 {% highlight html %}
-<a href="path/to/shopping/cart" title="View 3 items in your shopping cart">
+<a href="path/to/shopping/cart" aria-label="View 3 items in your shopping cart">
   <i class="fa fa-shopping-cart" aria-hidden="true"></i>
 </a>
 {% endhighlight %}
@@ -92,36 +93,29 @@
 
   <div class="margin-bottom-lg margin-top-lg">
 {% highlight html %}
-<a href="#navigation-main" title="Skip to main navigation">
+<a href="#navigation-main" aria-label="Skip to main navigation">
   <i class="fa fa-bars" aria-hidden="true"></i>
 </a>
 {% endhighlight %}
     <small class="text-muted">an icon being used as a link to a navigation menu</small>
+  </div>
 
+  <div class="margin-bottom-lg margin-top-lg">
 {% highlight html %}
-<a class="btn btn-danger" href="path/to/settings" title="Delete">
-  <i class="fa fa-trash-o" aria-hidden="true"></i>
+<a class="btn btn-danger" href="path/to/settings" aria-label="Delete">
+  <i class="fa fa-trash-o" aria-hidden="true" title="Delete this item?"></i>
 </a>
 {% endhighlight %}
-    <small class="text-muted">an icon being used as a delete button's symbol</small>
+    <small class="text-muted">an icon being used as a delete button's symbol with a <code>title</code> attribute to provide a native mouse tooltip</small>
+  </div>
+
 
+  <div class="alert alert-success">
+    <ul class="fa-ul margin-bottom-none">
+      <li>
+        <i class="fa-li fa fa-info-circle fa-lg" aria-hidden"true"></i>
+        <a href="{{ page.relative_path }}examples/#accessible">See more examples of how to add accessibility-minded icons</a> into your UI.
+      </li>
+    </ul>
   </div>
-</div>
-
-<div class="alert alert-success">
-  <ul class="fa-ul margin-bottom-none">
-    <li>
-      <i class="fa-li fa fa-info-circle fa-lg" aria-hidden="true"></i>
-      Bootstrap comes with a <a href="http://getbootstrap.com/css/#callout-has-feedback-icon-accessibility">utility class to visually hide content, but keep it semantically accessible</a>. If you're not using Bootstrap, there are <a href="https://css-tricks.com/places-its-tempting-to-use-display-none-but-dont/">plenty</a> of <a href="https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css#L124">recipes</a> to roll your own from.
-    </li>
-  </ul>
-</div>
-
-<div class="alert alert-success">
-  <ul class="fa-ul margin-bottom-none">
-    <li>
-      <i class="fa-li fa fa-info-circle fa-lg" aria-hidden"true"></i>
-      <a href="{{ page.relative_path }}examples/#accessible">See more examples of how to add accessibility-minded icons</a> into your UI.
-    </li>
-  </ul>
-</div>
+</section>
diff --git a/library/font_awesome/src/_includes/accessibility/background.html b/library/font_awesome/src/_includes/accessibility/background.html
index 5ca864826..da97e4762 100644
--- a/library/font_awesome/src/_includes/accessibility/background.html
+++ b/library/font_awesome/src/_includes/accessibility/background.html
@@ -1,7 +1,7 @@
-<div id="background">
-  <h2 class="page-header">Icon Fonts &amp; Accessibility</h2>
+<div id="accessibility-background">
+  <h4 class="margin-top-none">About Icon Fonts &amp; Accessibility</h4>
   <p>
-    Modern versions of assistive technology, like screen readers, will read CSS generated content (how Font Awesome icons are rendered), as well as specific Unicode characters. When trying our default markup for rendering icons, assisistive technology may have the following problems.
+    Modern versions of assistive technology, like screen readers, will read CSS generated content (how Font Awesome icons are rendered), as well as specific Unicode characters. When reading our default markup for rendering icons, assisistive technology may have the following problems.
   </p>
 
   <ul>
diff --git a/library/font_awesome/src/_includes/accessibility/cta-cdn-ally.html b/library/font_awesome/src/_includes/accessibility/cta-cdn-ally.html
new file mode 100644
index 000000000..61d4fe3a6
--- /dev/null
+++ b/library/font_awesome/src/_includes/accessibility/cta-cdn-ally.html
@@ -0,0 +1,11 @@
+<div class="well text-center">
+  <div class="text-center margin-bottom">
+    <i class="gg-col fa fa-magic fa-3x text-muted padding-right" aria-hidden="true"></i>
+    <i class="gg-col fa fa-plus fa-2x text-muted padding-right" aria-hidden="true"></i>
+    <i class="gg-col fa fa-universal-access fa-3x text-muted" aria-hidden="true"></i>
+  </div>
+  <h3>Automate your icons' accessibility</h3>
+  <p><a href="{{ page.relative_path }}get-started/#get-started-cdn">Font Awesome CDN</a> helps you automate accessibility support more easily so your icons work for the most people possible. You only need turn on a setting and any icons you use will have all of the best practices we recommend applied automatically.</p>
+
+  <a href="{{ page.relative_path }}get-started/#get-started-cdn" class="btn btn-success btn-lg">Get Automated Accessibility</a>
+</div>
diff --git a/library/font_awesome/src/_includes/accessibility/other.html b/library/font_awesome/src/_includes/accessibility/other.html
index 8a1078383..d3054ba8c 100644
--- a/library/font_awesome/src/_includes/accessibility/other.html
+++ b/library/font_awesome/src/_includes/accessibility/other.html
@@ -1,7 +1,7 @@
-<div id="other">
+<section id="accessibility-other" class="accessibility-other">
   <h2 class="page-header">Other cases and information</h2>
   <p>
-    While the scenarios and techniques above help avoid some serious issues and confusion, they are not exhaustive. There are many complex contexts and use cases when it comes to accessibility, such as users with low vision who need a high color contrast ratio to see UI. There are some great tools and resources to learn from and work on these issues out there. Here are a few reads we recommend.
+    While the scenarios and techniques here help avoid some serious issues and confusion, they are not exhaustive. There are many complex contexts and use cases when it comes to accessibility, such as users with low vision who need a high color contrast ratio to see UI. There are some great tools and resources to learn from and work on these issues out there. Here are a few reads we recommend.
   </p>
 
   <ul>
@@ -14,4 +14,4 @@
   <p>
     We'll continue to work on these under the larger topic of accessibility, but in the meantime, <a href="{{ page.relative_path }}community/#reporting-bugs">let us know if any bugs or issues</a>.
   </p>
-</div>
+</section>