Merge remote-tracking branch 'origin/master'

Documentation.html

@@ -4315,7 +4315,7 @@ chmod o+rwx tmp
 <h4 id="faq6_29">
     <a href="#faq6_29">6.29 Why can't I get a chart from my query result table?</a></h4>
 
-<p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_chart">wiki</a>.</p>
+<p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Charts#Data_formats_for_query_results_chart">wiki</a>.</p>
 
 <h3 id="faqproject">phpMyAdmin project</h3>
 
@@ -4343,7 +4343,7 @@ chmod o+rwx tmp
     <code>po/LANG_CODE.po</code> for your language (you can use
     <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code>
     to do this) or ask on the mailing list to add the translation to the web
-    interface. More details are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">our wiki</a>.
+    interface. More details are available on <a href="http://wiki.phpmyadmin.net/pma/Gettext_for_translators">our wiki</a>.
 </p>
 <p>
     Please note that we try not to use HTML entities like &amp;eacute; in
@@ -4394,7 +4394,7 @@ chmod o+rwx tmp
     </li>
 </ol>
 
-<p>More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Git">our wiki</a>.</p>
+<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 />

libraries/import.lib.php

@@ -773,7 +773,7 @@ function PMA_detectType($last_cumulative_type, &$cell) {
  * Determines if the column types are int, decimal, or string
  *
  *
- * @link http://wiki.phpmyadmin.net/pma/Devel:Import
+ * @link http://wiki.phpmyadmin.net/pma/Import
  *
  * @todo    Handle the error case more elegantly
  *
@@ -881,7 +881,7 @@ $import_notice = NULL;
  * as necessary, as well as insert all the data.
  *
  *
- * @link http://wiki.phpmyadmin.net/pma/Devel:Import
+ * @link http://wiki.phpmyadmin.net/pma/Import
  *
  * @access  public
  *

scripts/create-release.sh

@@ -4,7 +4,7 @@
 #
 
 # More documentation about making a release is available at:
-# http://wiki.phpmyadmin.net/pma/Devel:Releasing
+# http://wiki.phpmyadmin.net/pma/Releasing
 
 # Fail on undefined variables
 set -u