From b5b4bc3cd187d87dec3c2bfbcbfa592b4da40f34 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Thu, 17 Dec 2020 12:52:09 +0000
Subject: [PATCH] Twenty Twenty-One: Correct the DocBlock for `map-deep-set()`
 Sass function.

Props mukesh27.
Merges [49799] to the 5.6 branch.
Fixes #52064.
Built from https://develop.svn.wordpress.org/branches/5.6@49815


git-svn-id: http://core.svn.wordpress.org/branches/5.6@49534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../assets/sass/02-tools/functions.scss       | 20 +++++++++----------
 wp-includes/version.php                       |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wp-content/themes/twentytwentyone/assets/sass/02-tools/functions.scss b/wp-content/themes/twentytwentyone/assets/sass/02-tools/functions.scss
index ef7bb4efa9..831bbdc430 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/02-tools/functions.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/02-tools/functions.scss
@@ -46,16 +46,16 @@
 	@return $map;
 }
 
-// ep set function to set a value in nested maps
-// uthor Hugo Giraudel
-// ccess public
-// aram {Map} $map - Map
-// aram {List} $keys -  Key chaine
-// aram {*} $value - Value to assign
-// eturn {Map}
+// Deep set function to set a value in nested maps
+// @author Hugo Giraudel
+// @access public
+// @param {Map} $map - Map
+// @param {List} $keys -  Key chaine
+// @param {*} $value - Value to assign
+// @return {Map}
 //
-// ample:
-// _prefix-default-config: map-deep-set($__prefix-default-config, "layouts" "M", 650px);
+// Example:
+// $__prefix-default-config: map-deep-set($__prefix-default-config, "layouts" "M", 650px);
 @function map-deep-set($map, $keys, $value) {
 	$maps: ($map);
 	$result: null;
@@ -63,7 +63,7 @@
 	// If the last key is a map already
 	// Warn the user we will be overriding it with $value
 	@if type-of(nth($keys, -1)) == "map" {
-		@warn "The last key you specified is a map; it will be overrided with `#{$value}`.";
+		@warn "The last key you specified is a map; it will be overridden with `#{$value}`.";
 	}
 
 	// If $keys is a single key
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 81e50f20a9..3f90152457 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6.1-alpha-49809';
+$wp_version = '5.6.1-alpha-49815';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.