Merge remote-tracking branch 'origin/QA_3_5'

Documentation.html

@@ -559,7 +559,7 @@ $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey.conf';
 You then have to create the <tt>swekey.conf</tt> file that will associate
 each user with their Swekey Id. It is important to place this file outside
 of your web server's document root (in the example, it is located in <tt>/etc</tt>). A self documented sample file is provided 
-in the <tt>contrib</tt> directory. Feel free to use it with your own 
+in the <tt>examples</tt> directory. Feel free to use it with your own 
 users' information.<br /><br />
 If you want to purchase a Swekey please visit
 <a href="http://phpmyadmin.net/auth_key">http://phpmyadmin.net/auth_key</a>
@@ -770,9 +770,9 @@ since this link provides funding for phpMyAdmin.
                 session data or using supplied PHP script. This is useful for implementing single signon
                 from another application.
                 
-                Sample way how to seed session is in signon example: <code>scripts/signon.php</code>. 
-                There is also alternative example using OpenID - <code>scripts/openid.php</code> and 
-                example for scripts based solution - <code>scripts/signon-script.php</code>.
+                Sample way how to seed session is in signon example: <code>examples/signon.php</code>. 
+                There is also alternative example using OpenID - <code>examples/openid.php</code> and 
+                example for scripts based solution - <code>examples/signon-script.php</code>.
                 
                 You need to
                 configure <a href="#cfg_Servers_SignonSession"
@@ -1347,7 +1347,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     signon. The script needs to provide function
     <code>get_login_credentials</code> which returns list of username and
     password, accepting single parameter of existing username (can be empty).
-    See <code>scripts/signon-script.php</code> for an example.
+    See <code>examples/signon-script.php</code> for an example.
     </dd>
     <dt><span id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span> string</dt>
     <dd>Name of session which will be used for signon authentication method.

contrib/README

@@ -1,20 +0,0 @@
-phpMyAdmin Third Party Contributions
-====================================
-
-This directory contains various stuff contributed by users that might be
-useful to other. There is no guarantee it will work for you.
-
-Current content of this directory:
-
-packaging 
-    Contains files needed for creating packages for various
-    distributions. Please prefer official packages from your vendor if
-    possible.
-
-swekey.sample.conf
-    SweKey authentication configuration example.
-
-htaccess
-    Sample Apache configuration for limit access for bots.
-
-# vim: expandtab ts=4 sw=4 sts=4 tw=78

examples/config.manyhosts.inc.php

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This example configuration shows how to configure phpMyAdmin for
+ * many hosts that all have identical configuration otherwise. To add
+ * a new host, just drop it into $hosts below. Contributed by
+ * Matthew Hawkins.
+ */
+
+$i=0;
+$hosts = array (
+    "foo.example.com",
+    "bar.example.com",
+    "baz.example.com",
+    "quux.example.com",
+);
+
+foreach ($hosts as $host) {
+    $i++;
+    $cfg['Servers'][$i]['host']     = $host;
+    $cfg['Servers'][$i]['port']     = '';
+    $cfg['Servers'][$i]['socket']   = '';
+    $cfg['Servers'][$i]['connect_type']     = 'tcp';
+    $cfg['Servers'][$i]['extension']        = 'mysql';
+    $cfg['Servers'][$i]['compress'] = FALSE;
+    $cfg['Servers'][$i]['controluser']      = 'pma';
+    $cfg['Servers'][$i]['controlpass']      = 'pmapass';
+    $cfg['Servers'][$i]['auth_type']        = 'cookie';
+    $cfg['Servers'][$i]['user']     = '';
+    $cfg['Servers'][$i]['password'] = '';
+    $cfg['Servers'][$i]['only_db']  = '';
+    $cfg['Servers'][$i]['verbose']  = '';
+    $cfg['Servers'][$i]['pmadb']    = 'phpmyadmin';
+    $cfg['Servers'][$i]['bookmarktable']    = 'pma_bookmark';
+    $cfg['Servers'][$i]['relation'] = 'pma_relation';
+    $cfg['Servers'][$i]['table_info']       = 'pma_table_info';
+    $cfg['Servers'][$i]['table_coords']     = 'pma_table_coords';
+    $cfg['Servers'][$i]['pdf_pages']        = 'pma_pdf_pages';
+    $cfg['Servers'][$i]['column_info']      = 'pma_column_info';
+    $cfg['Servers'][$i]['history']  = 'pma_history';
+    $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
+}
+