From 3e41e6976271beb2284de308c63125eda311847e Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:35:54 +0200 Subject: [PATCH 1/5] Documentation cleanup I found a few places that needed cleanup plus the Synchronization FAQ was using literal utf charachters for ' ` " and so on -- those are replaces with the appropriate escaped character entity or blocks. --- Documentation.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation.html b/Documentation.html index d1d589d4a..5c966737d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4366,8 +4366,8 @@ chmod o+rwx tmp the translations, since we define the right character set in the file. With HTML entities, the text on JavaScript messages would not display correctly. - However there are some entities that need to be there, for quotes - ,non-breakable spaces, ampersands, less than, greater than. + However there are some entities that need to be there, for quotes, + non-breakable spaces, ampersands, less than, greater than.

You can then put your translations, as a zip file to avoid losing special @@ -4417,7 +4417,7 @@ chmod o+rwx tmp 8.2 How can I protect phpMyAdmin against brute force attacks?

If you use Apache web server, phpMyAdmin exports information about - authentication to Apache environment and it can be used in Apache logs. + authentication to the Apache environment and it can be used in Apache logs. Currently there are two variables available:

@@ -4448,14 +4448,14 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \ 9.1 How can I synchronize two databases/tables in phpMyAdmin?

You can now synchronize databases/tables in phpMyAdmin using the Synchronize feature. -It allows you to connect to local as well as remote servers.This requires you to enter +It allows you to connect to local as well as remote servers. This requires you to enter server host name, username, password, port and the name of the database. Therefore you can now synchronize your databases placed on the same server or some remote server.

This feature is helpful for developers who need to replicate their -databases’ structure as well as data. Moreover, this feature not only +database’s structure as well as data. Moreover, this feature not only helps replication but also facilitates the user to keep his/her database in sync with another database. Other than the full database, certain tables of the databases can also be synchronized. @@ -4476,29 +4476,29 @@ representation.

-On the left, are listed the source database table names.  Some of the -names have a ‘+’ plus sign preceding them. This shows that these tables +On the left, are listed the source database table names. Some of the +names have a + plus sign preceding them. This shows that these tables are only present in source database and they need to be added to the target database in order to synchronize the target database. The tables -whose names are not preceded by a ‘+’ sign are already present in the +whose names are not preceded by a + sign are already present in the target database.

On the right, are listed the target database table names. There are few -table names that have “(not present)” appended after their names. This +table names that have (not present) appended after their names. This means that these tables are to be created in target database in order to -synchronize target database with source database. Some tables’ names -have a ‘-’ minus sign preceding them. This shows that these tables are +synchronize target database with source database. Some table names +have a - minus sign preceding them. This shows that these tables are only present in target database and they will remain unchanged in the target database. The column in the middle shows the difference between the source and target corresponding tables.

-The difference is depicted by the red and green buttons with S and D +The difference is depicted by the red and green buttons with S and D letters, indicating that either Structure or Data are not up to date. By -clicking on them, they will turn grey, what means that they will be synchronised. +clicking on them, they will turn grey, what means that they will be synchronized.

From f41c6f887ad88f42456392712ec83e5b0a0b7343 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:37:01 +0200 Subject: [PATCH 2/5] FAQ 7.1 forum link Tiny improvement; link directly to the forum instead of the main sourceforge page. --- Documentation.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5c966737d..72d03b55d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4344,8 +4344,9 @@ chmod o+rwx tmp under the Bugs section.

But please first discuss your bug with other users:
- - http://sf.net/projects/phpmyadmin/ (and choose Forums)

+ + https://sourceforge.net/projects/phpmyadmin/forums. +

7.2 I want to translate the messages to a new language or upgrade an From 761aaf8bf20779c1ac5942a7b62b2315d8f5218d Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:38:09 +0200 Subject: [PATCH 3/5] FAQ 7.2 translation additions This adds a section about documentation translation. The text was taken from the PMA website. --- Documentation.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation.html b/Documentation.html index 72d03b55d..062657fa1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4379,6 +4379,18 @@ chmod o+rwx tmp list, because this is where we ask for translations of new messages.

+

+ Documentation is being translated using po4a and gettext (see + documentation + for existing translations). To start, checkout + localized_docs/po + from Git, or just go to the translation server + and translate it online. If your language is missing, just contact + Michal Čihař; he will add it. If + you prefer to directly translate the po files, please put updated ones into our + translation tracker. +

+

7.3 I would like to help out with the development of phpMyAdmin. How should I proceed?

From aa98d772e6f380f9d3b1ee9d9a6104c58192d1bc Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 9 Jun 2010 16:40:29 +0200 Subject: [PATCH 4/5] Documentation: FAQ 7.2 cleanup Some cleanups for FAQ 7.2 --- Documentation.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index 062657fa1..374366c4d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4352,14 +4352,14 @@ chmod o+rwx tmp 7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start? -

Always use latest Git version of po file to translate. You can optionally +

Always use latest Git version of the po file to translate. You can optionally translate online at our translation - server where you can also get latest po files and merge them - with your translations. For creating new translation simply use + server where you can also get the latest po files and merge them + with your translations. For creating a new translation simply use po/phpmyadmin.pot and generate po/LANG_CODE.po for your language (you can use msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po - to do this) or ask on mailing list to add the translation to the web + to do this) or ask on the mailing list to add the translation to the web interface. More details are available on our wiki.

@@ -4367,15 +4367,15 @@ chmod o+rwx tmp the translations, since we define the right character set in the file. With HTML entities, the text on JavaScript messages would not display correctly. - However there are some entities that need to be there, for quotes, + However there are some entities that need to be there: quotes, non-breakable spaces, ampersands, less than, greater than.

You can then put your translations, as a zip file to avoid losing special - characters, on the sourceforge.net translation tracker. + characters, on the sourceforge.net translation tracker.

- It would be a good idea to subscribe to the phpmyadmin-translators mailing + It would be a good idea to subscribe to the phpmyadmin-translators mailing list, because this is where we ask for translations of new messages.

From 3fc1f82e3ef9bf4408786335f224aad8ad4977ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Jun 2010 16:43:26 +0200 Subject: [PATCH 5/5] Fix markup. --- Documentation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation.html b/Documentation.html index 374366c4d..8839845e3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4383,7 +4383,7 @@ chmod o+rwx tmp Documentation is being translated using po4a and gettext (see documentation for existing translations). To start, checkout - localized_docs/po + localized_docs/po from Git, or just go to the translation server and translate it online. If your language is missing, just contact Michal Čihař; he will add it. If