Skip to content

Commit 48fd3bb

Browse files
committed
Merge branch 'main' into release-notes-september-2025
2 parents 8c09f7f + 6cfae18 commit 48fd3bb

File tree

2,783 files changed

+611
-131526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,783 files changed

+611
-131526
lines changed

.github/styles/UmbracoDocs/Acronyms.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ exceptions:
2626
- CDN # Content Delivery Network
2727
- CI # Continuous Integration
2828
- CLI # Command Line Interface
29+
- CNAME #
2930
- CMD # Command (Windows shell)
3031
- CMS # Content Management System
3132
- CPU # Central Processing Unit

10/umbraco-cms/extending/filesystemproviders/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ namespace UmbracoExamples.Composition
215215
var path = settings.UmbracoCssPath;
216216
var rootPath = hostingEnvironment.MapPathWebRoot(path);
217217
var rootUrl = hostingEnvironment.ToAbsolute(path);
218-
var fileSystem = new YourFileSystemImplementaion(ioHelper, hostingEnvironment, logger, rootPath, rootUrl);
218+
var fileSystem = new YourFileSystemImplementation(ioHelper, hostingEnvironment, logger, rootPath, rootUrl);
219219

220220
systems.SetStylesheetFilesystem(fileSystem);
221221
});

10/umbraco-cms/extending/health-check/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Umbraco comes with the following checks by default:
3737
* **HTTPS Configuration (id: `EB66BB3B-1BCD-4314-9531-9DA2C1D6D9A7`)** - to determine if the current site is running on a secure connection
3838
* **UseHttps check** - when the site is running on HTTPS, `Umbraco.Cms.Core.Configuration.Models.GlobalSettings.UseHttps` needs to be enabled to secure the backoffice. The setting can be found under `Umbraco:CMS:Global` in the `appsettings.json` file
3939
* Category **Services**
40-
* **SMTP Settings (id: `1B5D221B-CE99-4193-97CB-5F3261EC73DF`)** - checks that an Simple Mail Tranfer Protocol (SMTP) server is configured and is accepting requests for sending emails
40+
* **SMTP Settings (id: `1B5D221B-CE99-4193-97CB-5F3261EC73DF`)** - checks that an Simple Mail Transfer Protocol (SMTP) server is configured and is accepting requests for sending emails
4141

4242
Each check returns a message indicating whether or not the issue in question has been found on the website installation. This could be an error that should be fixed, or a warning you should be aware of.
4343

10/umbraco-cms/extending/packages/good-practice-and-defaults.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ When you have a package that contains many views you might consider building a d
3232

3333
## License files
3434

35-
Umbraco products store their licenses in `/umbraco/Licences`. It is recommended for third-party packages that require license files to also store their license files in this location.
35+
Umbraco products store their licenses in `/umbraco/Licenses`. It is recommended for third-party packages that require license files to also store their license files in this location.
3636

3737
The default `.gitignore` for Umbraco templates will include any files in the `/Licenses` folder while ignoring most of the rest of the Umbraco folder.
3838

10/umbraco-cms/extending/property-editors/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Convert the stored property data value to a useful object returned by the Publis
2323

2424
## [Property Actions](property-actions.md)
2525

26-
Use Property Actions to add additional functionaility to your custom property editors.
26+
Use Property Actions to add additional functionality to your custom property editors.
2727

2828
## [Tracking References](tracking.md)
2929

10/umbraco-cms/fundamentals/setup/install/installing-nightly-builds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ To add the nightly feed using Rider:
6363
2. Go to **View** > **Tool Windows** > **NuGet**.
6464
3. Go to **Sources** tab.
6565
4. Choose the `C:\Users\Úmbraco\AppData\Roaming\NuGet\NuGet.Config` to add the feed globally.
66-
5. Cick the green `+` button in the **New Feed** field.
66+
5. Click the green `+` button in the **New Feed** field.
6767

6868
![Open the new feed menu](images/Nightly/NuGet_NewFeed.jpg)
6969

10/umbraco-cms/legacy-documentation/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
description: Resources and links for older versions of Umbrco CMS.
2+
description: Resources and links for older versions of Umbraco CMS.
33
---
44

55
# Legacy Documentation

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Information on configuring Umbraco
55

66
# Configuration
77

8-
In Umbraco 9+, we have moved away from the previous configuration using `.config` files, to instead using the .NET built-in configuration pattern. This means that there is no longer separate files for different configuration, the configuration is now primarily done using `IConfiguration` with diffent sources. E.g. The `appsettings.json` file.
8+
In Umbraco 9+, we have moved away from the previous configuration using `.config` files, to instead using the .NET built-in configuration pattern. This means that there is no longer separate files for different configuration, the configuration is now primarily done using `IConfiguration` with different sources. E.g. The `appsettings.json` file.
99

1010
For more in depth information on the configuration pattern see Microsofts [Configuration in ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-6.0) article.
1111

@@ -27,7 +27,7 @@ There is one caveat, to this precedence though, the `appsettings.{environment}.j
2727

2828
### Using Environment Variables for Configuration
2929

30-
It is not feasible to have an entire json file as an environment variable, and the `:` doesn't work with environment variables on all platforms, so instead a double underscore is used to create the hierachy.
30+
It is not feasible to have an entire json file as an environment variable, and the `:` doesn't work with environment variables on all platforms, so instead a double underscore is used to create the hierarchy.
3131

3232
As an example, if you want to set your unattended username, you would normally write it in the `appsettings.json` like so:
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ From 10.4, `AllowedUploadFiles` & `DisallowedUploadFiles` is deprecated, they wi
5454

5555
## Root level settings
5656

57-
In the root level section, that is those without a seperate sub section like Imaging, you can configure:
57+
In the root level section, that is those without a separate sub section like Imaging, you can configure:
5858

5959
### Allow Edit Invariant From Non-Default
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ Valid values:
2929
- `"True"`
3030
- Allows data types to be changed after creation. This can lead to data on content is not valid on the Data Type.
3131
- `"False"`
32-
- Disallow Data Type changes. (Recommeded value, unless you really know what you are doing)
32+
- Disallow Data Type changes. (Recommended value, unless you really know what you are doing)
3333
- `"FalseWithHelpText"`
3434
- Disallow Data Type changes, but show the users a help text so they understand why.

0 commit comments

Comments
 (0)