Skip to content

Commit 5ab9660

Browse files
authored
Merge pull request #14619 from nextcloud/fix/dev-manual-high
2 parents 77a3579 + 03a3ca5 commit 5ab9660

11 files changed

Lines changed: 12 additions & 12 deletions

File tree

developer_manual/app_development/translation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ empty folder which later holds the translations.
5353
Branch selection ``.tx/backport``
5454
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5555

56-
The bot will run every night and only push commits to the following branches branch once there is an update to the translation:
56+
The bot will run every night and only push commits to the following branches once there is an update to the translation:
5757

5858
* main
5959
* master

developer_manual/basics/backgroundjobs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ For example you could add or remove a certain job based on some controller:
143143
144144
class SomeController extends Controller {
145145
146-
private IJobList $jobList
146+
private IJobList $jobList;
147147
148148
public function __construct(string $appName, IRequest $request, IJobList $jobList) {
149149
parent::__construct($appName, $request);

developer_manual/basics/controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ class implementing the ``OCP\\AppFramework\\Http\\Template\\IMenuAction`` interf
440440

441441
As the public template is also some HTML template, the same argumentation as for :ref:`regular templates<controller_template>` regarding the CSRF checks hold true:
442442
The usage of ``#[NoCSRFRequired]`` for public pages is considered acceptable for some pages:
443-
Each page that the user should be able to directly access (by typing/pastig the URL in the browser or clicking on a link in a mail) should have this attribute set.
443+
Each page that the user should be able to directly access (by typing/pasting the URL in the browser or clicking on a link in a mail) should have this attribute set.
444444
For multi-page forms in the second and later stages, this should **not** be set as the user should follow the series of pages.
445445

446446
Data-based responses

developer_manual/basics/dependency_injection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ The container works in the following way:
187187

188188
* **AuthorMapper** is queried::
189189

190-
$container->registerService(AuthorMappers::class, function(ContainerInterface $c): AuthorMapper {
190+
$container->registerService(AuthorMapper::class, function(ContainerInterface $c): AuthorMapper {
191191
return new AuthorService(
192192
$c->get(IDBConnection::class)
193193
);

developer_manual/basics/events.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ This event is triggered when a user deletes a calendar-subscription.
333333

334334
.. versionadded:: 20
335335

336-
This event is triggered when a user deletes a calendar-subscription.
336+
This event is triggered when a user updates a calendar subscription.
337337

338338
``\OCA\FederatedFileSharing\Events\FederatedShareAddedEvent``
339339
*************************************************************

developer_manual/basics/storage/filesystem.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ From the root folder you can either access a user's home folder or access a file
3232
private IUserSession $userSession;
3333
private IRootFolder $rootFolder;
3434
35-
public function __constructor(IUserSession $userSession, IRootFolder $rootFolder) {
35+
public function __construct(IUserSession $userSession, IRootFolder $rootFolder) {
3636
$this->userSession = $userSession;
3737
$this->rootFolder = $rootFolder;
3838
}

developer_manual/digging_deeper/reference.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,15 +658,15 @@ in a custom fashion:
658658
<div v-if="richObject">
659659
<div>
660660
<label>
661-
{{ t('myapp', 'Title' }}
661+
{{ t('myapp', 'Title') }}
662662
</label>
663663
<span>
664664
{{ richObject.title }}
665665
</span>
666666
<div>
667667
<div>
668668
<label>
669-
{{ t('myapp', 'Extra info' }}
669+
{{ t('myapp', 'Extra info') }}
670670
</label>
671671
<span>
672672
{{ richObject.extra_info }}

developer_manual/digging_deeper/rest_apis.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The following combinations of attributes might be relevant for various scenarios
101101
#. OCS route with CORS enabled: ``OCSController`` class and ``#[CORS]`` attribute on the method
102102

103103
.. warning::
104-
Adding the ``#[NoCRSFRequired]`` attribute imposes a security risk.
104+
Adding the ``#[NoCSRFRequired]`` attribute imposes a security risk.
105105
You should not add this to your controller methods unless you understand the implications and be sure that you absolutely need the attribute.
106106
Typically, you can use the ``OCS-APIRequest`` header for data requests instead, in order to satisfy the CSRF checks in your API requests.
107107

developer_manual/getting_started/coding_standards/php.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Use *UpperCamelCase* for Objects, *lowerCamelCase* for functions and variables.
4141
a default function/method parameter, do not use spaces. Do not prepend private
4242
class members with underscores.
4343

44-
.. code-block:: javascript
44+
.. code-block:: php
4545
4646
class MyClass {
4747

developer_manual/getting_started/development_process.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Here are some things to consider:
5151

5252
- Any major release that has not reached end-of-life status usually receives these backported fixes.
5353
- Backporting even the simplest changes has some level of risk.
54-
- 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).
54+
- 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).
5555
- 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).
5656

5757
Showstoppers (never backport things that cause these):

0 commit comments

Comments
 (0)