diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2dd33f56feb..f56091a872d 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1148,10 +1148,10 @@ class CommandeFournisseur extends Commande
 	}
 
 	/**
-	 * 	Set a delivery in database for this supplier order
-	 *	@param		user		User that input data
-	 *	@param		date		Date of reception
-	 *	@param		type		Type of receipt
+	 * 	\bref		Set a delivery in database for this supplier order
+	 *	\param		user		User that input data
+	 *	\param		date		Date of reception
+	 *	\param		type		Type of receipt
 	 */
 	function Livraison($user, $date, $type, $comment)
 	{
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 18661e9ac9f..8b31f348691 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -201,7 +201,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 
 					$pdf->MultiCell(20, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'C');
 
-					// \TODO Field not yet saved in database
+					// TODO Field not yet saved in database
 					//$pdf->SetXY (133, $curY );
 					//$pdf->MultiCell(10, 5, $object->lines[$i]->tva_tx, 0, 'C');
 
diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index aac22e4a853..45946233604 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -497,11 +497,11 @@ class DoliDb
 
 
 	/**
-	 *	\brief      Defini le tri de la requete.
-	 *	\param	    sortfield   liste des champ de tri
-	 *	\param	    sortorder   ordre du tri ('ASC' or 'DESC')
-	 *	\return	    string      chaine exprimant la syntax sql de l'ordre de tri
-	 *	\TODO		A mutualiser dans classe mere
+	 * Define sort criteria of request
+	 * @param	    sortfield   List of sort fields
+	 * @param	    sortorder   Sort order
+	 * @return	    string      String to provide syntax of a sort sql string
+	 * TODO			Mutualized this into a mother class
 	 */
 	function order($sortfield=0,$sortorder=0)
 	{
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index adeb4b3c15a..663f4e14ee7 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -489,11 +489,11 @@ class DoliDb
 
 
 	/**
-	 *	\brief      Defini le tri de la requete.
-	 *	\param	    sortfield   liste des champ de tri
-	 *	\param	    sortorder   ordre du tri ('ASC' or 'DESC')
-	 *	\return	    string      chaine exprimant la syntax sql de l'ordre de tri
-	 *	\TODO		A mutualiser dans classe mere
+	 * Define sort criteria of request
+	 * @param	    sortfield   List of sort fields
+	 * @param	    sortorder   Sort order
+	 * @return	    string      String to provide syntax of a sort sql string
+	 * TODO			Mutualized this into a mother class
 	 */
 	function order($sortfield=0,$sortorder=0)
 	{
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 6ae2c8bc03a..5b4c4f7e921 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -503,11 +503,11 @@ class DoliDb
 
 
 	/**
-	 *	\brief      Defini le tri de la requete.
-	 *	\param	    sortfield   liste des champ de tri
-	 *	\param	    sortorder   ordre du tri
-	 *	\return	    string      chaine exprimant la syntax sql de l'ordre de tri
-	 *	\TODO		A mutualiser dans classe mere
+	 * Define sort criteria of request
+	 * @param	    sortfield   List of sort fields
+	 * @param	    sortorder   Sort order
+	 * @return	    string      String to provide syntax of a sort sql string
+	 * TODO			Mutualized this into a mother class
 	 */
 	function order($sortfield=0,$sortorder=0)
 	{
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 6c795373a7b..c32184ec199 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -640,11 +640,11 @@ class DoliDb
 
 
 	/**
-	 * \brief       Defini le tri de la requete.
-	 * \param	    sortfield   liste des champ de tri
-	 * \param	    sortorder   ordre du tri
-	 * \return	    string      chaine exprimant la syntax sql de l'ordre de tri
-	 * \TODO		A mutualiser dans classe mere
+	 * Define sort criteria of request
+	 * @param	    sortfield   List of sort fields
+	 * @param	    sortorder   Sort order
+	 * @return	    string      String to provide syntax of a sort sql string
+	 * TODO			Mutualized this into a mother class
 	 */
 	function order($sortfield=0,$sortorder=0)
 	{
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 09b9d3d6c14..fa6a7d5a6d7 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -292,7 +292,7 @@ function makesalt($type=CRYPT_SALT_LENGTH)
 }
 
 /**
- *  Encode\decode database password in config file
+ *  Encode or decode database password in config file
  *  @param   	level   	Encode level: 0 no encoding, 1 encoding
  *	@return		int			<0 if KO, >0 if OK
  */
diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php
index b6acf02a1f4..ce6f8d23d49 100644
--- a/htdocs/lib/xcal.lib.php
+++ b/htdocs/lib/xcal.lib.php
@@ -340,7 +340,7 @@ function build_rssfile($format='rss',$title,$desc,$events_array,$outputfile,$fil
 			$eventqualified=true;
 			if ($filter)
 			{
-				// \TODO Add a filter
+				// TODO Add a filter
 
 				$eventqualified=false;
 			}