diff --git a/developer_manual/basics/events.rst b/developer_manual/basics/events.rst
index 167d2fbc8..7b953ed64 100644
--- a/developer_manual/basics/events.rst
+++ b/developer_manual/basics/events.rst
@@ -677,7 +677,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>
 
@@ -861,8 +862,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