Merge branch 'develop' of git://github.com/bcit-ci/CodeIgniter into develop

1 files changed, 6 insertions, 6 deletions

diff --git a/user_guide_src/source/libraries/calendar.rst b/user_guide_src/source/libraries/calendar.rst
index 52883d297..8fdacf1d7 100644
--- a/user_guide_src/source/libraries/calendar.rst
+++ b/user_guide_src/source/libraries/calendar.rst
@@ -60,10 +60,10 @@ parameter of the calendar generating function. Consider this example::
 	$this->load->library('calendar');
 
 	$data = array(
-		3  => 'http://example.com/news/article/2006/03/',
-		7  => 'http://example.com/news/article/2006/07/',
-		13 => 'http://example.com/news/article/2006/13/',
-		26 => 'http://example.com/news/article/2006/26/'
+		3  => 'http://example.com/news/article/2006/06/03/',
+		7  => 'http://example.com/news/article/2006/06/07/',
+		13 => 'http://example.com/news/article/2006/06/13/',
+		26 => 'http://example.com/news/article/2006/06/26/'
 	);
 
 	echo $this->calendar->generate(2006, 6, $data);
@@ -179,7 +179,7 @@ will be placed within a pair of pseudo-variables as shown here::
 
 		{cal_cell_blank} {/cal_cell_blank}
 
-		{cal_cell_other}{day}{cal_cel_other}
+		{cal_cell_other}{day}{/cal_cel_other}
 
 		{cal_cell_end}</td>{/cal_cell_end}
 		{cal_cell_end_today}</td>{/cal_cell_end_today}
@@ -304,4 +304,4 @@ Class Reference
 		:rtype:	CI_Calendar
 
 		Harvests the data within the template ``{pseudo-variables}`` used to
-		display the calendar.
\ No newline at end of file
+		display the calendar.