Merge remote-tracking branch 'upstream/develop' into develop

4 files changed, 10 insertions, 4 deletions

diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst
index 3cf51330b..4aacafd49 100644
--- a/user_guide_src/source/helpers/captcha_helper.rst
+++ b/user_guide_src/source/helpers/captcha_helper.rst
@@ -34,6 +34,7 @@ Once loaded you can generate a CAPTCHA like this::
 		'expiration'	=> 7200,
 		'word_length'	=> 8,
 		'font_size'	=> 16,
+		'img_id'	=> 'Imageid',
 		'pool'		=> '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
 
 		// White background and border, black text and red grid
@@ -60,7 +61,8 @@ Once loaded you can generate a CAPTCHA like this::
    in the captcha folder before it will be deleted. The default is two
    hours.
 -  **word_length** defaults to 8, **pool** defaults to '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
--  **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. 
+-  **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes.
+-  The **img_id** will be set as the "id" of the captcha image.
 -  If any of the **colors** values is missing, it will be replaced by the default.
 
 Adding a Database
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index d9019a203..dcff7a4e5 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -357,7 +357,7 @@ The following functions are available:
 				<option value='UP95'>(UTC +9:30) Australian Central Standard Time</option>
 				<option value='UP10'>(UTC +10:00) Australian Eastern Standard Time, Vladivostok Time</option>
 				<option value='UP105'>(UTC +10:30) Lord Howe Island</option>
-				<option value='UP11'>(UTC +11:00) Magadan Time, Solomon Islands, Vanuatu</option>
+				<option value='UP11'>(UTC +11:00) Srednekolymsk Time, Solomon Islands, Vanuatu</option>
 				<option value='UP115'>(UTC +11:30) Norfolk Island</option>
 				<option value='UP12'>(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand Standard Time</option>
 				<option value='UP1275'>(UTC +12:45) Chatham Islands Standard Time</option>
@@ -428,7 +428,7 @@ UP9             (UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk
 UP95            (UTC +9:30) Australian Central Standard Time
 UP10            (UTC +10:00) Australian Eastern Standard Time, Vladivostok Time
 UP105           (UTC +10:30) Lord Howe Island
-UP11            (UTC +11:00) Magadan Time, Solomon Islands, Vanuatu
+UP11            (UTC +11:00) Srednekolymsk Time, Solomon Islands, Vanuatu
 UP115           (UTC +11:30) Norfolk Island
 UP12            (UTC +12:00) Fiji, Gilbert Islands, Kamchatka, New Zealand
 UP1275          (UTC +12:45) Chatham Islands Standard Time
diff --git a/user_guide_src/source/helpers/email_helper.rst b/user_guide_src/source/helpers/email_helper.rst
index b665ce548..3b771a0b6 100644
--- a/user_guide_src/source/helpers/email_helper.rst
+++ b/user_guide_src/source/helpers/email_helper.rst
@@ -6,7 +6,8 @@ The Email Helper provides some assistive functions for working with
 Email. For a more robust email solution, see CodeIgniter's :doc:`Email
 Class <../libraries/email>`.
 
-.. important:: The Email helper is **deprecated**.
+.. important:: The Email helper is DEPRECATED and is currently
+	only kept for backwards compatibility.
 
 .. contents::
   :local:
diff --git a/user_guide_src/source/helpers/smiley_helper.rst b/user_guide_src/source/helpers/smiley_helper.rst
index e7a5724a8..5de1d83bb 100644
--- a/user_guide_src/source/helpers/smiley_helper.rst
+++ b/user_guide_src/source/helpers/smiley_helper.rst
@@ -5,6 +5,9 @@ Smiley Helper
 The Smiley Helper file contains functions that let you manage smileys
 (emoticons).
 
+.. important:: The Smiley helper is DEPRECATED and should not be used.
+	It is currently only kept for backwards compatibility.
+
 .. contents::
   :local: