1 files changed, 3 insertions, 30 deletions

diff --git a/Software/systemd/timedated.mdwn b/Software/systemd/timedated.mdwn
index d3231c25..aa9c9893 100644
--- a/Software/systemd/timedated.mdwn
+++ b/Software/systemd/timedated.mdwn
@@ -8,7 +8,7 @@ systemd 30 and newer include systemd-timedated. This is a tiny daemon that can b
 * The system time
 * The system timezone
 * A boolean controlling whether the system RTC is in local or UTC timezone
-* Whether the NTP services is enabled/started or disabled/stopped.
+* Whether the [[systemd-timesyncd.service(8)|http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.service.html]] (NTP) services is enabled/started or disabled/stopped.
 See [[systemd-timedated.service(8)|http://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html]] for more information.
 
 The daemon is accessible via D-Bus:
@@ -47,7 +47,7 @@ Use **SetTimezone()** to set the system timezone. Pass a value like "Europe/Berl
 
 Use **SetLocalRTC()** to control whether the RTC is in local time or UTC. It is strongly recommended to maintain the RTC in UTC. Some OSes (Windows) however maintain the RTC in local time which might make it necessary to enable this feature. However, this creates various problems as daylight changes might be missed. If fix_system is passed "true" the time from the RTC is read again and the system clock adjusted according to the new setting. If fix_system is passed "false" the system time is written to the RTC taking the new setting into account. Use fix_system=true in installers and livecds where the RTC is probably more reliable than the system time. Use fix_system=false in configuration UIs that are run during normal operation and where the system clock is probably more reliable than the RTC.
 
-Use **SetNTP()** to control whether the system clock is synchronized with the network using NTP. This will enable/start resp. disable/stop the NTP service.
+Use **SetNTP()** to control whether the system clock is synchronized with the network using systemd-timesyncd. This will enable/start resp. disable/stop the systemd-timesyncd service.
 
 Whenever the timezone and local_rtc settings are changed via the daemon PropertyChanged signals are sent out to which clients can subscribe. Changing the time settings using this interface is authenticated via PolicyKit.
 
@@ -61,31 +61,4 @@ The sources for timedated are available in git for review: [[http://cgit.freedes
 
 For more information how the system clock and RTC interact see [[http://lists.freedesktop.org/archives/systemd-devel/2011-May/002526.html|http://lists.freedesktop.org/archives/systemd-devel/2011-May/002526.html]]
 
-Plan: We plan to add a new boolean "CanNTP" soon, which can be used to determine whether the system can do NTP or not.
-
-
-## Hooking in an NTP Implementation
-
-systemd-timedated can enable/disable NTP implementations. Since multiple NTP implementations exist the unit to enable/start/disable/stop for this is not hardcoded in timedated and may be configured via drop-in files in /usr/lib/systemd/ntp-units.d/*.list. An NTP implementation should ship one of these files in its RPM listing the unit to disable or enable. timedated will then enable/disable the first unit it finds from all .list files in that directory. The files are sorted alphabetically by their names. A single file can list multiple unit files. Empty lines and lines starting with # are ignored. Example: the NTP implementation ntpd could ship:
-
-    ntpd.service
-
-as `/usr/lib/systemd/ntp-units.d/60-ntpd.list`. Similar, chrony could ship:
-
-    chronyd.service
-
-as `/usr/lib/systemd/ntp-units.d/50-chrony.list`. If both servers are installed chrony would be controlled preferably by timedated, since `50-chrony.list` is alphabetically before `60-ntpd.list`.
-
-Note that distributions can also override how the individual implementations order themselves alphabetically. For example, a distribution could drop in this:
-
-    # Prefer ntpd over chronyd
-    ntpd.service
-    chronyd.service
-
-as `/usr/lib/systemd/ntp-units.d/00-fedora.list` in which case this overrides the others, `since 00-fedora.list` is alphabetically before both `50-chrony.list` and `60-ntpd.list`.
-
-
-
----
-
- This D-Bus interface follows [[the usual interface versioning guidelines|http://0pointer.de/blog/projects/versioning-dbus.html]].
+This D-Bus interface follows [[the usual interface versioning guidelines|http://0pointer.de/blog/projects/versioning-dbus.html]].