[systemd-devel] [PATCH v9002 2/2] man: remove timezone(5) and add localtime(5)
Lennart Poettering
lennart at poettering.net
Fri Sep 14 10:28:28 PDT 2012
On Tue, 21.08.12 23:11, Shawn Landden (shawnlandden at gmail.com) wrote:
Applied both. Finally. Sorry for the delay.
> ---
> Makefile.am | 2 +-
> man/localtime.xml | 93 ++++++++++++++++++++++++++++++++++++
> man/timezone.xml | 90 ----------------------------------
> units/systemd-timedated.service.in | 2 +-
> 4 files changed, 95 insertions(+), 92 deletions(-)
> create mode 100644 man/localtime.xml
> delete mode 100644 man/timezone.xml
>
> diff --git a/Makefile.am b/Makefile.am
> index e6bfc1f..1996956 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -468,7 +468,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/localtime.xml b/man/localtime.xml
> new file mode 100644
> index 0000000..09df161
> --- /dev/null
> +++ b/man/localtime.xml
> @@ -0,0 +1,93 @@
> +<?xml version='1.0'?> <!--*-nxml-*-->
> +<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
> +
> +<!--
> + 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
> + the Free Software Foundation; either version 2.1 of the License, or
> + (at your option) any later version.
> +
> + systemd is distributed in the hope that it will be useful, but
> + WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public License
> + along with systemd; If not, see <http://www.gnu.org/licenses/>.
> +-->
> +
> +<refentry id="localtime">
> + <refentryinfo>
> + <title>/etc/localtime</title>
> + <productname>systemd</productname>
> +
> + <authorgroup>
> + <author>
> + <contrib>Developer</contrib>
> + <firstname>Lennart</firstname>
> + <surname>Poettering</surname>
> + <email>lennart at poettering.net</email>
> + </author>
> + <author>
> + <contrib>Developer</contrib>
> + <firstname>Shawn</firstname>
> + <surname>Landden</surname>
> + <email>shawnlandden at gmail.com</email>
> + </author>
> + </authorgroup>
> + </refentryinfo>
> +
> + <refmeta>
> + <refentrytitle>localtime</refentrytitle>
> + <manvolnum>5</manvolnum>
> + </refmeta>
> +
> + <refnamediv>
> + <refname>localtime</refname>
> + <refpurpose>Local time zone configuration file</refpurpose>
> + </refnamediv>
> +
> + <refsynopsisdiv>
> + <para><filename>/etc/localtime</filename> -> <filename>/usr/share/zoneinfo/…</filename></para>
> + </refsynopsisdiv>
> +
> + <refsect1>
> + <title>Description</title>
> +
> + <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
> + <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>The time zone may be overridden for individual
> + programs by using the TZ environment variable. See
> + <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
> + </refsect1>
> +
> + <refsect1>
> + <title>See Also</title>
> + <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>
> + </para>
> + </refsect1>
> +
> +</refentry>
> diff --git a/man/timezone.xml b/man/timezone.xml
> deleted file mode 100644
> index dedb7d9..0000000
> --- a/man/timezone.xml
> +++ /dev/null
> @@ -1,90 +0,0 @@
> -<?xml version='1.0'?> <!--*-nxml-*-->
> -<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
> - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
> -
> -<!--
> - This file is part of systemd.
> -
> - Copyright 2010 Lennart Poettering
> -
> - 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
> - the Free Software Foundation; either version 2.1 of the License, or
> - (at your option) any later version.
> -
> - systemd is distributed in the hope that it will be useful, but
> - WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - Lesser General Public License for more details.
> -
> - You should have received a copy of the GNU Lesser General Public License
> - along with systemd; If not, see <http://www.gnu.org/licenses/>.
> --->
> -
> -<refentry id="timezone">
> - <refentryinfo>
> - <title>/etc/timezone</title>
> - <productname>systemd</productname>
> -
> - <authorgroup>
> - <author>
> - <contrib>Developer</contrib>
> - <firstname>Lennart</firstname>
> - <surname>Poettering</surname>
> - <email>lennart at poettering.net</email>
> - </author>
> - </authorgroup>
> - </refentryinfo>
> -
> - <refmeta>
> - <refentrytitle>timezone</refentrytitle>
> - <manvolnum>5</manvolnum>
> - </refmeta>
> -
> - <refnamediv>
> - <refname>timezone</refname>
> - <refpurpose>Local time zone configuration file</refpurpose>
> - </refnamediv>
> -
> - <refsynopsisdiv>
> - <para><filename>/etc/timezone</filename></para>
> - </refsynopsisdiv>
> -
> - <refsect1>
> - <title>Description</title>
> -
> - <para>The <filename>/etc/timezone</filename> 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
> - <literal>Europe/Berlin</literal>. The file
> - <filename>/etc/localtime</filename> corresponds with
> - <filename>/etc/timezone</filename> and contains the
> - binary time zone data for the time zone. These files
> - should always be changed simultaneously and kept in
> - sync.</para>
> -
> - <para>The time zone may be overridden for individual
> - programs by using the TZ environment variable. See
> - <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
> - </refsect1>
> -
> - <refsect1>
> - <title>History</title>
> -
> - <para>The simple configuration file format of
> - <filename>/etc/timezone</filename> originates from
> - Debian GNU/Linux.</para>
> - </refsect1>
> -
> - <refsect1>
> - <title>See Also</title>
> - <para>
> - <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
> - </para>
> - </refsect1>
> -
> -</refentry>
> diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
> index 1944a71..dd3eb1b 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]
Lennart
--
Lennart Poettering - Red Hat, Inc.
More information about the systemd-devel
mailing list