Merge from origin/emacs-30

4b60267d832 Make Python skeletons available in 'python-ts-mode' as well
62dcbfb776f Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
1baa62b2ac1 ; * etc/NEWS: Fix typos.
dfcfaa0ef58 More accurate documentation of 'equal' in ELisp Reference
baaf97ce1a1 ; Fix some ungrammatical uses of "allows to"

# Conflicts:
#	etc/NEWS

2 files changed, 6 insertions, 5 deletions

diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index bf355ff1fea..97110dc8cdb 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -71,7 +71,7 @@ tool bars on the bottom.  For the same reasons @code{modifier-bar-mode}
 is now gone.
 
 @item
-The command @code{recover-file} no longer allows to display the diffs
+The command @code{recover-file} no longer allows displaying the diffs
 between a file and its auto-save file.  You either want to recover a
 file or you don't; confusing users with a third alternative when they
 are anxious already by the possibility of losing precious edits is
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index ec6ab8204d6..399a1d169c2 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2413,6 +2413,11 @@ the converse is not always true.
 @end group
 @end example
 
+The @code{equal} function recursively compares the contents of objects
+if they are integers, strings, markers, lists, cons cells, vectors,
+bool-vectors, byte-code function objects, char-tables, records, or font
+objects.
+
 Comparison of strings is case-sensitive, but does not take account of
 text properties---it compares only the characters in the strings.
 @xref{Text Properties}.  Use @code{equal-including-properties} to also
@@ -2428,10 +2433,6 @@ same sequence of character codes and all these codes are in the range
 @end group
 @end example
 
-The @code{equal} function recursively compares the contents of objects
-if they are integers, strings, markers, vectors, bool-vectors,
-byte-code function objects, char-tables, records, or font objects.
-
 If @var{object1} or @var{object2} contains symbols with position,
 @code{equal} treats them as if they were their bare symbols when
 @code{symbols-with-pos-enabled} is non-@code{nil}.  Otherwise