Merge remote-tracking branch 'origin/QA_3_5'

1 files changed, 7 insertions, 64 deletions

diff --git a/Documentation.html b/Documentation.html
index 75a77f9b6e..3a7f374d4d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4559,26 +4559,10 @@ chmod o+rwx tmp
     <a href="#faq7_3">7.3 I would like to help out with the development of
     phpMyAdmin. How should I proceed?</a></h4>
 
-<p> The following method is preferred for new developers:</p>
-
-<ol><li>fetch the current git repository over anonymous git:<br />
-    <tt>git clone git://github.com/phpmyadmin/phpmyadmin.git</tt><br />
-    </li>
-    <li>add your stuff</li>
-    <li>generate patch with your changes:
-    <tt>git diff &gt; xxx.diff</tt><br />
-    </li>
-    <li>submit your patch via the <a
-        href="https://sourceforge.net/tracker/?group_id=23067&amp;atid=377410">patch
-        tracker of the phpMyAdmin project</a>.
-    </li>
-</ol>
-
-<p>More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Git">our wiki</a>.</p>
-
-<p> Write access to the repository is granted only to experienced developers who
-    have already contributed something useful to phpMyAdmin.<br />
-    Also, have a look at the <a href="#developers">Developers section</a>.</p>
+<p>We welcome every contribution to the development of phpMyAdmin. 
+   You can check out all the possibilities to contribute in the
+   <a href="http://www.phpmyadmin.net/home_page/improve.php">contribute section on our website</a>.
+   </p>
 
 <h3 id="faqsecurity">Security</h3>
 
@@ -4693,50 +4677,9 @@ must have a primary key.
     great features have been written by other people and you too can help to
     make phpMyAdmin a useful tool.</p>
 
-<p> If you're planning to contribute source, please read the following
-    information:</p>
-
-<ul><li>All files include <i>libraries/header.inc.php</i> (layout),.
-        <i>libraries/common.lib.php</i> (common functions) and
-        <i>config.inc.php</i>.<br />
-        Only configuration data should go in <i>config.inc.php</i>. Please keep
-        it free from other code.<br />
-        Commonly used functions should be added to
-        <i>libraries/common.lib.php</i> and more specific ones may be added
-        within a library stored into the <i>libraries</i> sub-directory.</li>
-    <li>Obviously, you're free to use whatever coding style you want. But
-        please try to keep your code as simple as possible: beginners are
-        using phpMyAdmin as an example application.<br />
-        As far as possible, we want the scripts to be XHTML1.0 and CSS2
-        compliant on one hand, they fit the
-        <a href="http://pear.php.net/">
-        <abbr title="PHP Extension and Application Repository">PEAR</abbr>
-        coding standards</a>
-        on the other hand. Please pay attention to this.</li>
-    <li>Please enable showing PHP errors and warnings by the
-        <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code>
-        configuration directive.</li>
-    <li>Please try to keep up the file-naming conventions. Table-related stuff
-        goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
-        server-related tools to <i>server_*.php</i> and so on.</li>
-    <li>Please use gettext wrappers around all messages 
-        (<code>__('Some text')</code> or <code>_ngettext()</code> function).
-        To translate them, you need to call <code>scripts/update-po</code>
-        script. To use translated messages, call
-        <code>scripts/generate-mo</code>, which generates binary files read by
-        Gettext.</li>
-    <li>If you want to be really helpful, write an entry for the ChangeLog.</li>
-    <li id="developersdbg">
-        The DBG extension (<a href="http://dd.cron.ru/dbg/">PHP
-        Debugger DBG</a>) is now supported by phpMyAdmin for developers to
-        better debug and profile their code.<br />
-        Please see the
-        <a href="#cfg_DBG" class="configrule">$cfg['DBG']*</a> configuration
-        options for more information.<br />
-        This is in memoriam of the Space Shuttle Columbia (STS-107) which was
-        lost during its re-entry into Earth's atmosphere and in memory of the
-        brave men and women who gave their lives for the people of Earth.</li>
-</ul>
+<p>You can check out all the possibilities to contribute in the
+   <a href="http://www.phpmyadmin.net/home_page/improve.php">contribute section on our website</a>.
+   </p>
 
 <h2 id="copyright">Copyright</h2>