Skip to content

Commit 57716e1

Browse files
authored
Merge pull request #7126 from umbraco/acronyms
Defined acronyms
2 parents 54710fd + d6dc6a1 commit 57716e1

File tree

2 files changed

+32
-24
lines changed

2 files changed

+32
-24
lines changed

15/umbraco-cms/reference/configuration/globalsettings.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: "Information on the global settings section"
44

55
# Global Settings
66

7-
Global settings contains at set of global settings for the CMS such as default UI language, reserved urls, and much more. All of these, except for SMTP settings contains default values, meaning that all configuration is optional, unless you wish to send emails from your site.
7+
Global settings contains at set of global settings for the CMS such as default UI language, reserved urls, and much more. All settings except Simple Mail Transfer Protocol (SMTP) use default values. Configuration is optional unless you want to send emails from your site.
88

9-
The following snippet contains all the available options, with default values, and some example values for the required keys `From`, `Host` and `Port` keys of the SMTP settings:
9+
The following snippet contains all the available options, with default values, and some example values for the required keys `From`, `Host`, and `Port` keys of the SMTP settings:
1010

1111
```json
1212
"Umbraco": {
@@ -61,7 +61,7 @@ The following snippet contains all the available options, with default values, a
6161

6262
## Root level settings
6363

64-
In the root level section, that is those without a seperate sub section like SMTP, you can configure
64+
In the root level section, that is those without a seperate sub section like SMTP, you can configure.
6565

6666
### Reserved urls
6767

@@ -77,7 +77,9 @@ Type: `string` (default: `~/app_plugins/,~/install/,~/mini-profiler-resources/,~
7777

7878
A comma-separated list of all the folders in your directory to be left alone by Umbraco. If you have folders with custom files, add them to this setting to make sure Umbraco leaves them alone.
7979

80-
{% hint style="warning" %} Adding additional values to the Reserves URLs and Reserved Paths will overwrite default/current values. This causes performance issues as well. {% endhint %}
80+
{% hint style="warning" %}
81+
Adding additional values to the Reserves URLs and Reserved Paths will overwrite default/current values. This causes performance issues as well.
82+
{% endhint %}
8183

8284
### Timeout
8385

@@ -86,7 +88,9 @@ Type: `string` (default: `00:20:00`)
8688

8789
Configure the session timeout to determine how much time without a request being made can pass before the user is required to log in again. The session timeout format needs to be set as `HH:MM:SS`. Any activity within the backoffice will reset the timer.
8890

89-
{% hint style="info" %} Long session timeouts raise data exposure and unauthorized access risks. Thus, it's vital to establish a reasonable timeout to mitigate security risks. {% endhint %}
91+
{% hint style="info" %}
92+
Long session timeouts raise data exposure and unauthorized access risks. Thus, it's vital to establish a reasonable timeout to mitigate security risks.
93+
{% endhint %}
9094

9195
### Default UI language
9296

@@ -121,35 +125,35 @@ When this value is set above 0, the backoffice will check for a new version of U
121125
Key: `IconsPath`
122126
Type: `string` (default: `umbraco/assets/icons`)
123127

124-
By adding this value you can specify a new/different folder for storing your icon resources. It's important to be aware of NetCore's limitations regarding serving static file content. By default, static content will only be served from the `wwwroot` folder.
128+
By adding this value you can specify a new/different folder for storing your icon resources. It's important to be aware of .NET Core's limitations regarding serving static file content. By default, static content will only be served from the `wwwroot` folder.
125129

126130
### Umbraco CSS path
127131

128132
Key: `UmbracoCssPath`
129133
Type: `string` (default: `~/css`)
130134

131-
By adding this you can specify a new/different folder for storing your CSS files, and still be able to edit them within Umbraco. It's also important to be aware of NetCores limitations regarding serving static file content here as well, by default, static content will only be served from the wwwroot folder. For more info see [Extending filesystem](../../extending/filesystemproviders/)
135+
By adding this, you can store CSS files in a different folder and still edit them in Umbraco. .NET Core only serves static files from the `wwwroot` folder by default. For more info see [Extending filesystem](../../extending/filesystemproviders/).
132136

133137
### Umbraco scripts path
134138

135139
Key: `UmbracoScriptsPath`
136140
Type: `string` (default: `~/scripts`)
137141

138-
By adding this you can specify a new/different folder for storing your script/js files, and still be able to edit them within Umbraco. It's also important to be aware of NetCores limitations regarding serving static file content here as well, by default, static content will only be served from the wwwroot folder. For more info see [Extending filesystem](../../extending/filesystemproviders/)
142+
By adding this, you can store script/JavaScript files in a different folder and still edit them in Umbraco. .NET Core only serves static files from the `wwwroot` folder by default. For more info see [Extending filesystem](../../extending/filesystemproviders/).
139143

140144
### Umbraco media path
141145

142146
Key: `UmbracoMediaPath`
143147
Type: `string` (default: `~/media`)
144148

145-
By adding this you can specify a new/different folder for storing your media files, and still be able to edit them within Umbraco. It's also important to be aware of NetCores limitations regarding serving static file content here as well, by default, static content will only be served from the wwwroot folder. For more info see [Extending filesystem](../../extending/filesystemproviders/)
149+
By adding this, you can store media files in a different folder and still edit them in Umbraco. .NET Core only serves static files from the `wwwroot` folder by default. For more info see [Extending filesystem](../../extending/filesystemproviders/).
146150

147151
### Umbraco media physical root path
148152

149153
Key: `UmbracoMediaPhysicalRootPath`
150154
Type: `string` (default: `~/media`)
151155

152-
By adding this you can specify a new/different folder for storing your media files elsewhere on the server. Unlike `UmbracoMediaPath`, this does not change the relative path that media is served from (e.g. /media) but allows for files to be stored **outside** of the wwwroot folder. Both relative paths (../../Shared/Media) and absolute server paths (X:/Shared/Media) are supported. For more info see [Extending filesystem](../../extending/filesystemproviders/)
156+
By adding this you can specify a new/different folder for storing your media files elsewhere on the server. Unlike `UmbracoMediaPath`, this does not change the relative path that media is served from (e.g. /media) but allows for files to be stored **outside** of the wwwroot folder. Both relative paths (../../Shared/Media) and absolute server paths (X:/Shared/Media) are supported. For more info see [Extending filesystem](../../extending/filesystemproviders/).
153157

154158
### Install missing database
155159

@@ -176,7 +180,7 @@ Type: `bool` (default: `false`)
176180

177181
This is not a setting that commonly needs to be configured.
178182

179-
This setting is used to specify which sql server version that the database is running, this setting is only required if you use SqlServer 2008, if this is the case set the setting to `"SqlServer.V2008"`
183+
This setting is used to specify which sql server version that the database is running, this setting is only required if you use SqlServer 2008, if this is the case set the setting to `"SqlServer.V2008"`.
180184

181185
### Main dom lock
182186

@@ -243,7 +247,7 @@ By adding this settings to the appsettings.json you will be able to send out ema
243247

244248
### From
245249

246-
Specifies the default address emails will be sent from, this setting may be overridden some place, such as when inviting a user, where the email of the user sending the invite will be used instead. The format of the address follows the RFC 822 standard so you can include a friendly name using the format `"Friendly Name <[email protected]>"`
250+
Specifies the default email address used when sending emails. This can be overridden in some cases, like when inviting a user. The address follows the Request for Comments (RFC) 822 format, allowing a friendly name like: `"Friendly Name <[email protected]>"`.
247251

248252
### Host
249253

16/umbraco-cms/reference/configuration/globalsettings.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: "Information on the global settings section"
44

55
# Global Settings
66

7-
Global settings contains at set of global settings for the CMS such as default UI language, reserved urls, and much more. All of these, except for SMTP settings contains default values, meaning that all configuration is optional, unless you wish to send emails from your site.
7+
Global settings contains at set of global settings for the CMS such as default UI language, reserved urls, and much more. All settings except Simple Mail Transfer Protocol (SMTP) use default values. Configuration is optional unless you want to send emails from your site.
88

9-
The following snippet contains all the available options, with default values, and some example values for the required keys `From`, `Host` and `Port` keys of the SMTP settings:
9+
The following snippet contains all the available options, with default values, and some example values for the required keys `From`, `Host`, and `Port` keys of the SMTP settings:
1010

1111
```json
1212
"Umbraco": {
@@ -61,7 +61,7 @@ The following snippet contains all the available options, with default values, a
6161

6262
## Root level settings
6363

64-
In the root level section, that is those without a seperate sub section like SMTP, you can configure
64+
In the root level section, that is those without a seperate sub section like SMTP, you can configure.
6565

6666
### Reserved urls
6767

@@ -77,7 +77,9 @@ Type: `string` (default: `~/app_plugins/,~/install/,~/mini-profiler-resources/,~
7777

7878
A comma-separated list of all the folders in your directory to be left alone by Umbraco. If you have folders with custom files, add them to this setting to make sure Umbraco leaves them alone.
7979

80-
{% hint style="warning" %} Adding additional values to the Reserves URLs and Reserved Paths will overwrite default/current values. This causes performance issues as well. {% endhint %}
80+
{% hint style="warning" %}
81+
Adding additional values to the Reserves URLs and Reserved Paths will overwrite default/current values. This causes performance issues as well.
82+
{% endhint %}
8183

8284
### Timeout
8385

@@ -86,7 +88,9 @@ Type: `string` (default: `00:20:00`)
8688

8789
Configure the session timeout to determine how much time without a request being made can pass before the user is required to log in again. The session timeout format needs to be set as `HH:MM:SS`. Any activity within the backoffice will reset the timer.
8890

89-
{% hint style="info" %} Long session timeouts raise data exposure and unauthorized access risks. Thus, it's vital to establish a reasonable timeout to mitigate security risks. {% endhint %}
91+
{% hint style="info" %}
92+
Long session timeouts raise data exposure and unauthorized access risks. Thus, it's vital to establish a reasonable timeout to mitigate security risks.
93+
{% endhint %}
9094

9195
### Default UI language
9296

@@ -121,35 +125,35 @@ When this value is set above 0, the backoffice will check for a new version of U
121125
Key: `IconsPath`
122126
Type: `string` (default: `umbraco/assets/icons`)
123127

124-
By adding this value you can specify a new/different folder for storing your icon resources. It's important to be aware of NetCore's limitations regarding serving static file content. By default, static content will only be served from the `wwwroot` folder.
128+
By adding this value you can specify a new/different folder for storing your icon resources. It's important to be aware of .NET Core's limitations regarding serving static file content. By default, static content will only be served from the `wwwroot` folder.
125129

126130
### Umbraco CSS path
127131

128132
Key: `UmbracoCssPath`
129133
Type: `string` (default: `~/css`)
130134

131-
By adding this you can specify a new/different folder for storing your CSS files, and still be able to edit them within Umbraco. It's also important to be aware of NetCores limitations regarding serving static file content here as well, by default, static content will only be served from the wwwroot folder. For more info see [Extending filesystem](../../extending/filesystemproviders/)
135+
By adding this, you can store CSS files in a different folder and still edit them in Umbraco. .NET Core only serves static files from the `wwwroot` folder by default. For more info see [Extending filesystem](../../extending/filesystemproviders/).
132136

133137
### Umbraco scripts path
134138

135139
Key: `UmbracoScriptsPath`
136140
Type: `string` (default: `~/scripts`)
137141

138-
By adding this you can specify a new/different folder for storing your script/js files, and still be able to edit them within Umbraco. It's also important to be aware of NetCores limitations regarding serving static file content here as well, by default, static content will only be served from the wwwroot folder. For more info see [Extending filesystem](../../extending/filesystemproviders/)
142+
By adding this, you can store script/JavaScript files in a different folder and still edit them in Umbraco. .NET Core only serves static files from the `wwwroot` folder by default. For more info see [Extending filesystem](../../extending/filesystemproviders/).
139143

140144
### Umbraco media path
141145

142146
Key: `UmbracoMediaPath`
143147
Type: `string` (default: `~/media`)
144148

145-
By adding this you can specify a new/different folder for storing your media files, and still be able to edit them within Umbraco. It's also important to be aware of NetCores limitations regarding serving static file content here as well, by default, static content will only be served from the wwwroot folder. For more info see [Extending filesystem](../../extending/filesystemproviders/)
149+
By adding this, you can store media files in a different folder and still edit them in Umbraco. .NET Core only serves static files from the `wwwroot` folder by default. For more info see [Extending filesystem](../../extending/filesystemproviders/).
146150

147151
### Umbraco media physical root path
148152

149153
Key: `UmbracoMediaPhysicalRootPath`
150154
Type: `string` (default: `~/media`)
151155

152-
By adding this you can specify a new/different folder for storing your media files elsewhere on the server. Unlike `UmbracoMediaPath`, this does not change the relative path that media is served from (e.g. /media) but allows for files to be stored **outside** of the wwwroot folder. Both relative paths (../../Shared/Media) and absolute server paths (X:/Shared/Media) are supported. For more info see [Extending filesystem](../../extending/filesystemproviders/)
156+
By adding this you can specify a new/different folder for storing your media files elsewhere on the server. Unlike `UmbracoMediaPath`, this does not change the relative path that media is served from (e.g. /media) but allows for files to be stored **outside** of the wwwroot folder. Both relative paths (../../Shared/Media) and absolute server paths (X:/Shared/Media) are supported. For more info see [Extending filesystem](../../extending/filesystemproviders/).
153157

154158
### Install missing database
155159

@@ -176,7 +180,7 @@ Type: `bool` (default: `false`)
176180

177181
This is not a setting that commonly needs to be configured.
178182

179-
This setting is used to specify which sql server version that the database is running, this setting is only required if you use SqlServer 2008, if this is the case set the setting to `"SqlServer.V2008"`
183+
This setting is used to specify which sql server version that the database is running, this setting is only required if you use SqlServer 2008, if this is the case set the setting to `"SqlServer.V2008"`.
180184

181185
### Main dom lock
182186

@@ -243,7 +247,7 @@ By adding this settings to the appsettings.json you will be able to send out ema
243247

244248
### From
245249

246-
Specifies the default address emails will be sent from, this setting may be overridden some place, such as when inviting a user, where the email of the user sending the invite will be used instead. The format of the address follows the RFC 822 standard so you can include a friendly name using the format `"Friendly Name <[email protected]>"`
250+
Specifies the default email address used when sending emails. This can be overridden in some cases, like when inviting a user. The address follows the Request for Comments (RFC) 822 format, allowing a friendly name like: `"Friendly Name <[email protected]>"`.
247251

248252
### Host
249253

0 commit comments

Comments
 (0)