Commit Graph

51 Commits

Author SHA1 Message Date
Marc Delisle
c4d564026b Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-29 09:43:32 -04:00
Marc Delisle
b4ef886fb2 Merge branch 'QA_4_3' 2015-02-05 08:46:52 -05:00
Marc Delisle
f7ac0a8e05 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-05 08:46:27 -05:00
Madhura Jayaratne
e125a7711e Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-04 12:44:03 +05:30
Marc Delisle
50619593bd Bug Incorrect link in doc
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-03 08:00:48 -05:00
Marc Delisle
0f67f7fb2f Merge branch 'QA_4_3' 2015-01-09 08:33:11 -05:00
Marc Delisle
3db70d7da4 Clarify upgrading procedure
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-09 08:32:29 -05:00
Marc Delisle
0f3e58bf2e Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-05 10:08:05 -05:00
Marc Delisle
c6bf4d61bc Clarifications
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-05 10:04:09 -05:00
Isaac Bennetch
7e3309fc2a User documentation for Zero Configuration
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-05 10:00:37 -05:00
Madhura Jayaratne
1b87db5724 bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 22:55:33 +05:30
Marc Delisle
d5e485f4f1 Merge branch 'QA_4_3' 2014-12-10 12:35:02 -05:00
Marc Delisle
8260ae8b75 Bug #4640 Incorrect reference to PHP 6
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-10 12:34:41 -05:00
Marc Delisle
d17215986d Improve English
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-28 08:02:01 -05:00
Michal Čihař
109f08f429 Improve a bit recommendation to use another authentication as well
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-11-28 13:44:31 +01:00
Michal Čihař
a2fca828e7 Merge commit '648c016422365f88d047d9bf82c23cb8b2be9210' 2014-08-12 10:17:12 +02:00
Michal Čihař
648c016422 Document Debian and Ubuntu differences
The Debian package comes with patched documentation, but I think it's
better to cover this upstream as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-08-12 10:15:20 +02:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-12 01:52:32 +05:30
Michal Čihař
234cfbf73f Document AES usage
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-12 14:43:10 +02:00
Isaac Bennetch
26efcfd66a Feature request 1528: Documentation refers to .htaccess files that have been removed
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2014-05-28 10:18:30 -04:00
Michal Čihař
2be24a07ff Show Swekey example in the docs
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 14:46:01 +02:00
Michal Čihař
616e732c37 Add crossreferences to the auth docs
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 18:07:39 +02:00
Michal Čihař
33e8a493a4 Better documentation for authentication modes
- move most of that to the setup section
- remove historical notes (like when it was introduced or originally
  called)
- include example scripts in the docs as well

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 18:07:39 +02:00
Michal Čihař
edcd09ca1b Remove trailing whitespace from the documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-20 09:39:07 +01:00
Michal Čihař
657c512ac5 Update documentation in regard to --skip-show-database
As we no longer use SHOW DATABASE for listing databases, this section is
no longer relevant.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-26 09:04:33 +01:00
Isaac Bennetch
cdb25a1e9e Documentation improvements
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2014-02-11 14:19:13 -05:00
Marc Delisle
39e044d795 Fix merge conflicts 2013-11-25 08:09:54 -05:00
Marc Delisle
975870337b - bug #4163 Setup script does not recognize manually-configured server
- Improve English
2013-11-25 08:06:54 -05:00
Michal Čihař
017e387048 Link to existing page on Wikipedia 2013-09-25 16:32:27 +02:00
Michal Čihař
8d26080f46 Remove not needed of 2013-09-25 15:28:33 +02:00
Michal Čihař
c7dab76355 Add link to wiki 2013-09-25 15:04:08 +02:00
Michal Čihař
66427dd542 Mention XAMMP as easy way to install on Windows 2013-09-25 15:04:08 +02:00
Michal Čihař
c4763baaff Incorporate distro specific docs from website 2013-09-25 15:04:08 +02:00
Marc Delisle
09e14a6113 Fix typo 2013-08-27 11:00:37 -04:00
Marc Delisle
a1dc57bfdf We no longer supply a .htaccess in libraries 2013-08-03 05:27:53 -04:00
Michal Čihař
fab879f924 Simplify reCaptcha configuration
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
2013-06-12 09:38:10 +02:00
Michal Čihař
e9f7faa6d3 Add hint to captcha in security tips 2013-06-11 15:33:41 +02:00
Michal Čihař
8002be2ad8 Highlight PHP without starting <?php tag in docs 2013-06-05 10:29:37 +02:00
Michal Čihař
69fc0a94a3 Fix text description around SQL for granting pma user privileges 2013-05-21 14:32:21 +02:00
Michal Čihař
222f484bb0 Add missing reference 2012-11-30 11:14:06 +01:00
Michal Čihař
92f3afbb8e Fix reference to auth_type config option 2012-11-30 11:12:06 +01:00
Michal Čihař
b159fff3b4 We no longer provide other that utf-8 languages 2012-11-14 13:52:23 +01:00
Michal Čihař
e70505d77f This is now called users 2012-11-14 13:50:33 +01:00
Michal Čihař
25f4660f88 Use glossary terms instead of abbreviations
This avoids need to repeat the abbreviation all the time and easies
translations.
2012-11-14 09:42:42 +01:00
Michal Čihař
12bde800ad Various improvements to docs 2012-11-12 14:55:22 +01:00
Michal Čihař
17504d5132 Add some tips for securing phpMyAdmin 2012-11-12 14:32:00 +01:00
Michal Čihař
ae84e704b5 Add missing link to configuration 2012-11-12 14:27:35 +01:00
Michal Čihař
fb6db32167 Add missing link to configuration 2012-11-12 14:24:52 +01:00
Michal Čihař
937a377821 Move to doc directory 2012-11-12 08:59:53 +01:00
Michal Čihař
318701f0e5 Revert move to docs 2012-11-09 12:01:46 +01:00