diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index 0e96c61f7..ede9828d6 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -174,7 +174,7 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
                 ((suspend-emacs
                   (format "%s %s -nw; fg"
                           (shell-quote-argument (restart-emacs--get-emacs-binary))
-                          (string-join (mapcar #'shell-quote-argument args) " ")))))
+                          (mapconcat #'shell-quote-argument args " ")))))
         (error
          (delete-file file)
          (signal (car e) (cdr e)))))))
diff --git a/core/cli/autoloads.el b/core/cli/autoloads.el
index 64518f8e5..d04a4f696 100644
--- a/core/cli/autoloads.el
+++ b/core/cli/autoloads.el
@@ -222,7 +222,7 @@ even if it doesn't need reloading!"
                    (member-p
                     (push sexp forms)))))
          (if forms
-             (concat (string-join (mapcar #'prin1-to-string (reverse forms)) "\n")
+             (concat (mapconcat #'prin1-to-string (reverse forms) "\n")
                      "\n")
            ""))))))
 
diff --git a/core/cli/env.el b/core/cli/env.el
index 714f75ba5..6d3c677a4 100644
--- a/core/cli/env.el
+++ b/core/cli/env.el
@@ -101,8 +101,7 @@ order of `doom-env-switches' determines priority."
           "#\n"
           "# It is NOT safe to edit this file. Changes will be overwritten next time\n"
           "# that `doom env refresh` is executed. Alternatively, create your own env file\n"
-          "# in your DOOMDIR and load it with \n"
-          "# `(doom-load-env-vars (expand-file-name FILE doom-private-dir))`.\n"
+          "# and load it with `(doom-load-env-vars FILE)`.\n"
           "#\n"
           "# To auto-regenerate this file when `doom reload` is run, use `doom env auto'\n"
           "# or set DOOMENV=1 in your shell environment/config.\n"
diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el
index c72b2bc90..c20cf1fdd 100644
--- a/modules/editor/format/config.el
+++ b/modules/editor/format/config.el
@@ -16,14 +16,14 @@ Irrelevant if you do not have the +onsave flag enabled for this module.")
   "If non-nil, the leading indentation is preserved when formatting the whole
 buffer. This is particularly useful for partials.
 
-Indentation is always preserved when formatting regions. ")
+Indentation is always preserved when formatting regions.")
 
 (defvar-local +format-with nil
   "Set this to explicitly use a certain formatter for the current buffer.")
 
 
 ;;
-;; Bootstrap
+;;; Bootstrap
 
 (defun +format|enable-on-save-maybe ()
   "Enable formatting on save in certain major modes.
@@ -43,16 +43,14 @@ This is controlled by `+format-on-save-enabled-modes'."
 
 
 ;;
-;; Hacks
+;;; Hacks
 
 ;; Allow a specific formatter to be used by setting `+format-with', either
 ;; buffer-locally or let-bound.
 (advice-add #'format-all--probe :around #'+format*probe)
 
 ;; Doom uses a modded `format-all-buffer', which
-;;   1. Doesn't move the cursorafter reformatting,
-;;   2. Can reformat regions, rather than the entire buffer (while preserving
-;;      leading indentation),
-;;   3. Applies changes via RCS patch, line by line, as not to protect buffer
-;;      markers and avoid any jarring cursor+window scrolling.
+;;   1. Enables partial reformatting (while preserving leading indentation),
+;;   2. Applies changes via RCS patch, line by line, to protect buffer markers
+;;      and avoid any jarring cursor+window scrolling.
 (advice-add #'format-all-buffer :override #'+format/buffer)
diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index 9d8e33116..410059889 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -26,7 +26,7 @@ to the right fringe.")
     "Enable `git-gutter-mode' in the current buffer.
 
 If the buffer doesn't represent an existing file, `git-gutter-mode's activation
-is deferred until the file is saved."
+is deferred until the file is saved. Respects `git-gutter:disabled-modes'."
     (when (or +vc-gutter-in-remote-files
               (not (file-remote-p (or buffer-file-name default-directory))))
       (if (not buffer-file-name)