File comments:

- remove @license and @version from comments
- add vim settings
- change descriptions in form definition files

libraries/config/ConfigFile.class.php

@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Config file management
  *
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @package    phpMyAdmin
+ * @package phpMyAdmin
  */
 
 /**

libraries/config/Form.class.php

@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form handling code.
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**

libraries/config/FormDisplay.class.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form management class, displays and processes forms
  *
@@ -8,8 +9,7 @@
  * o translated_path - work_path modified for HTML field name, a path with
  *                     slashes changed to hyphens, eg. Servers-4-verbose
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**

libraries/config/FormDisplay.tpl.php

@@ -1,9 +1,9 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Form templates
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**

libraries/config/config_functions.lib.php

@@ -3,7 +3,7 @@
 /**
  * Common config manipulation functions
  *
- * @package    phpMyAdmin
+ * @package phpMyAdmin
  */
 
 /**

libraries/config/messages.inc.php

@@ -1,11 +1,13 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Messages for phpMyAdmin.
  *
  * This file is here for easy transition to Gettext. You should not add any
  * new messages here, use instead gettext directly in your template/PHP
  * file.
+ *
+ * @package phpMyAdmin
  */
 
 if (!function_exists('__')) {

libraries/config/setup.forms.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * List of avaible forms, each form is described as an array of fields to display.
  * Fields MUST have their counterparts in the $cfg array.
@@ -9,12 +10,16 @@
  * $forms['Form group']['Form name'] = array('Servers/1/host');
  *
  * You can assign default values set by special button ("set value: ..."), eg.:
- * $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
- *  'pmadb' => 'phpmyadmin')));
+ * 'Servers/1/pmadb' => 'phpmyadmin'
  *
- * @package    phpMyAdmin-setup
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
+ * To group options, use:
+ * ':group:' . __('group name') // just define a group
+ * or
+ * 'option' => ':group' // group starting from this option
+ * End group blocks with:
+ * ':group:end'
+ *
+ * @package phpMyAdmin-setup
  */
 
 $forms = array();

libraries/config/user_preferences.forms.php

@@ -1,13 +1,21 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * List of avaible forms, each form is described as an array of fields to display.
  * Fields MUST have their counterparts in the $cfg array.
  *
  * To define form field, use the notatnion below:
- * $forms['Form group']['Form name'] = array('Servers/1/host');
+ * $forms['Form group']['Form name'] = array('Option/path');
  *
  * You can assign default values set by special button ("set value: ..."), eg.:
- * $forms['Server']['pmadb form'] = array('Servers/1/pmadb' => 'phpmyadmin');
+ * 'Servers/1/pmadb' => 'phpmyadmin'
+ *
+ * To group options, use:
+ * ':group:' . __('group name') // just define a group
+ * or
+ * 'option' => ':group' // group starting from this option
+ * End group blocks with:
+ * ':group:end'
  *
  * @package phpMyAdmin
  */

libraries/config/validate.lib.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Various validation functions
  *
@@ -11,8 +12,7 @@
  *
  * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
  *
- * @package    phpMyAdmin
- * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @package phpMyAdmin
  */
 
 /**