2 files changed, 28 insertions, 7 deletions
diff --git a/phpBB/config/default/container/services_help.yml b/phpBB/config/default/container/services_help.yml
index ae3eafe7b0..8b9d497945 100644
--- a/phpBB/config/default/container/services_help.yml
+++ b/phpBB/config/default/container/services_help.yml
@@ -1,10 +1,27 @@
 services:
-    phpbb.help.controller:
-        class: phpbb\help\controller\help
+    phpbb.help.manager:
+        class: phpbb\help\manager
         arguments:
-            - @controller.helper
             - @dispatcher
+            - @language
+            - @template
+
+    phpbb.help.controller.bbcode:
+        class: phpbb\help\controller\bbcode
+        arguments:
+            - @controller.helper
+            - @phpbb.help.manager
+            - @template
+            - @language
+            - %core.root_path%
+            - %core.php_ext%
+
+    phpbb.help.controller.faq:
+        class: phpbb\help\controller\faq
+        arguments:
+            - @controller.helper
+            - @phpbb.help.manager
             - @template
-            - @user
+            - @language
             - %core.root_path%
             - %core.php_ext%
diff --git a/phpBB/config/default/routing/help.yml b/phpBB/config/default/routing/help.yml
index 957d6dab55..8d43839d1e 100644
--- a/phpBB/config/default/routing/help.yml
+++ b/phpBB/config/default/routing/help.yml
@@ -1,3 +1,7 @@
-phpbb_help_controller:
-    path: /{mode}
-    defaults: { _controller: phpbb.help.controller:handle }
+phpbb_help_bbcode_controller:
+    path: /bbcode
+    defaults: { _controller: phpbb.help.controller.bbcode:handle }
+
+phpbb_help_faq_controller:
+    path: /faq
+    defaults: { _controller: phpbb.help.controller.faq:handle }