Skip to content

Commit 5b3535d

Browse files
authored
Merge branch 'main' into vale-fixes
2 parents 5e87504 + 0048e96 commit 5b3535d

File tree

11 files changed

+56
-51
lines changed

11 files changed

+56
-51
lines changed

.github/styles/UmbracoDocs/Acronyms.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@ exceptions:
9292
- CMD
9393
- NGINX
9494
- SDK
95+
- SMTP

umbraco-cloud/build-and-customize-your-solution/set-up-your-project/project-settings/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ From this page, you can manage whether your site is automatically upgraded to th
9191

9292
![Automatic Upgrades](images/automatic-upgrades.png)
9393

94-
### [CDN & Caching](../../../optimize-and-maintain-your-site/optimize-performance/manage-cdn-caching.md)
94+
### [Content Delivery Network (CDN) and Caching](../../../optimize-and-maintain-your-site/optimize-performance/manage-cdn-caching.md)
9595

96-
The CDN & Caching section lets you manage CDN Caching and Optimization settings for your project. You can:
96+
The CDN and Caching section lets you manage CDN Caching and Optimization settings for your project. You can:
9797

9898
* Modify the default settings that apply to all hostnames added to the project.
9999
* Set specific caching settings per hostname if different configurations are required for certain hostnames.
@@ -205,7 +205,9 @@ You can upgrade your project to a **Standard** or a **Professional** plan from t
205205
You can rename your Umbraco Cloud project from the **Management** menu.
206206

207207
{% hint style="info" %}
208+
208209
If you are working locally, you need to update the origin of your local git repository to point to the new clone URL. Alternatively, you can make a fresh local clone of the project once you’ve changed your project name.
210+
209211
{% endhint %}
210212

211213
![Rename Project](images/rename-project.png)

umbraco-cloud/build-and-customize-your-solution/set-up-your-project/project-settings/application-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can find this option in **Settings** -> **Advanced** -> **Custom Application
1414

1515
## Enable client certificate loaded from file system Explained
1616

17-
If your cloud project needs to load a client certificate (such as an X.509 certificate) at runtime, you can turn on this feature for one or more environments. By turning this feature on for an environment, you will be able to load a client certificate as a file during the run-time of your cloud project.
17+
To load a client certificate (such as an X.509 certificate) at runtime, enable this feature for one or more environments. Enabling this feature for an environment allows you to load a client certificate file during your cloud project's runtime.
1818

1919
For more information on loading a certificate from a file, see the [Load certificate from file](https://docs.microsoft.com/en-us/azure/app-service/configure-ssl-certificate-in-code#load-certificate-from-file) article in the Microsoft documentation.
2020

umbraco-cloud/build-and-customize-your-solution/set-up-your-project/project-settings/config-transforms.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To transform a config file, you need to create a new file in your project with t
2222
If your project is on Umbraco 7 and 8 the naming convention is the following: `{config-file name}.{environment}.xdt.config.` Find more details on this in the [Legacy Documentation](https://github.com/umbraco/UmbracoDocs/blob/legacy-cloud/Umbraco-Cloud/Set-Up/Config-Transforms/index.md).
2323
{% endhint %}
2424

25-
If you want to do a transform on your `Web.config` file for the Live environment of your project, the config transform you need to create will look like this:
25+
To transform your `Web.config` file for the Live environment, create a config transform that looks like this:
2626

2727
`Web.Production.config`
2828

@@ -32,7 +32,7 @@ The `{environment}` part needs to be replaced with the target environment, for w
3232
2. `Staging`
3333
3. `Development`
3434

35-
This file needs to be created on a local clone of your project, as this will ensure that the file is added to the project repository.
35+
Create this file in your local project clone to ensure it's added to the repository.
3636

3737
When the file is deployed to the Live environment, the transforms will be applied to the `Web.config` file in the `Root` of your project. In the case that you have mutliple mainline environments, the `Web.Production.config` will **only** transform the `Web.config` on the Live environment.
3838

@@ -88,7 +88,7 @@ Here is an example of how that config transform would look:
8888
```
8989

9090
{% hint style="info" %}
91-
The above snippet requires your project to have a web.config file with a matching structure, otherwise, the config transform (and subsequently, the deployment) might fail.
91+
The snippet requires a `web.config` file with a matching structure; otherwise, the config transform (and subsequently, the deployment) may fail.
9292
{% endhint %}
9393

9494
This config transform will add a `<rule>` to `<system.webServer><rewrite><rules>`. The `xdt:Transform` attribute is used to tell the system what to transform. In this case, the value is `Insert`, which means it will add the section if it's not already in the config file.

umbraco-cloud/build-and-customize-your-solution/set-up-your-project/project-settings/smtp-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66

77
# SMTP Settings
88

9-
In many cases, you might want to send emails from your Umbraco Cloud project. This could be for inviting users to the Backoffice or as part of an Umbraco Forms Workflow. To do so, you need a Simple Mail Transfer Protocol (SMTP) server and must configure it in your `appsettings.json` file.
9+
In many cases, you might want to send emails from your Umbraco Cloud project. This could be for inviting users to the Backoffice or as part of an Umbraco Forms Workflow. To do so, you need a SMTP server and must configure it in your `appsettings.json` file.
1010

1111
SMTP servers are not included with Umbraco Cloud projects. You will need to set up your own SMTP server elsewhere and configure it with your Umbraco Cloud project.
1212

umbraco-cloud/build-and-customize-your-solution/set-up-your-project/project-settings/upgrade-your-plan.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Upgrade your Plan
22

3-
In this article, you can read about how you can upgrade your Umbraco Cloud plan and what you need to be aware of before you do so.
3+
This article discusses how to upgrade your Umbraco Cloud plan and important considerations to keep in mind.
44

55
## Before you upgrade your plan
66

@@ -12,9 +12,11 @@ Before you decide to upgrade your Umbraco Cloud plan, you need to consider a few
1212
* Before upgrading, make sure to check the [price difference](https://umbraco.com/umbraco-cloud-pricing) and the features you get on the new plan.
1313

1414
{% hint style="warning" %}
15+
1516
When upgrading your plan (for example, from Starter to Standard), log files such as trace logs will not be transferred to the new environment.
1617

1718
If you need to retain log history, make sure to download and back up the log files before upgrading. For more information on accessing the logs, see the [Log files](../../../optimize-and-maintain-your-site/monitor-and-troubleshoot/resolve-issues-quickly-and-efficiently/log-files.md) article.
19+
1820
{% endhint %}
1921

2022
## How to upgrade your plan
@@ -41,10 +43,10 @@ In the menu, you can find a tab called _"Upgrade plan"_.
4143
Follow the below steps to upgrade your plan:
4244

4345
1. Click on the **Select Plan** button to choose the plan you want to upgrade to.
44-
2. _\[Optional]_ Choose to upgrade to a **dedicated option** in the next step.
46+
2. _[Optional]_ Choose to upgrade to a **dedicated option** in the next step.
4547

4648
<div align="left"><figure><img src="images/dedicated-option.png" alt=""><figcaption><p>Dedicated option on Cloud</p></figcaption></figure></div>
47-
3. Review the **Summary** to make sure that everything selected is correct in the last step.
49+
3. Review the **Summary** to make sure that everything selected is correct in the last step.
4850

4951
<figure><img src="images/upgrade-summary.png" alt=""><figcaption><p>Summary of project upgrade.</p></figcaption></figure>
5052

@@ -62,16 +64,16 @@ When upgrading or downgrading the plan, the ID of your project will be appended
6264

6365
## Automatic plan upgrades
6466

65-
If your project/website exceeds any of the usage limits, you will automatically get upgraded to a plan that fits your actual usage to ensure your website keeps running smoothly.
67+
If your project exceeds usage limits, you'll be automatically upgraded to a suitable plan to keep your website running smoothly.
6668

67-
We will send an email to the project owner and the technical contact(s) of the project to let you know that this has happened. The upgrade to a new plan will be reflected in your next bill and will count from the day of the upgrade.
69+
We will send an email to the project owner and the technical contact(s) to inform them about this update. The upgrade to a new plan will be reflected in your next bill and will take effect from the date of the upgrade.
6870

69-
When you get upgraded to a new plan, you also get access to all the features that are included in this plan. [Check out the list of features for the various Umbraco Cloud plans](https://umbraco.com/umbraco-cloud-pricing/).
71+
Once you are upgraded to a new plan, you also get access to all the features that are included in that plan. [Check out the list of features for the Umbraco Cloud plans](https://umbraco.com/umbraco-cloud-pricing/).
7072

7173
## Downgrade your plan
7274

73-
If you’d like to downgrade, this is possible if you make sure to lower your limit to fit the desired plan.
75+
If you would like to downgrade your plan, you can do so by first lowering your data usage limit to match the desired plan.
7476

75-
When you’ve lowered the required data usage, reach out to Umbraco Support and they’ll be able to help downgrade your plan. When downgrading to a lower plan, this will come to effect immediately, meaning that your usage limits will be reduced and any extra features related to your previous plan will be deactivated. You will pay for the old plan until the next scheduled bill.
77+
Once you have adjusted your data usage, contact Umbraco Support for assistance with the downgrade. Keep in mind that when you downgrade to a lower plan, the changes will take effect immediately. This means your usage limits will be reduced, and any extra features associated with your previous plan will be deactivated. You will continue to be billed for the old plan until your next scheduled billing date.
7678

77-
If you have any questions regarding this, feel free to reach out to [Umbraco Support](mailto:[email protected]).
79+
If you have any questions regarding this process, feel free to reach out to [Umbraco Support](mailto:[email protected]).

umbraco-cloud/expand-your-projects-capabilities/external-services/README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# External Services
22

3-
In some cases, Umbraco Cloud might not be the only service you are working with. You might need to work with other services as well - this could be either internal or third-party services. In either case, it will be serviced externally to Umbraco Cloud.
3+
In some cases, Umbraco Cloud might not be the only service you are working with. You might need to work with other services as well. This could be either internal or third-party services. In either case, it will be serviced externally to Umbraco Cloud.
44

5-
When you are working with an external service that is behind a firewall and that service needs to communicate with your Umbraco Cloud project, you need to make sure the Umbraco Cloud Server IPs are allowed to bypass the firewall.
5+
If an external service behind a firewall needs to communicate with your Umbraco Cloud project, allow Umbraco Cloud Server IPs to bypass the firewall.
66

7-
An example could be, that you're fetching some information from an external service that is behind a firewall. To give your Umbraco Cloud project access to the external service you need to add the IPs used by the Umbraco Cloud servers to an allow list (other services may refer to it as a "whitelist").
7+
For example, to retrieve information from an external service that is located behind a firewall, you must grant access to your Umbraco Cloud project. To do this, add the IP addresses used by Umbraco Cloud servers to an allowlist.
88

99
## Enabling static outbound IP addresses
1010

@@ -13,12 +13,14 @@ For projects on a Standard, Professional, and Enterprise plan you can enable sta
1313
On the **Advanced** page of your project, you can turn on the static outbound IP address feature to ensure persistent communication. This opt-in feature can be switched on for **Standard**, **Professional**, and **Enterprise** Cloud projects.
1414

1515
{% hint style="info" %}
16+
1617
The enabling of static outbound IP addresses will have the effect that port 25 will be blocked. Port 25 is the default port for SMTP relays and is commonly abused to send spam from compromised parties. Accordingly, this port is often blocked by ISPs and cloud providers such as Microsoft and Google. For SMTP submissions, we advise you to use port 587 or port 2525.
18+
1719
{% endhint %}
1820

1921
![StaticOutboundIps](https://user-images.githubusercontent.com/93588665/158338313-c433c994-71a5-40f5-a947-4947df23a0cf.gif)
2022

21-
The static outbound IP ranges vary per region. Below are the values per region in a [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) (Classless Inter-Domain Routing) notation. The expanded IP ranges can be calculated by using [online tooling](https://www.ipaddressguide.com/cidr).
23+
The static outbound IP ranges vary per region. Below are the values per region in a [Classless Inter-Domain Routing (CIDR)](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation. The expanded IP ranges can be calculated by using [online tooling](https://www.ipaddressguide.com/cidr).
2224

2325
**West Europe**
2426

@@ -44,8 +46,8 @@ The static outbound IP ranges vary per region. Below are the values per region i
4446
4.147.161.240/28
4547
```
4648

47-
If you need to use a CIDR (Classless Inter-Domain Routing) Range for the IPs: `40.113.173.32/28`
49+
If you need to use a CIDR Range for the IPs: `40.113.173.32/28`
4850

4951
{% hint style="info" %}
50-
For projects on a Starter plan, you can see the current dynamic outbound IP addresses. The IP addresses shown for starter projects are dynamic and are likely to change at some point due to either Azure or Umbraco optimizing hosting resources.
52+
For projects on a Starter plan, you can see the current dynamic outbound IP addresses. The IP addresses for starter projects are dynamic and may change due to Azure or Umbraco optimizing resources.
5153
{% endhint %}

umbraco-cloud/expand-your-projects-capabilities/external-services/application-insights.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ To install Application Insight on your Umbraco Cloud project read the[ Applicati
1313
## Limitations on Umbraco Cloud
1414

1515
{% hint style="warning" %}
16-
As projects on Umbraco Cloud are hosted on a shared infrastructure, the information that&#x20;
16+
Be aware that projects hosted on Umbraco Cloud operate on a shared infrastructure, which may lead to misleading information when using Application Insights.
1717

18-
you gather through Application Insight can be a misrepresentation.
18+
Since multiple projects utilize the same resources, Application Insights will provide data based on the overall resource usage across these projects.
1919

20-
Since several projects share the same resources Application Insight will gather information based on the overall resources used.
21-
22-
To gather accurate information using Application Insight, you must move your project to a [dedicated server](../../build-and-customize-your-solution/set-up-your-project/project-settings/dedicated-resources.md).
20+
To obtain accurate information with Application Insights, you must move your project to a [dedicated server](../../build-and-customize-your-solution/set-up-your-project/project-settings/dedicated-resources.md).
2321
{% endhint %}
2422

2523
## Microsoft Documentation

umbraco-cloud/explore-umbraco-cloud/what-is-umbraco-cloud/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ description: >-
66

77
# What is Umbraco Cloud?
88

9-
Umbraco Cloud is the fully managed, flexible, and scalable way to build and host Umbraco websites, all in one place. Built on top of the open-source Umbraco CMS and hosted on Microsoft Azure, it gives developers, editors, and teams everything they need to deliver fast, secure, and future-proof digital experiences.
9+
Umbraco Cloud is a fully managed, flexible, and scalable way to build and host Umbraco websites, all in one place. Built on the open-source Umbraco CMS and hosted on Microsoft Azure, it provides everything developers and teams need for fast, secure digital experiences.
1010

1111
Umbraco Cloud takes care of installation, infrastructure, and security. You will also get the tools to work with your project in the Cloud or locally. Local development starts with cloning the project down to your PC or Linux/macOS.
1212

1313
When you are ready to show your work to the world, Umbraco Cloud provides a safe deployment mechanism that lets you publish to the web. When you have changes or updates to your site, Umbraco Cloud follows the process of moving, testing, and deploying your changes to your public site.
1414

1515
## Why Use Umbraco Cloud?
1616

17-
* Fully managed hosting: Hosted on Microsoft Azure with automatic backups, global CDN, HTTPS, and scaling built in.
18-
* Out-of-the-box DevOps: Use Git-based workflows, built-in CI/CD, and structured environments (Development, Staging, Live) to deliver with confidence.
19-
* Easy collaboration: Invite team members, manage access, and deploy content and code with ease, all from the Cloud Portal.&#x20;
20-
* Security and reliability: Backed by secure infrastructure, automated TLS, point-in-time restores, and Cloudflare protection for performance and safety.
17+
* Fully managed hosting: Hosted on Microsoft Azure with automatic backups, global Content Delivery Network (CDN), HTTPS, and scaling built in.
18+
* Out-of-the-box DevOps: Use Git-based workflows, built-in CI/CD, and structured environments (Development, Staging, Live) to deliver with confidence.
19+
* Seamless collaboration: Invite team members, manage access, and deploy content and code with ease, all from Cloud Portal.
20+
* Security and reliability: Backed by secure infrastructure, automated Transport Layer Security (TLS), point-in-time restores, and Cloudflare protection for performance and safety.
2121
* Built for growth: Start small and scale as needed, with flexible environments, external integrations, and support for custom workflows and packages.
2222

2323
### Umbraco Cloud Plans
@@ -32,11 +32,11 @@ Learn more about the [quotas put in place](umbraco-cloud-plans.md) to ensure the
3232

3333
### What’s Included?
3434

35-
* Umbraco CMS: The core editor-friendly, open-source CMS.
36-
* Cloud Portal: A user-friendly dashboard for managing projects, environments, users, and settings.
37-
* Umbraco Deploy: Effortlessly synchronize content and structure across environments, ensuring smooth collaboration between development and live environments.
38-
* Umbraco Forms: Build and manage forms seamlessly, enhancing user engagement and collecting valuable insights without additional costs.
39-
* Umbraco UI Builder (In selected plans): Accelerate content creation and management by building intuitive, customized interfaces that enhance editorial workflows.
35+
* Umbraco CMS: The core editor-friendly, open-source CMS.
36+
* Cloud Portal: A user-friendly dashboard for managing projects, environments, users, and settings.
37+
* Umbraco Deploy: Effortlessly synchronize content and structure across environments, ensuring smooth collaboration between development and live environments.
38+
* Umbraco Forms: Build and manage forms seamlessly, enhancing user engagement and collecting valuable insights without additional costs.
39+
* Umbraco UI Builder (In selected plans): Accelerate content creation and management by building intuitive, customized interfaces that enhance editorial workflows.
4040
* Support Plans: Umbraco Cloud Support ensures you're never alone. Known for being helpful and knowledgeable, they're dedicated to your Cloud success.&#x20;
4141

4242
### Different ways to start an Umbraco Cloud project

0 commit comments

Comments
 (0)