master 5de5b7b418d 2/5: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 5de5b7b418d1c1ae9c96709ea6f41a21ddc56c72
Merge: d8fcb9b711c d5e5ea4e36b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    d5e5ea4e36b Fix guessing commands for zstandard archives in Dired
    90db29aff86 Fix eglot.texi (JSONRPC objects in Elisp) example
    5ef48ad6a37 ; Fix one author's name.
    c4e9a6159a3 * doc/man/emacsclient.1: Fix --tramp option.
    6dca3a8eab2 Improve `nsm-protocol-check--3des-cipher` docstring
---
 admin/authors.el      |  2 +-
 doc/man/emacsclient.1 |  4 ++--
 doc/misc/eglot.texi   | 10 +++++-----
 lisp/dired-aux.el     |  2 +-
 lisp/net/nsm.el       |  8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/admin/authors.el b/admin/authors.el
index 679ddf08085..2108f481a0c 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -78,7 +78,7 @@ files.")
     ("David M. Koppelman" "David Koppelman")
     ("David M. Smith" "David Smith" "David M Smith")
     ("David O'Toole" "David T. O'Toole")
-    (nil "dalanicolai")
+    ("Daniel Laurens Nicolai" "dalanicolai")
     (nil "deech@deech")
     ("Deepak Goel" "D. Goel")
     ("Earl Hyatt" "Earl" "ej32u@protonmail.com")
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index acc2edd4609..0acf3dd339e 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for conditions for redistribution.
-.TH EMACSCLIENT 1 "2023-10-16" "GNU Emacs" "GNU"
+.TH EMACSCLIENT 1 "2023-10-25" "GNU Emacs" "GNU"
 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
 .\" other params are allowed: see man(7), man(1)
 .SH NAME
@@ -119,7 +119,7 @@ This can also be specified via the EMACS_SOCKET_NAME 
environment variable.
 .B \-nw, \-t, \-\-tty
 Open a new Emacs frame on the current terminal.
 .TP
-.B \-T, \-\-tramp-prefix=PREFIX
+.B \-T, \-\-tramp=PREFIX
 Set PREFIX to add to filenames for Emacs to locate files on remote
 machines using TRAMP.  This is mostly useful in combination with using
 the Emacs server over TCP with --server-file.  This can also be
diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 3c1d44cd363..9ffea80b641 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -1237,8 +1237,8 @@ For example, the plist
 @lisp
 (:pylsp (:plugins (:jedi_completion (:include_params t
                                      :fuzzy t
-                                     :cache_for ["pandas" "numpy"]
-                   :pylint (:enabled :json-false))))
+                                     :cache_for ["pandas" "numpy"])
+                   :pylint (:enabled :json-false)))
  :gopls (:usePlaceholders t))
 @end lisp
 
@@ -1252,7 +1252,7 @@ is serialized by Eglot to the following JSON text:
       "jedi_completion": @{
         "include_params": true,
         "fuzzy": true,
-        "cache_for": [ "pandas", "numpy" ],
+        "cache_for": [ "pandas", "numpy" ]
       @},
       "pylint": @{
         "enabled": false
@@ -1260,8 +1260,8 @@ is serialized by Eglot to the following JSON text:
     @}
   @},
   "gopls": @{
-    "usePlaceholders":true
-  @},
+    "usePlaceholders": true
+  @}
 @}
 @end example
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 2ff620065a5..e0bcae6b005 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1176,7 +1176,7 @@ Return the result of `process-file' - zero for success."
          "unxz")
 
    ;; zstandard archives
-   `(,(rx (or ".tar.zst" ".tzst") eos) "unzstd -c %i | tar -xf -")
+   `(,(rx (or ".tar.zst" ".tzst") eos) "unzstd -c ? | tar -xf -")
    `(,(rx ".zst" eos)                  "unzstd --rm")
 
    '("\\.shar\\.Z\\'" "zcat * | unshar")
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 274cca7123a..09f7ac52537 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -550,14 +550,14 @@ Due to its use of 64-bit block size, it is known that a
 ciphertext collision is highly likely when 2^32 blocks are
 encrypted with the same key bundle under 3-key 3DES.  Practical
 birthday attacks of this kind have been demonstrated by Sweet32[1].
-As such, NIST is in the process of disallowing its use in TLS[2].
+As such, NIST has disallowed its use after December 31, 2023[2].
 
 [1]: Bhargavan, Leurent (2016).  \"On the Practical (In-)Security of
 64-bit Block Ciphers — Collision Attacks on HTTP over TLS and
 OpenVPN\", `https://sweet32.info/'
-[2]: NIST Information Technology Laboratory (Jul 2017).  \"Update to
-Current Use and Deprecation of TDEA\",
-`https://csrc.nist.gov/News/2017/Update-to-Current-Use-and-Deprecation-of-TDEA'"
+[2]: National Institute of Standards and Technology (Mar 2019).
+\"Transitioning the Use of Cryptographic Algorithms and Key
+Lengths\", `https://doi.org/10.6028/NIST.SP.800-131Ar2'"
   (let ((cipher (plist-get status :cipher)))
     (and (string-match "\\b3DES\\b" cipher)
          (format-message