Merge pull request bcit-ci#3650 from jim-parry/fix/housekeeping

[ci skip] Housekeeping.

Author: narfbg

readme.rst

@@ -54,13 +54,16 @@ Resources
 *********
 
 -  `User Guide <http://www.codeigniter.com/docs>`_
+-  `Language File Translations <https://github.com/bcit-ci/codeigniter3-translations>`_
 -  `Community Forums <http://forum.codeigniter.com/>`_
 -  `Community Wiki <https://github.com/bcit-ci/CodeIgniter/wiki>`_
 -  `Community IRC <http://www.codeigniter.com/irc>`_
 
+Report security issues to our `Security Panel <mailto:security@codeigniter.com>`_, thank you.
+
 ***************
 Acknowledgement
 ***************
 
-The EllisLab team and The Reactor Engineers would like to thank all the
+The CodeIgniter team would like to thank EllisLab, all the
 contributors to the CodeIgniter project and you, the CodeIgniter user.

system/libraries/Session/drivers/Session_memcached_driver.php

@@ -326,7 +326,7 @@ protected function _get_lock($session_id)
 
 		if ($attempt === 30)
 		{
-			log_message('error', 'Session: Unable to obtain lock for '.$this->_key_prefix.$session_id.' after 5 attempts, aborting.');
+			log_message('error', 'Session: Unable to obtain lock for '.$this->_key_prefix.$session_id.' after 30 attempts, aborting.');
 			return FALSE;
 		}
 

user_guide_src/source/libraries/sessions.rst

@@ -363,7 +363,7 @@ To read a tempdata variable, again you can just access it through the
 
 .. important:: The ``userdata()`` method will NOT return tempdata items.
 
-Or if you want to be sure that you're reading "flashdata" (and not any
+Or if you want to be sure that you're reading "tempdata" (and not any
 other kind), you can also use the ``tempdata()`` method::
 
 	$this->session->tempdata('item');