diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 13509c8d4c7..86de98de149 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -20,11 +20,8 @@
 /**
  * 		\defgroup   mymodule     Module MyModule
  *      \brief      Example of a module descriptor.
- *					Such a file must be copied into htdocs/includes/module directory.
- */
-
-/**
- *      \file       htdocs/includes/modules/modMyModule.class.php
+ *					Such a file must be copied into htdocs/mymodule/includes/modules directory.
+ *      \file       htdocs/mymodule/includes/modules/modMyModule.class.php
  *      \ingroup    mymodule
  *      \brief      Description and activation file for module MyModule
  */
diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/includes/modules/modAccounting.class.php
index 761bcf80ced..57cd4147b89 100644
--- a/htdocs/includes/modules/modAccounting.class.php
+++ b/htdocs/includes/modules/modAccounting.class.php
@@ -19,14 +19,11 @@
  */
 
 /**
- * \defgroup   accounting 			Module accounting
- * \brief      Module to include accounting features
- */
-
-/**
- *		\file       htdocs/includes/modules/modAccounting.class.php
- *		\ingroup    accounting
- * 		\brief      Fichier de description et activation du module Comptabilite Expert
+ * 	\defgroup   accounting 			Module accounting
+ * 	\brief      Module to include accounting features
+ *	\file       htdocs/includes/modules/modAccounting.class.php
+ *	\ingroup    accounting
+ * 	\brief      Fichier de description et activation du module Comptabilite Expert
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php
index 4a720fff4d1..616bb495632 100644
--- a/htdocs/includes/modules/modAdherent.class.php
+++ b/htdocs/includes/modules/modAdherent.class.php
@@ -20,11 +20,8 @@
  */
 
 /**
- *       \defgroup   member     Module foundation
- *       \brief      Module to manage members of a foundation
- */
-
-/**
+ *      \defgroup   member     Module foundation
+ *      \brief      Module to manage members of a foundation
  *		\file       htdocs/includes/modules/modAdherent.class.php
  *      \ingroup    member
  *      \brief      File descriptor or module Member
diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php
index af5ccb7a89b..358fe322218 100644
--- a/htdocs/includes/modules/modAgenda.class.php
+++ b/htdocs/includes/modules/modAgenda.class.php
@@ -23,9 +23,6 @@
 /**
  *		\defgroup   agenda     Module agenda
  *      \brief      Module pour gerer l'agenda et actions
- */
-
-/**
  *      \file       htdocs/includes/modules/modAgenda.class.php
  *      \ingroup    agenda
  *      \brief      Fichier de description et activation du module agenda
diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php
index 21f969a3d09..e4acc6943d7 100644
--- a/htdocs/includes/modules/modBanque.class.php
+++ b/htdocs/includes/modules/modBanque.class.php
@@ -20,14 +20,11 @@
  */
 
 /**
- * \defgroup   banque     Module bank
- * \brief      Module pour gerer la tenue d'un compte bancaire et rapprochements
- */
-
-/**
- *		\file       htdocs/includes/modules/modBanque.class.php
- *		\ingroup    banque
- *		\brief      Fichier de description et activation du module Banque
+ * 	\defgroup   banque     Module bank
+ * 	\brief      Module pour gerer la tenue d'un compte bancaire et rapprochements
+ *	\file       htdocs/includes/modules/modBanque.class.php
+ *	\ingroup    banque
+ *	\brief      Fichier de description et activation du module Banque
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php
index 616465f0fb9..2f45b4db670 100644
--- a/htdocs/includes/modules/modBarcode.class.php
+++ b/htdocs/includes/modules/modBarcode.class.php
@@ -20,9 +20,6 @@
 /**
  *	\defgroup   barcode         Module barcode
  *	\brief      Module pour gerer les codes barres
- */
-
-/**
  *	\file       htdocs/includes/modules/modBarcode.class.php
  *	\ingroup    barcode,produit
  *	\brief      Fichier de description et activation du module Barcode
diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php
index b285958c3c8..0b7a34c11be 100644
--- a/htdocs/includes/modules/modBookmark.class.php
+++ b/htdocs/includes/modules/modBookmark.class.php
@@ -19,9 +19,6 @@
 /**
  *	\defgroup   bookmark    Module bookmarks
  *	\brief      Module to manage Bookmarks
- */
-
-/**
  *	\file       htdocs/includes/modules/modBookmark.class.php
  *	\ingroup    bookmark
  *	\brief      Fichier de description et activation du module Bookmarks
diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php
index b2993ec0c46..404aa362b83 100644
--- a/htdocs/includes/modules/modBoutique.class.php
+++ b/htdocs/includes/modules/modBoutique.class.php
@@ -18,15 +18,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**    
+/**
  * 	\defgroup   oscommerce     Module oscommerce
  *	\brief      Module pour gerer une boutique et interface avec OSCommerce
- */
-
-/**
- * \file       htdocs/includes/modules/modBoutique.class.php
- * \ingroup    oscommerce
- * \brief      Fichier de description et activation du module OSCommerce
+ *  \file       htdocs/includes/modules/modBoutique.class.php
+ *  \ingroup    oscommerce
+ *  \brief      Fichier de description et activation du module OSCommerce
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -73,7 +70,7 @@ class modBoutique extends DolibarrModules
 		// Constants
 		$this->const = array();
 		$r=0;
-		
+
 		$this->const[$r][0] = "OSC_DB_HOST";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "localhost";
diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php
index 83a293de7a1..da0be6e18fe 100644
--- a/htdocs/includes/modules/modCashDesk.class.php
+++ b/htdocs/includes/modules/modCashDesk.class.php
@@ -18,9 +18,6 @@
 /**
  *      \defgroup   pos       Module points of sale
  *      \brief      Module to manage points of sale
- */
-
-/**
  *      \file       htdocs/includes/modules/modCashDesk.class.php
  *      \ingroup    pos
  *      \brief      File to enable/disable module Point Of Sales
diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/includes/modules/modCategorie.class.php
index 906b2891045..8b3f3bde08f 100644
--- a/htdocs/includes/modules/modCategorie.class.php
+++ b/htdocs/includes/modules/modCategorie.class.php
@@ -19,12 +19,9 @@
 /**
  *      \defgroup   category       Module categories
  *      \brief      Module to manage categories
- */
-
-/**
- *       \file       htdocs/includes/modules/modCategorie.class.php
- *       \ingroup    category
- *       \brief      Fichier de description et activation du module Categorie
+ *      \file       htdocs/includes/modules/modCategorie.class.php
+ *      \ingroup    category
+ *      \brief      Fichier de description et activation du module Categorie
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modClickToDial.class.php b/htdocs/includes/modules/modClickToDial.class.php
index 0b2a216fac1..3b00f3a7194 100644
--- a/htdocs/includes/modules/modClickToDial.class.php
+++ b/htdocs/includes/modules/modClickToDial.class.php
@@ -19,9 +19,6 @@
 /**
  *	\defgroup   clicktodial      Module clicktodial
  *	\brief      Module pour gerer l'appel automatique
- */
-
-/**
  *	\file       htdocs/includes/modules/modClickToDial.class.php
  *	\ingroup    clicktodial
  *	\brief      Fichier de description et activation du module de click to Dial
diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php
index 731f6e4c08a..768e5123717 100644
--- a/htdocs/includes/modules/modCommande.class.php
+++ b/htdocs/includes/modules/modCommande.class.php
@@ -23,9 +23,6 @@
 /**
  *		\defgroup   commande     Module orders
  *		\brief      Module pour gerer le suivi des commandes
- */
-
-/**
  *		\file       htdocs/includes/modules/modCommande.class.php
  *		\ingroup    commande
  *		\brief      Fichier de description et activation du module Commande
diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php
index 433c190e6f6..af9ebed88f9 100644
--- a/htdocs/includes/modules/modComptabilite.class.php
+++ b/htdocs/includes/modules/modComptabilite.class.php
@@ -21,9 +21,6 @@
 /**
  * \defgroup   comptabilite     Module comptabilite
  * \brief      Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports)
- */
-
-/**
  * \file       htdocs/includes/modules/modComptabilite.class.php
  * \ingroup    comptabilite
  * \brief      Fichier de description et activation du module Comptabilite
diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php
index a0b66658846..105b2402a44 100644
--- a/htdocs/includes/modules/modContrat.class.php
+++ b/htdocs/includes/modules/modContrat.class.php
@@ -20,9 +20,6 @@
 /**
  *	\defgroup   contrat     Module contract
  *	\brief      Module pour gerer la tenue de contrat de services
- */
-
-/**
  *	\file       htdocs/includes/modules/modContrat.class.php
  *	\ingroup    contrat
  *	\brief      Fichier de description et activation du module Contrat
diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php
index 5749904e507..92bce9394c0 100644
--- a/htdocs/includes/modules/modDeplacement.class.php
+++ b/htdocs/includes/modules/modDeplacement.class.php
@@ -19,9 +19,6 @@
 /**
  *	\defgroup   deplacement     Module trips
  *	\brief      Module pour gerer les deplacements et notes de frais
- */
-
-/**
  *	\file       htdocs/includes/modules/modDeplacement.class.php
  *	\ingroup    deplacement
  *	\brief      Fichier de description et activation du module Deplacement et notes de frais
diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/includes/modules/modDocument.class.php
index dbf1d573a55..2b7511aa561 100644
--- a/htdocs/includes/modules/modDocument.class.php
+++ b/htdocs/includes/modules/modDocument.class.php
@@ -20,12 +20,9 @@
 /**
  *	\defgroup   	document     Module mass mailings
  *	\brief      	Module pour gerer des generations de documents
- */
-
-/**
- *	\file       htdocs/includes/modules/modDocument.class.php
- *	\ingroup    document
- *	\brief      Fichier de description et activation du module Generation document
+ *	\file       	htdocs/includes/modules/modDocument.class.php
+ *	\ingroup    	document
+ *	\brief      	Fichier de description et activation du module Generation document
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php
index eb2015171f3..96cf2919129 100644
--- a/htdocs/includes/modules/modDon.class.php
+++ b/htdocs/includes/modules/modDon.class.php
@@ -20,9 +20,6 @@
 /**
  *	\defgroup   don     Module donation
  *	\brief      Module pour gerer le suivi des dons
- */
-
-/**
  *	\file       htdocs/includes/modules/modDon.class.php
  *	\ingroup    don
  *	\brief      Fichier de description et activation du module Don
diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php
index 0a445493f9f..6aba18497e1 100644
--- a/htdocs/includes/modules/modECM.class.php
+++ b/htdocs/includes/modules/modECM.class.php
@@ -18,12 +18,9 @@
 
 /**     \defgroup   ecm		Module ecm
  *      \brief      Module for ECM (Electronic Content Management)
- */
-
-/**
- *       \file       htdocs/includes/modules/modECM.class.php
- *       \ingroup    ecm
- *       \brief      Description and activation file for module ECM
+ *      \file       htdocs/includes/modules/modECM.class.php
+ *      \ingroup    ecm
+ *      \brief      Description and activation file for module ECM
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php
index 1a38e6eae3f..aa5e08d5dfe 100644
--- a/htdocs/includes/modules/modExpedition.class.php
+++ b/htdocs/includes/modules/modExpedition.class.php
@@ -21,9 +21,6 @@
 /**
  *	\defgroup   expedition     Module shipping
  *	\brief      Module pour gerer les expeditions de produits
- */
-
-/**
  *	\file       htdocs/includes/modules/modExpedition.class.php
  *	\ingroup    expedition
  *	\brief      Fichier de description et activation du module Expedition
diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/includes/modules/modExport.class.php
index c5add37ea9d..ab78a58e48c 100644
--- a/htdocs/includes/modules/modExport.class.php
+++ b/htdocs/includes/modules/modExport.class.php
@@ -17,11 +17,8 @@
  */
 
 /**
- * \defgroup   export      Module export
- * \brief      Module generique pour realiser des exports de donnees en base
- */
-
-/**
+ *  \defgroup   export      Module export
+ *  \brief      Module generique pour realiser des exports de donnees en base
  *	\file       htdocs/includes/modules/modExport.class.php
  *	\ingroup    export
  *	\brief      Fichier de description et activation du module export
diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/includes/modules/modExternalRss.class.php
index d3e614d6dac..bc290d1fb33 100644
--- a/htdocs/includes/modules/modExternalRss.class.php
+++ b/htdocs/includes/modules/modExternalRss.class.php
@@ -19,9 +19,6 @@
 /**
  *  \defgroup   externalrss     Module externalrss
  *	\brief      Module pour inclure des informations externes RSS
- */
-
-/**
  *	\file       htdocs/includes/modules/modExternalRss.class.php
  *	\ingroup    externalrss
  *	\brief      Fichier de description et activation du module externalrss
diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/includes/modules/modExternalSite.class.php
index 0f6fee7fce0..692dbae2477 100644
--- a/htdocs/includes/modules/modExternalSite.class.php
+++ b/htdocs/includes/modules/modExternalSite.class.php
@@ -20,9 +20,6 @@
 /**
  * \defgroup   externalsite     Module externalsite
  * \brief      Module to include an external web site/tools into Dolibarr menu and into a frame page.
- */
-
-/**
  * \file       htdocs/includes/modules/modExternalSite.class.php
  * \ingroup    externalsite
  * \brief      Description and activation file for module ExternalSite
diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/includes/modules/modFTP.class.php
index 7a007522b59..037a0da0627 100644
--- a/htdocs/includes/modules/modFTP.class.php
+++ b/htdocs/includes/modules/modFTP.class.php
@@ -17,14 +17,11 @@
  */
 
 /**
- * \defgroup   ftp		Module FTP
- * \brief      Module for FTP client module
- */
-
-/**
- *       \file       htdocs/includes/modules/modFTP.class.php
- *       \ingroup    ftp
- *       \brief      Description and activation file for module FTP
+ * 		\defgroup   ftp		Module FTP
+ * 		\brief      Module for FTP client module
+ *      \file       htdocs/includes/modules/modFTP.class.php
+ *      \ingroup    ftp
+ *      \brief      Description and activation file for module FTP
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php
index 85744e2ca74..ff2806b42cc 100644
--- a/htdocs/includes/modules/modFacture.class.php
+++ b/htdocs/includes/modules/modFacture.class.php
@@ -22,10 +22,6 @@
 /**
  * 		\defgroup   facture     Module invoices
  *      \brief      Module pour gerer les factures clients et/ou fournisseurs
- */
-
-
-/**
  *      \file       htdocs/includes/modules/modFacture.class.php
  *		\ingroup    facture
  *		\brief      Fichier de la classe de description et activation du module Facture
diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php
index 02eadf1d36f..775c69cc0d3 100644
--- a/htdocs/includes/modules/modFckeditor.class.php
+++ b/htdocs/includes/modules/modFckeditor.class.php
@@ -20,9 +20,6 @@
 /**
  *  \defgroup   fckeditor     Module fckeditor
  *  \brief      Module pour mettre en page les zones de saisie de texte
- */
-
-/**
  *  \file       htdocs/includes/modules/modFckeditor.class.php
  *  \ingroup    fckeditor
  *  \brief      Fichier de description et activation du module Fckeditor
@@ -31,7 +28,7 @@
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
-/** 
+/**
  * 	\class modFckeditor
  *  \brief      Classe de description et activation du module Fckeditor
  */
diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/includes/modules/modFicheinter.class.php
index 1d855898170..eb9afc6bebf 100644
--- a/htdocs/includes/modules/modFicheinter.class.php
+++ b/htdocs/includes/modules/modFicheinter.class.php
@@ -23,9 +23,6 @@
 /**
  *	\defgroup   ficheinter     Module intervention cards
  *	\brief      Module to manage intervention cards
- */
-
-/**
  *	\file       htdocs/includes/modules/modFicheinter.class.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de description et activation du module Ficheinter
diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php
index 0db456a32a0..faeb86ce007 100644
--- a/htdocs/includes/modules/modFournisseur.class.php
+++ b/htdocs/includes/modules/modFournisseur.class.php
@@ -20,9 +20,6 @@
 /**
  * 		\defgroup   fournisseur     Module suppliers
  *		\brief      Module pour gerer des societes et contacts de type fournisseurs
- */
-
-/**
  *		\file       htdocs/includes/modules/modFournisseur.class.php
  *		\ingroup    fournisseur
  *		\brief      Fichier de description et activation du module Fournisseur
diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/includes/modules/modGeoIPMaxmind.class.php
index 71da5fe358e..505263a91fa 100644
--- a/htdocs/includes/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/includes/modules/modGeoIPMaxmind.class.php
@@ -16,11 +16,8 @@
  */
 
 /**
- * \defgroup   geoip      Module GeoIP
- * \brief      Module to make geoip conversions
- */
-
-/**
+ *  \defgroup   geoip      Module GeoIP
+ *  \brief      Module to make geoip conversions
  *	\file       htdocs/includes/modules/modGeoIPMaxmind.class.php
  *	\ingroup    geoip
  *	\brief      File of geoipmaxmind module descriptor
diff --git a/htdocs/includes/modules/modGravatar.class.php b/htdocs/includes/modules/modGravatar.class.php
index 25f93b4d833..3743c1adaa0 100644
--- a/htdocs/includes/modules/modGravatar.class.php
+++ b/htdocs/includes/modules/modGravatar.class.php
@@ -17,14 +17,11 @@
  */
 
 /**
- * \defgroup   gravatar     Module gravatar
- * \brief      Module to use Gravatar to show photo of users
- */
-
-/**
- *      \file       htdocs/includes/modules/modGravatar.class.php
- *      \ingroup    gravatar
- *      \brief      Description and activation file for module Gravatar
+ * 	\defgroup   gravatar     Module gravatar
+ * 	\brief      Module to use Gravatar to show photo of users
+ *  \file       htdocs/includes/modules/modGravatar.class.php
+ *  \ingroup    gravatar
+ *  \brief      Description and activation file for module Gravatar
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php
index 75035803e33..a086cc84c5e 100644
--- a/htdocs/includes/modules/modImport.class.php
+++ b/htdocs/includes/modules/modImport.class.php
@@ -17,11 +17,8 @@
  */
 
 /**
- * \defgroup   import      Module import
- * \brief      Module to make generic import of data into dolibarr database
- */
-
-/**
+ *  \defgroup   import      Module import
+ *  \brief      Module to make generic import of data into dolibarr database
  *	\file       htdocs/includes/modules/modImport.class.php
  *	\ingroup    import
  *	\brief      Fichier de description et activation du module Import
diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/includes/modules/modLabel.class.php
index ba54ff7edd6..bcc063bfd43 100644
--- a/htdocs/includes/modules/modLabel.class.php
+++ b/htdocs/includes/modules/modLabel.class.php
@@ -19,9 +19,6 @@
 /**
  *	\defgroup   label         Module labels
  *	\brief      Module pour gerer les formats d'impression des etiquettes
- */
-
-/**
  *	\file       htdocs/includes/modules/modLabel.class.php
  *	\ingroup    other
  *	\brief      Fichier de description et activation du module Label
@@ -31,8 +28,8 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
 /**
- \class      modLabel
- \brief      Classe de description et activation du module Label
+ *	\class      modLabel
+ *	\brief      Classe de description et activation du module Label
  */
 
 class modLabel extends DolibarrModules
diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/includes/modules/modLdap.class.php
index cd9c629b80d..8c8fd62ac72 100644
--- a/htdocs/includes/modules/modLdap.class.php
+++ b/htdocs/includes/modules/modLdap.class.php
@@ -19,13 +19,10 @@
 
 /**
  *  \defgroup   ldap     Module ldap
- *  \brief      Module pour interfacer les contacts avec un annuaire Ldap
- */
-
-/**
+ *  \brief		Module to manage LDAP interfaces with contacts or users
  *	\file       htdocs/includes/modules/modLdap.class.php
  *	\ingroup    ldap
- *	\brief      Fichier de description et activation du module Ldap
+ *	\brief		File to describe and activate Ldap module
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/includes/modules/modMailing.class.php
index 9755230637b..5d9d88cdcf2 100644
--- a/htdocs/includes/modules/modMailing.class.php
+++ b/htdocs/includes/modules/modMailing.class.php
@@ -20,9 +20,6 @@
 /**
  *	\defgroup   mailing  Module emailing
  *	\brief      Module to manage EMailings
- */
-
-/**
  *	\file       htdocs/includes/modules/modMailing.class.php
  *	\ingroup    mailing
  *	\brief      Fichier de description et activation du module Mailing
diff --git a/htdocs/includes/modules/modMantis.class.php b/htdocs/includes/modules/modMantis.class.php
index f5499ba25a4..239dab8abb7 100644
--- a/htdocs/includes/modules/modMantis.class.php
+++ b/htdocs/includes/modules/modMantis.class.php
@@ -19,9 +19,6 @@
 /**
  * \defgroup   mantis     Module mantis
  * \brief      Module to include Mantis into Dolibarr
- */
-
-/**
  * \file       htdocs/includes/modules/modMantis.class.php
  * \ingroup    mantis
  * \brief      Description and activation file for module Mantis
diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/includes/modules/modNotification.class.php
index efc1aca9437..aba3e1938e4 100644
--- a/htdocs/includes/modules/modNotification.class.php
+++ b/htdocs/includes/modules/modNotification.class.php
@@ -19,9 +19,6 @@
 /**
  *	\defgroup   notification	Module email notification
  *	\brief      Module pour gerer les notifications (par mail ou autre)
- */
-
-/**
  *	\file       htdocs/includes/modules/modNotification.class.php
  *	\ingroup    notification
  *	\brief      Fichier de description et activation du module Notification
diff --git a/htdocs/includes/modules/modPaybox.class.php b/htdocs/includes/modules/modPaybox.class.php
index c96e95ab58a..35a2c1cb58f 100644
--- a/htdocs/includes/modules/modPaybox.class.php
+++ b/htdocs/includes/modules/modPaybox.class.php
@@ -17,14 +17,11 @@
  */
 
 /**
- * \defgroup   paybox     Module paybox
- * \brief      Add integration with Paybox online payment system.
- */
-
-/**
- *      \file       htdocs/includes/modules/modPaybox.class.php
- *      \ingroup    paybox
- *      \brief      Description and activation file for module Paybox
+ * 	\defgroup   paybox     Module paybox
+ * 	\brief      Add integration with Paybox online payment system.
+ *  \file       htdocs/includes/modules/modPaybox.class.php
+ *  \ingroup    paybox
+ *  \brief      Description and activation file for module Paybox
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/includes/modules/modPaypal.class.php
index f4e86ba4138..2f45bfc2910 100644
--- a/htdocs/includes/modules/modPaypal.class.php
+++ b/htdocs/includes/modules/modPaypal.class.php
@@ -18,14 +18,11 @@
  */
 
 /**
- * \defgroup   paypal     Module paypal
- * \brief      Add integration with Paypal online payment system.
- */
-
-/**
- *      \file       htdocs/includes/modules/modPaypal.class.php
- *      \ingroup    paypal
- *      \brief      Description and activation file for module Paypal
+ * 	\defgroup   paypal     Module paypal
+ * 	\brief      Add integration with Paypal online payment system.
+ *  \file       htdocs/includes/modules/modPaypal.class.php
+ *  \ingroup    paypal
+ *  \brief      Description and activation file for module Paypal
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
@@ -107,7 +104,7 @@ class modPaypal extends DolibarrModules
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
 		$r=0;
-		
+
 
 		// Main menu entries
 		$this->menus = array();			// List of menus to add
diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/includes/modules/modPrelevement.class.php
index 035ed33154d..50a8396caee 100644
--- a/htdocs/includes/modules/modPrelevement.class.php
+++ b/htdocs/includes/modules/modPrelevement.class.php
@@ -21,12 +21,9 @@
 /**
  *	\defgroup   	prelevement     Module prelevement
  *	\brief      	Module de gestion des prelevements bancaires
- */
-
-/**
- *	\file       htdocs/includes/modules/modPrelevement.class.php
- *	\ingroup    prelevement
- *	\brief      Fichier de description et activation du module Prelevement
+ *	\file       	htdocs/includes/modules/modPrelevement.class.php
+ *	\ingroup    	prelevement
+ *	\brief      	Fichier de description et activation du module Prelevement
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -106,7 +103,7 @@ class modPrelevement extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'bons';
 		$this->rights[$r][5] = 'send';
-		
+
 		$r++;
 		$this->rights[$r][0] = 154;
 		$this->rights[$r][1] = 'credit/refuse withdrawals';
@@ -114,7 +111,7 @@ class modPrelevement extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'bons';
 		$this->rights[$r][5] = 'credit';
-		
+
 /*        $this->rights[2][0] = 154;
         $this->rights[2][1] = 'Setup withdraw account';
         $this->rights[2][2] = 'w';
diff --git a/htdocs/includes/modules/modProduct.class.php b/htdocs/includes/modules/modProduct.class.php
index 47e2b332eef..85d458bb06d 100644
--- a/htdocs/includes/modules/modProduct.class.php
+++ b/htdocs/includes/modules/modProduct.class.php
@@ -22,9 +22,6 @@
 /**
  *	\defgroup   produit     Module products
  *	\brief      Module pour gerer le suivi de produits predefinis
- */
-
-/**
  *	\file       htdocs/includes/modules/modProduct.class.php
  *	\ingroup    produit
  *	\brief      Fichier de description et activation du module Produit
diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/includes/modules/modProjet.class.php
index ec5d0cd62f4..153a4b6bf68 100644
--- a/htdocs/includes/modules/modProjet.class.php
+++ b/htdocs/includes/modules/modProjet.class.php
@@ -22,9 +22,6 @@
 /**
  *  \defgroup   projet     Module project
  *	\brief      Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks.
- */
-
-/**
  *  \file       htdocs/includes/modules/modProjet.class.php
  *	\ingroup    projet
  *	\brief      Fichier de description et activation du module Projet
diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php
index eef1af723c2..ec10ec7a487 100644
--- a/htdocs/includes/modules/modPropale.class.php
+++ b/htdocs/includes/modules/modPropale.class.php
@@ -22,9 +22,6 @@
 /**
  *	\defgroup   propale     Module commercial proposals
  *	\brief      Module pour gerer la tenue de propositions commerciales
- */
-
-/**
  *	\file       htdocs/includes/modules/modPropale.class.php
  *	\ingroup    propale
  *	\brief      Fichier de description et activation du module Propale
diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/includes/modules/modService.class.php
index 4cb57bc9b63..34534df0639 100644
--- a/htdocs/includes/modules/modService.class.php
+++ b/htdocs/includes/modules/modService.class.php
@@ -23,9 +23,6 @@
 /**
  *	\defgroup   service     Module services
  *	\brief      Module pour gerer le suivi de services predefinis
- */
-
-/**
  *	\file       htdocs/includes/modules/modService.class.php
  *	\ingroup    service
  *	\brief      Fichier de description et activation du module Service
diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index 3ba44a56d11..a0daa28a0d7 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -22,9 +22,6 @@
 /**
  *	\defgroup   societe     Module societe
  *	\brief      Module to manage third parties (customers, prospects)
- */
-
-/**
  *	\file       htdocs/includes/modules/modSociete.class.php
  *	\ingroup    societe
  *	\brief      Fichier de description et activation du module Societe
diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/includes/modules/modStock.class.php
index 96b0f78a40f..ff9c6591f06 100644
--- a/htdocs/includes/modules/modStock.class.php
+++ b/htdocs/includes/modules/modStock.class.php
@@ -20,9 +20,6 @@
 /**
  *	\defgroup   	stock     Module stocks
  *	\brief      	Module pour gerer la tenue de stocks produits
- */
-
-/**
  *	\file       htdocs/includes/modules/modStock.class.php
  *	\ingroup    stock
  *	\brief      Fichier de description et activation du module Stock
diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php
index f5445198513..39d1c6a3d06 100644
--- a/htdocs/includes/modules/modSyslog.class.php
+++ b/htdocs/includes/modules/modSyslog.class.php
@@ -19,9 +19,6 @@
 /**
  *	\defgroup   syslog  Module syslog
  *	\brief      Module pour gerer les messages d'erreur dans syslog
- */
-
-/**
  *	\file       htdocs/includes/modules/modSyslog.class.php
  *	\ingroup    syslog
  *	\brief      Fichier de description et activation du module de syslog
diff --git a/htdocs/includes/modules/modTax.class.php b/htdocs/includes/modules/modTax.class.php
index 2212db084fd..a739d2802e1 100644
--- a/htdocs/includes/modules/modTax.class.php
+++ b/htdocs/includes/modules/modTax.class.php
@@ -21,11 +21,8 @@
  */
 
 /**
- * \defgroup   tax		Module taxes
- * \brief      Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales
- */
-
-/**
+ * 		\defgroup   tax		Module taxes
+ * 		\brief      Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales
  *      \file       htdocs/includes/modules/modTax.class.php
  *      \ingroup    tax
  *      \brief      Fichier de description et activation du module Taxe
diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php
index e3c055bc212..da9da0e8c11 100644
--- a/htdocs/includes/modules/modUser.class.php
+++ b/htdocs/includes/modules/modUser.class.php
@@ -20,9 +20,6 @@
 /**
  *	\defgroup   user  Module user management
  *	\brief      Module pour gerer les utilisateurs
- */
-
-/**
  *	\file       htdocs/includes/modules/modUser.class.php
  *	\ingroup    user
  *	\brief      Fichier de description et activation du module Utilisateur
diff --git a/htdocs/includes/modules/modWebServices.class.php b/htdocs/includes/modules/modWebServices.class.php
index 7e7cf2f8a9e..724c14c2814 100644
--- a/htdocs/includes/modules/modWebServices.class.php
+++ b/htdocs/includes/modules/modWebServices.class.php
@@ -18,9 +18,6 @@
 /**
  *      \defgroup   webservices     Module webservices
  *      \brief      Module to enable the Dolibarr server of web services
- */
-
-/**
  *       \file       htdocs/includes/modules/modWebServices.class.php
  *       \ingroup    webservices
  *       \brief      File to describe webservices module
@@ -46,16 +43,16 @@ class modWebServices extends DolibarrModules
         $this->numero = 2600;
 
         $this->family = "technic";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "Enable the Dolibarr web services server";
         $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
-		$this->special = 1;
-		// Name of image file used for this module.
-		$this->picto='technic';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+        $this->special = 1;
+        // Name of image file used for this module.
+        $this->picto='technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -74,11 +71,11 @@ class modWebServices extends DolibarrModules
         //-----------
         $this->const = array();
 
-		// New pages on tabs
-		// -----------------
+        // New pages on tabs
+        // -----------------
         $this->tabs = array();
 
-		// Boxes
+        // Boxes
         //------
         $this->boxes = array();
 
@@ -93,14 +90,14 @@ class modWebServices extends DolibarrModules
     /**
      *   \brief      Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
      *               Definit egalement les repertoires de donnees a creer pour ce module.
-	 *	\param		options		Options when enabling module
+     *	\param		options		Options when enabling module
      */
     function init($options='')
     {
-		// Prevent pb of modules not correctly disabled
-		//$this->remove($options);
+        // Prevent pb of modules not correctly disabled
+        //$this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
         return $this->_init($sql,$options);
     }
@@ -108,13 +105,13 @@ class modWebServices extends DolibarrModules
     /**
      *	\brief      Fonction appelee lors de la desactivation d'un module.
      *              Supprime de la base les constantes, boites et permissions du module.
-	 *	\param		options		Options when disabling module
+     *	\param		options		Options when disabling module
      */
     function remove($options='')
     {
-		$sql = array();
+        $sql = array();
 
-		return $this->_remove($sql,$options);
+        return $this->_remove($sql,$options);
     }
 
 }
diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php
index f9e3cbe4507..0dade02d57f 100644
--- a/htdocs/includes/modules/modWorkflow.class.php
+++ b/htdocs/includes/modules/modWorkflow.class.php
@@ -18,10 +18,7 @@
 
 /**
  *      \defgroup   workflow     Module workflow
- *      \brief      Workflow management
- */
-
-/**
+ *      \brief		Workflow management
  *      \file       htdocs/includes/modules/modWorkflow.class.php
  *      \ingroup    workflow
  *      \brief      File to describe and activate module Workflow