Merge pull request #3650 from jim-parry/fix/housekeeping
[ci skip] Housekeeping.
diff --git a/readme.rst b/readme.rst
index dd59fd8..640dd24 100644
--- a/readme.rst
+++ b/readme.rst
@@ -54,13 +54,16 @@
*********
- `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.
\ No newline at end of file
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
index 938a612..c7185ee 100644
--- a/system/libraries/Session/drivers/Session_memcached_driver.php
+++ b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -326,7 +326,7 @@
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;
}
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 104adb6..51ecc03 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -363,7 +363,7 @@
.. 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');