From 18ab3d6415ca0b06d21e9a72edb91736336aefd1 Mon Sep 17 00:00:00 2001
From: Guillaume Paumier <gp@guillaumepaumier.com>
Date: Sat, 16 Jun 2018 08:59:39 +0200
Subject: [PATCH] Use pull request #10835 from gpaumier/patch-1 for v6.5.0

c52a9f879 typo
40d3b04bf docs: fix typo in "upcoming"

Co-Authored-By: Nicolas Coden <nicolas@ncoden.fr>
Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>
---
 docs/pages/flex-grid.md           | 2 +-
 docs/pages/grid.md                | 2 +-
 docs/partials/footer-contact.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/pages/flex-grid.md b/docs/pages/flex-grid.md
index 7cf3a0416..bc5376f7d 100644
--- a/docs/pages/flex-grid.md
+++ b/docs/pages/flex-grid.md
@@ -7,7 +7,7 @@ video: tpmQcZSPw4Q
 
 <div class="callout training-callout">
   <p>Become a master of the Foundation Grids to create complex layouts faster and with less code. The new XY Grid is the newest and most powerful version. Stay up-to-date with all the new features in Foundation 6.4 and learn how to migrate to the XY Grid with our online webinar training. You’ll also learn all the useful UI components and Foundation JavaScript to really crush your projects.</p>
-  <a href="http://zurb.com/university/foundation-intro" target="_blank">Get registered for an upcomming Foundation training →</a>
+  <a href="http://zurb.com/university/foundation-intro" target="_blank">Get registered for an upcoming Foundation training →</a>
 </div>
 
 The flex grid works very similarly to the standard float grid, but includes a number of useful features only possible with flexbox, like horizontal and vertical alignment, automatic sizing, and easier source ordering.
diff --git a/docs/pages/grid.md b/docs/pages/grid.md
index e177844cf..b00391587 100644
--- a/docs/pages/grid.md
+++ b/docs/pages/grid.md
@@ -11,7 +11,7 @@ tags:
 
 <div class="callout training-callout">
   <p>Become a master of the Foundation Grids to create complex layouts faster and with less code. The new XY Grid is the newest and most powerful version. Stay up-to-date with all the new features in Foundation 6.4 and learn how to migrate to the XY Grid with our online webinar training. You’ll also learn all the useful UI components and Foundation JavaScript to really crush your projects.</p>
-  <a href="http://zurb.com/university/foundation-intro" target="_blank">Get registered for an upcomming Foundation training →</a>
+  <a href="http://zurb.com/university/foundation-intro" target="_blank">Get registered for an upcoming Foundation training →</a>
 </div>
 
 ## Basics
diff --git a/docs/partials/footer-contact.html b/docs/partials/footer-contact.html
index 7c23d149e..2dd927f39 100644
--- a/docs/partials/footer-contact.html
+++ b/docs/partials/footer-contact.html
@@ -38,7 +38,7 @@
         <input type="hidden" name="_subject" value="ZURB | Foundation Training Inquiry">
         <input type="hidden" name="_to" value="foundation@zurb.com">
       </form> -->
-      <a href="https://zurb.com/university/courses" class="expanded large button home-form-submit-button">See Upcomming Classes</a>
+      <a href="https://zurb.com/university/courses" class="expanded large button home-form-submit-button">See Upcoming Classes</a>
       <p class="text-center">Or if you prefer, contact the Foundation Team at <a class="text-link" href="mailto:foundation@zurb.com">training@zurb.com</a> or (408) 341-0600 x635</p>
     </div>
   </div>
-- 
2.47.3