diff --git a/developer_manual/app_development/translation_setup.rst b/developer_manual/app_development/translation_setup.rst index 7761ea089f3..d62cea8d88a 100644 --- a/developer_manual/app_development/translation_setup.rst +++ b/developer_manual/app_development/translation_setup.rst @@ -53,7 +53,7 @@ empty folder which later holds the translations. Branch selection ``.tx/backport`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The bot will run every night and only push commits to the following branches branch once there is an update to the translation: +The bot will run every night and only push commits to the following branches once there is an update to the translation: * main * master diff --git a/developer_manual/basics/backgroundjobs.rst b/developer_manual/basics/backgroundjobs.rst index c526721f853..52cbb285a21 100644 --- a/developer_manual/basics/backgroundjobs.rst +++ b/developer_manual/basics/backgroundjobs.rst @@ -143,7 +143,7 @@ For example you could add or remove a certain job based on some controller: class SomeController extends Controller { - private IJobList $jobList + private IJobList $jobList; public function __construct(string $appName, IRequest $request, IJobList $jobList) { parent::__construct($appName, $request); @@ -183,7 +183,7 @@ Beware that the reliability of the execution time is limited. Systems that do no class ShareService { - private IJobList $jobList + private IJobList $jobList; public function __construct(IJobList $jobList) { $this->jobList = $jobList; diff --git a/developer_manual/basics/events.rst b/developer_manual/basics/events.rst index 17c8f5f26ab..9df58b82689 100644 --- a/developer_manual/basics/events.rst +++ b/developer_manual/basics/events.rst @@ -333,7 +333,7 @@ This event is triggered when a user deletes a calendar-subscription. .. versionadded:: 20 -This event is triggered when a user deletes a calendar-subscription. +This event is triggered when a user updates a calendar subscription. ``\OCA\FederatedFileSharing\Events\FederatedShareAddedEvent`` ************************************************************* diff --git a/developer_manual/basics/storage/filesystem.rst b/developer_manual/basics/storage/filesystem.rst index 2f346f8c98f..ef466b67c8c 100644 --- a/developer_manual/basics/storage/filesystem.rst +++ b/developer_manual/basics/storage/filesystem.rst @@ -32,7 +32,7 @@ From the root folder you can either access a user's home folder or access a file private IUserSession $userSession; private IRootFolder $rootFolder; - public function __constructor(IUserSession $userSession, IRootFolder $rootFolder) { + public function __construct(IUserSession $userSession, IRootFolder $rootFolder) { $this->userSession = $userSession; $this->rootFolder = $rootFolder; } diff --git a/developer_manual/digging_deeper/reference.rst b/developer_manual/digging_deeper/reference.rst index 52aae051508..ae9f1c8e9b3 100644 --- a/developer_manual/digging_deeper/reference.rst +++ b/developer_manual/digging_deeper/reference.rst @@ -658,7 +658,7 @@ in a custom fashion:
{{ richObject.title }} @@ -666,7 +666,7 @@ in a custom fashion:
{{ richObject.extra_info }} diff --git a/developer_manual/getting_started/coding_standards/php.rst b/developer_manual/getting_started/coding_standards/php.rst index 066d94b4696..bd768a77a2b 100644 --- a/developer_manual/getting_started/coding_standards/php.rst +++ b/developer_manual/getting_started/coding_standards/php.rst @@ -41,7 +41,7 @@ Use *UpperCamelCase* for Objects, *lowerCamelCase* for functions and variables. a default function/method parameter, do not use spaces. Do not prepend private class members with underscores. -.. code-block:: javascript +.. code-block:: php class MyClass { diff --git a/developer_manual/getting_started/development_process.rst b/developer_manual/getting_started/development_process.rst index 2b8f8221fea..3c335a7c198 100644 --- a/developer_manual/getting_started/development_process.rst +++ b/developer_manual/getting_started/development_process.rst @@ -51,7 +51,7 @@ Here are some things to consider: - Any major release that has not reached end-of-life status usually receives these backported fixes. - Backporting even the simplest changes has some level of risk. -- Differences among stable branches - including of shipped and third-pary apps - means there are additional variables outside of the main branch (or even versus the latest stable). +- Differences among stable branches - including of shipped and third-party apps - means there are additional variables outside of the main branch (or even versus the latest stable). - Fixes often do not have a lot of time in the field (< 4 weeks and it's possible no one has directly interacted with the new code outside of the original developer). Showstoppers (never backport things that cause these): diff --git a/developer_manual/prologue/security.rst b/developer_manual/prologue/security.rst index 856a938f703..63f4e4beabf 100644 --- a/developer_manual/prologue/security.rst +++ b/developer_manual/prologue/security.rst @@ -98,7 +98,7 @@ An even better way to make your app safer is to use the jQuery built-in function messageTd.text(username); -It may also be wise to choose a proper JavaScript framework like AngularJS which automatically handles the JavaScript escaping for you. +It may also be wise to choose a proper JavaScript framework like Vue.js which automatically handles the JavaScript escaping for you. Clickjacking ------------