From 7353e26d5d41563ca51520fb38b5950530cb6b9c Mon Sep 17 00:00:00 2001 From: Collin Anderson Date: Fri, 5 Sep 2014 16:55:24 -0700 Subject: Fixed #23340 -- Corrected naturaltime docs to match behavior. Thanks zachborboa for the report and blackguest for the patch. --- docs/ref/contrib/humanize.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/ref/contrib/humanize.txt b/docs/ref/contrib/humanize.txt index aca6ed990d..8accfe326e 100644 --- a/docs/ref/contrib/humanize.txt +++ b/docs/ref/contrib/humanize.txt @@ -111,13 +111,18 @@ Examples (when 'now' is 17 Feb 2007 16:30:00): * ``17 Feb 2007 16:29:31`` becomes ``29 seconds ago``. * ``17 Feb 2007 16:29:00`` becomes ``a minute ago``. * ``17 Feb 2007 16:25:35`` becomes ``4 minutes ago``. -* ``17 Feb 2007 15:30:29`` becomes ``an hour ago``. +* ``17 Feb 2007 15:30:29`` becomes ``59 minutes ago``. +* ``17 Feb 2007 15:30:01`` becomes ``59 minutes ago``. +* ``17 Feb 2007 15:30:00`` becomes ``an hour ago``. * ``17 Feb 2007 13:31:29`` becomes ``2 hours ago``. -* ``16 Feb 2007 13:31:29`` becomes ``1 day, 3 hours ago``. -* ``17 Feb 2007 16:30:30`` becomes ``29 seconds from now``. +* ``16 Feb 2007 13:31:29`` becomes ``1 day, 2 hours ago``. +* ``16 Feb 2007 13:30:01`` becomes ``1 day, 2 hours ago``. +* ``16 Feb 2007 13:30:00`` becomes ``1 day, 3 hours ago``. +* ``17 Feb 2007 16:30:30`` becomes ``30 seconds from now``. +* ``17 Feb 2007 16:30:29`` becomes ``29 seconds from now``. * ``17 Feb 2007 16:31:00`` becomes ``a minute from now``. * ``17 Feb 2007 16:34:35`` becomes ``4 minutes from now``. -* ``17 Feb 2007 16:30:29`` becomes ``an hour from now``. +* ``17 Feb 2007 17:30:29`` becomes ``an hour from now``. * ``17 Feb 2007 18:31:29`` becomes ``2 hours from now``. * ``18 Feb 2007 16:31:29`` becomes ``1 day from now``. * ``26 Feb 2007 18:31:29`` becomes ``1 week, 2 days from now``. -- cgit v1.3