diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 01e85b456c4..6995353ac05 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -22,7 +22,7 @@
 
 /**
  *   	\file       htdocs/adherents/admin/adherent.php
- *		\ingroup    adherent
+ *		\ingroup    member
  *		\brief      Page to setup the module Foundation
  *		\version    $Id$
  */
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index b4130b781d6..2cc006b61c4 100755
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file 		htdocs/adherents/cartes/carte.php
- *	\ingroup    adherent
+ *	\ingroup    member
  *	\brief      Page to output members business cards
  *	\version    $Id$
  */
diff --git a/htdocs/adherents/cartes/etiquette.php b/htdocs/adherents/cartes/etiquette.php
index 4c154af0cb9..07790aed373 100755
--- a/htdocs/adherents/cartes/etiquette.php
+++ b/htdocs/adherents/cartes/etiquette.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file 		htdocs/adherents/cartes/etiquette.php
- *	\ingroup    adherent
+ *	\ingroup    member
  *	\brief      Page de creation d'etiquettes
  *	\version    $Id$
  */
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 2311fd4c577..299cf5e19a9 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -22,7 +22,7 @@
 
 /**
  *   	\file       htdocs/admin/ldap_members.php
- *		\ingroup    ldap adherent
+ *		\ingroup    ldap member
  *		\brief      Page d'administration/configuration du module Ldap adherent
  *		\version    $Id$
  */
diff --git a/htdocs/comm/class/address.class.php b/htdocs/comm/class/address.class.php
index 283b3edb311..b0159f52b89 100644
--- a/htdocs/comm/class/address.class.php
+++ b/htdocs/comm/class/address.class.php
@@ -30,7 +30,6 @@
  *  \class 		Address
  *  \brief 		Classe permettant la gestion des adresses des tiers
  */
-
 class Address
 {
 	var $db;
@@ -470,6 +469,11 @@ class Address
 
 }
 
+
+/**
+ *  \class 		AddressLine
+ *  \brief 		Class to manage one address line
+ */
 class AddressLine
 {
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5c3e0cfa78e..627dbb96aa0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2220,7 +2220,7 @@ class Propal extends CommonObject
 
 
 /**
- *	\class      PropalLigne
+ *	\class      PropaleLigne
  *	\brief      Class to manage commercial proposal lines
  */
 class PropaleLigne
diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
index d4311e68f89..792ad10dde4 100644
--- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
@@ -20,19 +20,18 @@
  * $Id$
  */
 
-/*
-		\file       htdocs/compta/prelevement/rejet-prelevement.class.php
+/**
+		\file       htdocs/compta/prelevementclass//rejet-prelevement.class.php
 		\ingroup    prelevement
-		\brief      Fichier de la classe des prelevements
+		\brief      File of class to manage standing orders rejects
 		\version    $Revision$
 */
 
 
 /**
 		\class 		Prelevement
-		\brief      Classe permettant la gestion des prelevements
+		\brief      Class to manage standing orders rejects
 */
-
 class RejetPrelevement
 {
   var $id;
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index 403b6ffe82f..d76a17161a1 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -23,6 +23,11 @@
  *	\brief      File of class to manage cookies
  */
 
+
+/**
+ *	\class      DolCookie
+ *	\brief      Class to manage cookies
+ */
 class DolCookie
 {
 	var $myKey;
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index bbc5a2345be..2ff4bc232ec 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -37,8 +37,8 @@
 
 
 /**
- *	\class      Graph
- *	\brief      Classe mere permettant la gestion des graph
+ *	\class      DolGraph
+ *	\brief      Parent class of graph classes
  */
 class DolGraph
 {
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 740d49df8d9..c99493abf72 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/**	    \file       htdocs/fichinter/fichinter.class.php
+/**	    \file       htdocs/fichinter/class/fichinter.class.php
  *		\ingroup    ficheinter
  *		\brief      Fichier de la classe des gestion des fiches interventions
  *		\version    $Id$
@@ -28,7 +28,7 @@ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 
 
 /**
- * 	\class      Ficheinter
+ * 	\class      Fichinter
  *	\brief      Classe des gestion des fiches interventions
  */
 class Fichinter extends CommonObject
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 425a91d440e..01466ba8ea7 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -19,22 +19,20 @@
  */
 
 /**
- *	\file       htdocs/fourn/fournisseur.class.php
+ *	\file       htdocs/fourn/class/fournisseur.class.php
  *	\ingroup    fournisseur,societe
- *	\brief      Fichier de la classe des fournisseurs
+ *	\brief      File of class to manage suppliers
  *	\version    $Id$
  */
-
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php");
 
 
 /**
- *	\class Fournisseur
- *	\brief Classe permettant la gestion des fournisseur
+ *	\class 	Fournisseur
+ *	\brief 	Class to manage suppliers
  */
-
 class Fournisseur extends Societe
 {
 	var $db;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 4add2c6507d..bc87ee34426 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -21,9 +21,9 @@
  */
 
 /**
- *	\file       htdocs/fourn/fournisseur.commande.class.php
+ *	\file       htdocs/fourn/classfournisseur.commande.class.php
  *	\ingroup    fournisseur,commande
- *	\brief      Fichier des classes des commandes fournisseurs
+ *	\brief      File of class to manage suppliers orders
  *	\version    $Id$
  */
 
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 
 /**
  *	\class      CommandeFournisseur
- *	\brief      Classe de gestion de commande fournisseur
+ *	\brief      Class to manage predefined suppliers products
  */
 class CommandeFournisseur extends Commande
 {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index dd1893972f4..a48ac32f45c 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -22,9 +22,9 @@
  */
 
 /**
- *	\file       htdocs/fourn/fournisseur.facture.class.php
+ *	\file       htdocs/fourn/class/fournisseur.facture.class.php
  *	\ingroup    fournisseur,facture
- *	\brief      Fichier de la classe des factures fournisseurs
+ *	\brief      File of class to manage suppliers invoices
  *	\version    $Id$
  */
 
@@ -33,7 +33,7 @@ include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
 /**
  *	\class      FactureFournisseur
- *	\brief      Classe permettant la gestion des factures fournisseurs
+ *	\brief      Class to manage suppliers invoices
  */
 class FactureFournisseur extends Facture
 {
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index a1f61ec452b..444484d81c6 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -19,9 +19,9 @@
  */
 
 /**
- * 	\file       htdocs/fourn/fournisseur.product.class.php
+ * 	\file       htdocs/fourn/class/fournisseur.product.class.php
  * 	\ingroup    produit
- * 	\brief      Fichier de la classe des produits predefinis
+ * 	\brief      File of class to manage predefined suppliers products
  * 	\version    $Id$
  */
 
@@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php";
 
 
 /**
- * 	\class      Product
- * 	\brief      Classe permettant la gestion des produits predefinis
+ * 	\class      ProductFournisseur
+ * 	\brief      Class to manage predefined suppliers products
  */
 class ProductFournisseur extends Product
 {
diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php
index 02f4a9d7c2d..dd5dc1ebbae 100644
--- a/htdocs/includes/modules/export/export_csv.modules.php
+++ b/htdocs/includes/modules/export/export_csv.modules.php
@@ -20,7 +20,7 @@
 /**
  *		\file       htdocs/includes/modules/export/export_csv.modules.php
  *		\ingroup    export
- *		\brief      File to build exports with CSV format
+ *		\brief      File of class to build exports with CSV format
  *		\author	    Laurent Destailleur
  *		\version    $Id$
  */
@@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
 
 /**
  *	    \class      ExportCsv
- *		\brief      Classe permettant de generer les fichiers exports au format CSV
+ *		\brief      Class to build export files with format CSV
  */
 class ExportCsv extends ModeleExports
 {
diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php
index 7cf1a134312..218694016c2 100644
--- a/htdocs/includes/modules/export/export_tsv.modules.php
+++ b/htdocs/includes/modules/export/export_tsv.modules.php
@@ -20,7 +20,7 @@
 /**
  *		\file       htdocs/includes/modules/export/export_csv.modules.php
  *		\ingroup    export
- *		\brief      Fichier de la classe permettant de g�n�rer les export au format CSV
+ *		\brief      File of class to build export files with format TSV
  *		\author	    Laurent Destailleur
  *		\version    $Id$
 */
@@ -29,8 +29,8 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
 
 
 /**
- *	    \class      ExportCsv
- *		\brief      Classe permettant de g�n�rer les factures au mod�le Crabe
+ *	    \class      ExportTsv
+ *		\brief      Class to build export files with format TSV
  */
 class ExportTsv extends ModeleExports
 {
diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php
index c0504a5fe34..8f4e1572398 100644
--- a/htdocs/includes/modules/fichinter/mod_arctic.php
+++ b/htdocs/includes/modules/fichinter/mod_arctic.php
@@ -21,18 +21,17 @@
  */
 
 /**
-	\file       htdocs/includes/modules/fichinter/mod_arctic.php
-	\ingroup    fiche intervention
-	\brief      Fichier contenant la classe du modèle de numérotation de référence de fiche intervention Arctic
-	\version    $Id$
-*/
-
+ *	\file       htdocs/includes/modules/fichinter/mod_arctic.php
+ *	\ingroup    fiche intervention
+ *	\brief      Fichier contenant la classe du mod�le de num�rotation de r�f�rence de fiche intervention Arctic
+ *	\version    $Id$
+ */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php");
 
 /**
-	\class      mod_arctic
-	\brief      Classe du modèle de numérotation de référence de fiche intervention Arctic
-*/
+ *	\class      mod_arctic
+ *	\brief      Class to manage numbering of intervention cards with rule Artic.
+ */
 class mod_arctic extends ModeleNumRefFicheinter
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
@@ -46,7 +45,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 		$this->nom = "arctic";
 	}
 
-    /**     \brief      Renvoi la description du modele de numérotation
+    /**     \brief      Renvoi la description du modele de num�rotation
      *      \return     string      Texte descripif
      */
 	function info()
@@ -84,7 +83,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 		return $texte;
     }
 
-    /**     \brief      Renvoi un exemple de numérotation
+    /**     \brief      Renvoi un exemple de num�rotation
      *      \return     string      Example
      */
     function getExample()
@@ -103,8 +102,8 @@ class mod_arctic extends ModeleNumRefFicheinter
 		return $numExample;
     }
 
-	/**		\brief      Renvoi prochaine valeur attribuée
-	*      	\param      objsoc      Objet société
+	/**		\brief      Renvoi prochaine valeur attribu�e
+	*      	\param      objsoc      Objet soci�t�
 	*      	\param      ficheinter	Object ficheinter
 	*      	\return     string      Valeur
 	*/
@@ -114,7 +113,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 
 		require_once(DOL_DOCUMENT_ROOT ."/lib/functions2.lib.php");
 
-		// On défini critere recherche compteur
+		// On d�fini critere recherche compteur
 		$mask=$conf->global->FICHINTER_ARTIC_MASK;
 
 		if (! $mask)
diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/includes/modules/fichinter/mod_pacific.php
index ae9d5352436..82f10defe9c 100644
--- a/htdocs/includes/modules/fichinter/mod_pacific.php
+++ b/htdocs/includes/modules/fichinter/mod_pacific.php
@@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.p
 
 /**
  *  \class      mod_pacific
- *	\brief      Classe du moderotation de reference de fiche intervention Pacific
+ *	\brief      Class to manage numbering of intervention cards with rule Pacific.
  */
 class mod_pacific extends ModeleNumRefFicheinter
 {
diff --git a/htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php b/htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php
index d04be22f785..2fb0330a42e 100644
--- a/htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php
+++ b/htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php
@@ -8,9 +8,20 @@
  * Code that need to be changed in this file are marked by "CHANGE THIS" tag.
  */
 
+/**
+ *	\file       htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php
+ *	\ingroup    mailing
+ *	\brief      File of class to offer a selector of emailing targets with Rule 'services expired'.
+ *	\version    $Id$
+ */
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 
+/**
+ *	\class      mailing_dolibarr_services_expired
+ *	\brief      Class to offer a selector of emailing targets with Rule 'services expired'.
+ */
 class mailing_dolibarr_services_expired extends MailingTargets
 {
 	var $name='DolibarrContractsLinesExpired';
diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php
index 3528db8798d..5e280d109b2 100644
--- a/htdocs/includes/modules/mailings/modules_mailings.php
+++ b/htdocs/includes/modules/mailings/modules_mailings.php
@@ -20,20 +20,18 @@
  */
 
 /**
-	    \file       htdocs/includes/modules/mailings/modules_mailings.php
-		\ingroup    mailing
-		\brief      Fichier contenant la classe m�re des classes de liste de destinataires mailing
-		\version    $Id$
-*/
-
+ *	    \file       htdocs/includes/modules/mailings/modules_mailings.php
+ *		\ingroup    mailing
+ *		\brief      File with parent class of emailing target selectors modules
+ *		\version    $Id$
+ */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
 
 /**
-	    \class      MailingTargets
-		\brief      Classe m�re des classes de liste de destinataires mailing
-*/
-
+ *	    \class      MailingTargets
+ *		\brief      Parent class of emailing target selectors modules
+ */
 class MailingTargets
 {
     var $db='';
diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php
index a31817e68a6..ad1d46e451a 100644
--- a/htdocs/includes/modules/mailings/peche.modules.php
+++ b/htdocs/includes/modules/mailings/peche.modules.php
@@ -20,19 +20,17 @@
 /**
  *	\file       htdocs/includes/modules/mailings/peche.modules.php
  *	\ingroup    mailing
- *	\brief      Fichier de la classe permettant de generer la liste de destinataires Peche
+ *	\brief      File of class to offer a selector of emailing targets with Rule 'Peche'.
  *	\version    $Id$
  */
-
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 
 /**
- *	\class      mailing_pomme
- *	\brief      Classe permettant de generer la liste des destinataires Peche
+ *	\class      mailing_peche
+ *	\brief      Class to offer a selector of emailing targets with Rule 'Peche'.
  */
-
 class mailing_peche extends MailingTargets
 {
 	var $name='EmailsFromFile';              // Identifiant du module mailing
diff --git a/htdocs/includes/modules/mailings/poire.modules.php b/htdocs/includes/modules/mailings/poire.modules.php
index f7b0d827de7..5bb34f86dea 100644
--- a/htdocs/includes/modules/mailings/poire.modules.php
+++ b/htdocs/includes/modules/mailings/poire.modules.php
@@ -20,20 +20,19 @@
  */
 
 /**
- \file       htdocs/includes/modules/mailings/poire.modules.php
- \ingroup    mailing
- \brief      Fichier de la classe permettant de g�n�rer la liste de destinataires Poire
- \version    $Id$
+ *	\file       htdocs/includes/modules/mailings/poire.modules.php
+ *	\ingroup    mailing
+ *	\brief      File of class to offer a selector of emailing targets with Rule 'Poire'.
+ *	\version    $Id$
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
 
 
 /**
- \class      mailing_poire
- \brief      Classe permettant de g�n�rer la liste des destinataires Poire
+ *	\class      mailing_poire
+ *	\brief      Class to offer a selector of emailing targets with Rule 'Poire'.
  */
-
 class mailing_poire extends MailingTargets
 {
 	var $name='ContactCompanies';                     // Identifiant du module mailing
diff --git a/htdocs/includes/modules/member/PDF_card.class.php b/htdocs/includes/modules/member/PDF_card.class.php
index 63a9c12a31a..08ae774d3b4 100644
--- a/htdocs/includes/modules/member/PDF_card.class.php
+++ b/htdocs/includes/modules/member/PDF_card.class.php
@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////
 // PDF_Label
 //
-// Classe afin d'�diter au format PDF des �tiquettes
+// Classe afin d'editer au format PDF des etiquettes
 // au format Avery ou personnalis�
 //
 //
@@ -55,7 +55,7 @@
 
 /**
  *	\file       htdocs/adherents/cartes/PDF_card.class.php
- *	\ingroup    adherent
+ *	\ingroup    member
  *	\brief      Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
  *	\author     Steve Dillon
  *	\author	    Laurent Passebecq
diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php
index 3b16b8bca07..b6e672b1337 100644
--- a/htdocs/includes/modules/member/cards/modules_cards.php
+++ b/htdocs/includes/modules/member/cards/modules_cards.php
@@ -21,10 +21,9 @@
  */
 
 /**
- *	\file       htdocs/includes/modules/facture/modules_facture.php
- *	\ingroup    facture
- *	\brief      Fichier contenant la classe mere de generation des factures en PDF
- * 				et la classe mere de numerotation des factures
+ *	\file       htdocs/includes/modules/members/cards/modules_facture.php
+ *	\ingroup    member
+ *	\brief      File of parent class of document generator for members cards.
  *	\version    $Id$
  */
 
@@ -34,8 +33,8 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 /**
- *	\class      ModelePDFFactures
- *	\brief      Classe mere des modeles de facture
+ *	\class      ModelePDFCards
+ *	\brief      Parent class of document generator for members cards.
  */
 class ModelePDFCards
 {
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index b896d04cf7a..124ad6b2e92 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -55,7 +55,7 @@
 
 /**
  *	\file       htdocs/includes/modules/member/card/pdf_standard.class.php
- *	\ingroup    adherent
+ *	\ingroup    member
  *	\brief      Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise
  *	\author     Steve Dillon
  *	\author	    Laurent Passebecq
diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php
index da43f56a21b..4ffee53a33f 100644
--- a/htdocs/includes/modules/modAdherent.class.php
+++ b/htdocs/includes/modules/modAdherent.class.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *       \defgroup   adherent     Module foundation
+ *       \defgroup   member     Module foundation
  *       \brief      Module to manage members of a foundation
  */
 
diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php
index 99a205620b5..f29a0acb3ab 100644
--- a/htdocs/includes/modules/modAgenda.class.php
+++ b/htdocs/includes/modules/modAgenda.class.php
@@ -35,7 +35,7 @@
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 /**
- *      \class      modAdherent
+ *      \class      modAgenda
  *      \brief      Classe de description et activation du module Adherent
  */
 class modAgenda extends DolibarrModules
diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/includes/modules/modGeoIPMaxmind.class.php
index 5d411edd41e..7b8fb029d27 100644
--- a/htdocs/includes/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/includes/modules/modGeoIPMaxmind.class.php
@@ -30,7 +30,7 @@
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
-/**     \class      modImport
+/**     \class      modGeoIPMaxmind
  *		\brief      Classe de description et activation du module Import
  */
 class modGeoIPMaxmind extends DolibarrModules
diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/includes/modules/modNotification.class.php
index 424e5ae5a7a..dc96477db54 100644
--- a/htdocs/includes/modules/modNotification.class.php
+++ b/htdocs/includes/modules/modNotification.class.php
@@ -32,7 +32,7 @@
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 /**
- *	\class      modMailing
+ *	\class      modNotification
  *	\brief      Classe de description et activation du module Mailing
  */
 class modNotification extends DolibarrModules
diff --git a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
index 304d030abee..98976f1a584 100644
--- a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
@@ -28,9 +28,9 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_gen
 
 
 /**
-	    \class      modGeneratePassNone
-		\brief      Classe permettant de g�n�rer un mot de passe selon r�gle standard
-*/
+ *	    \class      modGeneratePassNone
+ *		\brief      Class to generate a password according to rule 'no password'
+ */
 class modGeneratePassNone extends ModeleGenPassword
 {
 	var $id;
diff --git a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
index 583edce590b..c8d6f5574bb 100644
--- a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
@@ -28,9 +28,9 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_gen
 
 
 /**
-	    \class      modGeneratePassNone
-		\brief      Classe permettant de generer un mot de passe selon regle standard
-*/
+ *	    \class      modGeneratePassNone
+ *		\brief      Class to generate a password according to a dolibarr standard rule (8 random chars)
+ */
 class modGeneratePassStandard extends ModeleGenPassword
 {
 	var $id;
diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php
index d3f4f17d759..760ee1aa618 100644
--- a/htdocs/lib/ldap.class.php
+++ b/htdocs/lib/ldap.class.php
@@ -22,18 +22,19 @@
 
 /**
  *	\file 		htdocs/lib/ldap.class.php
- *	\brief 		Classe de gestion d'annuaire LDAP
- *	\author 	Rodolphe Quiedeville
- *	\author		Benoit Mortier
- *	\author		Regis Houssin
- *	\author		Laurent Destailleur
+ *	\brief 		File of class to manage LDAP features
  *	\version 	$Id$
  */
+
+/**
+ *      \class      Ldap
+ *      \brief      Class to manage LDAP features
+ */
 class Ldap
 {
 
 	/**
-	 * Tableau des serveurs (IP addresses ou nom d'h�tes)
+	 * Tableau des serveurs (IP addresses ou nom d'hotes)
 	 */
 	var $server=array();
 	/**
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index baf3cb88c6d..e558f88e18a 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/public/members/new.php
- *	\ingroup    adherent
+ *	\ingroup    member
  *	\brief      Example of form to add a new member
  *	\version    $Id$
  */
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index cdd80e8fb92..9256531da28 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/public/members/public_card.php
- *	\ingroup    adherent
+ *	\ingroup    member
  * 	\brief      File to show a public card of a member
  *	\version    $Id$
  */
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 19e7e0f3e35..a84a9fb6efd 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/public/members/priv_liste.php
- *	\ingroup    adherent
+ *	\ingroup    member
  *  \brief      File sample to list members
  *  \version    $Id$
  */