summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2004-05-31 17:27:01 +0000
committeryar <yar@FreeBSD.org>2004-05-31 17:27:01 +0000
commit0afeadb6754c6618de0352dd6ba967ee4445a73d (patch)
tree1816006a2a103e9327670ab1be9e22955b44b5de /release
parent2ca388c9217f2daf14956e17e137dabe8d4ad1f1 (diff)
downloadFreeBSD-src-0afeadb6754c6618de0352dd6ba967ee4445a73d.zip
FreeBSD-src-0afeadb6754c6618de0352dd6ba967ee4445a73d.tar.gz
MFC: cron(8) -j and -J options.
Diffstat (limited to 'release')
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml2
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index c79a1c6..8daa5ff 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -606,7 +606,7 @@
will sleep for a small random period of time in the specified
range before executing a job. This feature is intended to
smooth load peaks appearing when a lot of jobs are scheduled
- for a particular moment.</para>
+ for a particular moment. &merged;</para>
<para>&man.df.1; now supports a <option>-c</option> option to display
a grand total of statistics for file systems.</para>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index c79a1c6..8daa5ff 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -606,7 +606,7 @@
will sleep for a small random period of time in the specified
range before executing a job. This feature is intended to
smooth load peaks appearing when a lot of jobs are scheduled
- for a particular moment.</para>
+ for a particular moment. &merged;</para>
<para>&man.df.1; now supports a <option>-c</option> option to display
a grand total of statistics for file systems.</para>
OpenPOWER on IntegriCloud