diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 69d90f6731e37dec9fbc586574606cbe5f34fb68..23531ed547a29579fcf166372ef0a33705a45559 100644
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -625,6 +625,7 @@ EXCLUDE                = ../../mssql \
                          ../../htdocs/includes/adodbtime \
                          ../../htdocs/includes/artichow \
                          ../../htdocs/includes/barcode \
+                         ../../htdocs/includes/ckeditor \
                          ../../htdocs/includes/efc_xfss \
                          ../../htdocs/includes/fckeditor \
                          ../../htdocs/includes/fpdf \
diff --git a/build/makepack-dolibarrlang.pl b/build/makepack-dolibarrlang.pl
index e81dabcfaec142adb4cdf36acd21133fa2c00409..6d9e3e4b9c242621aa8283f80d98096b21ec17ff 100644
--- a/build/makepack-dolibarrlang.pl
+++ b/build/makepack-dolibarrlang.pl
@@ -78,7 +78,7 @@ print "Makepack langs version $VERSION\n";
 print "Enter language code to package (en_US, fr_FR, ...) : ";
 $PROJECT=<STDIN>;
 chomp($PROJECT);
-# \todo Autodetect version
+# TODO Autodetect version
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
diff --git a/build/makepack-dolibarrtheme.pl b/build/makepack-dolibarrtheme.pl
index 18d43775dc463d0ae6013a28a457eef8f7ea986e..9d2cf83fe3eee5af1e06ee9fa044dc6bfe712b17 100644
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -78,7 +78,7 @@ print "Makepack theme version $VERSION\n";
 print "Enter name of theme to package: ";
 $PROJECT=<STDIN>;
 chomp($PROJECT);
-# \todo Autodetect version
+# TODO Autodetect version
 # Ask and set version $MAJOR and $MINOR
 print "Enter value for version: ";
 $PROJVERSION=<STDIN>;
diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php
index fba232c5230e2c19cf46e8a8be29e9dfa64ba172..5fe436eb5c5cc2faa4f34e92313f15f7e99937f9 100644
--- a/htdocs/includes/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php
@@ -25,19 +25,18 @@
  *				et la classe mere de numerotation des bons de livraisons
  * 	\version	$Id$
  */
-
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
 
 
 /**
- *	\class      methode_expedition
- *	\brief      Classe mere des methodes expeditions
+ *	\class      ModeleShippingMethod
+ *	\brief      Parent class for shipping method classes
  */
-class methode_expedition
+class ModeleShippingMethod
 {
 
-	function methode_expedition($db=0)
+	function ModeleShippingMethod($db=0)
 	{
 		$this->db = $db;
 		$this->name = "NOT DEFINED";
@@ -46,8 +45,8 @@ class methode_expedition
 
 
 	/**
-	 *      \brief      Return list of active generation modules
-	 * 		\param		$db		Database handler
+	 *      Return list of active generation modules
+	 * 		@param		$db		Database handler
 	 */
 	function liste_modeles($db)
 	{
diff --git a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php b/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php
index cb3133d656343d1c2bcd6c6e2abdd245c4a5b1c5..4e4165f66f44e86ad611b6eea719482dafc9a035 100644
--- a/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php
@@ -16,29 +16,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
+/**
+ *	\file       htdocs/includes/modules/expedition/methode_expedition_colsui.modules.php
+ *	\ingroup    expedition
  * 	\version	$Id$
  */
-
 include_once "methode_expedition.modules.php";
 
 
-Class methode_expedition_colsui extends methode_expedition
+class methode_expedition_colsui extends ModeleShippingMethod
 {
 
-  	function methode_expedition_colsui($db=0)
-    { 
-      $this->db = $db;
-      $this->id = 3; // Do not change this value
-      $this->code = "COLSUI";  // Do not change this value
-      $this->name = "Colissimo Suivi";
-      $this->description = "Colissimo Suivi";
-    }
+	function methode_expedition_colsui($db=0)
+	{
+		$this->db = $db;
+		$this->id = 3; // Do not change this value
+		$this->code = "COLSUI";  // Do not change this value
+		$this->name = "Colissimo Suivi";
+		$this->description = "Colissimo Suivi";
+	}
 
-  Function provider_url_status($tracking_number)
-    {
-      return sprintf("http://www.coliposte.net/particulier/suivi_particulier.jsp?colispart=%s",$tracking_number);
-    }
+	function provider_url_status($tracking_number)
+	{
+		return sprintf("http://www.coliposte.net/particulier/suivi_particulier.jsp?colispart=%s",$tracking_number);
+	}
 }
 
 ?>
diff --git a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php b/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
index 2c689e7196980b5b200004d42aedb5e0b8dde212..d03b77ee7b88da2d3fa05c5e508cccb118444992 100644
--- a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
@@ -15,14 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
+/**
+ *	\file       htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
+ *	\ingroup    expedition
  * 	\version	$Id$
  */
-
 include_once "methode_expedition.modules.php";
 
 
-Class methode_expedition_enl extends methode_expedition
+class methode_expedition_enl extends ModeleShippingMethod
 {
 
 	function methode_expedition_enl($db=0)
@@ -34,11 +35,11 @@ Class methode_expedition_enl extends methode_expedition
 		$this->code = "ENL";
 		$this->description = $langs->trans("Enlevement");
 	}
-	
+
 	Function provider_url_status($tracking_number)
-  {
-  	return '';
-  }
+	{
+		return '';
+	}
 }
 
 ?>
diff --git a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php b/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
index 2954592ac66b16471cf7f74d9c283f753adc6b6e..5c0f008a503cc0bfebde11789a0b333d18e6c7d8 100644
--- a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
@@ -15,31 +15,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
+/**
+ *	\file       htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
+ *	\ingroup    expedition
  * 	\version	$Id$
  */
-
 include_once "methode_expedition.modules.php";
 
 
-Class methode_expedition_trans extends methode_expedition
+class methode_expedition_trans extends ModeleShippingMethod
 {
 
 	function methode_expedition_trans($db=0)
 	{
 		global $langs;
-		
+
 		$this->db = $db;
 		$this->id = 2; // Ne pas changer cette valeur
 		$this->code = "TRANS";
 		$this->name = "Transporteur";
 		$this->description = $langs->trans("GenericTransport");
 	}
-	
+
 	Function provider_url_status($tracking_number)
-  {
-  	return '';
-  }
+	{
+		return '';
+	}
 }
 
 ?>