summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries/calendar.html
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
commite917f9be8b05c81357c1c2c9730d5060685d644d (patch)
treeb6a7d5ce8ba57b69ba61454f77829b04f2ce5974 /user_guide/libraries/calendar.html
parent5b2d2da5ae2e97043c6bef53e565d30e50196e2b (diff)
parente1f6e9ddff788f6a154f5f35dc117d14aeb0c484 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'user_guide/libraries/calendar.html')
-rw-r--r--user_guide/libraries/calendar.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index 74a8619bf..2c052424d 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -114,7 +114,7 @@ how data passed to your cells is handled so you can pass different types of info
<h2>Setting Display Preferences</h2>
-<p>There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an
+<p>There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an
array of preferences in the second parameter of the loading function. Here is an example:</p>