From: J William Piggott <elseifthen@gmx.com>
Date: Fri, 13 Feb 2015 03:19:00 +0000 (-0500)
Subject: [BZ #17969]
X-Git-Tag: glibc-2.22~598
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f293d614c9e641a0d96d347df5c1c5ee687762f;p=thirdparty%2Fglibc.git

[BZ #17969]

* manual/time.texi (TZ Variable): The zoneinfo path is
/usr/share/zoneinfo.
---

diff --git a/ChangeLog b/ChangeLog
index 87a9f58b860..821da1dd884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-12  J William Piggott  <elseifthen@gmx.com>
+
+	[BZ #17969]
+	* manual/time.texi: correct the zoneinfo path in the TZ Variable
+	node.
+
 2015-02-12  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #17964]
diff --git a/NEWS b/NEWS
index 11ca36bf383..f6f34e8811f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ Version 2.22
 
 * The following bugs are resolved with this release:
 
-  4719, 15467, 15790, 16560, 17912, 17932, 17944, 17949, 17964, 17965.
+  4719, 15467, 15790, 16560, 17912, 17932, 17944, 17949, 17964, 17965,
+  17969.
 
 Version 2.21
 
diff --git a/manual/time.texi b/manual/time.texi
index a7bf156a795..c8c728886d9 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -2509,11 +2509,11 @@ rule for choosing the default time zone, so there is little we can say
 about them.
 
 @cindex time zone database
-@pindex /share/lib/zoneinfo
+@pindex /usr/share/zoneinfo
 @pindex zoneinfo
 If @var{characters} begins with a slash, it is an absolute file name;
 otherwise the library looks for the file
-@w{@file{/share/lib/zoneinfo/@var{characters}}}.  The @file{zoneinfo}
+@w{@file{/usr/share/zoneinfo/@var{characters}}}.  The @file{zoneinfo}
 directory contains data files describing local time zones in many
 different parts of the world.  The names represent major cities, with
 subdirectories for geographical areas; for example,