Merge branch 'main' of https://github.com/umbraco/UmbracoDocs into engage-page-descriptions

eshanrnh · eshanrnh · commit 6014ff634eb8 · 2024-11-15T10:59:12.000+01:00
diff --git a/13/umbraco-deploy/release-notes.md b/13/umbraco-deploy/release-notes.md
@@ -17,6 +17,16 @@ If you are upgrading to a new major version you can find the details about the b
 
 This section contains the release notes for Umbraco Deploy 13 including all changes for this version.
 
+#### [13.3.0-rc1](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.3.0) (November 13rd 2024)
+
+* Add option to include all schema in a workspace export
+* Add option to export from transfer queue
+* Combine migrated grid editor with default Block Grid block configuration (set `RowMinSpan` and `RowMaxSpan` to `1` and `EditorSize` to `medium`)
+* Import on startup
+* Added `ValidateDependenciesOnImport` setting to disable dependency validation on import
+* Fixed issue where content was not saved when transferring variant content with a release date
+* Support flexible environments on Umbraco Cloud (remove requirement for environment types to be Development, Staging or Live)
+
 #### [13.2.2](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.2.2) (October 3rd 2024)
 
 * Support migrating legacy Grid editor settings (config/styles) using JSON object pre-values
diff --git a/13/umbraco-engage/.gitbook/assets/image (1) (1) (1).png b/13/umbraco-engage/.gitbook/assets/image (1) (1) (1).png
diff --git a/13/umbraco-engage/.gitbook/assets/image (1) (1).png b/13/umbraco-engage/.gitbook/assets/image (1) (1).png
diff --git a/13/umbraco-engage/.gitbook/assets/image (1).png b/13/umbraco-engage/.gitbook/assets/image (1).png
diff --git a/13/umbraco-engage/.gitbook/assets/image.png b/13/umbraco-engage/.gitbook/assets/image.png
diff --git a/13/umbraco-engage/tutorials/marketing-resources/README.md b/13/umbraco-engage/tutorials/marketing-resources/README.md
@@ -1,8 +1,8 @@
 ---
-description: >-
-  Add extra functionality to your website using the templates detailed in
-  this section.
 icon: square-exclamation
+description: >-
+  Add extra functionality to your website using the templates detailed in this
+  section.
 ---
 
 # Marketing Resources
@@ -11,3 +11,15 @@ As a marketer, you want to interact with your website visitors without the help
 Find in this section, templates to jump-start your onsite visitor interaction.
 
 With the help of these generic CSS and JavaScript templates, you will be up and running within 5 minutes.
+
+{% content-ref url="generic-topbar-template.md" %}
+[generic-topbar-template.md](generic-topbar-template.md)
+{% endcontent-ref %}
+
+{% content-ref url="generic-popup-template.md" %}
+[generic-popup-template.md](generic-popup-template.md)
+{% endcontent-ref %}
+
+{% content-ref url="generic-exit-intent-popup-template.md" %}
+[generic-exit-intent-popup-template.md](generic-exit-intent-popup-template.md)
+{% endcontent-ref %}
diff --git a/13/umbraco-engage/tutorials/marketing-resources/generic-popup-template.md b/13/umbraco-engage/tutorials/marketing-resources/generic-popup-template.md
@@ -9,6 +9,8 @@ description: >-
 
 Use the popup template to start boosting your marketing activities. The template can be set up and used without help from a developer.
 
+<figure><img src="../../.gitbook/assets/image.png" alt=""><figcaption><p>A preview of the Generic Popup Template.</p></figcaption></figure>
+
 It is recommended to personalize the popup to make it even more relevant for your specific audience. Follow the [Create a Personalized Popup in 5 minutes tutorial](../create-a-personalized-popup-in-5-minutes.md) to set up a personalized popup within Umbraco Engage.
 
 {% hint style="info" %}
@@ -19,14 +21,14 @@ Install the [client-side script](../../developers/analytics/client-side-events-a
 
 This popup will not affect the styling of your existing page or website. Some JavaScript is needed to insert the popup HTML in your existing content to apply the popup. The code also includes an option for the visitor to close the popup.
 
-Copy and paste the following JavaScript below into Umbraco Engage.
+Copy and paste the following JavaScript into Umbraco Engage. You can create a new JavaScript file containing the code or add it within a script tag in your template.
 
 <details>
 
 <summary>JavaScript</summary>
 
 <pre class="language-javascript"><code class="lang-javascript">var popupTitle = "Popups do convert!"; // The title of your popup.
-var popupText = "The average conversion; // The text of your popup.
+var popupText = "The average conversion"; // The text of your popup.
 var popupbuttonText = "I want this!"; // The button text.
 var popupButtonLink = "https://www.umbraco.com/"; // The button link.
 var popupButtonClose = "X"; // The close-button text.
@@ -102,7 +104,7 @@ if (!hasCookie) {
 
 </details>
 
-Now that you have your popup in place you can update the look. Copy and paste the following CSS into Umbraco Engage and your popup is ready.
+Now that you have your popup in place you can update the look. Copy and paste the following CSS into Umbraco Engage and your popup is ready. You can add the CSS to your existing stylesheet or create a new one.
 
 <details>
 
diff --git a/14/umbraco-cms/customizing/extending-overview/extension-types/section-sidebar.md b/14/umbraco-cms/customizing/extending-overview/extension-types/section-sidebar.md
@@ -43,14 +43,20 @@ interface UmbSectionSidebarAppElement {}
 
 ```typescript
 {
- "type": "menuSectionSidebarApp",
+ "type": "sectionSidebarApp",
+ "kind": "menu",
  "alias": "My.SectionSidebarApp.MyMenu",
  "name": "My Menu Section Sidebar App",
  "meta": {
   "label": "My Sidebar Menu",
-  "sections": ["My.Section"],
   "menu": "My.Menu"
- }
+ },
+ "conditions": [
+  {
+   "alias": "Umb.Condition.SectionAlias",
+   "match": "My.Section"
+  }
+ ]
 }
 ```
 
diff --git a/14/umbraco-cms/reference/content-delivery-api/README.md b/14/umbraco-cms/reference/content-delivery-api/README.md
@@ -14,9 +14,19 @@ The Delivery API is an opt-in feature in Umbraco. It must be explicitly enabled
 
 ### Enable the Content Delivery API
 
+When creating your project, you can enable the Delivery API using the `--use-delivery-api` or `-da` flag. This will automatically add the necessary configuration to your project.
+
+```bash
+dotnet new umbraco -n MyProject -da
+```
+
+You can also enable the Delivery API at a later point by following these steps:
+
 1. Open your project's `appsettings.json`.
 2. Insert the `DeliveryApi` configuration section under `Umbraco:CMS`.
 3. Add the `Enabled` key and set its value to `true`.
+4. Open `Program.Cs`
+5. Add `.AddDeliveryApi()` to `builder.CreateUmbracoBuilder()`
 
 {% code title="appsettings.json" %}
 ```json
@@ -32,6 +42,18 @@ The Delivery API is an opt-in feature in Umbraco. It must be explicitly enabled
 ```
 {% endcode %}
 
+{% code title="Program.cs" %}
+```csharp
+builder.CreateUmbracoBuilder()
+    .AddBackOffice()
+    .AddWebsite()
+    .AddDeliveryApi()
+    .AddComposers()
+    .Build();
+
+```
+{% endcode %}
+
 Once the Content Delivery API is enabled, the next step is to rebuild the Delivery API content index (_DeliveryApiContentIndex_). This can be done using the **Examine Management** dashboard in the **Settings** section of the Umbraco Backoffice.
 
 1. Access the Umbraco Backoffice.
diff --git a/14/umbraco-commerce/SUMMARY.md b/14/umbraco-commerce/SUMMARY.md
@@ -1,6 +1,6 @@
 # Table of contents
 
-* [Umbraco Commerce 14  Documentation](README.md)
+* [Umbraco Commerce Documentation](README.md)
 * [Release Notes](release-notes/README.md)
   * [v14.0.0](release-notes/v14.0.0.md)
   * [v14.0.0-Alpha](release-notes/v14.0.0-alpha.md)
@@ -85,8 +85,8 @@
   * [Dynamic Rate Shipping](reference/shipping/dynamic-rate-shipping.md)
   * [Realtime Rate Shipping](reference/shipping/realtime-rate-shipping.md)
 * [Taxes](reference/taxes/README.md)
-    * [Fixed Tax Rates](reference/taxes/fixed-tax-rates.md)
-    * [Calculated Tax Rates](reference/taxes/calculated-tax-rates.md)
+  * [Fixed Tax Rates](reference/taxes/fixed-tax-rates.md)
+  * [Calculated Tax Rates](reference/taxes/calculated-tax-rates.md)
 * [Storefront API](reference/storefront-api/README.md)
   * [Endpoints](reference/storefront-api/endpoints/README.md)
     * [Order](reference/storefront-api/endpoints/order.md)
diff --git a/14/umbraco-deploy/release-notes.md b/14/umbraco-deploy/release-notes.md
@@ -18,6 +18,16 @@ If you are upgrading to a new major version you can find the details about the b
 
 This section contains the release notes for Umbraco Deploy 14 including all changes for this version.
 
+#### [14.2.0-rc1](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F14.2.0) (November 13th 2024)
+
+* Add option to include all schema in a workspace export
+* Add option to export from transfer queue
+* Combine migrated grid editor with default Block Grid block configuration (set `RowMinSpan` and `RowMaxSpan` to `1` and `EditorSize` to `medium`)
+* Import on startup
+* Added `ValidateDependenciesOnImport` setting to disable dependency validation on import
+* Fixed issue where content was not saved when transferring variant content with a release date
+* Support flexible environments on Umbraco Cloud (remove requirement for environment types to be Development, Staging or Live)
+
 #### [14.1.4](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F14.1.4) (October 3rd 2024)
 
 * Support migrating legacy Grid editor settings (config/styles) using JSON object pre-values
diff --git a/15/umbraco-cms/customizing/extending-overview/extension-types/section-sidebar.md b/15/umbraco-cms/customizing/extending-overview/extension-types/section-sidebar.md
@@ -43,14 +43,20 @@ interface UmbSectionSidebarAppElement {}
 
 ```typescript
 {
- "type": "menuSectionSidebarApp",
+ "type": "sectionSidebarApp",
+ "kind": "menu",
  "alias": "My.SectionSidebarApp.MyMenu",
  "name": "My Menu Section Sidebar App",
  "meta": {
   "label": "My Sidebar Menu",
-  "sections": ["My.Section"],
   "menu": "My.Menu"
- }
+ },
+ "conditions": [
+  {
+   "alias": "Umb.Condition.SectionAlias",
+   "match": "My.Section"
+  }
+ ]
 }
 ```
 
diff --git a/15/umbraco-cms/reference/content-delivery-api/README.md b/15/umbraco-cms/reference/content-delivery-api/README.md
@@ -14,9 +14,19 @@ The Delivery API is an opt-in feature in Umbraco. It must be explicitly enabled
 
 ### Enable the Content Delivery API
 
+When creating your project, you can enable the Delivery API using the `--use-delivery-api` or `-da` flag. This will automatically add the necessary configuration to your project.
+
+```bash
+dotnet new umbraco -n MyProject -da
+```
+
+You can also enable the Delivery API at a later point by following these steps:
+
 1. Open your project's `appsettings.json`.
 2. Insert the `DeliveryApi` configuration section under `Umbraco:CMS`.
 3. Add the `Enabled` key and set its value to `true`.
+4. Open `Program.Cs`
+5. Add `.AddDeliveryApi()` to `builder.CreateUmbracoBuilder()`
 
 {% code title="appsettings.json" %}
 ```json
@@ -32,6 +42,18 @@ The Delivery API is an opt-in feature in Umbraco. It must be explicitly enabled
 ```
 {% endcode %}
 
+{% code title="Program.cs" %}
+```csharp
+builder.CreateUmbracoBuilder()
+    .AddBackOffice()
+    .AddWebsite()
+    .AddDeliveryApi()
+    .AddComposers()
+    .Build();
+
+```
+{% endcode %}
+
 Once the Content Delivery API is enabled, the next step is to rebuild the Delivery API content index (_DeliveryApiContentIndex_). This can be done using the **Examine Management** dashboard in the **Settings** section of the Umbraco Backoffice.
 
 1. Access the Umbraco Backoffice.
diff --git a/15/umbraco-commerce/SUMMARY.md b/15/umbraco-commerce/SUMMARY.md
@@ -84,8 +84,8 @@
   * [Dynamic Rate Shipping](reference/shipping/dynamic-rate-shipping.md)
   * [Realtime Rate Shipping](reference/shipping/realtime-rate-shipping.md)
 * [Taxes](reference/taxes/README.md)
-    * [Fixed Tax Rates](reference/taxes/fixed-tax-rates.md)
-    * [Calculated Tax Rates](reference/taxes/calculated-tax-rates.md)
+  * [Fixed Tax Rates](reference/taxes/fixed-tax-rates.md)
+  * [Calculated Tax Rates](reference/taxes/calculated-tax-rates.md)
 * [Storefront API](reference/storefront-api/README.md)
   * [Endpoints](reference/storefront-api/endpoints/README.md)
     * [Order](reference/storefront-api/endpoints/order.md)
@@ -100,7 +100,7 @@
     * [Content](reference/storefront-api/endpoints/content.md)
 * [Management API](reference/management-api/README.md)
 * [Go behind the scenes](reference/go-behind-the-scenes.md)
-* [Telemetry](reference/telemetry/README.md)
+* [Telemetry](reference/telemetry.md)
 
 ## Tutorials
 
diff --git a/15/umbraco-commerce/reference/telemetry.md b/15/umbraco-commerce/reference/telemetry.md
@@ -0,0 +1,2 @@
+# Telemetry
+
diff --git a/15/umbraco-commerce/release-notes/v15.0.0-rc.md b/15/umbraco-commerce/release-notes/v15.0.0-rc.md
@@ -1,23 +1,23 @@
 ---
-description: >-
-  Umbraco Commerce v15.0.0-rc release notes.
+description: Umbraco Commerce v15.0.0-rc release notes.
 ---
 
-# Umbraco Commerce v15.0.0-rc
+# v15.0.0-Rc
 
-Umbraco Commerce v15.0.0-rc is the initial release of Umbraco Commerce for Umbraco CMS v15. Because of 
+Umbraco Commerce v15.0.0-rc is the initial release of Umbraco Commerce for Umbraco CMS v15.
 
 ## Key Takeaways
 
-* Everything is now [async](#async).
-* [Storefront API](#storefront-api) aligned with Management API
-* A number of [Umbraco v15 updates](#umbraco-v15-updates).
+* Everything is now [async](v15.0.0-rc.md#async).
+* [Storefront API](v15.0.0-rc.md#storefront-api) aligned with Management API
+* A number of [Umbraco v15 updates](v15.0.0-rc.md#umbraco-v15-updates).
 
 ## Async
 
 The key focus of this release is the move to a fully asynchronous code base. To reduce the maintenance burden, the decision was made to go fully async without maintaining backward compatibility. This will therefore require code updates to use the new async methods.
 
 ### Previous behavior
+
 Previously all C# API's were synchronous and thus blocking by nature.
 
 ```csharp
@@ -41,7 +41,8 @@ public class MyNotification : NotificationEventHandlerBase<OrderFinalizedNotific
 ```
 
 ### New behavior
-All APIs are now asynchronous and thus are suffixed with Async and return a Task<T> result.
+
+All APIs are now asynchronous and thus are suffixed with Async and return a Task result.
 
 ```csharp
 // Fluent API example
diff --git a/15/umbraco-deploy/README.md b/15/umbraco-deploy/README.md
@@ -4,24 +4,16 @@ description: Documentation on how to work with Umbraco Deploy.
 
 # Umbraco Deploy Documentation
 
-{% hint style="info" %}
-This is the documentation for the **Umbraco Deploy 15 Release Candidate**.
-
-This version of the Umbraco Deploy documentation is currently slimmed down to contain only new and updated material related to the upcoming release.
-
-:bangbang: Due to the above, some links might reference the GitHub file instead of the GitBook article.
-{% endhint %}
-
 Umbraco Deploy is a deployment tool that helps you with the process of transferring code and data between multiple environments. Deploy can be configured for many different setups and is great for both small setups as well as large and more complex infrastructures.
 
 <table data-view="cards"><thead><tr><th></th><th></th><th data-hidden data-card-cover data-type="files"></th><th data-hidden data-card-target data-type="content-ref"></th></tr></thead><tbody><tr><td><strong>Set up Umbraco Deploy</strong></td><td>Learn how you can set up Umbraco Deploy on new and existing Umbraco projects.</td><td><a href=".gitbook/assets/update.png">update.png</a></td><td><a href="installation/install-configure.md">install-configure.md</a></td></tr><tr><td><strong>Deployment workflow in</strong></td><td>Learn about how the Deployment workflow in Umbraco Deploy work.</td><td><a href=".gitbook/assets/lightbulb.png">lightbulb.png</a></td><td><a href="deployment-workflow/">deployment-workflow</a></td></tr><tr><td><strong>Upgrading</strong></td><td>Learn how you can upgrade Umbraco Deploy.</td><td><a href=".gitbook/assets/code_cursor.png">code_cursor.png</a></td><td><a href="upgrades/">upgrades</a></td></tr></tbody></table>
 
 {% content-ref url="getting-started/deploy-settings.md" %}
-[getting-started/deploy-settings.md](getting-started/deploy-settings.md)
+[deploy-settings.md](getting-started/deploy-settings.md)
 {% endcontent-ref %}
 
 {% content-ref url="getting-started/extending.md" %}
-[getting-started/extending.md](getting-started/extending.md)
+[extending.md](getting-started/extending.md)
 {% endcontent-ref %}
 
 {% content-ref url="troubleshooting.md" %}
diff --git a/15/umbraco-deploy/release-notes.md b/15/umbraco-deploy/release-notes.md
@@ -18,13 +18,30 @@ If you are upgrading to a new major version you can find the details about the b
 
 This section contains the release notes for Umbraco Deploy 15 including all changes for this version.
 
+#### [15.0.0](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F15.0.0) (November 14th 2024)
+
+* Update CMS dependency to 15.0.0
+
+#### [15.0.0-rc4](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F15.0.0) (November 13th 2024)
+
+* Update CMS dependency to 15.0.0-rc4
+* Preview of features and bug fixes due in 13.3 and 14.2:
+  * Import on startup
+  * Added `ValidateDependenciesOnImport` setting to disable dependency validation on import
+  * Support flexible environments on Umbraco Cloud (remove requirement for environment types to be Development, Staging or Live)
+
+#### [15.0.0-rc3](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F15.0.0) (November 7th 2024)
+
+* Update CMS dependency to 15.0.0-rc3
+
 #### [15.0.0-rc2](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F15.0.0) (October 24th 2024)
 
 * Update CMS dependency to 15.0.0-rc2
-* Add option to include all schema in a workspace export
-* Add option to export from transfer queue
-* Fix `BlockValue` obsoleted properties (set GUID keys instead of UDIs and support block level variants)
-* Combine migrated grid editor with default Block Grid block configuration (set `RowMinSpan` and `RowMaxSpan` to `1` and `EditorSize` to `medium`)
+* Preview of features and bug fixes due in 13.3 and 14.2:
+  * Add option to include all schema in a workspace export
+  * Add option to export from transfer queue
+  * Fix `BlockValue` obsoleted properties (set GUID keys instead of UDIs and support block level variants)
+  * Combine migrated grid editor with default Block Grid block configuration (set `RowMinSpan` and `RowMaxSpan` to `1` and `EditorSize` to `medium`)
 * Restructure keys and add new UI localizations
 
 #### [15.0.0-rc1](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F15.0.0) (October 11th 2024)
@@ -37,7 +54,19 @@ This section contains the release notes for Umbraco Deploy 15 including all chan
 
 ## Deploy Contrib
 
-#### [15.0.0-rc2](https://github.com/umbraco/Umbraco.Deploy.Contrib/releases/tag/release-15.0.0-rc1) (October 24th 2024)
+#### [15.0.0](https://github.com/umbraco/Umbraco.Deploy.Contrib/releases/tag/release-15.0.0) (November 14th 2024)
+
+* Update CMS and Deploy dependencies to 15.0.0
+
+#### [15.0.0-rc4](https://github.com/umbraco/Umbraco.Deploy.Contrib/releases/tag/release-15.0.0-rc4) (November 13th 2024)
+
+* Update CMS and Deploy dependencies to 15.0.0-rc4
+
+#### [15.0.0-rc3](https://github.com/umbraco/Umbraco.Deploy.Contrib/releases/tag/release-15.0.0-rc3) (November 7th 2024)
+
+* Update CMS and Deploy dependencies to 15.0.0-rc3
+
+#### [15.0.0-rc2](https://github.com/umbraco/Umbraco.Deploy.Contrib/releases/tag/release-15.0.0-rc2) (October 24th 2024)
 
 * Update CMS and Deploy dependencies to 15.0.0-rc2
 
diff --git a/15/umbraco-forms/release-notes.md b/15/umbraco-forms/release-notes.md
diff --git a/15/umbraco-ui-builder/README.md b/15/umbraco-ui-builder/README.md
