diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index eeeb8ba83..ec7744b62 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -429,14 +429,16 @@ HTML
 	/**
 	 * Display history tab of an object
 	 *
-	 * @param \WebPage $oPage
+	 * @deprecated 3.0.0 will be removed in 3.1, see N°3824
+	 *
 	 * @param bool $bEditMode
 	 * @param int $iLimitCount
 	 * @param int $iLimitStart
 	 *
+	 * @param \WebPage $oPage
+	 *
 	 * @throws \CoreException
 	 *
-	 * @deprecated
 	 */
 	public function DisplayBareHistory(WebPage $oPage, $bEditMode = false, $iLimitCount = 0, $iLimitStart = 0)
 	{
diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index c6dcd17c1..b1830524d 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1629,6 +1629,8 @@ JS
  * - list produces a table listing the objects
  * - count produces a paragraphs with a sentence saying 'cont' objects found
  * - details display (as  table) the details of each object found (best if only one)
+ *
+ * @deprecated 3.0.0 will be removed in 3.1, see N°3824
  */
 class HistoryBlock extends DisplayBlock
 {
diff --git a/application/template.class.inc.php b/application/template.class.inc.php
index a71877751..6d4e2c151 100644
--- a/application/template.class.inc.php
+++ b/application/template.class.inc.php
@@ -21,7 +21,7 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages
  *
- * @deprecated Since 3.0.0
+ * @deprecated 3.0.0
  */
 class DisplayTemplate
 {
diff --git a/js/utils.js b/js/utils.js
index e0fde3fcb..6a4b0b226 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -564,6 +564,9 @@ function ExportInitButton(sSelector) {
 	});
 }
 
+/**
+ * @deprecated 3.0.0 will be removed in 3.1, see N°3824
+ */
 function DisplayHistory(sSelector, sFilter, iCount, iStart) {
 	$(sSelector).block();
 	var oParams = {operation: 'history_from_filter', filter: sFilter, start: iStart, count: iCount};
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index f6b021376..0c6895252 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -1493,7 +1493,7 @@ JS
 			$oPage->add("</div>");
 			break;
 
-		// TODO 3.0.0: Handle the history pagination
+		/** @deprecated 3.0.0 Will be removed in 3.1, see N°3824 */
 		case 'history':
 			$oPage->SetContentType('text/html');
 			$id = (int)utils::ReadParam('id', 0);
@@ -1507,7 +1507,7 @@ JS
 			// widgets: ['myZebra', 'truncatedList']} );");
 			break;
 
-			// TODO 3.0.0: What to do with this?
+		/** @deprecated 3.0.0 Will be removed in 3.1, see N°3824 */
 		case 'history_from_filter':
 			$oPage->SetContentType('text/html');
 			$oHistoryFilter = DBSearch::unserialize($sFilter);