[nongnu] elpa/hyperdrive 943d624839 140/163: Tidy: Say "the gateway" instead of "hyper-gateway-ushin"

[ELPA Syncer]

branch: elpa/hyperdrive
commit 943d624839fcf34c6200fdea636470e155ee6faf
Author: Joseph Turner <joseph@ushin.org>
Commit: Joseph Turner <joseph@ushin.org>

    Tidy: Say "the gateway" instead of "hyper-gateway-ushin"
    
    Where it's not necessary to refer to the exact name of the program,
    say "the gateway".
    
    Includes renaming private defun h//hyper-gateway-ushin-path to
    h//gateway-path.
---
 CHANGELOG.org       |  4 +--
 CONTRIBUTING.org    |  2 +-
 DEV.org             |  2 +-
 doc/hyperdrive.org  | 65 ++++++++++++++++++++++--------------------------
 doc/hyperdrive.texi | 71 +++++++++++++++++++++++------------------------------
 hyperdrive-lib.el   | 19 +++++++-------
 hyperdrive-vars.el  |  6 ++---
 hyperdrive.el       | 22 ++++++++---------
 tests/org links.org |  2 +-
 9 files changed, 90 insertions(+), 103 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 956b6ca99e..01b78482fe 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -15,7 +15,7 @@ This project adheres to 
[[https://semver.org/spec/v2.0.0.html][Semantic Versioni
 ** Added
 
 - Simplified installation: After ~M-x package-install hyperdrive.el~,
-  run ~M-x hyperdrive-install~ to install ~hyper-gateway-ushin~.
+  run ~M-x hyperdrive-install~ to install the gateway.
 - When visiting an old version of a hyperdrive file, press ~n~ and ~p~ to
   traverse the version history.  Press ~q~ to kill the current buffer.
 
@@ -26,7 +26,7 @@ This project adheres to 
[[https://semver.org/spec/v2.0.0.html][Semantic Versioni
   instructions](https://git.sr.ht/~ushin/hyper-gateway-ushin#installation).
 - Directory listings load faster
 - Improved defcustom types
-- Better error message when ~hyper-gateway-ushin~ is not installed.
+- Better error message when the gateway is not installed.
   Thanks to ~magnum~ on XMPP for reporting.
 - Removed ~hyperdrive-reuse-buffers~ user option to ensure consistent
   behavior when uniquifying buffer names.
diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org
index dc80a49995..63960ebfce 100644
--- a/CONTRIBUTING.org
+++ b/CONTRIBUTING.org
@@ -72,7 +72,7 @@ These checklists should be followed when releasing new 
versions:
 
 /A list of the places where version numbers are present and need to be 
updated./
 
-** hyper-gateway-ushin version numbers
+** Gateway version numbers
 
 + [ ] [[file:hyperdrive.el::(defvar 
h/gateway-urls-and-hashes][h/gateway-urls-and-hashes variable]]
 + [ ] [[file:hyperdrive-vars.el::defvar h/gateway-version-expected 
"3.7.0"][h/gateway-version-expected variable]]
diff --git a/DEV.org b/DEV.org
index 9cfa6e402b..52e9c42aee 100644
--- a/DEV.org
+++ b/DEV.org
@@ -37,7 +37,7 @@ So, e.g. ~makem~'s ~lint-declare~ rule, which uses 
~check-declare~, gives false
 
 ** Decisions
 
-+ We don't want to delete or install ~hyper-gateway-ushin~ anywhere other than 
~~/.local/lib/hyperdrive.el~. :: In case the user has installed a different 
version at a different location, we want to respect that.
++ We don't want to delete or install the gateway anywhere other than 
~~/.local/lib/hyperdrive.el~. :: In case the user has installed a different 
version at a different location, we want to respect that.
 +  :: 
 
 ** Testing gateway commands
diff --git a/doc/hyperdrive.org b/doc/hyperdrive.org
index 3da3e83c97..09ae00713c 100644
--- a/doc/hyperdrive.org
+++ b/doc/hyperdrive.org
@@ -60,7 +60,7 @@ list-packages~, select ~hyperdrive~, and click the ~Install~ 
button.
 hypercore network.
 
 After installing ~hyperdrive.el~ (see [[*Install hyperdrive.el][Install 
hyperdrive.el]]), run ~M-x
-hyperdrive-install~ to download and install ~hyper-gateway-ushin~.
+hyperdrive-install~ to download and install the gateway.
 
 Alternatively, follow the 
[[https://git.sr.ht/~ushin/hyper-gateway-ushin#installation][manual 
installation instructions]].
 
@@ -96,10 +96,6 @@ When you upload a file, beware:
 On the network it still may be there.
 #+end_verse
 
-** Install hyper-gateway-ushin
-
-Please be sure to [[*Install hyper-gateway-ushin][install 
hyper-gateway-ushin]].
-
 ** Menu bar support
 #+findex: menu-bar-mode
 
@@ -141,35 +137,35 @@ documentation]].  To learn about the commands available in
 
 ** Start/stop the gateway
 
-To connect with peers, you'll need to start ~hyper-gateway-ushin~ (see
-[[*hyper-gateway-ushin]]).  The current running status of the gateway can
-be seen in ~hyperdrive-menu~ (see [[*Hyperdrive menu command]]) and in the
-"Hyperdrive" menu bar (see [[*Menu bar support]]).
+To connect with peers, you'll need to start the gateway (see
+[[*hyper-gateway-ushin]]).  The current running status of the gateway
+can be seen in ~hyperdrive-menu~ (see [[*Hyperdrive menu command]])
+and in the "Hyperdrive" menu bar (see [[*Menu bar support]]).
 
 - Command: hyperdrive-start ::
 
-  Start ~hyper-gateway-ushin~.
+  Start the gateway.
 
 - Command: hyperdrive-stop ::
 
-  Stop ~hyper-gateway-ushin~.
+  Stop the gateway.
 
 - User Option: hyperdrive-gateway-process-type ::
 
-  How to start and stop ~hyper-gateway-ushin~.  By default,
-  ~hyperdrive.el~ will autodetect the appropriate process type.  If you
-  have configured 
[[https://git.sr.ht/~ushin/hyper-gateway-ushin#how-do-i-run-hyper-gateway-ushin-as-a-background-process-on-gnulinux--systemd][hyper-gateway-ushin
 to run as a systemd service]],
-  then ~hyperdrive.el~ will automatically use ~systemd~ to manage the
-  gateway.  Otherwise, ~hyperdrive.el~ will start ~hyper-gateway-ushin~
-  as an Emacs subprocess.
+  How to start and stop the gateway.  By default, ~hyperdrive.el~ will
+  autodetect the appropriate process type.  If you have configured
+  
[[https://git.sr.ht/~ushin/hyper-gateway-ushin#how-do-i-run-hyper-gateway-ushin-as-a-background-process-on-gnulinux--systemd][hyper-gateway-ushin
+  to run as a systemd service]], then ~hyperdrive.el~ will automatically
+  use ~systemd~ to manage the gateway.  Otherwise, ~hyperdrive.el~ will
+  start the gateway as an Emacs subprocess.
 
 - User Option: hyperdrive-gateway-command ::
 
-  The command run to start ~hyper-gateway-ushin~ as an Emacs subprocess.  This
-  option only takes effect when ~hyperdrive-gateway-process-type~ is set
-  to ~subprocess~.
+  The command run to start the gateway as an Emacs subprocess.  This
+  option only takes effect when ~hyperdrive-gateway-process-type~ is
+  set to ~subprocess~.
 
-Alternatively, you can start ~hyper-gateway-ushin~ manually by running:
+Alternatively, you can start the gateway manually by running:
 
 #+begin_src sh
 hyper-gateway-ushin run --writable true
@@ -941,14 +937,13 @@ your hyperdrive was actually created at version 51 of 
your hyperdrive:
 |          1-50 | unknown |
 
 Running ~hyperdrive-previous~ while looking at ~/bar.org~ at version 51 or
-52 will send a request for ~/bar.org~ at version 50.
-~hyper-gateway-ushin~ will report that ~/bar.org~ does not exist at
-version 50, but it won't report whether ~/bar.org~ ever existed /before/
-version 50.  For example, ~/bar.org~ might have been created at version
-6, deleted at 14, then created again at version 51.  ~hyperdrive.el~
-will keep sending requests to the network (up to
-~hyperdrive-fill-version-ranges-limit~) until the history view looks
-like:
+52 will send a request for ~/bar.org~ at version 50.  The gateway will
+report that ~/bar.org~ does not exist at version 50, but it won't report
+whether ~/bar.org~ ever existed /before/ version 50.  For example,
+~/bar.org~ might have been created at version 6, deleted at 14, then
+created again at version 51.  ~hyperdrive.el~ will keep sending requests
+to the network (up to ~hyperdrive-fill-version-ranges-limit~) until the
+history view looks like:
 
 | Version range | exists  |
 |---------------+---------|
@@ -975,7 +970,7 @@ and technical reason:
 
 The secret master key is combined with a seed (see [[*Seeds]]) to generate
 a new public key for a hyperdrive when you run ~hyperdrive-new~.  Your
-master key is generated automatically by ~hyper-gateway-ushin~.
+master key is generated automatically by the gateway.
 
 ** hyper-gateway-ushin
 #+cindex: hyper-gateway-ushin
@@ -1012,8 +1007,8 @@ Public keys are globally unique identifiers for 
hyperdrives.  They
 make up the first part of a ~hyper://~ URL.  Public keys are
 52-character-long 
[[https://en.wikipedia.org/wiki/Base32#z-base-32][z-base-32]] encoded keys 
generated from your master
 key (see [[*Master key]]) and a [[*Seeds][seed]] string.  When you run 
~hyperdrive-new~
-and type a new seed, ~hyper-gateway-ushin~ automatically generates a
-new public key.
+and type a new seed, the gateway automatically generates a new public
+key.
 
 *** Nicknames
 #+cindex: Nicknames
@@ -1064,7 +1059,7 @@ running ~M-x customize-group RET hyperdrive RET~:
 
 - User Option: hyperdrive-gateway-port ::
 
-  ~hyperdrive.el~ will send HTTP requests to ~hyper-gateway-ushin~ on this 
port.
+  ~hyperdrive.el~ will send HTTP requests to the gateway on this port.
   Defaults to ~4973~.
 
 - User Option: hyperdrive-persist-location ::
@@ -1080,8 +1075,8 @@ running ~M-x customize-group RET hyperdrive RET~:
 
 - User Option: hyperdrive-queue-limit ::
 
-  Default number of request sent to ~hyper-gateway-ushin~ at a time in
-  a queue.  Defaults to ~20~.
+  Default number of request sent to the gateway at a time in a queue.
+  Defaults to ~20~.
 
 - User Option: hyperdrive-fill-version-ranges-limit ::
 
diff --git a/doc/hyperdrive.texi b/doc/hyperdrive.texi
index c724c7b9a0..b8d89d0d95 100644
--- a/doc/hyperdrive.texi
+++ b/doc/hyperdrive.texi
@@ -74,7 +74,6 @@ Installation
 
 Usage
 
-* Install hyper-gateway-ushin: Install hyper-gateway-ushin (1). 
 * Menu bar support::
 * Hyperdrive menu command::
 * Start/stop the gateway::
@@ -227,7 +226,7 @@ list-packages}, select @code{hyperdrive}, and click the 
@code{Install} button.
 hypercore network.
 
 After installing @code{hyperdrive.el} (see @ref{Install hyperdriveel, , 
Install hyperdrive.el}), run @code{M-x
-hyperdrive-install} to download and install @code{hyper-gateway-ushin}.
+hyperdrive-install} to download and install the gateway.
 
 Alternatively, follow the 
@uref{https://git.sr.ht/~ushin/hyper-gateway-ushin#installation, manual 
installation instructions}.
 
@@ -266,7 +265,6 @@ On the network it still may be there.
 @end display
 
 @menu
-* Install hyper-gateway-ushin: Install hyper-gateway-ushin (1). 
 * Menu bar support::
 * Hyperdrive menu command::
 * Start/stop the gateway::
@@ -288,11 +286,6 @@ On the network it still may be there.
 * Miscellaneous features::
 @end menu
 
-@node Install hyper-gateway-ushin (1)
-@section Install hyper-gateway-ushin
-
-Please be sure to @ref{Install hyper-gateway-ushin (1), , install 
hyper-gateway-ushin}.
-
 @node Menu bar support
 @section Menu bar support
 
@@ -338,35 +331,35 @@ documentation,,transient,}.  To learn about the commands 
available in
 @node Start/stop the gateway
 @section Start/stop the gateway
 
-To connect with peers, you'll need to start @code{hyper-gateway-ushin} (see
-@ref{hyper-gateway-ushin}).  The current running status of the gateway can
-be seen in @code{hyperdrive-menu} (see @ref{Hyperdrive menu command}) and in 
the
-``Hyperdrive'' menu bar (see @ref{Menu bar support}).
+To connect with peers, you'll need to start the gateway (see
+@ref{hyper-gateway-ushin}).  The current running status of the gateway
+can be seen in @code{hyperdrive-menu} (see @ref{Hyperdrive menu command})
+and in the ``Hyperdrive'' menu bar (see @ref{Menu bar support}).
 
 @deffn Command hyperdrive-start
-Start @code{hyper-gateway-ushin}.
+Start the gateway.
 @end deffn
 
 @deffn Command hyperdrive-stop
-Stop @code{hyper-gateway-ushin}.
+Stop the gateway.
 @end deffn
 
 @defopt hyperdrive-gateway-process-type
-How to start and stop @code{hyper-gateway-ushin}.  By default,
-@code{hyperdrive.el} will autodetect the appropriate process type.  If you
-have configured 
@uref{https://git.sr.ht/~ushin/hyper-gateway-ushin#how-do-i-run-hyper-gateway-ushin-as-a-background-process-on-gnulinux--systemd,
 hyper-gateway-ushin to run as a systemd service},
-then @code{hyperdrive.el} will automatically use @code{systemd} to manage the
-gateway.  Otherwise, @code{hyperdrive.el} will start @code{hyper-gateway-ushin}
-as an Emacs subprocess.
+How to start and stop the gateway.  By default, @code{hyperdrive.el} will
+autodetect the appropriate process type.  If you have configured
+@uref{https://git.sr.ht/~ushin/hyper-gateway-ushin#how-do-i-run-hyper-gateway-ushin-as-a-background-process-on-gnulinux--systemd,
 hyper-gateway-ushin
+to run as a systemd service}, then @code{hyperdrive.el} will automatically
+use @code{systemd} to manage the gateway.  Otherwise, @code{hyperdrive.el} will
+start the gateway as an Emacs subprocess.
 @end defopt
 
 @defopt hyperdrive-gateway-command
-The command run to start @code{hyper-gateway-ushin} as an Emacs subprocess.  
This
-option only takes effect when @code{hyperdrive-gateway-process-type} is set
-to @code{subprocess}.
+The command run to start the gateway as an Emacs subprocess.  This
+option only takes effect when @code{hyperdrive-gateway-process-type} is
+set to @code{subprocess}.
 @end defopt
 
-Alternatively, you can start @code{hyper-gateway-ushin} manually by running:
+Alternatively, you can start the gateway manually by running:
 
 @example
 hyper-gateway-ushin run --writable true
@@ -1296,14 +1289,13 @@ your hyperdrive was actually created at version 51 of 
your hyperdrive:
 @end multitable
 
 Running @code{hyperdrive-previous} while looking at @code{/bar.org} at version 
51 or
-52 will send a request for @code{/bar.org} at version 50.
-@code{hyper-gateway-ushin} will report that @code{/bar.org} does not exist at
-version 50, but it won't report whether @code{/bar.org} ever existed 
@emph{before}
-version 50.  For example, @code{/bar.org} might have been created at version
-6, deleted at 14, then created again at version 51.  @code{hyperdrive.el}
-will keep sending requests to the network (up to
-@code{hyperdrive-fill-version-ranges-limit}) until the history view looks
-like:
+52 will send a request for @code{/bar.org} at version 50.  The gateway will
+report that @code{/bar.org} does not exist at version 50, but it won't report
+whether @code{/bar.org} ever existed @emph{before} version 50.  For example,
+@code{/bar.org} might have been created at version 6, deleted at 14, then
+created again at version 51.  @code{hyperdrive.el} will keep sending requests
+to the network (up to @code{hyperdrive-fill-version-ranges-limit}) until the
+history view looks like:
 
 @multitable {aaaaaaaaaaaaa} {aaaaaa}
 @headitem Version range
@@ -1344,7 +1336,7 @@ contains, which can never prove that a directory doesn't 
exist.
 
 The secret master key is combined with a seed (see @ref{Seeds}) to generate
 a new public key for a hyperdrive when you run @code{hyperdrive-new}.  Your
-master key is generated automatically by @code{hyper-gateway-ushin}.
+master key is generated automatically by the gateway.
 
 @node hyper-gateway-ushin
 @section hyper-gateway-ushin
@@ -1404,8 +1396,8 @@ Public keys are globally unique identifiers for 
hyperdrives.  They
 make up the first part of a @code{hyper://} URL@.  Public keys are
 52-character-long @uref{https://en.wikipedia.org/wiki/Base32#z-base-32, 
z-base-32} encoded keys generated from your master
 key (see @ref{Master key}) and a @ref{Seeds, , seed} string.  When you run 
@code{hyperdrive-new}
-and type a new seed, @code{hyper-gateway-ushin} automatically generates a
-new public key.
+and type a new seed, the gateway automatically generates a new public
+key.
 
 @node Nicknames
 @subsection Nicknames
@@ -1464,7 +1456,7 @@ You can adjust the following options in the customization 
interface by
 running @code{M-x customize-group RET hyperdrive RET}:
 
 @defopt hyperdrive-gateway-port
-@code{hyperdrive.el} will send HTTP requests to @code{hyper-gateway-ushin} on 
this port.
+@code{hyperdrive.el} will send HTTP requests to the gateway on this port.
 Defaults to @code{4973}.
 @end defopt
 
@@ -1480,8 +1472,8 @@ which see.
 @end defopt
 
 @defopt hyperdrive-queue-limit
-Default number of request sent to @code{hyper-gateway-ushin} at a time in
-a queue.  Defaults to @code{20}.
+Default number of request sent to the gateway at a time in a queue.
+Defaults to @code{20}.
 @end defopt
 
 @defopt hyperdrive-fill-version-ranges-limit
@@ -1638,8 +1630,7 @@ If you run into issues, please first try resetting the 
values of
 @end lisp
 
 Please ensure that your version of @code{hyper-gateway-ushin} (@code{M-x
-hyperdrive-hyper-gateway-ushin-version}) is version `3.8.0` ([download
-from
+hyperdrive-gateway-version}) is version `3.8.0` ([download from
 
Codeberg](@uref{https://codeberg.org/USHIN/hyper-gateway-ushin/releases/tag/v3.8.0})
 or [download from
 SourceHut](@uref{https://git.sr.ht/~ushin/hyper-gateway-ushin/refs/v3.8.0})).
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index fe1556717a..9baba64958 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -235,8 +235,7 @@ PLZ-ERR should be a `plz-error' struct."
      ;; Curl error 7 is "Failed to connect to host."
      (h/user-error "Gateway not running.  Use \\[hyperdrive-start] to start 
it"))
     ((app plz-error-response (cl-struct plz-response (status (or 403 405)) 
body))
-     ;; 403 Forbidden or 405 Method Not Allowed: Display message from
-     ;; hyper-gateway-ushin.
+     ;; 403 Forbidden or 405 Method Not Allowed: Display message from gateway.
      (h/error "%s" body))
     ((guard else)
      (funcall else plz-err))
@@ -604,7 +603,7 @@ echo area when the request for the file is made."
                      (not-found-action))))
                   (500 ;; Generic error, likely a mistyped URL
                    (h/message
-                    "Generic hyper-gateway-ushin status 500 error. %s %s"
+                    "Generic gateway status 500 error. %s %s"
                     "Is this URL correct?" (he/url entry)))
                   (_ (h/message "Unable to load URL \"%s\": %S"
                                 (he/url entry) err))))))
@@ -963,7 +962,7 @@ HYPERDRIVE's public metadata file."
 (cl-defun h/purge-no-prompt (hyperdrive &key then else)
   "Purge all data corresponding to HYPERDRIVE, then call THEN with response.
 
-- HYPERDRIVE file content and metadata managed by hyper-gateway-ushin
+- HYPERDRIVE file content and metadata managed by the gateway
 - hash table entry for HYPERDRIVE in `hyperdrive-hyperdrives'
 - hash table entries for HYPERDRIVE in `hyperdrive-version-ranges'
 
@@ -1416,8 +1415,10 @@ Then calls THEN if given."
 
 ;;;; Gateway process
 
-(defun h//hyper-gateway-ushin-path ()
-  "Return path to hyper-gateway-ushin executable, or nil if not found."
+(defun h//gateway-path ()
+  "Return path to gateway executable, or nil if not found.
+See user options `hyperdrive-gateway-program' and
+`hyperdrive-gateway-directory'."
   (cond ((file-exists-p
           (expand-file-name h/gateway-program hyperdrive-gateway-directory))
          (expand-file-name h/gateway-program hyperdrive-gateway-directory))
@@ -1430,7 +1431,7 @@ Default function; see variable 
`h/gateway-start-function'."
         (make-process
          :name "hyperdrive-gateway"
          :buffer " *hyperdrive-start*"
-         :command (cons (h//hyper-gateway-ushin-path)
+         :command (cons (h//gateway-path)
                         (split-string-and-unquote h/gateway-command-args))
          :connection-type 'pipe)))
 
@@ -1491,8 +1492,8 @@ process is running."
 
 (defun h/gateway-installed-p ()
   "Return non-nil if the gateway program is installed."
-  (and-let* ((hyper-gateway-ushin-path (hyperdrive--hyper-gateway-ushin-path)))
-    (file-executable-p hyper-gateway-ushin-path)))
+  (and-let* ((gateway-path (hyperdrive--gateway-path)))
+    (file-executable-p gateway-path)))
 
 (defun h//gateway-ready-p ()
   "Return non-nil if the gateway is running and accessible.
diff --git a/hyperdrive-vars.el b/hyperdrive-vars.el
index 4191b8bf1c..45f27c109e 100644
--- a/hyperdrive-vars.el
+++ b/hyperdrive-vars.el
@@ -43,7 +43,7 @@
   "Renamed in hyperdrive.el v0.4.0 to reflect update to hyper-gateway-ushin.
 This alias will be removed in a later version of `hyperdrive.el'.")
 (defcustom h/gateway-port 4973
-  "Port to use to send requests to the hyper-gateway-ushin server."
+  "Port to use to send requests to the gateway server."
   :type 'natnum)
 
 (defcustom h/safe-hyperdrives nil
@@ -261,7 +261,7 @@ value (and should only be present once in the string).  
Used in
   "Name of gateway executable.
 Command `hyperdrive-install' installs to this name inside
 `hyperdrive-gateway-directory'.  Function
-`h//hyper-gateway-ushin-path' looks for executable by this name."
+`h//gateway-path' looks for executable by this name."
   :type 'string)
 
 (defcustom h/gateway-directory (expand-file-name "~/.local/lib/hyperdrive.el")
@@ -448,7 +448,7 @@ This hook is called by `hyperdrive--gateway-wait-for-ready' 
after
   :type 'hook)
 
 (defcustom h/gateway-command-args "run --writable true --silent true"
-  "Arguments passed to hyper-gateway-ushin."
+  "Arguments passed to the gateway."
   :type 'string
   :group 'hyperdrive)
 
diff --git a/hyperdrive.el b/hyperdrive.el
index 34eccb60dc..1d97db8de5 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -96,7 +96,7 @@
 
 ;;;###autoload
 (defun hyperdrive-start ()
-  "Start `hyper-gateway-ushin' if not already running.
+  "Start the gateway if not already running.
 Calls function set in option `hyperdrive-gateway-start-function',
 which see."
   (interactive)
@@ -121,7 +121,7 @@ which see."
 
 ;;;###autoload
 (defun hyperdrive-stop ()
-  "Stop `hyper-gateway-ushin' if running.
+  "Stop the gateway if running.
 Calls function set in option `hyperdrive-gateway-stop-function',
 which see."
   (interactive)
@@ -479,7 +479,7 @@ use, see `hyperdrive-write'."
                   ;; PUT responses only include ETag and Last-Modified
                   ;; headers, so we need to set other entry metadata manually.
                   ;; FIXME: For large buffers, `buffer-size' returns a 
different
-                  ;; value than hyper-gateway-ushin's Content-Length header.
+                  ;; value than the gateway's Content-Length header.
                   (setf (he/size entry) (buffer-size))
                   ;; FIXME: Will entry type ever be anything besides 
text/plain?
                   ;;        /.well-known/host-meta.json ?
@@ -827,11 +827,11 @@ The return value of this function is the retrieval 
buffer."
 (defvar h/menu-bar-menu
   '(("Gateway"
      ["Start Gateway" h/start
-      :help "Start hyper-gateway-ushin"]
+      :help "Start the gateway"]
      ["Stop Gateway" h/stop
-      :help "Stop hyper-gateway-ushin"]
+      :help "Stop the gateway"]
      ["Gateway version" h/gateway-version
-      :help "Say hyper-gateway-ushin version"]
+      :help "Say gateway version"]
      ["Install gateway" h/install
       :label (if (h/gateway-needs-upgrade-p) "Upgrade" "Install")
       :visible (and (not (h/gateway-installing-p))
@@ -1301,18 +1301,18 @@ Intended for relative (i.e. non-full) URLs."
        :sha256 
"c347255d3fc5e6499fc10bea4d20e62798fb5968960dbbe26d507d11688326bb")
      ( :url 
"https://git.sr.ht/~ushin/hyper-gateway-ushin/refs/download/v3.8.0/hyper-gateway-windows-v3.8.0.exe";
        :sha256 "")))
-  "Alist mapping `system-type' to URLs where hyper-gateway-ushin can be 
downloaded.")
+  "Alist mapping `system-type' to URLs where the gateway can be downloaded.")
 
 ;;;###autoload
 (defun hyperdrive-install (&optional forcep)
-  "Download and install hyper-gateway-ushin.
+  "Download and install the gateway.
 If FORCEP, don't prompt for confirmation before downloading."
   (interactive (list current-prefix-arg))
   (when (h/gateway-installing-p)
     (h/user-error "Installation of gateway already in progress"))
   (unless forcep
     (when (h/gateway-installed-p)
-      (unless (yes-or-no-p "Download and reinstall/upgrade 
hyper-gateway-ushin? ")
+      (unless (yes-or-no-p "Download and reinstall/upgrade the gateway? ")
         (h/user-error "Not downloading; aborted"))))
   (let ((urls-and-hashes (alist-get system-type h/gateway-urls-and-hashes))
         (destination (expand-file-name h/gateway-program h/gateway-directory)))
@@ -1378,7 +1378,7 @@ If FORCEP, don't prompt for confirmation before 
downloading."
       (try))))
 
 (defun h/cancel-install ()
-  "Stop downloading/installing hyper-gateway-ushin."
+  "Stop downloading/installing the gateway."
   (interactive)
   (unless (h/gateway-installing-p)
     (h/user-error "No installation in progress"))
@@ -1401,7 +1401,7 @@ If FORCEP, don't prompt for confirmation before 
downloading."
 ;;   "Return non-nil if a local installation of the gateway appears valid.
 ;; That is, if an executable file exists at the expected location
 ;; with an expected hash."
-;;   (when-let ((file-name (h//hyper-gateway-ushin-path)))
+;;   (when-let ((file-name (h//gateway-path)))
 ;;     (let* ((file-hash (with-temp-buffer
 ;;                          (insert-file-contents-literally file-name)
 ;;                          (secure-hash 'sha256 (current-buffer))))
diff --git a/tests/org links.org b/tests/org links.org
index f264e63593..e907d61960 100644
--- a/tests/org links.org       
+++ b/tests/org links.org       
@@ -34,7 +34,7 @@ Here are various link types which we want to test.
 + [[hyper://PUBLIC_KEY/links%20test.org]]
 + hyper://PUBLIC_KEY/links%20test.org
 
-+ [2023-08-30 Wed 14:43] Getting this error (with the public key changed to 
the real one), for both the bracketed and unbracketed links: ~Hyperdrive: 
Generic hyper-gateway-ushin status 500 error. Is this URL correct? 
hyper:////wnqpdr9xdy1p9wofqbj7e7csueg7aynqbot8gt53ueunezry6any/links%20test.org~
++ [2023-08-30 Wed 14:43] Getting this error (with the public key changed to 
the real one), for both the bracketed and unbracketed links: ~Hyperdrive: 
Generic gateway status 500 error. Is this URL correct? 
hyper:////wnqpdr9xdy1p9wofqbj7e7csueg7aynqbot8gt53ueunezry6any/links%20test.org~
 
   + There are FOUR SLASHES.