diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-06-13 02:03:58 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-06-13 02:38:47 +0000 |
| commit | 3ff01b231dfa83d518854c63e7c9cd1debd1139e (patch) | |
| tree | d760bee3bdd8c4b94fb9962c9e43577a92c1cd2c /cddl/sbin/zfs | |
| parent | 345077ccd52193591a1bad91fef3583f7129345d (diff) | |
| parent | afa7b3484556d3ae610a34582ce5ebd2c3e27bba (diff) | |
| download | src-3ff01b231dfa83d518854c63e7c9cd1debd1139e.tar.gz src-3ff01b231dfa83d518854c63e7c9cd1debd1139e.zip | |
zfs: merge openzfs/zfs@afa7b3484 (master) into main
Notable upstream pull request merges:
#12149: Multiple man-pages: Move to appropriate section
#12158: Re-embed multilist_t storage
#12191: Convert non-libzpool libraries to -fvisibility=hidden
#12196: Unify manpage makefiles, move pages to better sexions, ...
#12210: libzutil: import filtering optimisation
#12212: Remove pool io kstats
Obtained from: OpenZFS
OpenZFS commit: afa7b3484556d3ae610a34582ce5ebd2c3e27bba
Diffstat (limited to 'cddl/sbin/zfs')
| -rw-r--r-- | cddl/sbin/zfs/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 5ea237eecaa4..6a6ef62e4fce 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -3,6 +3,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zfs +.PATH: ${ZFSTOP}/man/man7 .PATH: ${ZFSTOP}/man/man8 .PATH: ${ZFSTOP}/module/os/freebsd/spl @@ -34,8 +35,8 @@ MAN= \ zfs-upgrade.8 \ zfs-userspace.8 \ zfs-wait.8 \ - zfsconcepts.8 \ - zfsprops.8 + zfsconcepts.7 \ + zfsprops.7 MLINKS= \ zfs-allow.8 zfs-unallow.8 \ zfs-hold.8 zfs-release.8 \ |