Merge pull request #6830 from umbraco/cms/release-13.7-15.3

Umbraco 13.7 and 15.3 release documentation updates

Author: sofietoft

13/umbraco-cms/reference/configuration/modelsbuildersettings.md

@@ -15,7 +15,8 @@ This section allows you to configure the Umbraco models builder, a complete sect
       "FlagOutOfDateModels": false,
       "ModelsDirectory": "~/umbraco/models",
       "AcceptUnsafeModelsDirectory": false,
-      "DebugLevel": 0
+      "DebugLevel": 0,
+      "IncludeVersionNumberInGeneratedModels": true
     }
   }
 }
@@ -61,3 +62,9 @@ By setting this to true, you specify that the models directory is allowed to be
 ## Debug level
 
 This setting specifies the logging level for the models builder. By default this is set to 0, which means minimal logging. Anything higher that 0 means increased logging. Be aware that this setting should only be set to something higher than 0 for development use, not on live sites.
+
+## Include version number in generated models
+
+When source code options are used, the Umbraco version number written to the generated code for each property of the model. This can be useful for debugging purposes but isn't essential. It causes the generated code to change every time Umbraco is upgraded and models are regenerated. In turn, this leads unnecessary code file changes that need to be checked into source control.
+
+If you prefer to exclude this version number from being written to the generated code, set this value to `false`.

13/umbraco-cms/reference/configuration/securitysettings.md

@@ -18,6 +18,7 @@ A full configuration with all default values can be seen here:
       "AuthCookieName": "UMB_UCONTEXT",
       "AuthCookieDomain": "",
       "UsernameIsEmail": true,
+      "MemberRequireUniqueEmail": true,
       "UserPassword": {
         "RequiredLength": 10,
         "RequireNonLetterOrDigit": false,
@@ -72,6 +73,10 @@ The authentication cookie which is set in the browser when a backoffice user log
 
 This setting specifies whether the username and email address are separate fields in the backoffice editor. When set to "false", you can specify an email address and username, only the username can be used to log on. When set to "true" (the default value) the username is hidden and always the same as the email address.
 
+### Member require unique email
+
+By default Umbraco will not allow creation of more than one member account with the same email address. If you wish to allow this, set this value to `false`.
+
 ## User password settings
 
 This section lets you define the password rules for users.

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

@@ -15,7 +15,8 @@ This section allows you to configure the Umbraco models builder, a complete sect
       "FlagOutOfDateModels": false,
       "ModelsDirectory": "~/umbraco/models",
       "AcceptUnsafeModelsDirectory": false,
-      "DebugLevel": 0
+      "DebugLevel": 0,
+      "IncludeVersionNumberInGeneratedModels": true
     }
   }
 }
@@ -34,7 +35,7 @@ Specifies how the models builder will generate models and when to generate them.
 
 {% hint style="info" %}
 When using Models Builder it is best practice to use the "Nothing" setting for all `appsettings.json` files. If needed, the models mode can then be set to "SourceCodeManual" or "SourceCodeAuto" In the `appsettings.json` file used on the local environment.
-{% endhint %} 
+{% endhint %}
 
 ## Models namespace
 
@@ -65,3 +66,9 @@ By setting this to true, you specify that the models directory is allowed to be
 ## Debug level
 
 This setting specifies the logging level for the models builder. By default this is set to 0, which means minimal logging. Anything higher that 0 means increased logging. Be aware that this setting should only be set to something higher than 0 for development use, not on live sites.
+
+## Include version number in generated models
+
+When source code options are used, the Umbraco version number written to the generated code for each property of the model. This can be useful for debugging purposes but isn't essential. It causes the generated code to change every time Umbraco is upgraded and models are regenerated. In turn, this leads unnecessary code file changes that need to be checked into source control.
+
+If you prefer to exclude this version number from being written to the generated code, set this value to `false`.

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

@@ -18,6 +18,7 @@ A full configuration with all default values can be seen here:
       "AuthCookieName": "UMB_UCONTEXT",
       "AuthCookieDomain": "",
       "UsernameIsEmail": true,
+      "MemberRequireUniqueEmail": true,
       "UserPassword": {
         "RequiredLength": 10,
         "RequireNonLetterOrDigit": false,
@@ -74,6 +75,10 @@ The authentication cookie which is set in the browser when a backoffice user log
 
 This setting specifies whether the username and email address are separate fields in the backoffice editor. When set to "false", you can specify an email address and username, only the username can be used to log on. When set to "true" (the default value) the username is hidden and always the same as the email address.
 
+### Member require unique email
+
+By default Umbraco will not allow creation of more than one member account with the same email address. If you wish to allow this, set this value to `false`.
+
 ### User default lockout time
 
 Use this setting to configure how long time a User is locked out of the Umbraco backoffice when a lockout occurs. The setting accepts an integer which defines the lockout in minutes.