diff --git a/core/DataTable.php b/core/DataTable.php
index f3df78aee33784a48711961cfe1e1d9335fcaed8..a5590e1cbb619a3a1da65552780f15c1048aa8d7 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -371,7 +371,7 @@ class Piwik_DataTable
 	 * 
 	 * A common row to 2 DataTable is defined by the same label
 	 * 	
-	 * @example @see tests/core/DataTable.test.php
+	 * @example tests/core/DataTable.test.php
 	 */
 	public function addDataTable( Piwik_DataTable $tableToSum )
 	{
diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php
index 09b5302ecf2146f3fe9e3eb9c97b2c8a3e512e2e..c2fecfbdc2b4311e0fb3728d15cb536da2c7c583 100644
--- a/core/ErrorHandler.php
+++ b/core/ErrorHandler.php
@@ -10,13 +10,19 @@
  * @package Piwik
  */
 
-// @since PHP 5
+/**
+ * @since PHP 5
+ */
 if(!defined('E_STRICT')) {            define('E_STRICT', 2048); }
 
-// @since PHP 5.2.0
+/**
+ * @since PHP 5.2.0
+ */
 if(!defined('E_RECOVERABLE_ERROR')) { define('E_RECOVERABLE_ERROR', 4096); }
 
-// @since PHP 5.3.0
+/**
+ * @since PHP 5.3.0
+ */
 if(!defined('E_DEPRECATED')) {        define('E_DEPRECATED', 8192); }
 if(!defined('E_USER_DEPRECATED')) {   define('E_USER_DEPRECATED', 16384); }
 
diff --git a/core/iUpdate.php b/core/iUpdate.php
index 634e11584851d84233e3417ffb3757990cd23e58..5b9888558cf08cb1a4eead41b610d5ad0c86d35d 100644
--- a/core/iUpdate.php
+++ b/core/iUpdate.php
@@ -13,7 +13,7 @@
 /**
  * Interface to be implemented by update scripts
  *
- * @example core/Updates/0.4.2.php Incremental update script from version 0.4.1 to 0.4.2
+ * @example core/Updates/0.4.2.php
  * @package Piwik
  */
 interface Piwik_iUpdate
diff --git a/misc/phpdoc-config.ini b/misc/phpdoc-config.ini
index 22ef3c0ad7408b3b9870f041d9a623dc2af2a33b..d7ebfc440fba050903339bead70f5c932b81b858 100644
--- a/misc/phpdoc-config.ini
+++ b/misc/phpdoc-config.ini
@@ -47,7 +47,7 @@ directory = core,plugins
 ;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
 ;; legal values: any wildcard strings separated by commas
 ;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
-ignore = pear-*,Documentation/,*.test.php,Lexer.inc,*.tpl,*.js,*.css,*.png,*.gif,*.ico,core/Updates/
+ignore = pear-*,Documentation/,*.test.php,Lexer.inc,*.tpl,*.js,*.css,*.png,*.gif,*.ico,core/Updates/*.php
 
 ;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
 ;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,
diff --git a/plugins/ExampleFeedburner/ExampleFeedburner.php b/plugins/ExampleFeedburner/ExampleFeedburner.php
index 50a4070fc3d782189a32c340cc7fe29a334cd451..fbaa68c913c16adb6803a62b09082bec3ef15cf0 100644
--- a/plugins/ExampleFeedburner/ExampleFeedburner.php
+++ b/plugins/ExampleFeedburner/ExampleFeedburner.php
@@ -49,6 +49,10 @@ class Piwik_ExampleFeedburner extends Piwik_Plugin
 
 Piwik_AddWidget('Example Widgets', 'Feedburner statistics', 'ExampleFeedburner', 'feedburner');
 
+/**
+ *
+ * @package Piwik_ExampleFeedburner
+ */
 class Piwik_ExampleFeedburner_Controller extends Piwik_Controller
 {