diff --git a/main/exercice/exercise_result.class.php b/main/exercice/exercise_result.class.php
index a6fecaaf3e..43542725c5 100755
--- a/main/exercice/exercise_result.class.php
+++ b/main/exercice/exercise_result.class.php
@@ -1,12 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-*	ExerciseResult class: This class allows to instantiate an object of type ExerciseResult
-*	which allows you to export exercises results in multiple presentation forms
-*	@package chamilo.exercise
-* 	@author Yannick Warnier
-* 	@version $Id: $
-*/
+ * ExerciseResult class: This class allows to instantiate an object 
+ * of type ExerciseResult
+ * which allows you to export exercises results in multiple presentation forms
+ * @package chamilo.exercise
+ * @author Yannick Warnier
+ * @version $Id: $
+ */
 /**
  * Code
  */
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index 76f190caf9..91250b573d 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -616,8 +616,7 @@ class Blog {
 	/**
 	 * Get personal task list
 	 * @author Toon Keppens
-	 *
-	 * @return Returns an unsorted list (<ul>) with the users' tasks
+	 * @return Returns an unsorted list (<ul></ul>) with the users' tasks
 	 */
 	public static function get_personal_task_list () {
 		global $_user;
diff --git a/main/inc/lib/course_request.lib.php b/main/inc/lib/course_request.lib.php
index d135e391c3..d8192714bc 100644
--- a/main/inc/lib/course_request.lib.php
+++ b/main/inc/lib/course_request.lib.php
@@ -1,6 +1,5 @@
 <?php
 /* For licensing terms, see /license.txt */
-
 /**
  * Course request manager
  * @package chamilo.library
@@ -11,7 +10,9 @@
  *
  * @author Ivan Tcholakov <ivantcholakov@gmail.com> (technical adaptation for Chamilo 1.8.8), 2010
  */
-
+/**
+ * Code
+ */
 define(COURSE_REQUEST_PENDING,  0);
 define(COURSE_REQUEST_ACCEPTED, 1);
 define(COURSE_REQUEST_REJECTED, 2);
diff --git a/main/inc/lib/debug.lib.php b/main/inc/lib/debug.lib.php
index ced3b4d9dd..8a40be42da 100644
--- a/main/inc/lib/debug.lib.php
+++ b/main/inc/lib/debug.lib.php
@@ -14,7 +14,7 @@ class Debug {
 	/**
 	 * This function displays the contend of a variable, array or object in a nicely formatted way.
 	 * @param	Mixed	A variable, array or object
-	 * @return 	void	Prints <pre> HTML block to output
+	 * @return 	void	Prints \<pre\> HTML block to output
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version November 2006
 	 */
diff --git a/main/inc/lib/geometry.lib.php b/main/inc/lib/geometry.lib.php
index 2ddc012ffd..e0abb1a141 100755
--- a/main/inc/lib/geometry.lib.php
+++ b/main/inc/lib/geometry.lib.php
@@ -1,8 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *
- * @author: Arnaud Ligot (CBlue SPRL) <arnaud@cblue.be>
+ * @author Arnaud Ligot (CBlue SPRL) <arnaud@cblue.be>
  * @package chamilo.include.geometry
  */
 /**
@@ -11,10 +10,8 @@
 DEFINE('DEBUG', false);
 /**
  * poly_init -    build the array which will store the image of the polygone
- *
  * @param max[x]    X resolution
  * @param max[y]    Y resolution
- *
  * @returns an array such as: for all i in [0..max[x][ : for all j in [0..max[y][ : array[i][j] = FALSE
  * @package chamilo.include.geometry
  */
diff --git a/main/inc/lib/import.lib.php b/main/inc/lib/import.lib.php
index d33318d7d7..9a634876a9 100755
--- a/main/inc/lib/import.lib.php
+++ b/main/inc/lib/import.lib.php
@@ -1,12 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
-
 /**
  * This class provides some functions which can be used when importing data from
  * external files into Chamilo.
  * @package	 chamilo.library
  */
-
+/**
+ * Class
+ * @package	 chamilo.library
+ */
 class Import {
 
 	/**
diff --git a/main/inc/lib/model.lib.php b/main/inc/lib/model.lib.php
index 5bf543e2e4..e345b3b1e8 100644
--- a/main/inc/lib/model.lib.php
+++ b/main/inc/lib/model.lib.php
@@ -1,12 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
-
 /**
 *	This class provides basic methods to implement a CRUD for a new table in the database see examples in: career.lib.php and promotion.lib.php
 *	Include/require it in your code to use its features.
 *	@package chamilo.library
 */
-
+/**
+ * Class
+ * @package chamilo.library
+ */
 class Model {
     
     var $table;
@@ -142,4 +144,4 @@ class Model {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php
index dd0351126e..65f8984f10 100644
--- a/main/inc/lib/pdf.lib.php
+++ b/main/inc/lib/pdf.lib.php
@@ -37,7 +37,7 @@ class PDF {
      * @param   mixed   could be an html file path or an array with paths example: /var/www/myfile.html or array('/myfile.html','myotherfile.html') or even an indexed array with both 'title' and 'path' indexes for each element like array(0=>array('title'=>'Hello','path'=>'file.html'),1=>array('title'=>'Bye','path'=>'file2.html'));
      * @param   string  pdf name   
      * @param   string  course code (if you are using html that are located in the document tool you must provide this) 
-     * @return  
+     * @return void
      */    
     public function html_to_pdf($html_file_array, $pdf_name = '', $course_code = null, $print_title = false) {
         
diff --git a/main/inc/lib/search/DokeosIndexer.class.php b/main/inc/lib/search/DokeosIndexer.class.php
index a7046ce315..221430ab04 100755
--- a/main/inc/lib/search/DokeosIndexer.class.php
+++ b/main/inc/lib/search/DokeosIndexer.class.php
@@ -1,11 +1,17 @@
 <?php
 /* For licensing terms, see /license.txt */
-
+/**
+ * @package chamilo.include.search
+ */
+/**
+ * code
+ */
 require_once dirname(__FILE__) . '/../../global.inc.php';
 include_once 'xapian/XapianIndexer.class.php';
 
 /**
  * Class wrapper
+ * @package chamilo.include.search
  */
 class DokeosIndexer extends XapianIndexer {
 
@@ -85,5 +91,3 @@ if (!function_exists('trim_value')) {
 		$value = trim($value);
 	}
 }
-
-?>
diff --git a/main/inc/lib/search/DokeosQuery.php b/main/inc/lib/search/DokeosQuery.php
index e2059de967..7a3e982868 100755
--- a/main/inc/lib/search/DokeosQuery.php
+++ b/main/inc/lib/search/DokeosQuery.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /dokeos_license.txt */
 /*
  * Script defining generic functions against a search engine api. Just only if one day the search engine changes
- * @package: chamilo.include.search
+ * @package chamilo.include.search
  */
 /**
  * Code
diff --git a/main/inc/lib/search/IndexableChunk.class.php b/main/inc/lib/search/IndexableChunk.class.php
index ac56655e1f..b5b766a404 100755
--- a/main/inc/lib/search/IndexableChunk.class.php
+++ b/main/inc/lib/search/IndexableChunk.class.php
@@ -93,6 +93,7 @@ abstract class _IndexableChunk
 
 /**
  * Extension of the _IndexableChunk class to make IndexableChunk extensible.
+ * @package chamilo.include.search
  */
 class IndexableChunk extends _IndexableChunk
 {
@@ -111,5 +112,3 @@ class IndexableChunk extends _IndexableChunk
   }
 
 }
-
-?>
diff --git a/main/inc/lib/search/xapian/XapianIndexer.class.php b/main/inc/lib/search/xapian/XapianIndexer.class.php
index 64aa1efd97..761cd366b0 100755
--- a/main/inc/lib/search/xapian/XapianIndexer.class.php
+++ b/main/inc/lib/search/xapian/XapianIndexer.class.php
@@ -1,7 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *
  * @package chamilo.include.search
  */
 /**
@@ -12,6 +11,7 @@ require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
 
 /**
  * Abstract helper class
+ * @package chamilo.include.search
  */
 abstract class XapianIndexer {
     /* XapianWritableDatabase */
diff --git a/main/inc/lib/sortabletable.class.php b/main/inc/lib/sortabletable.class.php
index a35c9e7c96..e7e29d8998 100755
--- a/main/inc/lib/sortabletable.class.php
+++ b/main/inc/lib/sortabletable.class.php
@@ -761,7 +761,7 @@ class SortableTable extends HTML_Table {
 
 	/**
 	 * Define a list of additional parameters to use in the generated URLs
-	 * @example $parameters['action'] = 'test'; will be convert in <input type="hidden" name="action" value="test">
+	 * <code>$parameters['action'] = 'test'; will be convert in <input type="hidden" name="action" value="test"></code>
 	 * @param array $parameters
 	 */
 	public function set_additional_parameters ($parameters) {
diff --git a/main/inc/lib/text.lib.php b/main/inc/lib/text.lib.php
index 62ebd390e9..9e8fe904a7 100755
--- a/main/inc/lib/text.lib.php
+++ b/main/inc/lib/text.lib.php
@@ -420,9 +420,9 @@ function make_clickable($string) {
  * @desc This function does some parsing on the text that gets inputted. This parsing can be of any kind
  *       LaTeX notation, Word Censoring, Glossary Terminology (extension will available soon), Musical Notations, ...
  *       The inspiration for this filter function came from Moodle an phpBB who both use a similar approach.
+ * <code>[tex]\sqrt(2)[/tex]</code>
  * @param $input string. some text
  * @return $output string. some text that contains the parsed elements.
- * @example [tex]\sqrt(2)[/tex]
  * @author Patrick Cool <patrick.cool@UGent.be>
  * @version March 2OO6
  */
diff --git a/main/inc/lib/upload.xajax.php b/main/inc/lib/upload.xajax.php
index 7b8feaa452..0b0a61571c 100755
--- a/main/inc/lib/upload.xajax.php
+++ b/main/inc/lib/upload.xajax.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @chamilo.library
+ * @package chamilo.library
  */
 /**
  * Code