Merge branch 'master' into feature/7053-fix-search-special-chars

mattermost · Oct 11, 2024 · 80594f2 · 80594f2
2 parents 43efd65 + 2155bd8
commit 80594f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/source/about/mattermost-v10-changelog.md b/source/about/mattermost-v10-changelog.md
@@ -12,6 +12,7 @@ Support for Mattermost Server v9.5 [Extended Support Release](https://docs.matte
 
 - **10.0.1, released 2024-10-10**
   - Mattermost v10.0.1 contains low to medium severity level security fixes. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Fixed an issue enabling Professional customers and Team Edition users to upgrade to Playbooks v2 via the in-product marketplace, which fails to start without an Enterprise License. Additional details and discussion can be found on the [forums here](https://forum.mattermost.com/t/clarification-on-playbooks-in-mattermost-v10/20563) [MM-60679](https://mattermost.atlassian.net/browse/MM-60679).
   - Mattermost v10.0.1 contains no database or functional changes.
 - **10.0.0, released 2024-09-16**
   - Original 10.0.0 release.

diff --git a/source/configure/web-server-configuration-settings.rst b/source/configure/web-server-configuration-settings.rst
@@ -705,22 +705,22 @@ Cluster log timeout
 | See the :doc:`performance monitoring </scale/deploy-prometheus-grafana-for-performance-monitoring>` documentation for details.                   |
 +--------------------------------------------------------+-----------------------------------------------------------------------------------------+
 
-.. config:setting:: file-maxpayloadsize
+.. config:setting:: service-maxpayloadsize
   :displayname: Maximum payload size (File Storage)
   :systemconsole: N/A
-  :configjson: .FileSettings.MaximumPayloadSizeBytes
-  :environment: MM_FILESETTINGS_MAXIMUMPAYLOADSIZEBYTES
+  :configjson: .ServiceSettings.MaximumPayloadSizeBytes
+  :environment: MM_SERVICESETTINGS_MAXIMUMPAYLOADSIZEBYTES
   :description: The maximum payload size in bytes for all APIs except APIs that receive a file as an input. For example, the upload attachment API or the API to upload a custom emoji. Default is 300000.
 
 Maximum payload size
 ~~~~~~~~~~~~~~~~~~~~
 
-+-----------------------------------------------------------+----------------------------------------------------------------------------------+
-| The maximum payload size in bytes for all APIs except     | - System Config path: N/A                                                        |
-| APIs that receive a file as an input.                     | - ``config.json`` setting: ``".FileSettings.MaximumPayloadSizeBytes: 300000",``  |
-|                                                           | - Environment variable: ``MM_FILESETTINGS_MAXIMUMPAYLOADSIZEBYTES``              |
-| For example, the upload attachment API or the API to      |                                                                                  |
-| upload a custom emoji.                                    |                                                                                  |
-|                                                           |                                                                                  |
-| Numerical value. Default is **300000** (300 kB).          |                                                                                  |
-+-----------------------------------------------------------+----------------------------------------------------------------------------------+
++-----------------------------------------------------------+-------------------------------------------------------------------------------------+
+| The maximum payload size in bytes for all APIs except     | - System Config path: N/A                                                           |
+| APIs that receive a file as an input.                     | - ``config.json`` setting: ``".ServiceSettings.MaximumPayloadSizeBytes: 300000",``  |
+|                                                           | - Environment variable: ``MM_SERVICESETTINGS_MAXIMUMPAYLOADSIZEBYTES``              |
+| For example, the upload attachment API or the API to      |                                                                                     |
+| upload a custom emoji.                                    |                                                                                     |
+|                                                           |                                                                                     |
+| Numerical value. Default is **300000** (300 kB).          |                                                                                     |
++-----------------------------------------------------------+-------------------------------------------------------------------------------------+