diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index 42c656ac852..bf355ff1fea 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -42,9 +42,9 @@ explicitly at configure time.  This makes the default Emacs build
 process much faster.
 
 @item
-JSON interfaces are slowly move into oblivion as past years come closer,
-so we have removed our internal implementation of JSON; you will now
-need to build Emacs with the libjansson library, if you need JSON.
+JSON interfaces slowly move into oblivion as past years come closer, so
+we have removed our internal implementation of JSON; you will now need
+to build Emacs with the libjansson library, if you need JSON.
 Eventually, we plan on removing JSON support from Emacs altogether; this
 move will make the removal much simpler.
 
@@ -52,7 +52,7 @@ move will make the removal much simpler.
 Tree-sitter based modes are now completely independent of their
 non-Tree-Sitter counterparts.  We decided that keeping the settings
 separate and independent goes a long way toward simplicity, which is one
-of our main motivation for removing stuff from Emacs.
+of our main motivations for removing stuff from Emacs.
 
 @item
 Various Help commands no longer turn on Outline minor mode.  With less
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 60599d42020..69f24ec192f 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -418,7 +418,7 @@ these commands are bound in the @kbd{C-x 5} prefix key.
 
 @cindex dedicated window
   Sometimes, a window is ``dedicated'' to its current buffer.
-@xref{Dedicated Windows,, elisp, The Emacs Lisp Reference Manual}.
+@xref{Dedicated Windows,,, elisp, The Emacs Lisp Reference Manual}.
 @code{display-buffer} will avoid reusing dedicated windows most of the
 time.  This is indicated by a @samp{d} in the mode line (@pxref{Mode
 Line}).  A window can also be strongly dedicated, which prevents any
@@ -434,9 +434,9 @@ you dedicate a window to that buffer, the command (through
 
 @kindex C-x w d
 @findex toggle-window-dedicated
-  Toggle whether the selected window is dedicated to the current
-buffer.  With a prefix argument, make the window strongly dedicated
-instead.
+  You can use the command @kbd{C-x w d} (@code{toggle-window-dedicated})
+to toggle whether the selected window is dedicated to the current
+buffer.  With a prefix argument, it makes the window strongly dedicated.
 
 @menu
 * Window Choice::   How @code{display-buffer} works.
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index f3d12feefc6..268ae08bc46 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -375,7 +375,7 @@ as a link in the @file{*Help*} buffer.
 @end table
 
 @strong{Please note:} Each @samp{\} must be doubled when written in a
-string in Emacs Lisp.
+string in Emacs Lisp (@pxref{Syntax for Strings}).
 
 @defun substitute-command-keys string &optional no-face include-menus
 @vindex help-key-binding@r{ (face)}
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 01ec2a6ecd5..2b1b0d704a0 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4447,9 +4447,12 @@ the value assigned by the last call of @code{set-window-dedicated-p} for
 selected window.
 @end defun
 
+@findex toggle-window-dedicated
 @defun set-window-dedicated-p window flag
 This function marks @var{window} as dedicated to its buffer if
 @var{flag} is non-@code{nil}, and non-dedicated otherwise.
+Interactively you can use the @kbd{C-x w d}
+(@code{toggle-window-dedicated}) command to do the same.
 
 As a special case, if @var{flag} is @code{t}, @var{window} becomes
 @dfn{strongly} dedicated to its buffer.  @code{set-window-buffer}
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index e1130917f0c..69572a139ff 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4580,6 +4580,11 @@ It does not report the remote terminal name via @code{process-tty-name}.
 
 @item
 It does not set process property @code{remote-pid}.
+
+@item
+It fails, when the command is too long.  This can happen on
+directories with a long directory name, or when the remote @env{PATH}
+and/or other environment variables, which must be set, are too long.
 @end itemize
 
 In order to gain even more performance, it is recommended to bind
diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index 9f2b9fa8b56..8a1ad98d8f9 100644
--- a/java/org/gnu/emacs/EmacsNoninteractive.java
+++ b/java/org/gnu/emacs/EmacsNoninteractive.java
@@ -120,11 +120,11 @@ public final class EmacsNoninteractive
 	  }
 
 	/* Get a LoadedApk or ActivityThread.PackageInfo.  How to do
-	   this varies by Android version.  On Android 2.3.3 and
-	   earlier, there is no ``compatibilityInfo'' argument to
+	   this varies by Android version.  On Android 3.0 and earlier,
+	   there is no ``compatibilityInfo'' argument to
 	   getPackageInfo.  */
 
-	if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
+	try
 	  {
 	    method
 	      = activityThreadClass.getMethod ("getPackageInfo",
@@ -134,7 +134,7 @@ public final class EmacsNoninteractive
 				       (Context.CONTEXT_INCLUDE_CODE
 					| Context.CONTEXT_IGNORE_SECURITY));
 	  }
-	else
+	catch (NoSuchMethodException exception)
 	  {
 	    compatibilityInfoClass
 	      = Class.forName ("android.content.res.CompatibilityInfo");
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 0a0b17b3850..0f6e3518758 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2529,7 +2529,7 @@ any completion candidate highlighted in *Completions* window (to
 indicate that it is the selected candidate) will be un-highlighted,
 and point in the *Completions* window will be moved off such a candidate.
 This means that `RET' (`minibuffer-choose-completion-or-exit') will exit
-the minubuffer with the minibuffer's current contents, instead of the
+the minibuffer with the minibuffer's current contents, instead of the
 selected completion candidate."
   :type '(choice (const :tag "Candidates in *Completions* stay selected as you type" nil)
                  (const :tag "Typing deselects any completion candidate in *Completions*" t))
diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el
index 6dedb6e4895..d19a48c3294 100644
--- a/lisp/progmodes/peg.el
+++ b/lisp/progmodes/peg.el
@@ -274,7 +274,7 @@
   "Actions collected along the current parse.
 Used at runtime for backtracking.  It's a list ((POS . THUNK)...).
 Each THUNK is executed at the corresponding POS.  Thunks are
-executed in a postprocessing step, not during parsing.")
+executed in a post-processing step, not during parsing.")
 
 (defvar peg--errors nil
   "Data keeping track of the rightmost parse failure location.
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 1298b39311b..89444f0208e 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -209,7 +209,7 @@ symbol."
         (when (derived-mode-p 'php-ts-mode)
           (php-ts-mode-set-style val)))))
 
-;; teken from c-ts-mode
+;; taken from c-ts-mode
 (defun php-ts-indent-style-safep (style)
   "Non-nil if STYLE's value is safe for file-local variables."
   (and (symbolp style) (not (functionp style))))
diff --git a/lisp/transient.el b/lisp/transient.el
index 05ad0ed8a0b..8788fbc834f 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -4001,9 +4001,9 @@ and its value is returned to the caller."
                         set " ")))))
 
 (cl-defmethod transient-format-description ((obj transient-group))
-  "Format the description by calling the next method.  If the result
-doesn't use the `face' property at all, then apply the face
-`transient-heading' to the complete string."
+  "Format the description by calling the next method.
+If the result doesn't use the `face' property at all, then apply the
+face `transient-heading' to the complete string."
   (and-let* ((desc (transient--get-description obj)))
     (cond ((oref obj inapt)
            (propertize desc 'face 'transient-inapt-suffix))
@@ -4012,8 +4012,9 @@ doesn't use the `face' property at all, then apply the face
           ((propertize desc 'face 'transient-heading)))))
 
 (cl-defmethod transient-format-description :around ((obj transient-suffix))
-  "Format the description by calling the next method.  If the result
-is nil, then use \"(BUG: no description)\" as the description.
+  "Format the description by calling the next method.
+If the result is nil, then use \"(BUG: no description)\" as the
+description.
 If the OBJ's `key' is currently unreachable, then apply the face
 `transient-unreachable' to the complete string."
   (let ((desc (or (cl-call-next-method obj)
diff --git a/src/emacs.c b/src/emacs.c
index c85beede992..37c8b28fc2c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -3590,7 +3590,7 @@ Special values:
   `windows-nt'   compiled as a native W32 application.
   `cygwin'       compiled using the Cygwin library.
   `haiku'        compiled for a Haiku system.
-  `android'	 compiled for Android.
+  `android'      compiled for Android.
 Anything else (in Emacs 26, the possibilities are: aix, berkeley-unix,
 hpux, usg-unix-v) indicates some sort of Unix system.  */);
   Vsystem_type = intern_c_string (SYSTEM_TYPE);
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 8074bed7a47..786700c727e 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -7623,6 +7623,8 @@ This requires restrictions of file name syntax."
 
 (tramp--test-deftest-without-file-attributes tramp-test41-special-characters)
 
+(tramp--test-deftest-direct-async-process tramp-test41-special-characters)
+
 (ert-deftest tramp-test42-utf8 ()
   "Check UTF8 encoding in file names and file contents."
   (skip-unless (tramp--test-enabled))
@@ -7691,6 +7693,8 @@ This requires restrictions of file name syntax."
 
 (tramp--test-deftest-without-file-attributes tramp-test42-utf8)
 
+(tramp--test-deftest-direct-async-process tramp-test42-utf8)
+
 (ert-deftest tramp-test43-file-system-info ()
   "Check that `file-system-info' returns proper values."
   (skip-unless (tramp--test-enabled))