chore: merge stable32 into backport branch and resolve conflicts

- Resolve conflict in dependency_injection.rst: accept stable32's major
  rewrite which already has the correct AuthorMapper::class references
  and also fixes new AuthorService -> AuthorMapper constructor bug
- Accept backgroundjobs.rst auto-merge: incorporates stable32's fix for
  'time minimum time' redundancy while keeping our semicolon fix
- Also fix missing semicolon in new backgroundjobs.rst Scheduling section
  added by stable32 (same PHP property declaration bug)

Signed-off-by: Anna Larch <anna@nextcloud.com>

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>

Author: Copilot

admin_manual/ai/app_context_agent.rst

@@ -165,7 +165,7 @@ Deck tools
 
 * Add a label to a card
 
-  * Example prompt: *"Can you add the label 'Urget' to the 'repair kitchen sink' card in my personal deck board?"*
+  * Example prompt: *"Can you add the label 'Urgent' to the 'repair kitchen sink' card in my personal deck board?"*
 
 * Assign a card to a user
 

admin_manual/ai/app_stt_whisper2.rst

@@ -4,7 +4,7 @@ App: Local Whisper Speech-To-Text (stt_whisper2)
 
 .. _ai-app-stt_whisper2:
 
-The *stt_whisper2* app is one of the apps that provide Speech-To-Text functionality in Nextcloud and act as a media transcription backend for the :ref:`Nextcloud Assistant app<ai-app-assistant>`, the *talk* app and :ref:`other apps making use of the core Translation API<stt-consumer-apps>`. The *stt_whisper2* app specifically runs only open source models and does so entirely on-premises. Nextcloud can provide customer support upon request, please talk to your account manager for the possibilities.
+The *stt_whisper2* app is one of the apps that provide Speech-To-Text functionality in Nextcloud and act as a media transcription backend for the :ref:`Nextcloud Assistant app<ai-app-assistant>`, the *talk* app and :ref:`other apps making use of the core Speech-To-Text API<stt-consumer-apps>`. The *stt_whisper2* app specifically runs only open source models and does so entirely on-premises. Nextcloud can provide customer support upon request, please talk to your account manager for the possibilities.
 
 This app supports input and output in languages other than English if the underlying model supports the language.
 

admin_manual/ai/overview.rst

@@ -4,7 +4,7 @@ Overview
 
 
 We strive to bring Artificial Intelligence features to Nextcloud. This section highlights these features, how they work and where to find them.
-All of these features are completely optional. If you want to have them on your server, you need install them via separate Nextcloud Apps.
+All of these features are completely optional. If you want to have them on your server, you need to install them via separate Nextcloud Apps.
 
 Overview of AI features
 -----------------------

admin_manual/configuration_files/encryption_configuration.rst

@@ -219,7 +219,7 @@ Here is a reference table for common occ commands:
    * - occ encryption:enable-master-key
      - Enable master key mode
    * - occ encryption:disable-master-key
-     - Enable user key mode
+     - Disable master key mode
    * - occ encryption:fix-encrypted-version
      - Fix bad signature errors
    * - occ encryption:fix-key-location [user]

admin_manual/configuration_files/file_versioning.rst

@@ -41,8 +41,10 @@ Additional options are:
 * ``D1, D2``    
     Keep versions for at least D1 days and delete when they exceed D2 days.
 
-* ``disabled``  
-    Disable the Versions app; no old file versions will be deleted.
+* `disabled`
+    Disable automatic expiration (pruning) of file versions; file versions
+    will continue to be created, but no old file versions will be deleted automatically.
+
 
 Background job
 --------------

admin_manual/configuration_server/dashboard_configuration.rst

@@ -10,8 +10,8 @@ Enabling the dashboard app
 The Dashboard App is shipped and enabled by default. If it is not enabled
 simply go to your Nextcloud Apps page to enable it.
 
-Configuring your Nextcloud for the activity app
------------------------------------------------
+Configuring your Nextcloud for the dashboard app
+-------------------------------------------------
 
 The dashboard widgets are provided by apps and have a unique identifier. This can be used to customize the default layout of the dashboard as an administrator. The layout is stored as a comma-separated list of widget identifiers.
 

admin_manual/configuration_server/email_configuration.rst

@@ -52,7 +52,7 @@ connect Nextcloud to a remote SMTP server:
 
 .. warning:: There were changes to the 3rd party mailer library in Nextcloud 26:
 
-    * STARTTLS cannot be enforced. It will be used automatically if the mail server supports it. The encryption type should be set to 'None/STARTTLS' in this case. See :ref:`here<TLSPeerVerification>` for an example on how to configure self signed certificates.
+    * STARTTLS cannot be enforced; it is used automatically if the mail server supports it. Set the encryption type to **None/STARTTLS** to allow this automatic upgrade. See :ref:`here<TLSPeerVerification>` for an example on how to configure self-signed certificates.
     * NTLM authentication for Microsoft Exchange is not supported by the new mailer library. Try using `basic authentication <https://learn.microsoft.com/en-us/exchange/client-developer/exchange-web-services/authentication-and-ews-in-exchange#basic-authentication>`_ instead.
     * Outlook and Microsoft Exchange have discontinued support for Basic authentication. It is no longer possible to use their services as your default email handler.
 

admin_manual/configuration_user/reset_user_password.rst

@@ -7,7 +7,7 @@ after a user enters an incorrect password, and then Nextcloud automatically
 resets their password. However, if you are using a read-only authentication 
 backend such as LDAP or Active Directory, this will not work. In this case you 
 may specify a custom URL in your ``config.php`` file to direct your user to a 
-server than can handle an automatic reset::
+server that can handle an automatic reset::
 
  'lost_password_link' => 'https://example.org/link/to/password/reset',
  

admin_manual/configuration_user/two_factor-auth.rst

@@ -5,7 +5,7 @@ Two-factor authentication
 =========================
 
 Two-factor authentication adds an additional layer of security to user accounts. In order to log
-in on an account when two-factor authentication (2FA) enabled, you must provide both the
+in on an account when two-factor authentication (2FA) is enabled, you must provide both the
 login password and another factor. 
 
 To use 2FA two things must happen:
@@ -36,9 +36,9 @@ types of factors. Three providers are automatically installed (but may need to b
 
 **Two-Factor Backup Codes**
 
-- A special 2FA factor provider enables users to generate backup codes provider.
-- Facilitates recovery of access if a a 2FA device is unavailable (i.e. gets stolen or is not working).
-- Generates ten backup codes (which can, of course, only be use once).
+- A special 2FA factor provider enables users to generate backup codes.
+- Facilitates recovery of access if a 2FA device is unavailable (i.e. gets stolen or is not working).
+- Generates ten backup codes (which can, of course, only be used once).
 - Always enabled.
 
 Other 2FA providers may be found in the App Store. 

admin_manual/configuration_user/user_auth_ldap.rst

@@ -545,7 +545,7 @@ Headline Field:
   The LDAP attribute holding the users headline.
 
 Biography Field:
-  The LDAP attribute holding the users about i.e. short biography.
+  The LDAP attribute holding the user's biography (short description).
   Multi line value with unix LF line ending.
   Windows CRLF and Macintosh CR line endings will be replaced with unix LF line ending.