# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 2011-04-05 09:09:08
# Node ID 06803dc5fc1909c7716cfed3c1ca6b18a1fda5aa
# Parent  fe48c57390f2f80addbf521f45bb32037aa2fdbe
# Parent  0a0988bd4818e78cae4573a39519ba5ee87be89a

merge with stable

diff --git a/mercurial/help/dates.txt b/mercurial/help/dates.txt
--- a/mercurial/help/dates.txt
+++ b/mercurial/help/dates.txt
@@ -23,10 +23,10 @@ Lastly, there is Mercurial's internal fo
 
 - ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)
 
-This is the internal representation format for dates. unixtime is the
-number of seconds since the epoch (1970-01-01 00:00 UTC). offset is
-the offset of the local timezone, in seconds west of UTC (negative if
-the timezone is east of UTC).
+This is the internal representation format for dates. The first number
+is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
+second is the offset of the local timezone, in seconds west of UTC
+(negative if the timezone is east of UTC).
 
 The log command also accepts date ranges: