[systemd-commits] 2 commits - man/sd-journal.xml units/systemd-timesyncd.service.in

[Lennart Poettering]

 man/sd-journal.xml                 |    6 ++++--
 units/systemd-timesyncd.service.in |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 55152b6ede680b9ac947c49d7dfa31cd3abe594e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 6 16:20:33 2014 +0200

    units: pull in time-sync.target from systemd-timedated.service
    
    After all, that's what we document for time-sync.target in
    systemd.special(5), hence let's follow our own suggestion.

diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
index 8d898e2..3a1bc48 100644
--- a/units/systemd-timesyncd.service.in
+++ b/units/systemd-timesyncd.service.in
@@ -14,6 +14,8 @@ RequiresMountsFor=/var/lib/systemd/clock
 After=systemd-remount-fs.service systemd-tmpfiles-setup.service
 Before=sysinit.target shutdown.target
 Conflicts=shutdown.target
+Wants=time-sync.target
+Before=time-sync.target
 
 [Service]
 Type=notify

commit d275b5296958446957e98ce61213f98519e11808
Author: Mantas MikulÄ—nas <grawity at gmail.com>
Date:   Mon Jun 2 16:47:15 2014 +0300

    man: fix references to sd_journal_cutoff_realtime_usec

diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 7a05aee..d3dc57f 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -79,7 +79,8 @@
                 <citerefentry><refentrytitle>sd_journal_add_match</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                 <citerefentry><refentrytitle>sd_journal_seek_head</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                 <citerefentry><refentrytitle>sd_journal_get_cursor</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>sd_journal_cutoff_realtime_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>sd_journal_get_cutoff_realtime_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                <citerefentry><refentrytitle>sd_journal_get_cutoff_monotonic_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                 <citerefentry><refentrytitle>sd_journal_get_usage</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                 <citerefentry><refentrytitle>sd_journal_get_catalog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 and
@@ -111,7 +112,8 @@
                         <citerefentry><refentrytitle>sd_journal_add_match</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_seek_head</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_get_cursor</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_journal_cutoff_realtime_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>sd_journal_get_cutoff_realtime_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>sd_journal_get_cutoff_monotonic_usec</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_get_usage</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_get_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sd_journal_query_unique</refentrytitle><manvolnum>3</manvolnum></citerefentry>,