Merge branch 'main' into patch-2

docs/apis/plugintypes/atto/_examples/button.tsx

@@ -62,7 +62,7 @@ export default (initialProps: Props): ComponentFileSummary => (
         defaultDescription={ButtonDescription}
         plugintype="atto"
         filepath="/yui/src/button/js/button.js"
-        filetype="yui"
+        filetype="js"
         summary="Example Button JavaScript"
         {...initialProps}
     />

general/community/meetings/202311.md

@@ -9,15 +9,10 @@ sidebar_position: -202311
 ### Details
 
 14th November 2023 - Time 07:00UTC
+
 [Meeting Recording](https://moodle.org/mod/bigbluebuttonbn/bbb_view.php?action=play&bn=1&rid=35&rtype=video)
 
 ### Agenda
 
 1. Moodle Communication API: "Unite, Connect, Communicate: One API to Rule them All", [Safat Shahin](https://moodle.org/user/profile.php?id=3375956) (Moodle HQ)  (00:00:40 - 00:17:00).
 2. Web Services - the future is bright, [Andrew Lyons](https://moodle.org/user/profile.php?id=268794) (Moodle HQ). (00:17:40 - 00:35:50)
-
-:::note
-
-If there is any topic that you would like to present or discuss at a developer meeting, please contact [Aurélie Soulier](https://moodle.org/user/view.php?id=5177207).
-
-:::

general/community/meetings/202402.md

@@ -0,0 +1,24 @@
+---
+title: Developer meeting - February 2024
+sidebar_label: February 2024
+tags:
+  - Developer meetings
+sidebar_position: -202402
+---
+
+### Details
+
+Date TBC
+
+[Meeting Link](https://moodle.org/mod/bigbluebuttonbn/view.php?id=8596)
+
+### Agenda
+
+1. TBC
+2. TBC
+
+:::note
+
+If there is any topic that you would like to present or discuss at a developer meeting, please contact [Olga Koenig](https://moodle.org/user/profile.php?id=6165464).
+
+:::

general/community/meetings/index.md

@@ -12,13 +12,17 @@ sidebar_label: Meetings
 Developer meetings are open to anyone interested in Moodle development.
 
 :::important
-Our next Developer meeting is January 2024.
-If there are any topics that you would like to present or discuss at a developer meeting, please contact [Aurelie Soulier](https://moodle.org/user/profile.php?id=5177207).
+Our next Developer meeting is February 2024.
+If there are any topics that you would like to present or discuss at a developer meeting, please contact [Olga Koenig](https://moodle.org/user/profile.php?id=6165464).
 
 :::
 
 ## Past meeting notes
 
+### 2024
+
+- [Developer meeting February 2024](./202402.md)
+
 ### 2023
 
 - [Developer meeting November 2023](./202311.md)

general/development/policies/backporting.md

@@ -37,7 +37,9 @@ The integration team will process backport requests, with the following guidelin
 If the backport request is approved, please follow the usual development process to submit the feature or improvement on earlier branches. Just to be clear, this means using the new bug number. So, even if the fix you are back-porting cherry-picks cleanly, you will need to amend the commit comment to use the new MDL-XXXXX number.
 
 :::tip
+
 It would be good practice to also add a line like "This is a backport of MDL-YYYYY." in the amended commit comment.
+
 :::
 
 You can probably copy the testing instructions from the original issue. If so, make it clear you done this by saying something like "Copied from MDL-66327". Of course, if you can improve the instructions, feel free to edit. [MDL-66614](https://tracker.moodle.org/browse/MDL-66614) and [MDL-66327](https://tracker.moodle.org/browse/MDL-66327) are probably a reasonably good example fo what should be done.
@@ -49,20 +51,19 @@ Many issues can be appropriately classified as borderline bug-fix/improvements.
 ## Backport fixes to unsupported branches
 
 - Given the [general policy](#general-policy) above, only supported stable branches are candidates normally.
-- Also security, privacy, data-loss and regressions caused by any of the previous issue types are accepted to be fixed into security-only supported branches.
-
-:::note
+- In addition to this any security, privacy, data-loss, and regression, caused by any of the previous issue types are accepted to be fixed into security-only supported branches.
+- In addition to the above, issues required to keep the testing infrastructure working and passing (GitHub Actions, Behat, PHPUnit, addressing random failures, including new Behat steps availability, and so on) will also be accepted when possible into security-only branches
+- Backport to _unsupported_ branches will only be considered when the issue is a **direct regression caused by a bug fix** introduced by the very latest releases. This applies to both security-only and out-of-support branches.
 
-This doesn't include [`security_benefit` labelled issues](../tracker/labels.md).
+A new weekly release will be performed including all the cases above, but [security issues that follow its own special process](../process.md#security-issues) and are released bi-monthly.
 
-::::
+:::note Security issues and the `security_benefit` label
 
-- Apart from the previous, issues required to keep the testing infrastructure working and passing (github actions, behat, phpunit, random failures, new steps availability...) will also be accepted when possible into security-only branches.
-- Finally, backport to unsupported branches only will happen when the issue is a **direct regression caused by a bug fix** introduced by the very latest releases. This applies to both security-only and out-of-support branches.
+Issues labelled with the [`security_benefit` labelled issues](../tracker/labels.md) are not considered to be security issues and will not be backported automatically. These are typically _improvements_ to security rather than bugs or vulnerabilities.
 
-A new weekly release will be performed including all the cases above, but [security issues that follow its own special process](../process.md#security-issues) and are released bi-monthly.
+:::
 
-## See also...
+## See also
 
 - [Integration review process](../process/integration/index.md)
 - [Process](../process.md)

general/development/policies/deprecation/index.md

@@ -227,7 +227,7 @@ Named parameter arguments are available from PHP 8.0 onwards.
 
 :::
 
-## See also...
+## See also
 
 - [String deprecation](../../../projects/api/string-deprecation.md)
 - [External functions deprecation](/docs/apis/subsystems/external/writing-a-service#deprecation)

versioned_docs/version-4.2/apis/plugintypes/atto/_examples/button.tsx

@@ -62,7 +62,7 @@ export default (initialProps: Props): ComponentFileSummary => (
         defaultDescription={ButtonDescription}
         plugintype="atto"
         filepath="/yui/src/button/js/button.js"
-        filetype="yui"
+        filetype="js"
         summary="Example Button JavaScript"
         {...initialProps}
     />

versioned_docs/version-4.3/apis/plugintypes/atto/_examples/button.tsx

@@ -62,7 +62,7 @@ export default (initialProps: Props): ComponentFileSummary => (
         defaultDescription={ButtonDescription}
         plugintype="atto"
         filepath="/yui/src/button/js/button.js"
-        filetype="yui"
+        filetype="js"
         summary="Example Button JavaScript"
         {...initialProps}
     />