From: Thibault Godouet Date: Sat, 1 Feb 2020 14:30:13 +0000 (+0000) Subject: fixed various invalid XML issues X-Git-Tag: ver3_3_1~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=288f3ec35f20737e4c3a6b094f78c73bde7ba31e;p=thirdparty%2Ffcron.git fixed various invalid XML issues --- diff --git a/doc/en/changes.sgml b/doc/en/changes.sgml index bba478c..7525df6 100644 --- a/doc/en/changes.sgml +++ b/doc/en/changes.sgml @@ -384,6 +384,7 @@ A copy of the license is included in gfdl.sgml. made fcrontab behave better when there is no space left in the spool directory (used to truncate the fcrontab source file). + Added a script, check_system_crontabs, to emulate Vixie cron's behavior about /etc/crontab and /etc/cron.d. Please have a look @@ -701,7 +702,7 @@ A copy of the license is included in gfdl.sgml. added some more checks in fileconf.c: allow user to use hours, days, hourly, daily, etc options only with %-lines: it is - ignored if set for a &-line, which is quite confusing for users + ignored if set for a &-line, which is quite confusing for users who may type, for instance "&hourly" instead of "%hourly". @@ -893,7 +894,7 @@ A copy of the license is included in gfdl.sgml. well, it seems to be more logical like that :)) . - bug fix: using options first with a &-line may have led to + bug fix: using options first with a &-line may have led to some problems during the first read by fcron (mail send erroneously if noticenotrun was used, bad set of the first execution's time and date or immediate execution if bootrun was @@ -1146,7 +1147,7 @@ A copy of the license is included in gfdl.sgml. bug corrected: fcrontab now defines correctly the remain - value of a line based on time and date beginning with a "&" but + value of a line based on time and date beginning with a "&" but without runfreq definition. diff --git a/doc/en/faq.sgml b/doc/en/faq.sgml index 7b1b234..316916a 100644 --- a/doc/en/faq.sgml +++ b/doc/en/faq.sgml @@ -108,7 +108,7 @@ every day at 2:30, it will run at 3:30 the day of this kind of DST change. the time and date of the execution of a job (please see the entry about system clock adjustment in the present FAQ). Because of this, on non-Linux systems it is recommended to explicitly 'tell' fcron - about suspends and the precise suspend duration: + about suspends and the precise suspend duration: send a SIGSTOP signal to fcron when going into suspend: @@ -122,6 +122,7 @@ every day at 2:30, it will run at 3:30 the day of this kind of DST change. Wake up fcron and tell it to process the suspend file and reschedule tasks accordingly: $ kill -CONT $(cat &fcron.pid;) + An example script implementing this for pm-utils and systemd is included: fcron.suspend.sh. Note that it is however not needed on Linux. Contribution of equivalent scripts for other @@ -371,19 +372,19 @@ and set appropriately the paths: &fcrontab;(5), and choose the type of line which is the most appropriate for your needs (this is likely to be a @-line or a %-line). - On a Debian/Ubuntu, the default /etc/anacrontab looks like: + On a Debian/Ubuntu, the default /etc/anacrontab looks like: 1 5 cron.daily nice run-parts --report /etc/cron.daily 7 10 cron.weekly nice run-parts --report /etc/cron.weekly @monthly 15 cron.monthly nice run-parts --report /etc/cron.monthly - A close fcron equivalent would be (see &optserial;): + A close fcron equivalent would be (see &optserial;): # Run once a day/week/month, and ensure only one of those tasks is run at a time: !reset !serial,nice(10) %daily * * run-parts --report /etc/cron.daily %weekly * * run-parts --report /etc/cron.weekly %monthly * * * run-parts --report /etc/cron.monthly - Or you could go for something a bit more specific (see &optlavg;, &optnoticenotrun;): + Or you could go for something a bit more specific (see &optlavg;, &optnoticenotrun;): # Only run the tasks out of office-hours when the system load is low # and send an email to the user if fcron couldn't run the job: !reset diff --git a/doc/en/fcron-doc.sgml b/doc/en/fcron-doc.sgml index 72a746f..66815c6 100644 --- a/doc/en/fcron-doc.sgml +++ b/doc/en/fcron-doc.sgml @@ -40,12 +40,12 @@ document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with the Back-Cover Texts being Back Cover Text. A copy of the license is included in -. +. &Fcron; is distributed under GPL license (please read the -license in ). +license in ). Project home page: &webpage; Author: Thibault GODOUET &email; diff --git a/doc/en/fcron.8.sgml b/doc/en/fcron.8.sgml index ae9cf44..6737e4c 100644 --- a/doc/en/fcron.8.sgml +++ b/doc/en/fcron.8.sgml @@ -62,7 +62,7 @@ A copy of the license is included in gfdl.sgml. &Fcron; should be started from /etc/rc or /etc/rc.local. Unless the (or ) option is given, it will return immediately, so -you don't need to start it with '&'. +you don't need to start it with '&'. &Fcron; loads users &fcrontabf;s (see &fcrontab;(5)) files previously installed by diff --git a/doc/en/fcron.conf.5.sgml b/doc/en/fcron.conf.5.sgml index 5d6ccaf..460811a 100644 --- a/doc/en/fcron.conf.5.sgml +++ b/doc/en/fcron.conf.5.sgml @@ -32,7 +32,7 @@ linkend="fcron.8">&fcron;(8). Blank lines, line beginning by a hash sign (#) (which are considered comments), leading blanks and tabs are ignored. Each line in a -&fcron.conf file is of the form +&fcron.conf; file is of the form
name = value
where the blanks around equal-sign (=) are ignored and @@ -55,6 +55,7 @@ optional. Trailing blanks are also ignored. Location of &fcron; pid file (needed by &fcrontab; to work properly). + suspendfile=file-path (&suspendfile;) @@ -125,9 +126,9 @@ refer to. &etc;/&fcron.conf.location; - Configuration file for &fcron;, &fcrontab and + Configuration file for &fcron;, &fcrontab; and &fcrondyn;: contains paths (spool dir, pid file) and default programs to use -(editor, shell, etc). See &fcron.conf(5) for +(editor, shell, etc). See &fcron.conf;(5) for more details. diff --git a/doc/en/fcrontab.5.sgml b/doc/en/fcrontab.5.sgml index 608efc3..7a03ef4 100644 --- a/doc/en/fcrontab.5.sgml +++ b/doc/en/fcrontab.5.sgml @@ -161,7 +161,7 @@ time Entries based on time and date The second type of &fcrontabf;'s entries begins by an optional -"&", which can be immediately followed by an optional number defining the +"&", which can be immediately followed by an optional number defining the frequency of execution (this is equivalent to option &optrunfreq;) or a declaration of options; it has five time and date fields, and a shell command : @@ -503,7 +503,7 @@ linkend="uptent">lines based on elapsed system up time is recommended ins The options can be set either for every line below the declaration or for an individual line. In the first case, the setting is done on a whole line immediately after an exclamation mark (!), while it is done after a -"&", a "%" or a "@" depending on the type of scheduling in the second case. Note +"&", a "%" or a "@" depending on the type of scheduling in the second case. Note that an option declaration in a schedule overrides the global declaration of that same option. Options are separated by commas (,) and their arguments, if @@ -522,7 +522,7 @@ abbreviation. The options are (default value in parentheses): b boolean(false) - Run an &-line at &fcron;'s startup (or system's resume after suspend/hibernation) if it should + Run an &-line at &fcron;'s startup (or system's resume after suspend/hibernation) if it should have run during system down time. @@ -596,7 +596,7 @@ useful when used in conjunction with option &optvolatile;. jitter integer(0) - Run the task between 0 and jitter seconds later than it should have been run. This options only applies to &-lines and is intended for systems where many jobs are supposed to be started at the same minute: the jitter option will randomly spread the start of all those jobs across the first jitter seconds of the minute instead of starting all of them at the first second of the minute. The argument must be between 0 and 255 (inclusive). + Run the task between 0 and jitter seconds later than it should have been run. This options only applies to &-lines and is intended for systems where many jobs are supposed to be started at the same minute: the jitter option will randomly spread the start of all those jobs across the first jitter seconds of the minute instead of starting all of them at the first second of the minute. The argument must be between 0 and 255 (inclusive). &seealso; option &optrandom;. @@ -731,7 +731,7 @@ reduce disk access on a laptop. boolean(false) Should &fcron; mail user to report the -non-execution of a %-job or an &-job? (because of system down state (including suspend/hibernation) for both or +non-execution of a %-job or an &-job? (because of system down state (including suspend/hibernation) for both or a too high system load average for the latter) &seealso; options &optlavg;, &optstrict;. @@ -790,7 +790,7 @@ permissions and environment (only root is allowed to use this option). If set to true, the task will be run at system startup (i.e. immediately after the &argfirstsleep; delay -- by default, &firstsleep; seconds -- when the &fcron; daemon starts the first time after the OS has booted). This is in addition to the regular schedule which won't be modified by this option. For instance, if a program should be started automatically and run from 7am to 6pm, you could use the following dfcrontab definitions: &runatreboot 0 6 * * 1-5 start_my_program.sh -& 0 7 * * 1-5 stop_my_program.sh +& 0 7 * * 1-5 stop_my_program.sh &seealso; options &optvolatile;, &optrunonce;, &optrebootreset;. @@ -881,7 +881,7 @@ not run) or be let there until the system load average allows its execution WARNING: this option is deprecated: use option timezone instead! Time zone difference (in hours, between -24 and 24) between the system time, and the local real time. This option allows a user -to define its & and %-lines in the local time. Note that this value is set for a +to define its & and %-lines in the local time. Note that this value is set for a whole fcrontab file, and only the last definition is taken into account. tzdiff is quite stupid: it doesn't handle daylight saving changes, while option timezone does, so you should use the latter. &seealso; options &opttimezone;. @@ -992,10 +992,10 @@ TEXT= " Hello\ 5 9 * * sat,sun echo "Good morning Thibault!" # run every even days of march at 18:00, except on 16th -0 18 2-30/2~16 Mar * echo "It's time to go back home!" +0 18 2-30/2~16 Mar * echo "It's time to go back home!" # the line above is equivalent to -& 0 18 2-30/2~16 Mar * echo "It's time to go back home!" +& 0 18 2-30/2~16 Mar * echo "It's time to go back home!" # reset options to default and set runfreq for lines below !reset,runfreq(7) @@ -1003,7 +1003,7 @@ TEXT= " Hello\ # run once every 7 matches (thanks to the declaration above), # so if system is running every day at 10:00, this will be # run once a week -& 0 10 * * * echo "if you got this message last time 7 days ago,\ +& 0 10 * * * echo "if you got this message last time 7 days ago,\ this computer has been running every day at 10:00 last week.\ If you got the message 8 days ago, then the system has been down \ one day at 10:00 since you got it, etc" @@ -1033,7 +1033,7 @@ TEXT= " Hello\ Configuration file for &fcron;, &fcrontab; and &fcrondyn;: contains paths (spool dir, pid file) and default programs to use -(editor, shell, etc). See &fcron.conf(5) for +(editor, shell, etc). See &fcron.conf;(5) for more details.