diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-19 13:54:08 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-19 13:54:08 +0100 |
| commit | 9a0e66096a1d70c28a7d5358f966f936f609d52b (patch) | |
| tree | e51bdbe131cd07bad9743a797ba45ee9d4fdd5cd /user_guide_src | |
| parent | e3d66af0845c0b9f995d1890d890cfd36ce1f3fc (diff) | |
[ci skip] Manually apply PR #3461
I would've merged it earlier, but that would cause conflicts when feature/session
is merged.
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/source/libraries/sessions.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/trackback.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/zip.rst | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 972c4001d..be1a39ef2 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -404,8 +404,8 @@ Preference Default Options **sess_expiration** 7200 (2 hours) Time in seconds (integer) The number of seconds you would like the session to last. If you would like a non-expiring session (until browser is closed) set the value to zero: 0 **sess_save_path** NULL None Specifies the storage location, depends on the driver being used. -**sess_time_to_update** 300 Time in seconds (integer) This options controls how often the session class will regenerate itself and create a new - session ID. Setting it to 0 will disable session ID regeneartion. +**sess_time_to_update** 300 Time in seconds (integer) This option controls how often the session class will regenerate itself and create a new + session ID. Setting it to 0 will disable session ID regeneration. **sess_match_ip** FALSE TRUE/FALSE (boolean) Whether to validate the user's IP address when reading the session cookie. Note that some ISPs dynamically changes the IP, so if you want a non-expiring session you will likely set this to FALSE. diff --git a/user_guide_src/source/libraries/trackback.rst b/user_guide_src/source/libraries/trackback.rst index 22859a13d..da7c319ac 100644 --- a/user_guide_src/source/libraries/trackback.rst +++ b/user_guide_src/source/libraries/trackback.rst @@ -67,7 +67,7 @@ Description of array data: - **blog_name** - The name of your weblog. - **charset** - The character encoding your weblog is written in. If omitted, UTF-8 will be used. -.. note:: the Trackback class will automatically send only the first 500 characters of your +.. note:: The Trackback class will automatically send only the first 500 characters of your entry. It will also strip all HTML. The Trackback sending method returns TRUE/FALSE (boolean) on success diff --git a/user_guide_src/source/libraries/zip.rst b/user_guide_src/source/libraries/zip.rst index b509236de..ce70e6c88 100644 --- a/user_guide_src/source/libraries/zip.rst +++ b/user_guide_src/source/libraries/zip.rst @@ -2,9 +2,8 @@ Zip Encoding Class ################## -CodeIgniter's Zip Encoding Class classes permit you to create Zip -archives. Archives can be downloaded to your desktop or saved to a -directory. +CodeIgniter's Zip Encoding Class permits you to create Zip archives. +Archives can be downloaded to your desktop or saved to a directory. .. contents:: :local: |