diff options
| author | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
|---|---|---|
| committer | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
| commit | ab0dbd4b992778678e00ea3f2a3dd4bf5f1ff504 (patch) | |
| tree | 740d3cabe5e51f18578a72abf6e13e62fba9eb62 /user_guide/general | |
| parent | dcf3d1bf17e1354ff0a644f390ed590f2e65298b (diff) | |
| parent | 2eb2557bf1c438d8fb7d612dbb76c6676eaec4d6 (diff) | |
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
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> |