Skip to content

Commit

Permalink
Merge pull request umbraco#2579 from umbraco/nul800sebastiaan-patch-1
Browse files Browse the repository at this point in the history
Remove usage of unnecessary and problematic terms
  • Loading branch information
sofietoft authored Jul 6, 2020
2 parents 6c3c7a1 + f076ef7 commit 98c7772
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/valeStyle/Terms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ ignorecase: true
swap:
back office: "'backoffice'"
back-office: "'backoffice'"
app_plugins: "'App_Plugins'"
app_plugins: "'App_Plugins'"
blacklist: "'deny list'"
whitelist: "'allow list'"
black list: "'deny list'"
white list: "'allow list'"
master: "'primary'"
slave: "'secondary'"
4 changes: 2 additions & 2 deletions Reference/Config/umbracoSettings/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ This setting is used when you're running Umbraco in virtual directories.

**`<DisallowedUploadFiles>`**

This setting consists of a "black list" of file extensions that editors shouldn't be allowed to upload via the backoffice.
This setting consists of a list of file extensions that editors shouldn't be allowed to upload via the backoffice.

```xml
<!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
Expand All @@ -354,7 +354,7 @@ This setting consists of a "black list" of file extensions that editors shouldn'

**`<AllowedUploadFiles>`**

If greater control is required than available from the above, this setting can be used to store a "white list" of file extensions. If provided, only files with these extensions can be uploaded via the backoffice.
If greater control is required than available from the above, this setting can be used to store a list of file extensions. If provided, only files with these extensions can be uploaded via the backoffice.

```xml
<!-- If completed, only the file extensions listed below will be allowed to be uploaded. If empty, disallowedUploadFiles will apply to prevent upload of specific file extensions. -->
Expand Down

0 comments on commit 98c7772

Please sign in to comment.