diff --git a/developer_manual/basics/events.rst b/developer_manual/basics/events.rst
index 1661462de..d42c62597 100644
--- a/developer_manual/basics/events.rst
+++ b/developer_manual/basics/events.rst
@@ -669,7 +669,8 @@ tbd
 Hooks
 -----
 
-.. warning:: The hooks mechanism is deprecated. Use the `OCP event dispatcher`_ instead.
+.. deprecated:: 18
+    Use the `OCP event dispatcher`_ instead.
 
 .. sectionauthor:: Bernhard Posselt <dev@bernhard-posselt.com>
 
@@ -853,8 +854,9 @@ Filesystem scanner hooks available in scope **\\OC\\Files\\Utils\\Scanner**:
 
 
 Public emitter
---------------------
+--------------
 
-.. warning:: The public emitter mechanism is deprecated. Use the `OCP event dispatcher`_ instead.
+.. deprecated:: 18
+    Use the `OCP event dispatcher`_ instead.
 
 tbd
diff --git a/developer_manual/basics/storage/database.rst b/developer_manual/basics/storage/database.rst
index 34442549e..589305eca 100644
--- a/developer_manual/basics/storage/database.rst
+++ b/developer_manual/basics/storage/database.rst
@@ -314,8 +314,10 @@ mapping, simply override the **columnToProperty** and **propertyToColumn** metho
 
 .. _database-entity-slugs:
 
-Slugs (deprecated)
-^^^^^^^^^^^^^^^^^^
+Slugs
+^^^^^
+
+.. deprecated:: 24
 
 Slugs are used to identify resources in the URL by a string rather than integer id. Since the URL allows only certain values, the entity base class provides a slugify method for it:
 
@@ -326,8 +328,6 @@ Slugs are used to identify resources in the URL by a string rather than integer
     $author->setName('Some*thing');
     $author->slugify('name');  // Some-thing
 
-.. note:: Entity slugs have been deprecated with the release of Nextcloud 24
-
 Table management tips
 -------------------------