diff --git a/TODO b/TODO
index 78da717912..d3a3a4d449 100644
--- a/TODO
+++ b/TODO
@@ -1,22 +1,12 @@
 Bugfixes:
 * always open() tty6 to keep X from using it; move debug shell to tty6
 
-* Fedora: rename /usr/lib/systemd/system-preset/99-default.preset to 90-default.preset
-
 * there is nothing to warn about here :)
   $ systemctl stop systemd-udevd.service systemd-udevd-kernel.socket systemd-udevd-control.socket
   Warning: Stopping systemd-udevd.service, but it can still be activated by:
   systemd-udevd-control.socket
   systemd-udevd-kernel.socket
 
-* kill /etc/timezone handling entirely? What does it provide?
-  - /etc/localtime carries the same information already:
-      $ ls -l /etc/localtime; cat /etc/timezone
-      lrwxrwxrwx 1 root root 33 Jul 27 09:55 /etc/localtime -> /usr/share/zoneinfo/Europe/Berlin
-      Europe/Berlin
-  - systemd enforces /usr to be available at bootup, so we can
-    enforce the use of the symlink
-
 * check systemd-tmpfiles for selinux context hookup for mknod(), symlink() and similar
 
 * swap units that are activated by one name but shown in the kernel under another are semi-broken
@@ -63,14 +53,9 @@ Features:
 
 * do shutdown audit/utmp msgs inside of PID 1, get rid of systemd-update-utmp-runlevel
 
-* make use of macros like this:
-
-        #define _cleanup_free_ __attribute__((cleanup(freep)))
-        #define _cleanup_fclose_ __attribute__((cleanup(fclosep)))
-
 * make timer units go away after they elapsed
 
-+ refuse automount triggers when automount is queued for stop, much like we refuse socket triggers when sockets are queued for stop
+* refuse automount triggers when automount is queued for stop, much like we refuse socket triggers when sockets are queued for stop
 
 * perfomance messages for selinux are gone from debug log?
 
@@ -88,8 +73,6 @@ Features:
 
 * Document word splitting syntax for ExecStart= and friends
 
-* merge: github.com/systemd/python-systemd
-
 * when writing journal entries order field items by their address to improve speed on rotating media
 
 * create /sbin/init symlinks from the build system
@@ -104,14 +87,10 @@ Features:
 
 * json: properly serialize multiple fields with the same name per entry
 
-* journald: add option to choose between "split up nothing", "split up login user journals", "split up all user journals"
-
 * journal live copy, based on libneon (client) and libmicrohttpd
 
 * document in wiki json serialization
 
-* python-journal merge
-
 * system-wide seccomp filter
 
 * securityfs: don't mount in container
@@ -197,8 +176,6 @@ Features:
 
 * logind: wakelock/opportunistic suspend support
 
-* switch-root: sockets need relabelling
-
 * systemd-analyze post-boot is broken for initrd
 
 * man: clarify that time-sync.target is not only sysv compat but also useful otherwise. Same for similar targets
@@ -390,9 +367,6 @@ Features:
 
 * when an instanced service exits, remove its parent cgroup too if possible.
 
-* if we can not get user quota for tmpfs, mount a separate tmpfs instance
-  for every user in /run/user/$USER with a configured maximum size
-
 * default to actual 32bit PIDs, via /proc/sys/kernel/pid_max
 
 * be able to specify a forced restart of service A where service B depends on, in case B
@@ -512,8 +486,6 @@ Features:
    - bluetoothd (/var/run/sdp! @/org/bluez/audio!)
    - distccd
 
-* auditd service files
-
 * fingerprint.target, wireless.target, gps.target, netdevice.target
 
 * io priority during initialization
diff --git a/man/localtime.xml b/man/localtime.xml
index 09df161baa..c0e87bf78f 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -55,7 +55,7 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/etc/localtime</filename> -> <filename>/usr/share/zoneinfo/…</filename></para>
+                <para><filename>/etc/localtime</filename> -> <filename>../usr/share/zoneinfo/…</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
@@ -64,17 +64,20 @@
                 <para>The <filename>/etc/localtime</filename> file
                 configures the system-wide time zone of the local
                 system that is used by applications for presentation
-                to the user. It should be an absolute symbolic link
-                with a destination of <filename>/usr/share/zoneinfo/</filename>,
-                fallowed by a time zone identifier such as
-                <literal>Europe/Berlin</literal> or <literal>Etc/UTC</literal>.
-                The resulting link should point to the corresponding binary
+                to the user. It should be an absolute or relative
+                symbolic link pointing to
+                <filename>/usr/share/zoneinfo/</filename>, followed by
+                a time zone identifier such as
+                <literal>Europe/Berlin</literal> or
+                <literal>Etc/UTC</literal>.  The resulting link should
+                lead to the corresponding binary
                 <citerefentry><refentrytitle>tzfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 time zone data for the configured time zone.</para>
 
-                <para>As the time zone identifier is extracted from the name of
-                the target of <filename>/etc/localtime</filename> this file may
-                not be a normal file or hardlink.</para>
+                <para>As the time zone identifier is extracted from
+                the symlink target name of
+                <filename>/etc/localtime</filename> this file may not
+                be a normal file or hardlink.</para>
 
                 <para>The time zone may be overridden for individual
                 programs by using the TZ environment variable. See
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 56450482d7..47e762284a 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -75,7 +75,7 @@
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>timezone</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>localtime</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>hwclock</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>