1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00

man: remove timezone(5) and add localtime(5)

This commit is contained in:
Shawn Landden 2012-08-21 23:11:27 -07:00 committed by Lennart Poettering
parent 92c4ef2d35
commit 608da9e9b5
3 changed files with 28 additions and 25 deletions

View File

@ -471,7 +471,7 @@ MANPAGES = \
man/systemd.conf.5 \ man/systemd.conf.5 \
man/tmpfiles.d.5 \ man/tmpfiles.d.5 \
man/hostname.5 \ man/hostname.5 \
man/timezone.5 \ man/localtime.5 \
man/machine-id.5 \ man/machine-id.5 \
man/locale.conf.5 \ man/locale.conf.5 \
man/os-release.5 \ man/os-release.5 \

View File

@ -7,6 +7,7 @@
This file is part of systemd. This file is part of systemd.
Copyright 2010 Lennart Poettering Copyright 2010 Lennart Poettering
Copyright 2012 Shawn Landden
systemd is free software; you can redistribute it and/or modify it 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 under the terms of the GNU Lesser General Public License as published by
@ -22,9 +23,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
--> -->
<refentry id="timezone"> <refentry id="localtime">
<refentryinfo> <refentryinfo>
<title>/etc/timezone</title> <title>/etc/localtime</title>
<productname>systemd</productname> <productname>systemd</productname>
<authorgroup> <authorgroup>
@ -34,55 +35,57 @@
<surname>Poettering</surname> <surname>Poettering</surname>
<email>lennart@poettering.net</email> <email>lennart@poettering.net</email>
</author> </author>
<author>
<contrib>Developer</contrib>
<firstname>Shawn</firstname>
<surname>Landden</surname>
<email>shawnlandden@gmail.com</email>
</author>
</authorgroup> </authorgroup>
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>timezone</refentrytitle> <refentrytitle>localtime</refentrytitle>
<manvolnum>5</manvolnum> <manvolnum>5</manvolnum>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>timezone</refname> <refname>localtime</refname>
<refpurpose>Local time zone configuration file</refpurpose> <refpurpose>Local time zone configuration file</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
<para><filename>/etc/timezone</filename></para> <para><filename>/etc/localtime</filename> -> <filename>/usr/share/zoneinfo/…</filename></para>
</refsynopsisdiv> </refsynopsisdiv>
<refsect1> <refsect1>
<title>Description</title> <title>Description</title>
<para>The <filename>/etc/timezone</filename> file <para>The <filename>/etc/localtime</filename> file
configures the system-wide time zone of the local configures the system-wide time zone of the local
system that is used by applications for presentation system that is used by applications for presentation
to the user. It should contain a single to the user. It should be an absolute symbolic link
newline-terminated line consisting of a time zone with a destination of <filename>/usr/share/zoneinfo/</filename>,
identifier such as fallowed by a time zone identifier such as
<literal>Europe/Berlin</literal>. The file <literal>Europe/Berlin</literal> or <literal>Etc/UTC</literal>.
<filename>/etc/localtime</filename> corresponds with The resulting link should point to the corresponding binary
<filename>/etc/timezone</filename> and contains the <citerefentry><refentrytitle>tzfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>
binary time zone data for the time zone. These files time zone data for the configured time zone.</para>
should always be changed simultaneously and kept in
sync.</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>The time zone may be overridden for individual <para>The time zone may be overridden for individual
programs by using the TZ environment variable. See programs by using the TZ environment variable. See
<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
</refsect1> </refsect1>
<refsect1>
<title>History</title>
<para>The simple configuration file format of
<filename>/etc/timezone</filename> originates from
Debian GNU/Linux.</para>
</refsect1>
<refsect1> <refsect1>
<title>See Also</title> <title>See Also</title>
<para> <para>
<citerefentry><refentrytitle>tzset</refentrytitle><manvolnum>3</manvolnum></citerefentry>
<citerefentry><refentrytitle>localtime</refentrytitle><manvolnum>3</manvolnum></citerefentry>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

View File

@ -7,7 +7,7 @@
[Unit] [Unit]
Description=Time & Date Service 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 Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
[Service] [Service]