From 5370d0d6c3c101d7ecf03d6ef78513ff75e6bb22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 2 May 2012 11:29:34 +0200
Subject: [PATCH] Fix spacing of @package used together with @subpackage

---
 examples/openid.php                         | 2 +-
 examples/signon-script.php                  | 2 +-
 examples/signon.php                         | 2 +-
 libraries/auth/config.auth.lib.php          | 2 +-
 libraries/auth/cookie.auth.lib.php          | 2 +-
 libraries/auth/http.auth.lib.php            | 2 +-
 libraries/auth/signon.auth.lib.php          | 2 +-
 libraries/dbi/drizzle-wrappers.lib.php      | 8 ++++----
 libraries/dbi/drizzle.dbi.lib.php           | 2 +-
 libraries/dbi/mysql.dbi.lib.php             | 2 +-
 libraries/dbi/mysqli.dbi.lib.php            | 2 +-
 libraries/import/docsql.php                 | 2 +-
 libraries/import/ldi.php                    | 2 +-
 libraries/import/ods.php                    | 2 +-
 libraries/import/shp.php                    | 2 +-
 libraries/import/sql.php                    | 2 +-
 libraries/import/xml.php                    | 2 +-
 libraries/string_mb.lib.php                 | 2 +-
 libraries/string_native.lib.php             | 2 +-
 libraries/string_type_ctype.lib.php         | 2 +-
 libraries/string_type_native.lib.php        | 2 +-
 test/selenium/PmaSeleniumPrivilegesTest.php | 2 +-
 test/selenium/PmaSeleniumTestCase.php       | 2 +-
 test/selenium/PmaSeleniumXssTest.php        | 2 +-
 themes/original/css/theme_left.css.php      | 2 +-
 themes/original/css/theme_print.css.php     | 2 +-
 themes/original/css/theme_right.css.php     | 2 +-
 themes/original/info.inc.php                | 2 +-
 themes/original/layout.inc.php              | 2 +-
 themes/pmahomme/css/theme_left.css.php      | 2 +-
 themes/pmahomme/css/theme_print.css.php     | 2 +-
 themes/pmahomme/css/theme_right.css.php     | 2 +-
 themes/pmahomme/info.inc.php                | 2 +-
 themes/pmahomme/layout.inc.php              | 2 +-
 34 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/examples/openid.php b/examples/openid.php
index 8faa808b71..c2220477cd 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -12,7 +12,7 @@
  * User first authenticates using OpenID and based on content of $AUTH_MAP
  * the login information is passed to phpMyAdmin in session data.
  *
- * @package PhpMyAdmin
+ * @package    PhpMyAdmin
  * @subpackage Example
  */
 
diff --git a/examples/signon-script.php b/examples/signon-script.php
index db98c73247..0ef97340df 100644
--- a/examples/signon-script.php
+++ b/examples/signon-script.php
@@ -7,7 +7,7 @@
  * phpMyAdmin, it is not intended to be perfect code and look, only
  * shows how you can integrate this functionality in your application.
  *
- * @package PhpMyAdmin
+ * @package    PhpMyAdmin
  * @subpackage Example
  */
 
diff --git a/examples/signon.php b/examples/signon.php
index d4acccb95f..6ab9e240aa 100644
--- a/examples/signon.php
+++ b/examples/signon.php
@@ -7,7 +7,7 @@
  * phpMyAdmin, it is not intended to be perfect code and look, only
  * shows how you can integrate this functionality in your application.
  *
- * @package PhpMyAdmin
+ * @package    PhpMyAdmin
  * @subpackage Example
  */
 
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 27524202f6..187fa16217 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run config authentication (ie no authentication).
  *
- * @package PhpMyAdmin-Auth
+ * @package    PhpMyAdmin-Auth
  * @subpackage Config
  */
 
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 09aa53ab0c..5cffe28180 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run cookie based authentication.
  *
- * @package PhpMyAdmin-Auth
+ * @package    PhpMyAdmin-Auth
  * @subpackage Cookie
  */
 
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index ae275cdd49..921fa34438 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -4,7 +4,7 @@
  * Set of functions used to run http authentication.
  * NOTE: Requires PHP loaded as a Apache module.
  *
- * @package PhpMyAdmin-Auth
+ * @package    PhpMyAdmin-Auth
  * @subpackage HTTP
  */
 
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index abad41e5fe..400e17039e 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run single signon authentication.
  *
- * @package PhpMyAdmin-Auth
+ * @package    PhpMyAdmin-Auth
  * @subpackage Signon
  */
 
diff --git a/libraries/dbi/drizzle-wrappers.lib.php b/libraries/dbi/drizzle-wrappers.lib.php
index 3b2e554759..051eb5e720 100644
--- a/libraries/dbi/drizzle-wrappers.lib.php
+++ b/libraries/dbi/drizzle-wrappers.lib.php
@@ -7,7 +7,7 @@
  * This wrapper is not complete and hides a lot of original functionality, but allows for easy usage
  * of the drizzle PHP extension.
  *
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage Drizzle
  */
 if (! defined('PHPMYADMIN')) {
@@ -78,7 +78,7 @@ function _dlog($end = false)
 /**
  * Wrapper for Drizzle class
  *
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage Drizzle
  */
 class PMA_Drizzle extends Drizzle
@@ -157,7 +157,7 @@ class PMA_Drizzle extends Drizzle
  * Wrapper around DrizzleCon class
  *
  * Its main task is to wrap results with PMA_DrizzleResult class
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage Drizzle
  */
 class PMA_DrizzleCon
@@ -245,7 +245,7 @@ class PMA_DrizzleCon
  *
  * Allows for reading result rows as an associative array and hides complexity
  * behind buffering.
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage Drizzle
  */
 class PMA_DrizzleResult
diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php
index d201f8cb4d..817b7b057a 100644
--- a/libraries/dbi/drizzle.dbi.lib.php
+++ b/libraries/dbi/drizzle.dbi.lib.php
@@ -8,7 +8,7 @@
  * TODO: This file and drizzle-wrappers.lib.php should be devoid of any segault related hacks.
  * TODO: Crashing versions of drizzle module and/or libdrizzle should be blacklisted
  *
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage Drizzle
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index f7c1e713df..19c7f415da 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -3,7 +3,7 @@
 /**
  * Interface to the classic MySQL extension
  *
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage MySQL
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index fecaabfb59..3e66f2752d 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -3,7 +3,7 @@
 /**
  * Interface to the improved MySQL extension (MySQLi)
  *
- * @package PhpMyAdmin-DBI
+ * @package    PhpMyAdmin-DBI
  * @subpackage MySQLi
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index 16f8e3ddcd..47b9c389e2 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -3,7 +3,7 @@
 /**
  * DocSQL import plugin for phpMyAdmin
  *
- * @package PhpMyAdmin-Import
+ * @package    PhpMyAdmin-Import
  * @subpackage DocSQL
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index 47319568f6..ce3a5e0594 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -3,7 +3,7 @@
 /**
  * CSV import plugin for phpMyAdmin using LOAD DATA
  *
- * @package PhpMyAdmin-Import
+ * @package    PhpMyAdmin-Import
  * @subpackage LDI
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
index a3bc4038e2..dc7765a7fd 100644
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -5,7 +5,7 @@
  *
  * @todo    Pretty much everything
  * @todo    Importing of accented characters seems to fail
- * @package PhpMyAdmin-Import
+ * @package    PhpMyAdmin-Import
  * @subpackage ODS
  */
 
diff --git a/libraries/import/shp.php b/libraries/import/shp.php
index f6fd664759..c3439a58f3 100644
--- a/libraries/import/shp.php
+++ b/libraries/import/shp.php
@@ -3,7 +3,7 @@
 /**
  * ESRI Shape file import plugin for phpMyAdmin
  *
- * @package PhpMyAdmin-Import
+ * @package    PhpMyAdmin-Import
  * @subpackage ESRI_Shape
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index e56ff7993a..4e97db7004 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -3,7 +3,7 @@
 /**
  * SQL import plugin for phpMyAdmin
  *
- * @package PhpMyAdmin-Import
+ * @package    PhpMyAdmin-Import
  * @subpackage SQL
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index 38c2054bff..f343b93e40 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -4,7 +4,7 @@
  * XML import plugin for phpMyAdmin
  *
  * @todo    Improve efficiency
- * @package PhpMyAdmin-Import
+ * @package    PhpMyAdmin-Import
  * @subpackage XML
  */
 
diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
index 7166d9e191..98ece6d562 100644
--- a/libraries/string_mb.lib.php
+++ b/libraries/string_mb.lib.php
@@ -9,7 +9,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package PhpMyAdmin-String
+ * @package    PhpMyAdmin-String
  * @subpackage MB
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
index 3a8b0bf380..f1db1b8d67 100644
--- a/libraries/string_native.lib.php
+++ b/libraries/string_native.lib.php
@@ -9,7 +9,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package PhpMyAdmin-String
+ * @package    PhpMyAdmin-String
  * @subpackage Native
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php
index 96b21d5348..95dfd2a003 100644
--- a/libraries/string_type_ctype.lib.php
+++ b/libraries/string_type_ctype.lib.php
@@ -9,7 +9,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package PhpMyAdmin-String
+ * @package    PhpMyAdmin-String
  * @subpackage CType
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php
index 0b6b364af7..808ae20db1 100644
--- a/libraries/string_type_native.lib.php
+++ b/libraries/string_type_native.lib.php
@@ -9,7 +9,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package PhpMyAdmin-String
+ * @package    PhpMyAdmin-String
  * @subpackage Native
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php
index 2e0816f59e..331b329c7e 100644
--- a/test/selenium/PmaSeleniumPrivilegesTest.php
+++ b/test/selenium/PmaSeleniumPrivilegesTest.php
@@ -3,7 +3,7 @@
 /**
  * Selenium TestCase for privilege related tests
  *
- * @package PhpMyAdmin-test
+ * @package    PhpMyAdmin-test
  * @subpackage Selenium
  */
 require_once 'PmaSeleniumTestCase.php';
diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php
index 06b404f86d..786c88744b 100644
--- a/test/selenium/PmaSeleniumTestCase.php
+++ b/test/selenium/PmaSeleniumTestCase.php
@@ -3,7 +3,7 @@
 /**
  * Selenium parent class for TestCases
  *
- * @package PhpMyAdmin-test
+ * @package    PhpMyAdmin-test
  * @subpackage Selenium
  */
 
diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php
index 1c880185f0..899700b1c2 100644
--- a/test/selenium/PmaSeleniumXssTest.php
+++ b/test/selenium/PmaSeleniumXssTest.php
@@ -3,7 +3,7 @@
 /**
  * Selenium TestCase for XSS related tests
  *
- * @package PhpMyAdmin-test
+ * @package    PhpMyAdmin-test
  * @subpackage Selenium
  */
 require_once 'PmaSeleniumTestCase.php';
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index a8f3fafa01..6591139871 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -3,7 +3,7 @@
 /**
  * navigation css file from theme Original
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php
index 82f6957f0b..3d8551f93d 100644
--- a/themes/original/css/theme_print.css.php
+++ b/themes/original/css/theme_print.css.php
@@ -3,7 +3,7 @@
 /**
  * print css file from theme Original
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage Original
  */
 ?>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index dd4b26eab0..cde5594fd5 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -3,7 +3,7 @@
 /**
  * main css file from theme Original
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php
index 635c3c6ae3..28866d6bf3 100644
--- a/themes/original/info.inc.php
+++ b/themes/original/info.inc.php
@@ -3,7 +3,7 @@
 /**
  * Theme information
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
index d2caeb5f88..fce646dc64 100644
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -4,7 +4,7 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php
index 9fc312f68e..6873681895 100644
--- a/themes/pmahomme/css/theme_left.css.php
+++ b/themes/pmahomme/css/theme_left.css.php
@@ -3,7 +3,7 @@
 /**
  * navigation css file from theme Original
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage PMAHomme
  */
 
diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php
index a53a7ebcc5..59ba3db069 100644
--- a/themes/pmahomme/css/theme_print.css.php
+++ b/themes/pmahomme/css/theme_print.css.php
@@ -3,7 +3,7 @@
 /**
  * print css file from theme Original
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage PMAHomme
  */
 ?>
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index ba9536f2c7..cbf3157261 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -3,7 +3,7 @@
 /**
  * main css file from theme pmahomme
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage PMAHomme
  */
 
diff --git a/themes/pmahomme/info.inc.php b/themes/pmahomme/info.inc.php
index f775507518..fafef6a1d3 100644
--- a/themes/pmahomme/info.inc.php
+++ b/themes/pmahomme/info.inc.php
@@ -3,7 +3,7 @@
 /**
  * Theme information
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage PMAHomme
  */
 
diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php
index d359aee076..5d87a0616d 100644
--- a/themes/pmahomme/layout.inc.php
+++ b/themes/pmahomme/layout.inc.php
@@ -4,7 +4,7 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @package PhpMyAdmin-theme
+ * @package    PhpMyAdmin-theme
  * @subpackage PMAHomme
  */