aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--sbin/mount/Makefile2
-rw-r--r--share/man/man5/Makefile1
-rw-r--r--share/man/man5/mount.conf.5 (renamed from sbin/mount/mount.conf.8)2
4 files changed, 5 insertions, 2 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 33d21badc8cd..bd70705d4c52 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20170529: mount.conf(8) -> mount.conf(5)
+OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
# 20170525: remove misleading template
OLD_FILES+=usr/share/misc/man.template
# 20170525: disconnect the roff docs from the build
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 80d40234e792..68c7ee9819d8 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -4,7 +4,7 @@
PACKAGE=runtime
PROG= mount
SRCS= mount.c mount_fs.c getmntopts.c vfslist.c
-MAN= mount.8 mount.conf.8
+MAN= mount.8
# We do NOT install the getmntopts.3 man page.
LIBADD= util
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 2e70716e9ea5..d2f79b69d0ef 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -40,6 +40,7 @@ MAN= acct.5 \
make.conf.5 \
moduli.5 \
motd.5 \
+ mount.conf.5 \
mqueuefs.5 \
msdosfs.5 \
networks.5 \
diff --git a/sbin/mount/mount.conf.8 b/share/man/man5/mount.conf.5
index f7d04af657fc..b0194a353901 100644
--- a/sbin/mount/mount.conf.8
+++ b/share/man/man5/mount.conf.5
@@ -27,7 +27,7 @@
.\"
.\"
.Dd October 17, 2013
-.Dt MOUNT.CONF 8
+.Dt MOUNT.CONF 5
.Os
.Sh NAME
.Nm mount.conf