diff options
| author | Darren Hill <dchill42@gmail.com> | 2011-09-01 13:43:38 +0200 |
|---|---|---|
| committer | Darren Hill <dchill42@gmail.com> | 2011-09-01 13:43:38 +0200 |
| commit | 826675178c2c2ad697e5ac55161645abd9143bef (patch) | |
| tree | df07f67a43b7467447549dfd7bd6b9e401e670ae /user_guide/general | |
| parent | a2ae6571e55d5a3d23645e96929eea996e9f0499 (diff) | |
| parent | 886d87c616bd422585c6a1190b0e1b72bc661269 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'user_guide/general')
| -rw-r--r-- | user_guide/general/profiling.html | 5 | ||||
| -rw-r--r-- | user_guide/general/requirements.html | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 9895b0284..0993da5b4 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -155,6 +155,11 @@ This information can be useful during development in order to help with debuggin <td class="td">TRUE</td> </tr> <tr> + <td class="td"><strong>session_data</strong></td> + <td class="td">Data stored in current session</td> + <td class="td">TRUE</td> + </tr> + <tr> <td class="td"><strong>query_toggle_count</strong></td> <td class="td">The number of queries after which the query block will default to hidden.</td> <td class="td">25</td> diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 405798f04..de0ee76dd 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -59,7 +59,7 @@ Server Requirements <ul> <li><a href="http://www.php.net/">PHP</a> version 5.1.6 or newer.</li> - <li>A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, and ODBC.</li> + <li>A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, ODBC and CUBRID.</li> </ul> |