--- a/NEWS	Sun Dec 05 19:35:28 2021 +0100
+++ b/NEWS	Tue Dec 07 08:55:02 2021 +0100
@@ -4,11 +4,6 @@
 ### General improvements
 
 
-- The pkg update command now accepts options that are passed to pkg install
-for each updated package.  Specifying @option{-local} or @option{-global}
-will restrict update checks to local and global installed packgaes,
-respectively.
-
 ### Graphical User Interface
 
 

--- a/etc/NEWS.7	Sun Dec 05 19:35:28 2021 +0100
+++ b/etc/NEWS.7	Tue Dec 07 08:55:02 2021 +0100
@@ -124,10 +124,10 @@
 The real name of the "magick++" library (including any potentially
 trailing "++") needs to be set in that option now.
 
-- The pkg update command now accepts options that are passed to pkg install
-for each updated package.  Specifying @option{-local} or @option{-global}
-will restrict update checks to local and global installed packgaes,
-respectively.
+- The `pkg update` command now accepts options that are passed to `pkg
+install` for each updated package.  Specifying @option{-local} or
+@option{-global} will restrict update checks to local or global
+installed packages, respectively.
 
 ### Graphical User Interface
 
@@ -137,6 +137,12 @@
 - In debug mode, symbol values are now shown in tooltips when hovering
 variables in the editor panel.
 
+- The "Disable global shortcuts when Command Window has focus" GUI
+preference under the Shortcuts tab is now disabled by default.  This
+option disables keyboard shortcuts to avoid interference with readline
+key strokes in the Command Window.  Unlike versions prior to Octave 7,
+this preference now also affects the Ctrl-C/V shortcuts for copy/paste.
+
 ### Graphics backend
 
 - Support for Qt4 for both graphics and the GUI has been removed.

--- a/libinterp/corefcn/sqrtm.cc	Sun Dec 05 19:35:28 2021 +0100
+++ b/libinterp/corefcn/sqrtm.cc	Tue Dec 07 08:55:02 2021 +0100
@@ -262,7 +262,7 @@
 
 /*
 %!assert (sqrtm (2*ones (2)), ones (2), 3*eps)
-%!assert (real (sqrtm (ones (4))), 0.5*ones (4), 4*eps)
+%!assert <60797*> (sqrtm (ones (4))^2, ones (4), 4*eps)
 
 ## The following two tests are from the reference in the docstring above.
 %!test