From 37e5ff65b2bd1601daadac40fdfce80fd8956fd7 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Sun, 21 Aug 2011 23:21:25 -0300
Subject: Added documentation for the nice_date function in the date_helper.

---
 user_guide/helpers/date_helper.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'user_guide/helpers/date_helper.html')

diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index f930ea3ae..29e242696 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -234,6 +234,20 @@ $unix = human_to_unix($human);</code>
 
 
 
+<h2>nice_date()</h2>
+
+<p>This function can take a number poorly-formed date formats and convert them into something useful. It also accepts well-formed dates.</p> 
+<p>The fuction will return a Unix timestamp by default. You can, optionally, pass a format string (the same type as the PHP date function accepts) as the second parameter. Example:</p>
+
+<code>$bad_time = 199605<br />
+<br />
+// Should Produce: 1996-05-01<br />
+$better_time = nice_date($bad_time,'Y-m-d');<br />
+<br />
+$bad_time = 9-11-2001<br />
+// Should Produce: 2001-09-11<br />
+$better_time = nice_date($human,'Y-m-d');</code>
+
 
 
 <h2>timespan()</h2>
-- 
cgit v1.2.3-24-g4f1b


From ee7363bb48e613d17566e82c6025ad71d39aa104 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sun, 21 Aug 2011 16:35:19 -0500
Subject: Fixing a spelling error.

---
 user_guide/helpers/date_helper.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide/helpers/date_helper.html')

diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index 29e242696..5b00e25e0 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -237,7 +237,7 @@ $unix = human_to_unix($human);</code>
 <h2>nice_date()</h2>
 
 <p>This function can take a number poorly-formed date formats and convert them into something useful. It also accepts well-formed dates.</p> 
-<p>The fuction will return a Unix timestamp by default. You can, optionally, pass a format string (the same type as the PHP date function accepts) as the second parameter. Example:</p>
+<p>The function will return a Unix timestamp by default. You can, optionally, pass a format string (the same type as the PHP date function accepts) as the second parameter. Example:</p>
 
 <code>$bad_time = 199605<br />
 <br />
-- 
cgit v1.2.3-24-g4f1b