Merge branch 'scala:main' into main

Author: jakedmlee

_overviews/quasiquotes/syntax-summary.md

@@ -120,7 +120,7 @@ permalink: /overviews/quasiquotes/:title.html
                               | Quasiquote                                                                                                                  | Type
 ------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------
  [Val][401]                   | `q"$mods val $tname: $tpt = $expr"` or `q"$mods val $pat = $expr"`                                                          | ValDef
- [Var][401]                   | `q"$mods var $tname: $tpt = $expr"` or `q"$mods val $pat = $expr"`                                                          | ValDef
+ [Var][401]                   | `q"$mods var $tname: $tpt = $expr"` or `q"$mods var $pat = $expr"`                                                          | ValDef
  [Val Pattern][403]           | `q"$mods val $pat: $tpt = $expr"`                                                                                           | Tree
  [Var Pattern][404]           | `q"$mods var $pat: $tpt = $expr"`                                                                                           | Tree
  [Method][403]                | `q"$mods def $tname[..$tparams](...$paramss): $tpt = $expr"`                                                                | DefDef

_overviews/scala-book/collections-maps.md

@@ -83,18 +83,18 @@ Here are some things you can do with a mutable `Map`:
 ```scala
 // add elements with +=
 states += ("AZ" -> "Arizona")
-states += ("CO" -> "Colorado", "KY" -> "Kentucky")
+states ++= Map("CO" -> "Colorado", "KY" -> "Kentucky")
 
 // remove elements with -=
 states -= "KY"
-states -= ("AZ", "CO")
+states --= List("AZ", "CO")
 
 // update elements by reassigning them
 states("AK") = "Alaska, The Big State"
 
-// retain elements by supplying a function that operates on
+// filter elements by supplying a function that operates on
 // the keys and/or values
-states.retain((k,v) => k == "AK")
+states.filterInPlace((k,v) => k == "AK")
 ```