Update references to nonexistent man pages in code

Refer to the correct section or alternative for FreeBSD and Linux.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11132

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 42c180890fec746877c2366f9401188b5211b945..f609a4e70677a5bb9494579e35e9939a2c9bf733 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -6596,9 +6596,9 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
 
                (void) fprintf(stderr, gettext("cannot share '%s': "
                    "legacy share\n"), zfs_get_name(zhp));
-               (void) fprintf(stderr, gettext("use share(1M) to "
-                   "share this filesystem, or set "
-                   "sharenfs property on\n"));
+               (void) fprintf(stderr, gettext("use exports(5) or "
+                   "smb.conf(5) to share this filesystem, or set "
+                   "the sharenfs or sharesmb property\n"));
                return (1);
        }
 
@@ -6613,7 +6613,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
 
                (void) fprintf(stderr, gettext("cannot %s '%s': "
                    "legacy mountpoint\n"), cmdname, zfs_get_name(zhp));
-               (void) fprintf(stderr, gettext("use %s(1M) to "
+               (void) fprintf(stderr, gettext("use %s(8) to "
                    "%s this filesystem\n"), cmdname, cmdname);
                return (1);
        }
@@ -7416,8 +7416,8 @@ unshare_unmount(int op, int argc, char **argv)
                                    "unshare '%s': legacy share\n"),
                                    zfs_get_name(zhp));
                                (void) fprintf(stderr, gettext("use "
-                                   "unshare(1M) to unshare this "
-                                   "filesystem\n"));
+                                   "exports(5) or smb.conf(5) to unshare "
+                                   "this filesystem\n"));
                                ret = 1;
                        } else if (!zfs_is_shared(zhp)) {
                                (void) fprintf(stderr, gettext("cannot "
@@ -7435,7 +7435,7 @@ unshare_unmount(int op, int argc, char **argv)
                                    "unmount '%s': legacy "
                                    "mountpoint\n"), zfs_get_name(zhp));
                                (void) fprintf(stderr, gettext("use "
-                                   "umount(1M) to unmount this "
+                                   "umount(8) to unmount this "
                                    "filesystem\n"));
                                ret = 1;
                        } else if (!zfs_is_mounted(zhp, NULL)) {

diff --git a/include/libzfs.h b/include/libzfs.h
index e0b2676a441fca6c6ac3aa690ae58726939e427c..337e4934a7b2028364eb2885f2443024ae6208ab 100644 (file)
--- a/include/libzfs.h
+++ b/include/libzfs.h
@@ -88,8 +88,8 @@ typedef enum zfs_error {
        EZFS_ZONED,             /* used improperly in local zone */
        EZFS_MOUNTFAILED,       /* failed to mount dataset */
        EZFS_UMOUNTFAILED,      /* failed to unmount dataset */
-       EZFS_UNSHARENFSFAILED,  /* unshare(1M) failed */
-       EZFS_SHARENFSFAILED,    /* share(1M) failed */
+       EZFS_UNSHARENFSFAILED,  /* failed to unshare over nfs */
+       EZFS_SHARENFSFAILED,    /* failed to share over nfs */
        EZFS_PERM,              /* permission denied */
        EZFS_NOSPC,             /* out of space */
        EZFS_FAULT,             /* bad address */

diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index fe63d735babc5369b94f8d447a4b8c6c6681bf02..211dd6d50c8c1872a7448e3981ad7b1216851c21 100644 (file)
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -249,7 +249,7 @@ typedef enum {
        ZPOOL_NUM_PROPS
 } zpool_prop_t;
 
-/* Small enough to not hog a whole line of printout in zpool(1M). */
+/* Small enough to not hog a whole line of printout in zpool(8). */
 #define        ZPROP_MAX_COMMENT       32
 
 #define        ZPROP_VALUE             "value"

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index a457fbfd0639a8392f0a8d440557b7a3215ccd3b..95cb32957218b63205609264bf0cb9e95bf760d7 100644 (file)
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -148,15 +148,15 @@ libzfs_error_description(libzfs_handle_t *hdl)
        case EZFS_MOUNTFAILED:
                return (dgettext(TEXT_DOMAIN, "mount failed"));
        case EZFS_UMOUNTFAILED:
-               return (dgettext(TEXT_DOMAIN, "umount failed"));
+               return (dgettext(TEXT_DOMAIN, "unmount failed"));
        case EZFS_UNSHARENFSFAILED:
-               return (dgettext(TEXT_DOMAIN, "unshare(1M) failed"));
+               return (dgettext(TEXT_DOMAIN, "NFS share removal failed"));
        case EZFS_SHARENFSFAILED:
-               return (dgettext(TEXT_DOMAIN, "share(1M) failed"));
+               return (dgettext(TEXT_DOMAIN, "NFS share creation failed"));
        case EZFS_UNSHARESMBFAILED:
-               return (dgettext(TEXT_DOMAIN, "smb remove share failed"));
+               return (dgettext(TEXT_DOMAIN, "SMB share removal failed"));
        case EZFS_SHARESMBFAILED:
-               return (dgettext(TEXT_DOMAIN, "smb add share failed"));
+               return (dgettext(TEXT_DOMAIN, "SMB share creation failed"));
        case EZFS_PERM:
                return (dgettext(TEXT_DOMAIN, "permission denied"));
        case EZFS_NOSPC:

diff --git a/man/man5/zpool-features.5 b/man/man5/zpool-features.5
index 36c4343a1388ea4528770160d96023bdb16a87db..08a84ece205b5837ee6a7ccf93f2041fcadd08dd 100644 (file)
--- a/man/man5/zpool-features.5
+++ b/man/man5/zpool-features.5
@@ -676,11 +676,11 @@ When the \fBmulti_vdev_crash_dump\fR feature is set to \fBenabled\fR,
 the administrator can use the \fBdumpadm\fR(1M) command to configure a
 dump device on a pool comprised of multiple vdevs.
 
-Under Linux this feature is registered for compatibility but not used.
-New pools created under Linux will have the feature \fBenabled\fR but
-will never transition to \fB\fBactive\fR.  This functionality is not
-required in order to support crash dumps under Linux.  Existing pools
-where this feature is \fB\fBactive\fR can be imported.
+Under FreeBSD and Linux this feature is registered for compatibility but not
+used.  New pools created under FreeBSD and Linux will have the feature
+\fBenabled\fR but will never transition to \fB\fBactive\fR.  This functionality
+is not required in order to support crash dumps under FreeBSD and Linux.
+Existing pools where this feature is \fB\fBactive\fR can be imported.
 .RE
 
 .sp

diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c
index 671b939b593b351db65e67216062a530f4c0bf97..55ed2e25d5c3d479c023707a63a47987347462bd 100644 (file)
--- a/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/module/os/freebsd/zfs/zfs_vfsops.c
@@ -433,7 +433,7 @@ zfs_sync(vfs_t *vfsp, int waitfor)
        } else {
                /*
                 * Sync all ZFS filesystems.  This is what happens when you
-                * run sync(1M).  Unlike other filesystems, ZFS honors the
+                * run sync(8).  Unlike other filesystems, ZFS honors the
                 * request by waiting for all pools to commit all dirty data.
                 */
                spa_sync_allpools();

diff --git a/module/os/linux/zfs/zfs_vfsops.c b/module/os/linux/zfs/zfs_vfsops.c
index b218237d07ff8e3fa239b435a7f8c131e8995d22..6c0d8134c486c85a522e110c61fb649b881d435d 100644 (file)
--- a/module/os/linux/zfs/zfs_vfsops.c
+++ b/module/os/linux/zfs/zfs_vfsops.c
@@ -294,7 +294,7 @@ zfs_sync(struct super_block *sb, int wait, cred_t *cr)
        } else {
                /*
                 * Sync all ZFS filesystems.  This is what happens when you
-                * run sync(1M).  Unlike other filesystems, ZFS honors the
+                * run sync(1).  Unlike other filesystems, ZFS honors the
                 * request by waiting for all pools to commit all dirty data.
                 */
                spa_sync_allpools();

diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index 0352b13aa240e86e0d44b18ab7e77e632256d045..89ddc59b226cab31653f5437dd10f13c2a2c1e6a 100644 (file)
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -551,14 +551,14 @@ zfs_prop_init(void)
            PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "<path> | legacy | none",
            "MOUNTPOINT");
        zprop_register_string(ZFS_PROP_SHARENFS, "sharenfs", "off",
-           PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | share(1M) options",
+           PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | NFS share options",
            "SHARENFS");
        zprop_register_string(ZFS_PROP_TYPE, "type", NULL, PROP_READONLY,
            ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK,
            "filesystem | volume | snapshot | bookmark", "TYPE");
        zprop_register_string(ZFS_PROP_SHARESMB, "sharesmb", "off",
            PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
-           "on | off | sharemgr(1M) options", "SHARESMB");
+           "on | off | SMB share options", "SHARESMB");
        zprop_register_string(ZFS_PROP_MLSLABEL, "mlslabel",
            ZFS_MLSLABEL_DEFAULT, PROP_INHERIT, ZFS_TYPE_DATASET,
            "<sensitivity label>", "MLSLABEL");

diff --git a/module/zfs/dsl_scan.c b/module/zfs/dsl_scan.c
index 4704781bfa4541b2e303805afa63f73623363dd6..f6a5ceca6a0e8828fa75ff078cdb79f01efb0992 100644 (file)
--- a/module/zfs/dsl_scan.c
+++ b/module/zfs/dsl_scan.c
@@ -3987,7 +3987,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 
                /*
                 * Keep track of how much data we've examined so that
-                * zpool(1M) status can make useful progress reports.
+                * zpool(8) status can make useful progress reports.
                 */
                scn->scn_phys.scn_examined += DVA_GET_ASIZE(dva);
                spa->spa_scan_pass_exam += DVA_GET_ASIZE(dva);

diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c
index 133005b227e58e51759884d472873d3a002b5cea..325f505b72d1d3a4bcd3c37c7867d851a4637396 100644 (file)
--- a/module/zfs/metaslab.c
+++ b/module/zfs/metaslab.c
@@ -5674,7 +5674,7 @@ metaslab_claim_concrete(vdev_t *vd, uint64_t offset, uint64_t size,
        range_tree_remove(msp->ms_allocatable, offset, size);
        range_tree_clear(msp->ms_trim, offset, size);
 
-       if (spa_writeable(spa)) {       /* don't dirty if we're zdb(1M) */
+       if (spa_writeable(spa)) {       /* don't dirty if we're zdb(8) */
                metaslab_class_t *mc = msp->ms_group->mg_class;
                multilist_sublist_t *mls =
                    multilist_sublist_lock_obj(mc->mc_metaslab_txg_list, msp);
@@ -5721,7 +5721,7 @@ metaslab_claim_impl(vdev_t *vd, uint64_t offset, uint64_t size, uint64_t txg)
                metaslab_claim_cb_arg_t arg;
 
                /*
-                * Only zdb(1M) can claim on indirect vdevs.  This is used
+                * Only zdb(8) can claim on indirect vdevs.  This is used
                 * to detect leaks of mapped space (that are not accounted
                 * for in the obsolete counts, spacemap, or bpobj).
                 */

diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
index 2ab58815400acdfb19d8825e1e043dd9f52224a6..2939c0366504239d18505c15d3d51a1477994ae8 100644 (file)
--- a/module/zfs/spa_history.c
+++ b/module/zfs/spa_history.c
@@ -321,7 +321,7 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx)
                 * posted as a result of the ZPOOL_HIST_CMD key being present
                 * it would result in only one sysevent being posted with the
                 * full command line arguments, requiring the consumer to know
-                * how to parse and understand zfs(1M) command invocations.
+                * how to parse and understand zfs(8) command invocations.
                 */
                spa_history_log_notify(spa, nvl);
        } else if (nvlist_exists(nvl, ZPOOL_HIST_IOCTL)) {

diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
index 04210472886cbffe472949f993a3bcf95f8f284c..1640dceddc761facbccba0eb5620ca25a492bcf9 100644 (file)
--- a/module/zfs/spa_misc.c
+++ b/module/zfs/spa_misc.c
@@ -1366,7 +1366,7 @@ spa_vdev_state_exit(spa_t *spa, vdev_t *vd, int error)
 
        /*
         * If anything changed, wait for it to sync.  This ensures that,
-        * from the system administrator's perspective, zpool(1M) commands
+        * from the system administrator's perspective, zpool(8) commands
         * are synchronous.  This is important for things like zpool offline:
         * when the command completes, you expect no further I/O from ZFS.
         */

diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c
index 6af61cdcd9bf44ada45b95a1df5d6a10ef8159dc..e41e79ab8a188f61df56594d677852f38e3733ec 100644 (file)
--- a/module/zfs/vdev.c
+++ b/module/zfs/vdev.c
@@ -229,7 +229,7 @@ vdev_default_xlate(vdev_t *vd, const range_seg64_t *in, range_seg64_t *res)
 
 /*
  * Derive the enumerated allocation bias from string input.
- * String origin is either the per-vdev zap or zpool(1M).
+ * String origin is either the per-vdev zap or zpool(8).
  */
 static vdev_alloc_bias_t
 vdev_derive_alloc_bias(const char *bias)

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 8a8fbccd7d6307a22d531a96f0680221d39495e9..260e88b0be2cf51ed850625370fdf4cd7b307026 100644 (file)
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -1272,7 +1272,7 @@ zio_claim(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
        ASSERT3U(spa->spa_uberblock.ub_rootbp.blk_birth, <,
            spa_min_claim_txg(spa));
        ASSERT(txg == spa_min_claim_txg(spa) || txg == 0);
-       ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa));       /* zdb(1M) */
+       ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa));       /* zdb(8) */
 
        zio = zio_create(pio, spa, txg, bp, NULL, BP_GET_PSIZE(bp),
            BP_GET_PSIZE(bp), done, private, ZIO_TYPE_CLAIM, ZIO_PRIORITY_NOW,

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh
index c88e300412f1ea68698ba8aea474b8a9e56326d6..6e293ca638293b7f40ab73a3678d6205ffebc009 100755 (executable)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh
@@ -92,7 +92,7 @@ for val in 1 2 3; do
        check_used $used $val
 done
 
-log_note "Verify df(1M) can correctly display the space charged."
+log_note "Verify df(1) can correctly display the space charged."
 for val in 1 2 3; do
        if is_freebsd; then
                used=`df -m /$TESTPOOL/fs_$val | grep $TESTPOOL/fs_$val \