master dbed538391: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit dbed53839136ef0e3f283599f51a5cef00343e28
Merge: e2ccd358c9 f5218385c0
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    f5218385c0 Fix obsoletion of nntp-authinfo-file
    10b6919870 ; Fix typos
---
 lisp/gnus/nntp.el                     | 2 +-
 lisp/language/european.el             | 2 +-
 lisp/net/dictionary.el                | 4 ++--
 lisp/org/ol.el                        | 2 +-
 test/lisp/calendar/icalendar-tests.el | 4 ++--
 test/lisp/cedet/semantic-utest-c.el   | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index f047c83293..9902a280d5 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -234,7 +234,7 @@ server there that you can connect to.  See also
                                          (const :format "" "password")
                                          (string :format "Password: %v")))))))
 
-(make-obsolete 'nntp-authinfo-file nil "24.1")
+(make-obsolete-variable 'nntp-authinfo-file 'netrc-file "24.1")
 
 
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 8e3aac7c2e..937215074b 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -390,7 +390,7 @@ Latin-9 is sometimes nicknamed `Latin-0'."))
 (define-coding-system-alias 'cp284 'ibm284)
 
 (define-coding-system 'ibm285
-  "UK english version of EBCDIC"
+  "UK English version of EBCDIC"
   :coding-type 'charset
   :charset-list '(ibm285)
   :mnemonic ?*)
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 31cc5035a3..d093615019 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -119,7 +119,7 @@ one dictionary yields matches."
   "exact"
   "The default strategy for listing matching words within a popup window.
 
-The following algorithm (defined by the dictd server) are supported
+The following algorithms (defined by the dictd server) are supported
 by the choice value:
 
 - Exact match
@@ -130,7 +130,7 @@ by the choice value:
 
   The found word sounds similar to the searched word.  For this match type
   the soundex algorithm defined by Donald E. Knuth is used.  It will only
-  works with english words and the algorithm is not very reliable (i.e.,
+  work with English words and the algorithm is not very reliable (i.e.,
   the soundex algorithm is quite simple).
 
 - Levenshtein distance one
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index a0dad926bc..1df59e2458 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -937,7 +937,7 @@ characters that should be escaped."
 
 (defun org-link-decode (s)
   "Decode percent-encoded parts in string S.
-E.g. \"%C3%B6\" becomes the german o-Umlaut."
+E.g. \"%C3%B6\" becomes the German o-Umlaut."
   (replace-regexp-in-string "\\(%[0-9A-Za-z]\\{2\\}\\)+"
                            #'org-link--decode-compound s t t))
 
diff --git a/test/lisp/calendar/icalendar-tests.el 
b/test/lisp/calendar/icalendar-tests.el
index ac7a84aa57..7f8cd47914 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -651,8 +651,8 @@ Argument INPUT-AMERICAN american style diary string.
 Argument EXPECTED-OUTPUT expected iCalendar result string.
 Optional argument ALARMS the value of `icalendar-export-alarms' for this test.
 
-European style input data must use german month names.  American
-and ISO style input data must use english month names."
+European style input data must use German month names.  American
+and ISO style input data must use English month names."
   (let ((tz (getenv "TZ"))
        (calendar-date-style 'iso)
        (icalendar-recurring-start-year 2000)
diff --git a/test/lisp/cedet/semantic-utest-c.el 
b/test/lisp/cedet/semantic-utest-c.el
index 2da450c273..87d754968f 100644
--- a/test/lisp/cedet/semantic-utest-c.el
+++ b/test/lisp/cedet/semantic-utest-c.el
@@ -94,7 +94,7 @@ Target: i486-linux-gnu
 Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.1-9ubuntu1' 
--with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs 
--enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared 
--with-system-zlib --libexecdir=/usr/lib --without-included-gettext 
--enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 
--program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug 
--enable-objc-gc --enable-mpfr --enable-targets=all --enable-chec [...]
 Thread model: posix
 gcc version 4.3.1 (Ubuntu 4.3.1-9ubuntu1)"
-    ;; My debian box:
+    ;; My Debian box:
     "Using built-in specs.
 Target: x86_64-unknown-linux-gnu
 Configured with: ../../../sources/gcc/configure 
--prefix=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3 
--with-gmp=/usr/local/gcc/gmp --with-mpfr=/usr/local/gcc/mpfr 
--enable-languages=c,c++,fortran 
--with-as=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/as 
--with-ld=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/ld --disable-multilib
@@ -123,13 +123,13 @@ Target: x86_64-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man 
--infodir=/usr/share/info --enable-shared --enable-threads=posix 
--enable-checking=release --with-system-zlib --enable-__cxa_atexit 
--disable-libunwind-exceptions --enable-libgcj-multifile 
--enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk 
--disable-dssi --enable-plugin 
--with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic 
--host=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.1.2 20080704 (Red Hat 4.1.2-44)"
-    ;; David Engster's german gcc on ubuntu 4.3
+    ;; David Engster's German gcc on Ubuntu 4.3
     "Es werden eingebaute Spezifikationen verwendet.
 Ziel: i486-linux-gnu
 Konfiguriert mit: ../src/configure -v --with-pkgversion='Ubuntu 
4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs 
--enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared 
--with-system-zlib --libexecdir=/usr/lib --without-included-gettext 
--enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 
--program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug 
--enable-objc-gc --enable-mpfr --enable-targets=all --enable-ch [...]
 Thread-Modell: posix
 gcc-Version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)"
-    ;; Damien Deville bsd
+    ;; Damien Deville BSD
     "Using built-in specs.
 Target: i386-undermydesk-freebsd
 Configured with: FreeBSD/i386 system compiler
@@ -139,7 +139,7 @@ gcc version 4.2.1 20070719  [FreeBSD]"
   "A bunch of sample gcc -v outputs from different machines.")
 
 (defvar semantic-gcc-test-strings-fail
-  '(;; A really old solaris box I found
+  '(;; A really old Solaris box I found
     "Reading specs from 
/usr/local/gcc-2.95.2/lib/gcc-lib/sparc-sun-solaris2.6/2.95.2/specs
 gcc version 2.95.2 19991024 (release)"
     )