diff options
| -rw-r--r-- | readme.rst | 5 | ||||
| -rw-r--r-- | system/language/english/calendar_lang.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/sessions.rst | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/readme.rst b/readme.rst index dd59fd8c1..640dd241b 100644 --- a/readme.rst +++ b/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.
\ No newline at end of file diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php index 9d3352868..d7b98faac 100644 --- a/system/language/english/calendar_lang.php +++ b/system/language/english/calendar_lang.php @@ -74,7 +74,7 @@ $lang['cal_january'] = 'January'; $lang['cal_february'] = 'February'; $lang['cal_march'] = 'March'; $lang['cal_april'] = 'April'; -$lang['cal_mayl'] = 'May'; +$lang['cal_may'] = 'May'; $lang['cal_june'] = 'June'; $lang['cal_july'] = 'July'; $lang['cal_august'] = 'August'; diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 104adb631..51ecc03bd 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/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'); |