Skip to content

Commit 57f6e60

Browse files
authored
Merge pull request #7586 from umbraco/merge-v16-changes-to-v17
Cherry picked v16 updates
2 parents 413ae27 + cad3bf3 commit 57f6e60

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

13/umbraco-forms/developer/extending/adding-a-fieldtype.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ In the constructor, or via overridden properties, we can specify details of the
5757
- `Name` - the name of the field presented in the backoffice.
5858
- `Description` - the description of the field presented in the backoffice.
5959
- `Icon` - the icon of the field presented in the backoffice form builder user interface.
60-
- `DataType` - specifies the type of data stored by the field. Options are `String`, `LongString`, `Integer`, `DataTime` or `Bit` (boolean).
60+
- `DataType` - specifies the type of data stored by the field. Options are `String`, `LongString`, `Integer`, `DateTime` or `Bit` (boolean).
6161
- `SupportsMandatory` - indicates whether mandatory validation can be used with the field (defaults to `true`).
6262
- `MandatoryByDefault` - indicates whether the field will be mandatory by default when added to a form (defaults to `false`).
6363
- `SupportsRegex` - indicates whether pattern based validation using regular expressions can be used with the field (defaults to `false`).

15/umbraco-deploy/installation/install-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ The setting under _Project:CurrentWorkspaceName_ should match the _Name_ provide
240240
In Umbraco Deploy 9, this value was set using the configuration key _Debug:EnvironmentName_. Although included under a "Debug" section, this setting is required for the installations of Umbraco Deploy on-premises (i.e. other than on Umbraco Cloud). Hence why it was moved to the "Project" section in Umbraco Deploy 10.
241241
{% endhint %}
242242

243-
Expected values for _Type_ are "development", "staging" or "live". These settings are required, though strictly only for the latter is it necessary to use the specific value of "live", so other values can be used if you have more than these three environments.
243+
Expected values for _Type_ are "development", "staging", or "live". These settings are required, though only the `live` environment strictly requires the specific value `live`. You can use other values if you have more than these three environments. All values for _Type_ must be written in lowercase.
244244

245245
You will need to generate a unique GUID for each environment. This can be done in Visual Studio:
246246

15/umbraco-forms/developer/extending/adding-a-fieldtype.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ In the constructor or via overridden properties, we can specify details of the f
6060
* `Name` - the name of the field presented in the backoffice.
6161
* `Description` - the description of the field presented in the backoffice.
6262
* `Icon` - the icon of the field presented in the backoffice form builder user interface.
63-
* `DataType` - specifies the type of data stored by the field. Options are `String`, `LongString`, `Integer`, `DataTime` or `Bit` (boolean).
63+
* `DataType` - specifies the type of data stored by the field. Options are `String`, `LongString`, `Integer`, `DateTime` or `Bit` (boolean).
6464
* `SupportsMandatory` - indicates whether mandatory validation can be used with the field (defaults to `true`).
6565
* `MandatoryByDefault` - indicates whether the field will be mandatory by default when added to a form (defaults to `false`).
6666
* `SupportsRegex` - indicates whether pattern-based validation using regular expressions can be used with the field (defaults to `false`).

17/umbraco-deploy/installation/install-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ The setting under _Project:CurrentWorkspaceName_ should match the _Name_ provide
240240
In Umbraco Deploy 9, this value was set using the configuration key _Debug:EnvironmentName_. Although included under a "Debug" section, this setting is required for the installations of Umbraco Deploy on-premises (other than on Umbraco Cloud). Hence why it was moved to the "Project" section in Umbraco Deploy 10.
241241
{% endhint %}
242242

243-
Expected values for _Type_ are "development", "staging" or "live". These settings are required, though strictly only for the latter is it necessary to use the specific value of "live", so other values can be used if you have more than these three environments.
243+
Expected values for _Type_ are "development", "staging", or "live". These settings are required, though only the `live` environment strictly requires the specific value `live`. You can use other values if you have more than these three environments. All values for _Type_ must be written in lowercase.
244244

245245
You will need to generate a unique GUID for each environment. This can be done in Visual Studio:
246246

17/umbraco-forms/developer/extending/adding-a-fieldtype.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ In the constructor or via overridden properties, we can specify details of the f
6060
* `Name` - the name of the field presented in the backoffice.
6161
* `Description` - the description of the field presented in the backoffice.
6262
* `Icon` - the icon of the field presented in the backoffice form builder user interface.
63-
* `DataType` - specifies the type of data stored by the field. Options are `String`, `LongString`, `Integer`, `DataTime` or `Bit` (boolean).
63+
* `DataType` - specifies the type of data stored by the field. Options are `String`, `LongString`, `Integer`, `DateTime` or `Bit` (boolean).
6464
* `SupportsMandatory` - indicates whether mandatory validation can be used with the field (defaults to `true`).
6565
* `MandatoryByDefault` - indicates whether the field will be mandatory by default when added to a form (defaults to `false`).
6666
* `SupportsRegex` - indicates whether pattern-based validation using regular expressions can be used with the field (defaults to `false`).

0 commit comments

Comments
 (0)