Module Name:    src
Committed By:   jruoho
Date:           Tue May  3 16:12:24 UTC 2011

Modified Files:
        src/distrib/sets/lists/man: mi
        src/share/man/man5: Makefile
Added Files:
        src/share/man/man5: daily.5 monthly.5 weekly.5
Removed Files:
        src/share/man/man5: daily.conf.5 monthly.conf.5 weekly.conf.5

Log Message:
Link {daily, monthly, weekly}.conf.5 to {daily, monthly, weekly}.5 and move
things around a little. Part of fixing PR bin/22230.


To generate a diff of this commit:
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.66 -r1.67 src/share/man/man5/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man5/daily.5 \
    src/share/man/man5/monthly.5 src/share/man/man5/weekly.5
cvs rdiff -u -r1.27 -r0 src/share/man/man5/daily.conf.5
cvs rdiff -u -r1.9 -r0 src/share/man/man5/monthly.conf.5
cvs rdiff -u -r1.10 -r0 src/share/man/man5/weekly.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1313 src/distrib/sets/lists/man/mi:1.1314
--- src/distrib/sets/lists/man/mi:1.1313	Tue Apr 26 17:30:45 2011
+++ src/distrib/sets/lists/man/mi	Tue May  3 16:12:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1313 2011/04/26 17:30:45 joerg Exp $
+# $NetBSD: mi,v 1.1314 2011/05/03 16:12:23 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1839,6 +1839,7 @@
 ./usr/share/man/cat5/cidr_table.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/core.0			man-sys-catman		.cat
 ./usr/share/man/cat5/crontab.0			man-cron-catman		.cat
+./usr/share/man/cat5/daily.0			man-sys-catman		.cat
 ./usr/share/man/cat5/daily.conf.0		man-sys-catman		.cat
 ./usr/share/man/cat5/dhclient.conf.0		man-dhclient-catman	.cat
 ./usr/share/man/cat5/dhclient.leases.0		man-dhclient-catman	.cat
@@ -1922,6 +1923,7 @@
 ./usr/share/man/cat5/master.passwd.0		man-sys-catman		.cat
 ./usr/share/man/cat5/mixerctl.conf.0		man-audio-catman	.cat
 ./usr/share/man/cat5/moduli.0			man-secsh-catman	crypto,.cat
+./usr/share/man/cat5/monthly.0			man-sys-catman		.cat
 ./usr/share/man/cat5/monthly.conf.0		man-sys-catman		.cat
 ./usr/share/man/cat5/motd.0			man-sys-catman		.cat
 ./usr/share/man/cat5/named.conf.0		man-bind-catman		.cat
@@ -2000,6 +2002,7 @@
 ./usr/share/man/cat5/veriexec.0			man-sys-catman		.cat
 ./usr/share/man/cat5/vgrindefs.0		man-groff-catman	.cat
 ./usr/share/man/cat5/virtual.0			man-postfix-catman	postfix,.cat
+./usr/share/man/cat5/weekly.0			man-sys-catman		.cat
 ./usr/share/man/cat5/weekly.conf.0		man-sys-catman		.cat
 ./usr/share/man/cat5/wpa_supplicant.conf.0	man-net-catman		.cat
 ./usr/share/man/cat5/wscons.conf.0		man-sys-catman		.cat
@@ -4540,6 +4543,7 @@
 ./usr/share/man/html5/cidr_table.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html5/core.html			man-sys-htmlman		html
 ./usr/share/man/html5/crontab.html		man-cron-htmlman	html
+./usr/share/man/html5/daily.html		man-sys-htmlman		html
 ./usr/share/man/html5/daily.conf.html		man-sys-htmlman		html
 ./usr/share/man/html5/dhclient.conf.html	man-dhclient-htmlman	html
 ./usr/share/man/html5/dhclient.leases.html	man-dhclient-htmlman	html
@@ -4616,6 +4620,7 @@
 ./usr/share/man/html5/master.passwd.html	man-sys-htmlman		html
 ./usr/share/man/html5/mixerctl.conf.html	man-audio-htmlman	html
 ./usr/share/man/html5/moduli.html		man-secsh-htmlman	crypto,html
+./usr/share/man/html5/monthly.html		man-sys-htmlman		html
 ./usr/share/man/html5/monthly.conf.html		man-sys-htmlman		html
 ./usr/share/man/html5/motd.html			man-sys-htmlman		html
 ./usr/share/man/html5/named.conf.html		man-bind-htmlman	html
@@ -4684,6 +4689,7 @@
 ./usr/share/man/html5/veriexec.html		man-sys-htmlman		html
 ./usr/share/man/html5/vgrindefs.html		man-groff-htmlman	html
 ./usr/share/man/html5/virtual.html		man-postfix-htmlman	postfix,html
+./usr/share/man/html5/weekly.html		man-sys-htmlman		html
 ./usr/share/man/html5/weekly.conf.html		man-sys-htmlman		html
 ./usr/share/man/html5/wpa_supplicant.conf.html	man-net-htmlman		html
 ./usr/share/man/html5/wscons.conf.html		man-sys-htmlman		html
@@ -7178,6 +7184,7 @@
 ./usr/share/man/man5/cidr_table.5		man-postfix-man		postfix,.man
 ./usr/share/man/man5/core.5			man-sys-man		.man
 ./usr/share/man/man5/crontab.5			man-cron-man		.man
+./usr/share/man/man5/daily.5			man-sys-man		.man
 ./usr/share/man/man5/daily.conf.5		man-sys-man		.man
 ./usr/share/man/man5/dhclient.conf.5		man-dhclient-man	.man
 ./usr/share/man/man5/dhclient.leases.5		man-dhclient-man	.man
@@ -7261,6 +7268,7 @@
 ./usr/share/man/man5/master.passwd.5		man-sys-man		.man
 ./usr/share/man/man5/mixerctl.conf.5		man-audio-man		.man
 ./usr/share/man/man5/moduli.5			man-secsh-man		crypto,.man
+./usr/share/man/man5/monthly.5			man-sys-man		.man
 ./usr/share/man/man5/monthly.conf.5		man-sys-man		.man
 ./usr/share/man/man5/motd.5			man-sys-man		.man
 ./usr/share/man/man5/named.conf.5		man-bind-man		.man
@@ -7339,6 +7347,7 @@
 ./usr/share/man/man5/veriexec.5			man-sys-man		.man
 ./usr/share/man/man5/vgrindefs.5		man-groff-man		.man
 ./usr/share/man/man5/virtual.5			man-postfix-man		postfix,.man
+./usr/share/man/man5/weekly.5			man-sys-man		.man
 ./usr/share/man/man5/weekly.conf.5		man-sys-man		.man
 ./usr/share/man/man5/wpa_supplicant.conf.5	man-net-man		.man
 ./usr/share/man/man5/wscons.conf.5		man-sys-man		.man

Index: src/share/man/man5/Makefile
diff -u src/share/man/man5/Makefile:1.66 src/share/man/man5/Makefile:1.67
--- src/share/man/man5/Makefile:1.66	Wed Sep 29 13:50:49 2010
+++ src/share/man/man5/Makefile	Tue May  3 16:12:23 2011
@@ -1,27 +1,31 @@
-#	$NetBSD: Makefile,v 1.66 2010/09/29 13:50:49 christos Exp $
+#	$NetBSD: Makefile,v 1.67 2011/05/03 16:12:23 jruoho Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 # missing: dump.5 plot.5
 
 MAN=	a.out.5 acct.5 ar.5 boot.cfg.5 \
-	core.5 daily.conf.5 disktab.5 elf.5 \
+	core.5 daily.5 disktab.5 elf.5 \
 	ethers.5 forward.5 \
 	fs.5 fstab.5 genassym.cf.5 gpio.conf.5 group.5 hesiod.conf.5 \
 	hosts.5 hosts.equiv.5 ifaliases.5 ifconfig.if.5 intro.5 \
 	ipsec.conf.5 ld.so.conf.5 link.5 locale.alias.5 \
-	locate.conf.5 login.conf.5 mixerctl.conf.5 mk.conf.5 monthly.conf.5 \
+	locate.conf.5 login.conf.5 mixerctl.conf.5 mk.conf.5 monthly.5 \
 	motd.5 netconfig.5 netgroup.5 networks.5 nologin.5 \
 	nsswitch.conf.5 pam.conf.5 passwd.5 passwd.conf.5 phones.5 \
 	printcap.5 protocols.5 ranlib.5 rc.conf.5 remote.5 \
 	resolv.conf.5 route.conf.5 rpc.5 \
 	security.conf.5 services.5 shells.5 \
 	stab.5 statvfs.5 sysctl.conf.5 ttyaction.5 \
-	utmp.5 utmpx.5 veriexec.5 weekly.conf.5 wscons.conf.5
+	utmp.5 utmpx.5 veriexec.5 weekly.5 wscons.conf.5
 
-MLINKS=	fs.5 inode.5 hosts.equiv.5 rhosts.5
+MLINKS+=daily.5 daily.conf.5
+MLINKS+=fs.5 inode.5
+MLINKS+=hosts.equiv.5 rhosts.5
+MLINKS+=monthly.5 monthly.conf.5
 MLINKS+=resolv.conf.5 resolver.5
 MLINKS+=utmp.5 wtmp.5 utmp.5 lastlog.5 passwd.5 master.passwd.5
 MLINKS+=utmpx.5 wtmpx.5 utmpx.5 lastlogx.5
+MLINKS+=weekly.5 weekly.conf.5
 
 .include <bsd.man.mk>
 .include <bsd.subdir.mk>

Added files:

Index: src/share/man/man5/daily.5
diff -u /dev/null src/share/man/man5/daily.5:1.1
--- /dev/null	Tue May  3 16:12:24 2011
+++ src/share/man/man5/daily.5	Tue May  3 16:12:23 2011
@@ -0,0 +1,204 @@
+.\"	$NetBSD: daily.5,v 1.1 2011/05/03 16:12:23 jruoho Exp $
+.\"
+.\" Copyright (c) 1996 Matthew R. Green
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd February 5, 2010
+.Dt DAILY.CONF 5
+.Os
+.Sh NAME
+.Nm daily.conf
+.Nd daily maintenance configuration file
+.Sh DESCRIPTION
+The
+.Nm
+file specifies which of the standard
+.Pa /etc/daily
+services are performed.
+The
+.Pa /etc/daily
+script is run, by default, every night on a
+.Nx
+system.
+.Pp
+The variables described below can be set to
+.Dq YES
+or
+.Dq NO
+in the
+.Pa /etc/daily.conf
+file.
+Most default to
+.Dq YES ,
+but not all.
+Check the
+.Pa /etc/defaults/daily.conf
+file if you are in doubt.
+(Note that you should never edit
+.Pa /etc/defaults/daily.conf
+directly, as it is often replaced during system upgrades.)
+.Bl -tag -width fetch_pkg_vulnerabilities
+.It Sy find_core
+This runs
+.Xr find 1
+over the entire local filesystem, looking for core files.
+.It Sy run_msgs
+This runs
+.Xr msgs 1
+with the
+.Fl c
+argument.
+.It Sy expire_news
+This runs the
+.Pa /etc/expire.news
+script.
+.It Sy purge_accounting
+This ages accounting files in
+.Pa /var/account .
+.It Sy run_calendar
+This runs
+.Xr calendar 1
+with the
+.Fl a
+argument.
+.It Sy check_disks
+This uses the
+.Xr df 1
+and
+.Xr dump 8
+to give disk status, and also reports failed
+.Xr raid 4
+components.
+.It Sy show_remote_fs
+In check_disks, show remote file systems, which are not reported on by
+default.
+.It Sy check_mailq
+This runs
+.Xr mailq 1 .
+.It Sy check_network
+This runs
+.Xr netstat 1
+with the
+.Fl i
+argument, and also checks the
+.Xr rwhod 8
+database, and runs
+.Xr ruptime 1
+if there are hosts in
+.Pa /var/rwho .
+.It Sy full_netstat
+By default,
+.Sy check_network
+outputs a summarized version of the
+.Xr netstat 1
+report.
+If a full version of the output run with the
+.Fl inv
+options is desired, set this variable.
+.It Sy run_fsck
+This runs
+.Xr fsck 8
+with the
+.Fl n
+option.
+.It Sy run_rdist
+This runs
+.Xr rdist 1
+with
+.Pa /etc/Distfile .
+.It Sy run_security
+This runs the
+.Pa /etc/security
+script looking for possible security problems with the system.
+.It Sy run_skeyaudit
+Runs the
+.Xr skeyaudit 1
+program to check the S/Key database and informs users of S/Keys that
+are about to expire.
+.It Sy fetch_pkg_vulnerabilities
+Refreshes the local database of package vulnerabilities.
+See the settings in
+.Xr security.conf 5
+for details on the actual package checks.
+.El
+.Pp
+The variables described below can be set to modify the tests:
+.Bl -tag -width check_network
+.It Sy find_core_ignore_fstypes
+Lists filesystem types to ignore during the
+.Sy find_core
+phase.
+Prefixing the type with a
+.Sq \&!
+inverts the match.
+For example,
+.Ql procfs !local
+will ignore
+.Ql procfs
+type filesystems and filesystems that are not
+.Ql local .
+.It Sy run_fsck_flags
+Extra options to be passed to
+.Xr fsck 8
+if
+.Sy run_fsck
+is enabled.
+.It Sy send_empty_security
+If set, the report generated by the
+.Sy run_security
+phase will always be sent, even if it is empty.
+.It Sy pkgdb_dir
+.Em DEPRECATED .
+Please set
+.Dv PKGDB_DIR
+in
+.Xr pkg_install.conf 5
+instead.
+.Pp
+If defined, points to the location of the packages database.
+Defaults to
+.Pa /var/db/pkg .
+.El
+.Sh FILES
+.Bl -tag -width /etc/defaults/daily.conf -compact
+.It Pa /etc/daily
+daily maintenance script
+.It Pa /etc/daily.conf
+daily maintenance configuration
+.It Pa /etc/defaults/daily.conf
+default settings, overridden by
+.Pa /etc/daily.conf
+.It Pa /etc/daily.local
+local site additions to
+.Pa /etc/daily
+.El
+.Sh SEE ALSO
+.Xr monthly.conf 5 ,
+.Xr security.conf 5 ,
+.Xr weekly.conf 5
+.Sh HISTORY
+The
+.Nm
+file appeared in
+.Nx 1.3 .
Index: src/share/man/man5/monthly.5
diff -u /dev/null src/share/man/man5/monthly.5:1.1
--- /dev/null	Tue May  3 16:12:24 2011
+++ src/share/man/man5/monthly.5	Tue May  3 16:12:23 2011
@@ -0,0 +1,65 @@
+.\"	$NetBSD: monthly.5,v 1.1 2011/05/03 16:12:23 jruoho Exp $
+.\"
+.\" Copyright (c) 1996 Matthew R. Green
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd February 6, 2007
+.Dt MONTHLY.CONF 5
+.Os
+.Sh NAME
+.Nm monthly.conf
+.Nd monthly maintenance configuration file
+.Sh DESCRIPTION
+The
+.Nm
+file specifies which of the standard
+.Pa /etc/monthly
+services are performed.  The
+.Pa /etc/monthly
+script is normally run in the morning of the 1st of every month, on a
+.Nx
+system.
+Note: this is disabled (commented out) in the default root's
+.Xr crontab 5
+file.
+.Pp
+There are currently no monthly tasks.
+.Sh FILES
+.Bl -tag -width /etc/monthly.local -compact
+.It Pa /etc/monthly
+monthly maintenance script
+.It Pa /etc/monthly.conf
+monthly maintenance configuration
+.It Pa /etc/monthly.local
+local site additions to
+.Pa /etc/monthly
+.El
+.Sh SEE ALSO
+.Xr daily.conf 5 ,
+.Xr weekly.conf 5
+.Sh HISTORY
+The
+.Nm
+file appeared in
+.Nx 1.3 .
Index: src/share/man/man5/weekly.5
diff -u /dev/null src/share/man/man5/weekly.5:1.1
--- /dev/null	Tue May  3 16:12:24 2011
+++ src/share/man/man5/weekly.5	Tue May  3 16:12:23 2011
@@ -0,0 +1,92 @@
+.\"	$NetBSD: weekly.5,v 1.1 2011/05/03 16:12:23 jruoho Exp $
+.\"
+.\" Copyright (c) 1996 Matthew R. Green
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd February 15, 2007
+.Dt WEEKLY.CONF 5
+.Os
+.Sh NAME
+.Nm weekly.conf
+.Nd weekly maintenance configuration file
+.Sh DESCRIPTION
+The
+.Nm
+file specifies which of the standard
+.Pa /etc/weekly
+services are performed.  The
+.Pa /etc/weekly
+script is run, by default, every Saturday morning on a
+.Nx
+system.
+.Pp
+The variables described below can be set to
+.Dq YES
+or
+.Dq NO
+in the
+.Pa /etc/weekly.conf
+file.
+The default settings are in the
+.Pa /etc/defaults/weekly.conf
+file.
+(Note that you should never edit
+.Pa /etc/defaults/weekly.conf
+directly, as it is often replaced during system upgrades.)
+.Bl -tag -width rebuild_locatedb
+.It Sy rebuild_locatedb
+This rebuilds the locate database,
+.Pa /var/db/locate.database ,
+which must also exist, in order to be rebuilt.
+.It Sy rebuild_whatisdb
+This rebuilds the whatis database(s).
+Note that
+.Nx
+provides a default whatis.db for the system manual pages and
+this may not be needed.
+(Adjust your
+.Pa /etc/man.conf
+as necessary.
+See
+.Xr man.conf 5
+for details.)
+.El
+.Sh FILES
+.Bl -tag -width /etc/weekly.local -compact
+.It Pa /etc/weekly
+weekly maintenance script
+.It Pa /etc/weekly.conf
+weekly maintenance configuration
+.It Pa /etc/weekly.local
+local site additions to
+.Pa /etc/weekly
+.El
+.Sh SEE ALSO
+.Xr daily.conf 5 ,
+.Xr monthly.conf 5
+.Sh HISTORY
+The
+.Nm
+file appeared in
+.Nx 1.3 .

Reply via email to