Merge branch 'main' into cms/release-15.2

Author: AndyButland

10/umbraco-cms/reference/configuration/nucachesettings.md

@@ -4,7 +4,9 @@ description: "Information on the NuCache settings section"
 
 # NuCache Settings
 
-This settings section allows you to specify the block size of the BTree used by NuCache. This is configured by default, so you don't need to configure this. However it is possible with something like:
+The NuCache settings allow you to configure different aspects of how cached content is stored and retrieved. Below are the details of the available settings and how they can be configured to optimize performance and compatibility with your project needs.
+
+## BTreeBlockSize
 
 ```json
 "Umbraco": {
@@ -16,15 +18,42 @@ This settings section allows you to specify the block size of the BTree used by
 }
 ```
 
-This is how NuCache is configured by default. It is important to mention that the block size must be a power of two, at least 512, and at most 65536 (64K).
+{% hint style="info" %}
+The block size must be a power of two. It should be at least 512 and at most 65536 (64K).
+{% endhint %}
 
-## Additional Settings
+## NuCacheSerializerType
+
+The `NuCacheSerializerType` setting allows developers to specify the serialization format for NuCache content. This setting is particularly relevant for projects migrating from older versions of Umbraco that relied on JSON formats.
+
+To use JSON serialization instead of the default MessagePack:
+
+### Using 'Program.cs'
+
+```csharp
+builder.Services.Configure<NuCacheSettings>(options =>
+{
+    options.NuCacheSerializerType = NuCacheSerializerType.JSON;
+});
+```
 
-It is possible to configure NuCache to work in memory only without reading/writing the NuCache database files.
+### Using 'appsettings.json'
 
-Startup duration may increase for larger sites during a "warm boot" but smaller sites should see minimal impact.
+```csharp
+{
+  "Umbraco": {
+    "CMS": {
+      "NuCache": {
+        "NuCacheSerializerType": "JSON"
+      }
+    }
+  }
+}
+```
+
+## Additional Settings
 
-The settings have not yet been exposed via the new configuration setup, instead you must configure with a composer.
+You can configure NuCache to work in memory only without reading/writing to the NuCache database files. Startup duration may increase for larger sites during a "warm boot" but smaller sites should see minimal impact. The settings have not yet been exposed via the new configuration setup, instead you must configure with a composer.
 
 ```csharp
 public class DisableNuCacheDatabaseComposer : IComposer

10/umbraco-forms/installation/install.md

@@ -15,12 +15,14 @@ Umbraco contains the **Forms** section, by default. You will see a similar inter
 
 To install the Umbraco Forms package (**Umbraco.Forms**), follow these steps:
 
-1.  Run the following command on a command prompt of your choice:
+1.  Identify the Umbraco CMS version your project is running.
+2.  Find a compatible version of Umbraco Forms that matches your Umbraco CMS version. A list of Umbraco Forms versions can be found on [nuget.org](https://www.nuget.org/packages/Umbraco.Forms#versions-body-tab).
+3.  Run the following command on a command prompt of your choice, replacing `<version_number>` with the appropriate version identified above:
 
     ```
-    dotnet add package Umbraco.Forms
+    dotnet add package Umbraco.Forms --version <version_number>
     ```
-2.  Restart the web application using the following command:
+4.  Restart the web application using the following command:
 
     ```
      dotnet run

13/umbraco-cms/reference/configuration/nucachesettings.md

@@ -4,7 +4,9 @@ description: Information on the NuCache settings section
 
 # NuCache Settings
 
-This settings section allows you to specify the block size of the BTree used by NuCache. This is configured by default, so you don't need to configure this. However it is possible with something like:
+The NuCache settings allow you to configure different aspects of how cached content is stored and retrieved. Below are the details of the available settings and how they can be configured to optimize performance and compatibility with your project needs.
+
+## BTreeBlockSize
 
 ```json
 "Umbraco": {
@@ -16,11 +18,13 @@ This settings section allows you to specify the block size of the BTree used by
 }
 ```
 
-This is how NuCache is configured by default. It is important to mention that the block size must be a power of two, at least 512, and at most 65536 (64K).
+{% hint style="info" %}
+The block size must be a power of two. It should be at least 512 and at most 65536 (64K).
+{% endhint %}
 
 ## UsePagedSqlQuery
 
-Setting `UsePagedSqlQuery` to `False`  your project will use the `Fetch` method instead of the `QueryPaged` method when rebuilding the NuCache files. This will increase performance on bigger Umbraco websites with a lot of content when rebuilding the NuCache.
+When `UsePagedSqlQuery` is set to `False`, the `Fetch` method is used instead of the `QueryPaged` method for rebuilding the NuCache files. This will increase performance on larger Umbraco websites with a lot of content when rebuilding the NuCache.
 
 ```json
 "Umbraco": {
@@ -33,13 +37,38 @@ Setting `UsePagedSqlQuery` to `False`  your project will use the `Fetch` method
 
 ```
 
-## Additional Settings
+## NuCacheSerializerType
+
+The `NuCacheSerializerType` setting allows developers to specify the serialization format for NuCache content. This setting is particularly relevant for projects migrating from older versions of Umbraco that relied on JSON formats.
+
+To use JSON serialization instead of the default MessagePack:
+
+### Using 'Program.cs'
+
+```csharp
+builder.Services.Configure<NuCacheSettings>(options =>
+{
+    options.NuCacheSerializerType = NuCacheSerializerType.JSON;
+});
+```
 
-It is possible to configure NuCache to work in memory only without reading/writing the NuCache database files.
+### Using 'appsettings.json'
 
-Startup duration may increase for larger sites during a "warm boot" but smaller sites should see minimal impact.
+```csharp
+{
+  "Umbraco": {
+    "CMS": {
+      "NuCache": {
+        "NuCacheSerializerType": "JSON"
+      }
+    }
+  }
+}
+```
+
+## Additional Settings
 
-The settings have not yet been exposed via the new configuration setup, instead you must configure with a composer.
+You can configure NuCache to work in memory only without reading/writing to the NuCache database files. Startup duration may increase for larger sites during a "warm boot" but smaller sites should see minimal impact. The settings have not yet been exposed via the new configuration setup, instead you must configure with a composer.
 
 ```csharp
 public class DisableNuCacheDatabaseComposer : IComposer

13/umbraco-cms/reference/security/external-login-providers.md

@@ -255,14 +255,19 @@ public class ProviderBackOfficeExternalLoginProviderOptions : IConfigureNamedOpt
         // Choose to automatically redirect to the external login provider
         // effectively removing the login button.
         options.AutoRedirectLoginToExternalProvider = false;
+
+        // [OPTIONAL]
+        // Set the button color and look.
+        options.ButtonColor = UuiButtonColor.Positive;
+        options.ButtonLook = UuiButtonLook.Primary;
     }
 }
 ```
 {% endcode %}
 
 **Icons**
 
-If you want to use a custom icon for the login button, you need to add the icon to the Umbraco backoffice. You can do this by adding the icon to the `~/App_Plugins/MyPlugin/BackOffice/Icons` folder. The icon should be a SVG file. The icon should be named the same as the icon name you specify in the `options.Icon` property.
+If you want to use a custom icon for the login button, you need to add the icon to the Umbraco backoffice. You can do this by adding the icon to the `~/App_Plugins/MyPlugin/BackOffice/Icons` folder. The icon should be an SVG file. The icon should be named the same as the icon name you specify in the `options.Icon` property.
 
 {% hint style="info" %}
 You can use the [Umbraco Icon Picker](../../fundamentals/data/defining-content/README.md#adding-icons-to-the-document-type) to see available icons.
@@ -362,7 +367,7 @@ The `CustomBackofficeView` allows for specifying a JavaScript module to render a
 * You want to display something different where external login providers are listed: in the login screen vs the backoffice panel vs on the logged-out screen. This same view will render in all of these cases but you can use the current route parameters to customize what is shown.
 * You want to change how the button interacts with the external login provider. For example, instead of having the site redirect on button-click, you want to open a popup window to load the external login provider.
 
-The path to the custom view is a virtual path, like this example: `"~/App_Plugins/MyPlugin/BackOffice/my-external-login.js"`.
+The path to the custom view is a virtual path, like this example: `"/App_Plugins/MyPlugin/BackOffice/my-external-login.js"`.
 
 When a custom view is specified it is 100% up to this module to perform all required logic.
 
@@ -374,7 +379,7 @@ The module should define a Custom Element and export it as default. The Custom E
 * `userViewState`: The current view state of the user. This can be one of the following values:
   * `loggingIn`: The user is on the login screen.
   * `loggedIn`: The user is on the backoffice panel.
-  * `loggedOut`: The user clicked the logout button and is on the logged-out screen.
+  * `loggedOut`: The user clicks the logout button and is on the logged-out screen.
   * `timedOut`: The user's session has timed out and they are on the timed-out screen.
 
 **TypeScript**
@@ -396,7 +401,7 @@ interface IExternalLoginCustomViewElement {
 
 **Examples**
 
-The Custom Element can be implemented in a number of ways with many different libraries or frameworks. The following examples show how to make a button appear and redirect to the external login provider. You will learn how to use the `externalLoginUrl` property to redirect to the external login provider. The login form should look like this when you open Umbraco:
+The Custom Element can be implemented in several ways with many different libraries or frameworks. The following examples show how to make a button appear and redirect to the external login provider. You will learn how to use the `externalLoginUrl` property to redirect to the external login provider. The login form should look like this when you open Umbraco:
 
 ![Login form with custom external login button](./images/external-login-provider-javascript.png)
 
@@ -475,7 +480,7 @@ class MyLitView extends LitElement {
       providerName: { type: String },
       displayName: { type: String },
       externalLoginUrl: { type: String },
-      userViewState: { type: String }
+      userViewState: { type: String, state: true }
     };
   }
 
@@ -514,7 +519,7 @@ export default MyLitView;
 
 ### Static extension class
 
-The extension class is required to extend on the default authentication implementation in Umbraco CMS. A generic example of such extension class can be seen below.
+The extension class is required to extend the default authentication implementation in Umbraco CMS. A generic example of such an extension class can be seen below.
 
 {% tabs %}
 {% tab title="User Authentication" %}