diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 84f13e501db..5fbc95f8dc5 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -30,8 +30,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modAccounting
- *	\brief      Classe de description et activation du module Comptabilite Expert
+ *	Classe de description et activation du module Comptabilite Expert
  */
 class modAccounting extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 1f8aeae6209..cb5b51c2318 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -26,7 +26,6 @@
  *      \ingroup    member
  *      \brief      File descriptor or module Member
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 7292503e31d..8d2d77fe4ba 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -30,8 +30,7 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *      \class      modAgenda
- *      \brief      Classe de description et activation du module Adherent
+ *	Classe de description et activation du module Adherent
  */
 class modAgenda extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index f5cc0ac0683..44fdfde6b17 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -31,10 +31,8 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modBanque
- *	\brief      Classe de description et activation du module Banque
+ *	Classe de description et activation du module Banque
  */
-
 class modBanque extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 1fa133e0a9f..2459fef3654 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -28,10 +28,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *	\class      modBarcode
- *	\brief      Classe de description et activation du module Barcode
+ *	Classe de description et activation du module Barcode
  */
-
 class modBarcode extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index c8cda2c14c9..5127d4da00e 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -28,10 +28,8 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modBookmark
- *	\brief      Classe de description et activation du module Bookmark
+ *	Classe de description et activation du module Bookmark
  */
-
 class modBookmark extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php
index 5538a9a63c9..8b9688f3a1a 100644
--- a/htdocs/core/modules/modBoutique.class.php
+++ b/htdocs/core/modules/modBoutique.class.php
@@ -30,8 +30,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *		\class 		modBoutique
- *		\brief      Classe de description et activation du module OSCommerce
+ *	Classe de description et activation du module OSCommerce
  */
 class modBoutique extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index 30a538dd3fa..0dc611f5448 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -26,8 +26,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *       \class      modCashDesk
- *       \brief      Class to describe and enable module Point Of Sales
+ *	Class to describe and enable module Point Of Sales
  */
 class modCashDesk extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 00e2ebfc5d7..5efe476ef34 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -27,8 +27,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *       \class      modCategorie
- *       \brief      Classe de description et activation du module Categorie
+ *	Classe de description et activation du module Categorie
  */
 class modCategorie extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index 47cbbfde2a0..4c605a43ec8 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -28,10 +28,8 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modClickToDial
- *	\brief      Classe de description et activation du module de Click to Dial
+ *	Classe de description et activation du module de Click to Dial
  */
-
 class modClickToDial extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modCommissions.class.php b/htdocs/core/modules/modCommissions.class.php
index 7aaa29f6063..58b6daeed1b 100644
--- a/htdocs/core/modules/modCommissions.class.php
+++ b/htdocs/core/modules/modCommissions.class.php
@@ -17,8 +17,8 @@
  */
 
 /**
- * 	\defgroup   commissions     Module Commissions
- * 	\brief      Example of a module descriptor.
+ * 	\defgroup   commissions     Module commissions
+ * 	\brief      Module commissions
  * 	\file       htdocs/core/modules/modCommissions.class.php
  * 	\ingroup    commissions
  * 	\brief      Description and activation file for module Commissions
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index a8fe798cd37..81ccc86590f 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -30,8 +30,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *		\class 		modComptabilite
- *      \brief      Classe de description et activation du module Comptabilite
+ *	Classe de description et activation du module Comptabilite
  */
 class modComptabilite extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index e7317dc99d0..630d683e15b 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -29,10 +29,8 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- \class      modContrat
- \brief      Classe de description et activation du module Contrat
+ *	Classe de description et activation du module Contrat
  */
-
 class modContrat extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index f42b6b20c80..0145c1bb55d 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -27,8 +27,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modDeplacement
- *	\brief      Classe de description et activation du module Deplacement
+ *	Classe de description et activation du module Deplacement
  */
 class modDeplacement extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modDocument.class.php b/htdocs/core/modules/modDocument.class.php
index 70058b77b1a..22714f84b1b 100644
--- a/htdocs/core/modules/modDocument.class.php
+++ b/htdocs/core/modules/modDocument.class.php
@@ -29,10 +29,8 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modDocument
- *	\brief      Classe de description et activation du module Document
+ *	Classe de description et activation du module Document
  */
-
 class modDocument extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index e1a39c42d13..d0879c5b4a8 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -29,8 +29,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modDon
- *	\brief      Classe de description et activation du module Don
+ *	Classe de description et activation du module Don
  */
 class modDon  extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 748b121547b..dbd796985d9 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -26,8 +26,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modECM
- *      \brief      Description and activation class for module ECM
+/**
+ * 	Description and activation class for module ECM
  */
 class modECM extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 99470a69325..5fa44181566 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -30,8 +30,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- * 	\class modExpedition
- *	\brief      Classe de description et activation du module Expedition
+ *	Classe de description et activation du module Expedition
  */
 class modExpedition extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 0c817b8488c..32ade6f6d3a 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -27,10 +27,9 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modExport
- *		\brief      Classe de description et activation du module export
+/**
+ *	Classe de description et activation du module export
  */
-
 class modExport extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index 435a3c75714..09fa08a4fe9 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -27,10 +27,9 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modExternalRss
- *		\brief      Classe de description et activation du module externalrss
+/**
+ *	Classe de description et activation du module externalrss
  */
-
 class modExternalRss extends DolibarrModules
 {
 
@@ -130,10 +129,10 @@ class modExternalRss extends DolibarrModules
     function remove($options='')
     {
 		$sql = array();
-		
+
 		// Delete old declarations of RSS box
 		$this->boxes[0][1] = "box_external_rss.php";
-		
+
 		return $this->_remove($sql,$options);
     }
 
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index aa0629d8ffc..da66f18c2cb 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -28,18 +28,17 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modExternalSite
-        \brief      Description and activation class for module ExternalSite
-*/
-
+/**
+ * 	Description and activation class for module ExternalSite
+ */
 class modExternalSite extends DolibarrModules
 {
 
-   /**
+    /**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-    */
+     */
 	function __construct($db)
 	{
 		$this->db = $db;
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 590d3500627..7bc5710a01f 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -27,8 +27,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modFTP
- *      \brief      Description and activation class for module FTP
+/**
+ * 	Description and activation class for module FTP
  */
 class modFTP extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 831a4bf679f..15e493c4f0c 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -29,8 +29,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- * 	\class modFckeditor
- *  \brief      Classe de description et activation du module Fckeditor
+ *	Classe de description et activation du module Fckeditor
  */
 
 class modFckeditor extends DolibarrModules
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 2a55a5653c0..e22023a74e3 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -32,8 +32,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modFicheinter
- *	\brief      Classe de description et activation du module Ficheinter
+ *	Classe de description et activation du module Ficheinter
  */
 class modFicheinter extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index be81886e514..2cade0b8b76 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -26,8 +26,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modGeoIPMaxmind
- *		\brief      Classe de description et activation du module Import
+/**
+ *	Classe de description et activation du module Import
  */
 class modGeoIPMaxmind extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index 9fc8899a1cf..7379b817396 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -26,8 +26,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modGravatar
- *      \brief      Description and activation class for module Gravatar
+/**
+ * 	Description and activation class for module Gravatar
  */
 class modGravatar extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index ee175a50588..f71c186c4bd 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -20,16 +20,12 @@
  */
 
 /**
- * 	  \defgroup   holiday Payes     Module holiday Payes
- *    \brief      Module de gestion des congés payés
+ * 	  \defgroup   holiday 	Module holiday
+ *    \brief      Module de gestion des congés
+ *    \file       htdocs/includes/modules/modHoliday.class.php
+ *    \ingroup    holiday
+ *    \brief      Description and activation file for module holiday
  */
-
-/**
- *      \file       htdocs/includes/modules/modHoliday.class.php
- *      \ingroup    holiday
- *      \brief      Description and activation file for module holiday
- */
-
 include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
 
 
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index 7bc70dbe55b..974028ef2e3 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -27,8 +27,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modImport
- *		\brief      Classe de description et activation du module Import
+/**
+ *	Classe de description et activation du module Import
  */
 class modImport extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 76a28618467..ef8dc306199 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -28,10 +28,8 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modLabel
- *	\brief      Classe de description et activation du module Label
+ *	Classe de description et activation du module Label
  */
-
 class modLabel extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index 66066e534fd..296293d60e6 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -28,8 +28,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *  \class 		modLdap
- *	\brief      Classe de description et activation du module Ldap
+ *	Classe de description et activation du module Ldap
  */
 class modLdap extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 62bf61082c2..9d13ed22e8b 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -29,8 +29,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modMailing
- *	\brief      Classe de description et activation du module Mailing
+ *	Classe de description et activation du module Mailing
  */
 class modMailing extends DolibarrModules
 {
@@ -75,35 +74,35 @@ class modMailing extends DolibarrModules
 		$this->rights = array();
 		$this->rights_class = 'mailing';
 		$r=0;
-		
+
 		$r++;
 		$this->rights[$r][0] = 221; // id de la permission
 		$this->rights[$r][1] = 'Consulter les mailings'; // libelle de la permission
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
-		
+
 		$r++;
 		$this->rights[$r][0] = 222;
 		$this->rights[$r][1] = 'Creer/modifier les mailings (sujet, destinataires...)';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'creer';
-		
+
 		$r++;
 		$this->rights[$r][0] = 223;
 		$this->rights[$r][1] = 'Valider les mailings (permet leur envoi)';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'valider';
-		
+
 		$r++;
 		$this->rights[$r][0] = 229;
 		$this->rights[$r][1] = 'Supprimer les mailings';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'supprimer';
-		
+
 		$r++;
 		$this->rights[$r][0] = 237;
 		$this->rights[$r][1] = 'View recipients and info';
@@ -111,7 +110,7 @@ class modMailing extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'recipient';
-		
+
 		$r++;
 		$this->rights[$r][0] = 238;
 		$this->rights[$r][1] = 'Manually send mailings';
@@ -119,7 +118,7 @@ class modMailing extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'send';
-		
+
 		$r++;
 		$this->rights[$r][0] = 239;
 		$this->rights[$r][1] = 'Delete mailings after validation and/or sent';
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 4619b765506..48b6a7b3c61 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**     \defgroup   margin     Module Margin
+/**     \defgroup   margin     Module margin
  *      \brief      Module to manage margins
  *      \file       htdocs/includes/modules/modMargin.class.php
  *      \ingroup    margin
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index 0aedef2948e..b04c974c250 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -23,12 +23,10 @@
  *	\ingroup    notification
  *	\brief      Fichier de description et activation du module Notification
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *	\class      modNotification
- *	\brief      Classe de description et activation du module Mailing
+ *	Classe de description et activation du module Mailing
  */
 class modNotification extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 8d9032f11d4..90f6000b2b0 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -26,8 +26,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modPayBox
- *      \brief      Description and activation class for module Paybox
+/**
+ * 	Description and activation class for module Paybox
  */
 class modPayBox extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 5c10fe30ee5..a15b00709ef 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -27,8 +27,8 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
-/**     \class      modPaypal
- *      \brief      Description and activation class for module Paypal
+/**
+ * 	Description and activation class for module Paypal
  */
 class modPaypal extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 0a5da251e0f..ed954e1b200 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -30,8 +30,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class 		modPrelevement
- *	\brief      Classe de description et activation du module Prelevement
+ *	Classe de description et activation du module Prelevement
  */
 class modPrelevement extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 528096343ab..a4f1e7d6978 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -22,14 +22,10 @@
 /**
  *	\defgroup   produit     Module products
  *	\brief      Module to manage catalog of predefined products
- */
-
-/**
  *	\file       htdocs/core/modules/modProduct.class.php
  *	\ingroup    produit
  *	\brief      File to describe module to manage catalog of predefined products
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 3849c7df0d8..a47ed483d16 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -26,13 +26,11 @@
  *	\ingroup    projet
  *	\brief      Fichier de description et activation du module Projet
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modProjet
- *	\brief      Classe de description et activation du module Projet
+ *	Classe de description et activation du module Projet
  */
 class modProjet extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index de004794807..8a44949690b 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -27,13 +27,11 @@
  *	\ingroup    propale
  *	\brief      Fichier de description et activation du module Propale
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *  \class 		modPropale
- *	\brief      Classe de description et activation du module Propale
+ *	Classe de description et activation du module Propale
  */
 class modPropale extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 88bc0b5491e..7fdc365c040 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -27,7 +27,6 @@
  *	\ingroup    service
  *	\brief      Fichier de description et activation du module Service
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 3fb3633ee64..116dbbfac6f 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -26,13 +26,11 @@
  *	\ingroup    societe
  *	\brief      Fichier de description et activation du module Societe
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modSociete
- *	\brief      Classe de description et activation du module Societe
+ *	Classe de description et activation du module Societe
  */
 class modSociete extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 5180e914ef5..2af2ce148fb 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -29,8 +29,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class      modStock
- *	\brief      Classe de description et activation du module Stock
+ *	Classe de description et activation du module Stock
  */
 class modStock extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 3147b067f35..6154a0f4bd8 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -27,8 +27,7 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *	\class      modSyslog
- *	\brief      Class to enable/disable module Logs
+ *	Class to enable/disable module Logs
  */
 class modSyslog extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 6342f53249d..72de8c56cb8 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -27,13 +27,11 @@
  *      \ingroup    tax
  *      \brief      Fichier de description et activation du module Taxe
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	\class 		modTax
- *	\brief      Classe de description et activation du module Tax
+ *	Classe de description et activation du module Tax
  */
 class modTax extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 8fcc8631e37..597e723b868 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -28,8 +28,7 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *	\class      modUser
- *	\brief      Classe de description et activation du module User
+ *	Classe de description et activation du module User
  */
 class modUser extends DolibarrModules
 {
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index f932d017ee2..2e35645be5d 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -22,14 +22,11 @@
  *       \ingroup    webservices
  *       \brief      File to describe webservices module
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 /**
- *       \class      modWebServices
- *       \brief      Class to describe a WebServices module
+ *	Class to describe a WebServices module
  */
-
 class modWebServices extends DolibarrModules
 {
 
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index acaed9cbf69..9ba4bf27d67 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -23,13 +23,11 @@
  *      \ingroup    workflow
  *      \brief      File to describe and activate module Workflow
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *  \class      modWorkflow
- *  \brief      Classe de description et activation du module Workflow
+ *	Classe de description et activation du module Workflow
  */
 class modWorkflow extends DolibarrModules
 {