Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

Author: bembelimen

administrator/components/com_categories/src/Controller/CategoryController.php

@@ -125,7 +125,7 @@ protected function allowEdit($data = array(), $key = 'parent_id')
 	 *
 	 * @return  boolean  True if successful, false otherwise.
 	 *
-	 * @since   4.0.4
+	 * @since   3.10.3
 	 */
 	public function save($key = null, $urlVar = null)
 	{
@@ -145,7 +145,7 @@ public function save($key = null, $urlVar = null)
 	 *
 	 * @return  boolean  True if access level checks pass, false otherwise.
 	 *
-	 * @since   4.0.4
+	 * @since   3.10.3
 	 */
 	public function cancel($key = null)
 	{