Skip to content

Commit 8bb8c47

Browse files
committed
Merge branch '6.1' into 6.2
2 parents 251000a + 1603995 commit 8bb8c47

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- '5.6'
99
- '6.0'
1010
- '6.1'
11+
- '6.2'
1112

1213
permissions:
1314
contents: write

docs/package/pip/cronjob.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Defaults to `0`.
4242

4343
### `<options>`
4444

45-
The options element can contain a comma-separated list of options of which at least one needs to be enabled for the template listener to be executed.
45+
The options element can contain a comma-separated list of options of which at least one needs to be enabled for the cronjob to be executed.
4646

4747
## Example
4848

docs/php/api/rpc_api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Endpoints are defined using a strict rule set:
111111

112112
## Convention for File Name and Location
113113

114-
It is strongly recommended to place the files in `lib/system/endpoint/<namespace>/<objects>/<nameOfTheAction>.class.php`.
114+
It is strongly recommended to place the files in `lib/system/endpoint/controller/<namespace>/<objects>/<nameOfTheAction>.class.php`.
115115
The file name should reflect the action itself, following the pattern `<Verb><Object>`, for example, `DeleteFile` or `CreatePost`.
116116

117117
## Registering the Route of an Endpoint

mkdocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ plugins:
188188
- macros:
189189
j2_comment_start_string: '{jinja#'
190190
j2_variable_start_string: '{jinja{'
191+
- mike:
192+
alias_type: redirect
191193

192194
markdown_extensions:
193195
- toc:

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Markdown==3.7
22
mike==2.1.3
33
mkdocs-git-revision-date-plugin==0.3.2
44
mkdocs-macros-plugin==1.3.7
5-
mkdocs-material==9.5.43
5+
mkdocs-material==9.5.49
66
mkdocs==1.6.1
7-
setuptools==75.5.0
7+
setuptools==75.6.0

0 commit comments

Comments
 (0)