summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-19 21:03:57 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-19 21:03:57 +0100
commitd8e25e94583706b02e0d39f7c108f4fb7ced656d (patch)
tree1564fc29548a967e184086230eb2f6cf01d82f74 /user_guide_src
parent9a0e66096a1d70c28a7d5358f966f936f609d52b (diff)
[ci skip] Some polishing to the latest doc changes
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/installation/upgrade_300.rst6
-rw-r--r--user_guide_src/source/libraries/sessions.rst2
2 files changed, 4 insertions, 4 deletions
diff --git a/user_guide_src/source/installation/upgrade_300.rst b/user_guide_src/source/installation/upgrade_300.rst
index 3c6529a8b..24353b35f 100644
--- a/user_guide_src/source/installation/upgrade_300.rst
+++ b/user_guide_src/source/installation/upgrade_300.rst
@@ -91,7 +91,7 @@ The :doc:`Session Library </libraries/session>` has been completely
re-written in CodeIgniter 3 and now comes with a bunch of new features,
but that also means that there are changes that you should make ...
-Most notably, - the library now uses separate storage drivers instead of
+Most notably, the library now uses separate storage drivers instead of
always relying on (encrypted) cookies.
In fact, cookies as storage have now been removed and you must always use
some kind of server-side storage engine, with the file-system being the
@@ -164,8 +164,8 @@ that you should make:
Previously, you could access the 'session_id', 'ip_address',
'user_agent' and 'last_activity' metadata items as userdata.
This is no longer possible, and you should read the notes about
- :doc:`Session Metadata </libraries/session#session-metadata>` if your
- application relies on those values.
+ :doc:`Session Metadata </libraries/session#accessing-session-metadata>`
+ if your application relies on those values.
Finally, if you have written a Session extension, you must now move it to
the *application/libraries/Session/* directory, although chances are that
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index be1a39ef2..18433d1ac 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -378,7 +378,7 @@ by default: 'session_id', 'ip_address', 'user_agent', 'last_activity'.
This was due to the specifics of how sessions worked, but is now no longer
necessary with our new implementation. However, it may happen that your
application relied on these values, so here are alternative methods of
-accessing them::
+accessing them:
- session_id: ``session_id()``
- ip_address: ``$_SERVER['REMOTE_ADDR']``