From c1f1baebb5170abb49fb0ec5d6d463d6827bae1b Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 29 Jan 2010 17:02:03 -0500 Subject: fix bad upstream merge --- man/backup.d.5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'man/backup.d.5') diff --git a/man/backup.d.5 b/man/backup.d.5 index 5090051..fd5c9b2 100644 --- a/man/backup.d.5 +++ b/man/backup.d.5 @@ -67,7 +67,7 @@ Example templates for the action configuration files can be found in /usr/share/ .SH SCHEDULING -By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. +By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. Special value 'manual' will disable scheduling for the backup action. It is possible to run the backup action manually by invoking \fBninjahelper(1)\fP with --run command line argument. For example: when = sundays at 02:00 @@ -76,6 +76,7 @@ For example: when = everyday at 01 when = Tuesday at 05:00 when = hourly + when = manual These values for "when" are invalid: when = tuesday at 2am -- cgit v1.2.3