diff --git a/Makefile.am b/Makefile.am
index 5674f1019a3..12c2d2e93b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,7 +471,7 @@ MANPAGES = \
man/systemd.conf.5 \
man/tmpfiles.d.5 \
man/hostname.5 \
- man/timezone.5 \
+ man/localtime.5 \
man/machine-id.5 \
man/locale.conf.5 \
man/os-release.5 \
diff --git a/man/timezone.xml b/man/localtime.xml
similarity index 59%
rename from man/timezone.xml
rename to man/localtime.xml
index dedb7d90ffb..09df161baa4 100644
--- a/man/timezone.xml
+++ b/man/localtime.xml
@@ -7,6 +7,7 @@
This file is part of systemd.
Copyright 2010 Lennart Poettering
+ Copyright 2012 Shawn Landden
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -22,9 +23,9 @@
along with systemd; If not, see .
-->
-
+
- /etc/timezone
+ /etc/localtime
systemd
@@ -34,55 +35,57 @@
Poettering
lennart@poettering.net
+
+ Developer
+ Shawn
+ Landden
+ shawnlandden@gmail.com
+
- timezone
+ localtime
5
- timezone
+ localtime
Local time zone configuration file
- /etc/timezone
+ /etc/localtime -> /usr/share/zoneinfo/…
Description
- The /etc/timezone file
+ The /etc/localtime file
configures the system-wide time zone of the local
system that is used by applications for presentation
- to the user. It should contain a single
- newline-terminated line consisting of a time zone
- identifier such as
- Europe/Berlin. The file
- /etc/localtime corresponds with
- /etc/timezone and contains the
- binary time zone data for the time zone. These files
- should always be changed simultaneously and kept in
- sync.
+ to the user. It should be an absolute symbolic link
+ with a destination of /usr/share/zoneinfo/,
+ fallowed by a time zone identifier such as
+ Europe/Berlin or Etc/UTC.
+ The resulting link should point to the corresponding binary
+ tzfile5
+ time zone data for the configured time zone.
+
+ As the time zone identifier is extracted from the name of
+ the target of /etc/localtime this file may
+ not be a normal file or hardlink.
The time zone may be overridden for individual
programs by using the TZ environment variable. See
environ7.
-
- History
-
- The simple configuration file format of
- /etc/timezone originates from
- Debian GNU/Linux.
-
-
See Also
+ tzset3
+ localtime3
systemd1
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
index 1944a71cb7f..dd3eb1b337e 100644
--- a/units/systemd-timedated.service.in
+++ b/units/systemd-timedated.service.in
@@ -7,7 +7,7 @@
[Unit]
Description=Time & Date Service
-Documentation=man:systemd-timedated.service(8) man:timezone(5)
+Documentation=man:systemd-timedated.service(8) man:localtime(5)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
[Service]