9 files changed, 18 insertions, 14 deletions

diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 54e2af2e5340..7a4852e7a2fc 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -445,7 +445,10 @@ to properly
 recognize the disk:
 .Bd -literal -offset indent
 dd if=/dev/zero of=/dev/da0 bs=512 count=32
-fdisk -BI da0
+gpart create -s MBR da0
+gpart add -t freebsd da0
+gpart set -a active -i 1 da0
+gpart bootcode -b /boot/mbr da0
 dd if=/dev/zero of=/dev/da0s1 bs=512 count=32
 bsdlabel -w -B da0s1
 bsdlabel -e da0s1
@@ -495,6 +498,5 @@ are not generally compatible.
 .Xr md 4 ,
 .Xr disktab 5 ,
 .Xr boot0cfg 8 ,
-.Xr fdisk 8 ,
 .Xr gpart 8 ,
 .Xr newfs 8
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index feb8758b5a15..bb8e93c3090a 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -100,8 +100,8 @@ flag is needed if the filesystem uses
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr fs 5 ,
-.Xr disklabel 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8 ,
 .Xr tunefs 8
 .Sh HISTORY
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index fcab1339782c..6894ab9f52e9 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -39,6 +39,13 @@ The
 utility can be used to divide space on the disk into slices and set one
 active.
 .Sh DESCRIPTION
+.Bf -symbolic
+This command is obsolete.
+Users are advised to use
+.Xr gpart 8
+instead.
+.Ef
+.Pp
 The
 .Fx
 utility,
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index d3c8e9f4ff05..4bf5cdd1cb18 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -121,9 +121,9 @@ to
 .Pa /var/tmp/ffsinfo
 with all available information.
 .Sh SEE ALSO
-.Xr disklabel 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr growfs 8 ,
 .Xr gvinum 8 ,
 .Xr newfs 8 ,
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 264532721531..6818d7bb9513 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -300,8 +300,7 @@ mount /dev/md1.nop /mnt
 .Sh SEE ALSO
 .Xr md 4 ,
 .Xr ffs 7 ,
-.Xr bsdlabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr mdmfs 8 ,
 .Xr malloc 9
 .Sh HISTORY
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index a4067e940862..f261bb01a632 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -303,11 +303,11 @@ on file systems that contain many small files.
 .Xr geom 4 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
-.Xr bsdlabel 8 ,
 .Xr camcontrol 8 ,
 .Xr dump 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr gjournal 8 ,
 .Xr growfs 8 ,
 .Xr gvinum 8 ,
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 0f1abb4e5cd5..967e1513556e 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -228,9 +228,7 @@ Create a 30MB image file, with the FAT partition starting
 newfs_msdos -C 30M -@63s ./somefile
 .Ed
 .Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8
 .Sh HISTORY
 The
diff --git a/sbin/newfs_nandfs/newfs_nandfs.8 b/sbin/newfs_nandfs/newfs_nandfs.8
index 7a630bbbf89e..fe3216394109 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.8
+++ b/sbin/newfs_nandfs/newfs_nandfs.8
@@ -63,9 +63,7 @@ Create a file system, using default parameters, on
 newfs_nandfs /dev/ada0s1
 .Ed
 .Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8
 .Sh HISTORY
 The
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 690dfcd436e2..71fa8e01f133 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -352,9 +352,9 @@ requirement has not been adhered to.
 .Xr make.conf 5 ,
 .Xr ttys 5 ,
 .Xr boot0cfg 8 ,
-.Xr bsdlabel 8 ,
 .Xr btxld 8 ,
 .Xr config 8 ,
+.Xr gpart 8 ,
 .Xr gptboot 8 ,
 .Xr halt 8 ,
 .Xr loader 8 ,