Merge from origin/emacs-30

67903f5909d Restore the old behavior of `bookmark-write-file'
062da7003f9 ; Improve prompts and error messages in 'info-look'
52dc01f1c8b ; * admin/admin.el (set-version): Note about Android.
fb282da2a07 Avoid double spaces around abbrevations in Texinfo
bc1ab8ac3d8 ; * doc/emacs/custom.texi (Init Rebinding): Fix spacing.
b41ef43af19 ; Fix previous change
5638b1d6bd4 Ispell: Use "personal dictionary" terminology consistently
cc791e7499f ; Check man pages for mistakes less frequently
4ed4792e3b9 ; * admin/release-process: Minor copy-edits.
4a867c823b7 Add language server "ruff server" for Python
9e687c2871f Fix go-ts-mode type declaration indentation (Bug#75785)
f751b3afa4f ; Minor improvements for doc strings in map.el
cda78edc7d9 ; Fix typos
ce50a1d3c18 ; * src/w32.c (w32_memory_info): Fix coding style of last...
58d3d4820ad Fix bug in w32_memory_info
77386412050 Avoid crashes in redisplay due to problematic font setups
0e3687e6006 Improve 'key-valid-p' docstring
9878092d2b9 Minor copyedits in internals.texi
4726900fdc5 Better document side-effect free and pure C functions
04c475a39f2 ; Fix documentation about faces of tool-tip text

# Conflicts:
#	admin/codespell/codespell.exclude

1 files changed, 6 insertions, 6 deletions

diff --git a/nextstep/README b/nextstep/README
index 487ea52ead4..853d6bcda35 100644
--- a/nextstep/README
+++ b/nextstep/README
@@ -14,7 +14,7 @@ OpenStep and then Rhapsody, which became Mac OS X.  In 2004 it was
 adapted to GNUstep, a free OpenStep implementation, and in 2008 it was
 merged to the GNU Emacs trunk and released with Emacs 23.  Around the
 same time a separate Mac-only port using the Carbon APIs and
-descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It
+descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed.  (It
 remains available externally under the name "mac".)
 
 
@@ -48,12 +48,12 @@ Classes are declared like the following:
 
   GUIDELINES
 
-* Adhere the to the FSF philosophy that a feature in GNU software
-  should not only be available on non-free systems.
+* Adhere to the FSF philosophy that a feature in GNU software should not
+  only be available on non-free systems.
 
 * People with varying Cocoa and Objective-C skills will read and
   modify the NS code over a long period of time.  Keep the code simple
-  and avoid language constructs that makes the code hard to maintain.
+  and avoid language constructs that make the code hard to maintain.
 
 * Don't use macros and types intended for the XCode Interface Builder,
   like 'IBAction'.
@@ -81,7 +81,7 @@ GNUstep.  Even though they are less frequently used, this is important
 for a number of reasons:
 
 * It supports the GNUstep project and provides an Emacs with the same
-  look-and-feel as the rest of the system.
+  look and feel as the rest of the system.
 
 * This allows other Emacs developers to test their changes on the NS
   interface without having access to a macOS machine.
@@ -93,7 +93,7 @@ for a number of reasons:
 
   SEE ALSO
 
-The src/ns... files contains the C and Objective-C parts.
+The src/ns... files contain the C and Objective-C parts.
 
 The lisp/term/ns-win.el file contains the lisp part of the NS
 interface.