diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_25.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_25.rst
index e2c988b1a..128ac405a 100644
--- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_25.rst
+++ b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_25.rst
@@ -17,23 +17,37 @@ Make sure your ``appinfo/info.xml`` allows for Nextcloud 25.
 	<dependencies>
 	  <nextcloud min-version="22" max-version="25" />
 	</dependencies>
-	
+
 SCSS support removal
 ^^^^^^^^^^^^^^^^^^^^
 
 With 25, we removed the support for scss files provided by apps.
 Please handle your own compilation, move to a vue app or move back to css.
-See `Github issue <https://github.com/nextcloud/server/issues/32060>`_.
+See `Github issue #32060 <https://github.com/nextcloud/server/issues/32060>`_.
 
 Front-end changes
 -----------------
 
-tbd
+Disabled keyboard shortcuts
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A global option to disable keyboard shortcuts was added to the accessibility settings.
+Since it heavily depends on the screenreader and tools that you use if Ctrl and/or Alt or other things are okay to use
+or not and maintaining a more detailed list is too much effort, we went for a global on/off switch. Apps can use this
+public javascript API call to determine whether the user used the opt-out: ``OCP.Accessibility.disableKeyboardShortcuts()``.
+If that is the case, no additional shortcuts shall be registered by any app. Only ``space`` to toggle checkboxes and
+``enter`` to submit the currently active buttons/links are okay to be used.
+See `Github issue #34081 <https://github.com/nextcloud/server/pull/34081>`_ and :ref:`JavaScript Frontend documentation <basics_frontend_javascript_keyboard_shortcuts>`.
 
 Back-end changes
 ----------------
 
-tbd
+``christophwurst/nextcloud`` replaced
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The `christophwurst/nextcloud <https://packagist.org/packages/christophwurst/nextcloud>`_ composer package was replaced
+with a now Nextcloud owned `nextcloud/ocp <https://packagist.org/packages/nextcloud/ocp>`_ package. The content is the
+same and all older versions were generated, so you can transition right away no matter which versions you support.
 
 Changed APIs
 ^^^^^^^^^^^^
diff --git a/developer_manual/basics/front-end/js.rst b/developer_manual/basics/front-end/js.rst
index 17d69ec51..1251c66af 100644
--- a/developer_manual/basics/front-end/js.rst
+++ b/developer_manual/basics/front-end/js.rst
@@ -150,6 +150,8 @@ function
 Now state will contain the provided state which you can use as any variable. It
 is as simple as that.
 
+.. _basics_frontend_javascript_keyboard_shortcuts:
+
 
 Keyboard shortcuts
 ------------------
@@ -164,6 +166,6 @@ Nextcloud wide. You can check the setting with the following function which retu
 
     OCP.Accessibility.disableKeyboardShortcuts();
 
-If that is the case, no additional shortcuts shall be registered by any app. Only space
-to toggle checkboxes and enter to submit the currently active buttons or links are okay,
+If that is the case, no additional shortcuts shall be registered by any app. Only ``space``
+to toggle checkboxes and ``enter`` to submit the currently active buttons or links are okay,
 as any other shortcut might interfere with screenreaders and other accessibility tools.