diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index a9d207362..573c6a1e4 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/AjaxPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/AjaxPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
 
 /**
  * Class ajax_page
- * @deprecated removed in 2.9.0 - moved to AjaxPage
+ * @deprecated will be removed in 3.1.0 - moved to AjaxPage
  */
 class ajax_page extends AjaxPage
 {
diff --git a/application/capturewebpage.class.inc.php b/application/capturewebpage.class.inc.php
index c300eaed6..153129dae 100644
--- a/application/capturewebpage.class.inc.php
+++ b/application/capturewebpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CaptureWebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/CaptureWebPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/clipage.class.inc.php b/application/clipage.class.inc.php
index 9f6d22bf8..ad0e90946 100644
--- a/application/clipage.class.inc.php
+++ b/application/clipage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CLIPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/CLIPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php
index b33bbc9dd..1e7e259b8 100644
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/CSVPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/CSVPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/errorpage.class.inc.php b/application/errorpage.class.inc.php
index 7d3f77ad0..e8f0f22cf 100644
--- a/application/errorpage.class.inc.php
+++ b/application/errorpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/ErrorPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/ErrorPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index fce7f65ed..ff7a1f693 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/iTopWebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/iTopWebPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/itopwizardwebpage.class.inc.php b/application/itopwizardwebpage.class.inc.php
index 3bbf014eb..406189abc 100644
--- a/application/itopwizardwebpage.class.inc.php
+++ b/application/itopwizardwebpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/iTopWizardWebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/iTopWizardWebPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index 87f6358e6..0526b4041 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/NiceWebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/NiceWebPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/pdfpage.class.inc.php b/application/pdfpage.class.inc.php
index 0bac0a085..f51419d20 100644
--- a/application/pdfpage.class.inc.php
+++ b/application/pdfpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/PDFPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/PDFPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index 5cec5ef26..1591abc72 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/WebPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/WebPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php
index 3de478994..cab7d792d 100644
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @deprecated  will be removed in 3.1.0 - moved to sources/application/WebPage/XMLPage.php
  * @license     http://opensource.org/licenses/AGPL-3.0
- * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/XMLPage.php
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
  */
  
diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php
index b1d87e301..3dc49c110 100644
--- a/core/cmdbobject.class.inc.php
+++ b/core/cmdbobject.class.inc.php
@@ -549,11 +549,12 @@ abstract class CMDBObject extends DBObject
 	 * The check should never fail, because the UI should prevent from such a usage
 	 * Anyhow, if the user has found a workaround... the security gets enforced here
 	 *
-	 * @param $bSkipStrongSecurity
-	 * @param $iActionCode
+	 * @deprecated 3.0.0 N°2591 will be removed in 3.1.0
+	 *
+	 * @param bool $bSkipStrongSecurity
+	 * @param int $iActionCode
 	 *
 	 * @throws \SecurityException
-	 * @deprecated in 3.0.0 will be removed in 2.9
 	 */
 	protected function CheckUserRights($bSkipStrongSecurity, $iActionCode)
 	{
diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php
index 9038bb9fa..447c8c4ca 100644
--- a/sources/application/WebPage/iTopWebPage.php
+++ b/sources/application/WebPage/iTopWebPage.php
@@ -124,7 +124,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/ckeditor.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/adapters/jquery.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js');
-		/* @deprecated qTip will be removed in 2.9.0, use Tippy.js instead */
+		/** @deprecated qTip will be removed in 3.1.0, use Tippy.js instead */
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.qtip-1.0.min.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'node_modules/@popperjs/core/dist/umd/popper.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'node_modules/tippy.js/dist/tippy-bundle.umd.js');