Use pull request #10962 from DanielRuf/docs/xy-grid-flex-grid-fallback for v6.5.0

0934977a0 docs: the flexgrid is used if $xy-grid is set to false
ba69d0085 better description of the foundation-everything mixin parameters

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/docs/pages/xy-grid.md b/docs/pages/xy-grid.md
index 9bb8014b6be49a4e4b7719665b647b741d722642..fdbf714ae28955e32ed03ae9c656ec8da7ec0373 100644 (file)
--- a/docs/pages/xy-grid.md
+++ b/docs/pages/xy-grid.md
@@ -24,7 +24,10 @@ The XY grid is supported in Chrome, Firefox, Safari 6+, IE10+, iOS 7+, and Andro
 
 ## Importing
 
-**XY grid is the default Foundation grid**. It is present by default in `foundation.css` of CDN link or package managers. In Sass, it will be generated by default by `@include foundation-everything` (unless `$global-flex` or `$xy-grid` are set to false).
+**XY grid is the default Foundation grid**. It is present by default in `foundation.css` of CDN link or package managers. In Sass, it will be generated by default by `@include foundation-everything` (unless `$flex` or `$xy-grid` are set to false).
+
+If `$xy-grid` is set to false, the flex grid is used.  
+If `$flex` is set to false, the float grid is used instead.
 
 You can manually generate the XY Grid with:
 ```scss