gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #128 from ibennetch/old-code

Browse Source 
Thanks!
This commit is contained in:
Madhura Jayaratne 2013-01-09 19:38:30 -08:00
commit 6c221b39fd
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/config.rst
View File

@ -1085,7 +1085,7 @@ Generic settings
Set the number of seconds a script is allowed to run. If seconds is
set to zero, no time limit is imposed. This setting is used while
importing/exporting dump files and in the Synchronize feature but has
importing/exporting dump files but has
no effect when PHP is running in safe mode.
.. config:option:: $cfg['SessionSavePath']
@ -1255,8 +1255,7 @@ Cookie authentication options
:default: false
If enabled, allows you to log in to arbitrary servers using cookie
authentication and permits to specify servers of your choice in the
Synchronize dialog.
authentication.
.. note::

2
doc/intro.rst
View File

@ -46,8 +46,6 @@ Currently phpMyAdmin can:
* create, edit, export and drop events and triggers
* communicate in `62 different languages
<http://www.phpmyadmin.net/home_page/translations.php>`_
* synchronize two databases residing on the same as well as remote
servers see :ref:`faq9_1`
A word about users