From 66bee50af774673bfaeb4c66a5a82e0ac99e70a4 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue, 7 May 2024 07:35:33 +0000
Subject: [PATCH] Remove cross-references to GBDE

---
 lib/geom/eli/geli.8        |  2 --
 lib/geom/shsec/gshsec.8    |  1 -
 libexec/rc/rc.d/geli       |  1 -
 sbin/ggate/ggatel/ggatel.8 | 18 ------------------
 share/man/man4/disk.4      |  2 --
 sys/sys/bufobj.h           |  2 +-
 sys/sys/disk.h             |  2 +-
 7 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/lib/geom/eli/geli.8 b/lib/geom/eli/geli.8
index 098ba4d0485e..d34e15dc4ad8 100644
--- a/lib/geom/eli/geli.8
+++ b/lib/geom/eli/geli.8
@@ -1242,10 +1242,8 @@ after the first time a provider is attached and before it is
 initialized in this way.
 .Sh SEE ALSO
 .Xr crypto 4 ,
-.Xr gbde 4 ,
 .Xr geom 4 ,
 .Xr loader.conf 5 ,
-.Xr gbde 8 ,
 .Xr geom 8 ,
 .Xr crypto 9
 .Sh HISTORY
diff --git a/lib/geom/shsec/gshsec.8 b/lib/geom/shsec/gshsec.8
index 9430fde13c52..d4477de3a71e 100644
--- a/lib/geom/shsec/gshsec.8
+++ b/lib/geom/shsec/gshsec.8
@@ -116,7 +116,6 @@ detected and connected, making the secret available via the
 device.
 .Sh SEE ALSO
 .Xr geom 4 ,
-.Xr gbde 8 ,
 .Xr geom 8 ,
 .Xr newfs 8
 .Sh HISTORY
diff --git a/libexec/rc/rc.d/geli b/libexec/rc/rc.d/geli
index 312d76a361ad..16d24efd1e39 100755
--- a/libexec/rc/rc.d/geli
+++ b/libexec/rc/rc.d/geli
@@ -44,7 +44,6 @@ geli_start()
 
 	if [ -z "${geli_tries}" ]; then
 		if [ -n "${geli_attach_attempts}" ]; then
-			# Compatibility with rc.d/gbde.
 			geli_tries=${geli_attach_attempts}
 		else
 			geli_tries=`${SYSCTL_N} kern.geom.eli.tries`
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index 1ac41ed9eaa7..816a5b9a6e0e 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -125,27 +125,9 @@ To get details about the failure,
 should be called with the
 .Fl v
 option.
-.Sh EXAMPLES
-.Dq GEOMify
-the
-.Dq Li fd0
-device and use
-.Xr gbde 8
-to encrypt data on a floppy disk.
-.Bd -literal -offset indent
-ggatel create -u 5 /dev/fd0
-gbde init /dev/ggate5
-gbde attach ggate5
-newfs /dev/ggate5.bde
-mount /dev/ggate5.bde /secret
-cp /private/foo /secret/
-umount /secret
-gbde detach ggate5
-ggatel destroy -u 5
 .Ed
 .Sh SEE ALSO
 .Xr geom 4 ,
-.Xr gbde 8 ,
 .Xr ggatec 8 ,
 .Xr ggated 8 ,
 .Xr mount 8 ,
diff --git a/share/man/man4/disk.4 b/share/man/man4/disk.4
index 6451ff0e7370..a6316d3fd268 100644
--- a/share/man/man4/disk.4
+++ b/share/man/man4/disk.4
@@ -111,8 +111,6 @@ the case for multipathing for example,
 GEOM classes that consume a single provider and provide single
 provider, like
 .Xr geli 8 ,
-and
-.Xr gbde 8 ,
 the identifier should be formed by attaching that provider's class
 name to the ident of the underlying provider,
 .It
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index d70327e31a37..a6a9c5c2bf01 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -33,7 +33,7 @@
  * cache.
  *
  * This used to be vnodes, but we need non-vnode code to be able
- * to use the buffer cache as well, specifically geom classes like gbde,
+ * to use the buffer cache as well, specifically geom classes like
  * raid3 and raid5.
  *
  * All vnodes will contain a bufobj initially, but down the road we may
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 73ae5ce5756e..b8e29cef1de5 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -78,7 +78,7 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl);
 	 *   only if they point at exactly the same physical storage, this is
 	 *   the case for multipathing for example,
 	 * - GEOM classes that consumes single providers and provide single
-	 *   providers, like geli, gbde, should just attach class name to the
+	 *   providers, like geli, should just attach class name to the
 	 *   ident of the underlying provider,
 	 * - ident is an ASCII string (is printable),
 	 * - ident is optional and applications can't relay on its presence.