Unnecessary rtrim and update docs for Calendar class

1 files changed, 25 insertions, 16 deletions

diff --git a/user_guide_src/source/libraries/calendar.rst b/user_guide_src/source/libraries/calendar.rst
index 3964db25e..8b2f503b9 100644
--- a/user_guide_src/source/libraries/calendar.rst
+++ b/user_guide_src/source/libraries/calendar.rst
@@ -86,21 +86,23 @@ The above code would start the calendar on saturday, use the "long"
 month heading, and the "short" day names. More information regarding
 preferences below.
 
-======================  ===========  ===============================================  ===================================================================
-Preference              Default		Options						Description                                                    
-======================  ===========  ===============================================  ===================================================================
-**template**           	None		None                                         	A string containing your calendar template.
-											See the template section below.
-**local_time**        	time()		None						A Unix timestamp corresponding to the current time.
-**start_day**         	sunday		Any week day (sunday, monday, tuesday, etc.) 	Sets the day of the week the calendar should start on.
-**month_type**        	long          	long, short                                   	Determines what version of the month name to use in the header.
-											long = January, short = Jan.
-**day_type**		abr		long, short, abr 				Determines what version of the weekday names to use in 
-											the column headers. long = Sunday, short = Sun, abr = Su.
-**show_next_prev**	FALSE		TRUE/FALSE (boolean)				Determines whether to display links allowing you to toggle
-											to next/previous months. See information on this feature below.
-**next_prev_url**     	None     	  A URL						Sets the basepath used in the next/previous calendar links.
-======================  ===========  ===============================================  ===================================================================
+======================  ==============  ===============================================  ===================================================================
+Preference              Default         Options                                          Description
+======================  ==============  ===============================================  ===================================================================
+**template**           	None            None                                             A string containing your calendar template.
+                                                                                         See the template section below.
+**local_time**        	time()          None                                             A Unix timestamp corresponding to the current time.
+**start_day**           sunday          Any week day (sunday, monday, tuesday, etc.)     Sets the day of the week the calendar should start on.
+**month_type**          long            long, short                                      Determines what version of the month name to use in the header.
+                                                                                         long = January, short = Jan.
+**day_type**            abr             long, short, abr                                 Determines what version of the weekday names to use in
+                                                                                         the column headers. long = Sunday, short = Sun, abr = Su.
+**show_next_prev**      FALSE           TRUE/FALSE (boolean)                             Determines whether to display links allowing you to toggle
+                                                                                         to next/previous months. See information on this feature below.
+**next_prev_url**       Controller URL  A URL                                            Sets the basepath used in the next/previous calendar links.
+**show_other_days**     FALSE           TRUE/FALSE (boolean)                             Determines whether to display days of other months that shares the
+                                                                                         first or last week of the calendar month.
+======================  ==============  ===============================================  ===================================================================
 
 
 Showing Next/Previous Month Links
@@ -123,7 +125,8 @@ You'll notice a few things about the above example:
 
 -  You must set the "show_next_prev" to TRUE.
 -  You must supply the URL to the controller containing your calendar in
-   the "next_prev_url" preference.
+   the "next_prev_url" preference. The Code Igniter will try to guess
+   the link for the current controller/method if you don't supply.
 -  You must supply the "year" and "month" to the calendar generating
    function via the URI segments where they appear (Note: The calendar
    class automatically adds the year/month to the base URL you
@@ -154,6 +157,8 @@ pair of pseudo-variables as shown here::
 
 	   {cal_row_start}<tr>{/cal_row_start}
 	   {cal_cell_start}<td>{/cal_cell_start}
+	   {cal_cell_start_today}<td>{/cal_cell_start_today}
+	   {cal_cell_start_other}<td class="other-month">{/cal_cell_start_other}
 
 	   {cal_cell_content}<a href="{content}">{day}</a>{/cal_cell_content}
 	   {cal_cell_content_today}<div class="highlight"><a href="{content}">{day}</a></div>{/cal_cell_content_today}
@@ -163,7 +168,11 @@ pair of pseudo-variables as shown here::
 
 	   {cal_cell_blank}&nbsp;{/cal_cell_blank}
 
+	   {cal_cell_other}{day}{cal_cel_other}
+
 	   {cal_cell_end}</td>{/cal_cell_end}
+	   {cal_cell_end_today}</td>{/cal_cell_end_today}
+	   {cal_cell_end_other}</td>{/cal_cell_end_other}
 	   {cal_row_end}</tr>{/cal_row_end}
 
 	   {table_close}</table>{/table_close}