Further clarification around where configuration goes

nul800sebastiaan · nathanwoulfe · commit e8a6a9279fd2 · 2021-10-21T08:58:29.000+10:00
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -813,7 +813,7 @@
   </area>
   <area alias="installer">
     <key alias="databaseErrorCannotConnect">The installer cannot connect to the database.</key>
-    <key alias="databaseErrorWebConfig">Could not save the appsettings.json file. Please modify the connection string manually.</key>
+    <key alias="databaseErrorWebConfig"><![CDATA[Could not save to your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>). Please modify the connection string manually.]]></key>
     <key alias="databaseFound">Your database has been found and is identified as</key>
     <key alias="databaseHeader">Database configuration</key>
         <key alias="databaseInstall">
@@ -822,12 +822,12 @@
     ]]>
         </key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "ConnectionStrings" property of the "appsettings.json" file is correct.</p>
-              <p>To proceed, please edit the "appsettings.json" file (using Visual Studio or your favourite text editor), add the connection string for your database in the key named "umbracoDbDSN" and save the file. </p>
+    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "ConnectionStrings" property in your configuration source is correct, for example, in appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>).</p>
+              <p>To proceed, please edit your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>), add the connection string for your database in the key named "umbracoDbDSN".</p>
               <p>
               Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Reference/V9-Config/ConnectionStringsSettings/" target="_blank" rel="noopener">
-			              More information on editing appsettings.json here</a>.</p>]]></key>
+              done.<br /><a href="https://umbra.co/configdocs" target="_blank" rel="noopener">
+			              More information on editing your configurations here (choose "Connection string settings")</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
         Please contact your ISP if necessary.
         If you're installing on a local machine or server you might need information from your system administrator.]]></key>
@@ -2048,8 +2048,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
     <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your appsettings.json file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your appsettings.json file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible"><![CDATA[The appSetting 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>). Once you access this site using the HTTPS scheme, that should be set to 'true'.]]></key>
+    <key alias="httpsCheckConfigurationCheckResult"><![CDATA[The appSetting 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>), your cookies are %1% marked as secure.]]></key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="compilationDebugCheckSuccessMessage">Debug compilation mode is disabled.</key>
     <key alias="compilationDebugCheckErrorMessage">Debug compilation mode is currently enabled. It is recommended to disable this setting before go live.</key>
@@ -2075,10 +2075,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
   	-->
     <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
     <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
-    <key alias="smtpMailSettingsNotFound">In the appsettings.json file, Umbraco:CMS:Global:Smtp could not be found.</key>
-    <key alias="smtpMailSettingsHostNotConfigured">In the appsettings.json file Umbraco:CMS:Global:Smtp section, the host is not configured.</key>
+    <key alias="smtpMailSettingsNotFound"><![CDATA[In your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>), Umbraco:CMS:Global:Smtp could not be found.]]></key>
+    <key alias="smtpMailSettingsHostNotConfigured"><![CDATA[In your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>) Umbraco:CMS:Global:Smtp section, the host is not configured.]]></key>
     <key alias="smtpMailSettingsConnectionSuccess">SMTP settings are configured correctly and the service is operating as expected.</key>
-    <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the appsettings.json file Umbraco:CMS:Global:Smtp are correct.</key>
+    <key alias="smtpMailSettingsConnectionFail"><![CDATA[The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>) is correct in the Umbraco:CMS:Global:Smtp section.]]></key>
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
     <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -832,19 +832,19 @@
   </area>
   <area alias="installer">
     <key alias="databaseErrorCannotConnect">The installer cannot connect to the database.</key>
-    <key alias="databaseErrorWebConfig">Could not save the appsettings.json file. Please modify the connection string manually.</key>
+    <key alias="databaseErrorWebConfig"><![CDATA[Could not save to your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>). Please modify the connection string manually.]]></key>
     <key alias="databaseFound">Your database has been found and is identified as</key>
     <key alias="databaseHeader">Database configuration</key>
     <key alias="databaseInstall"><![CDATA[
       Press the <strong>install</strong> button to install the Umbraco %0% database
     ]]></key>
     <key alias="databaseInstallDone"><![CDATA[Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.]]></key>
-    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "ConnectionStrings" property of the "appsettings.json" file is correct.</p>
-              <p>To proceed, please edit the "appsettings.json" file (using Visual Studio or your favourite text editor), add the connection string for your database in the key named "umbracoDbDSN" and save the file. </p>
+    <key alias="databaseNotFound"><![CDATA[<p>Database not found! Please check that the information in the "ConnectionStrings" property in your configuration source is correct, for example, in appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>).</p>
+              <p>To proceed, please edit your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>), add the connection string for your database in the key named "umbracoDbDSN".</p>
               <p>
               Click the <strong>retry</strong> button when
-              done.<br /><a href="https://our.umbraco.com/documentation/Reference/V9-Config/ConnectionStringsSettings/" target="_blank" rel="noopener">
-			              More information on editing appsettings.json here</a>.</p>]]></key>
+              done.<br /><a href="https://umbra.co/configdocs" target="_blank" rel="noopener">
+			              More information on editing your configurations here (choose "Connection string settings")</a>.</p>]]></key>
     <key alias="databaseText"><![CDATA[To complete this step, you must know some information regarding your database server ("connection string").<br />
         Please contact your ISP if necessary.
         If you're installing on a local machine or server you might need information from your system administrator.]]></key>
@@ -2105,8 +2105,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
     <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your appsettings.json file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your appsettings.json file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible"><![CDATA[The appSetting 'Umbraco:CMS:Global:UseHttps' is set to 'false' in your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>). Once you access this site using the HTTPS scheme, that should be set to 'true'.]]></key>
+    <key alias="httpsCheckConfigurationCheckResult"><![CDATA[The appSetting 'Umbraco:CMS:Global:UseHttps' is set to '%0%' in your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>), your cookies are %1% marked as secure.]]></key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="compilationDebugCheckSuccessMessage">Debug compilation mode is disabled.</key>
     <key alias="compilationDebugCheckErrorMessage">Debug compilation mode is currently enabled. It is recommended to disable this setting before go live.</key>
@@ -2132,10 +2132,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
   	-->
     <key alias="excessiveHeadersFound"><![CDATA[The following headers revealing information about the website technology were found: <strong>%0%</strong>.]]></key>
     <key alias="excessiveHeadersNotFound">No headers revealing information about the website technology were found.</key>
-    <key alias="smtpMailSettingsNotFound">In the appsettings.json file, Umbraco:CMS:Global:Smtp could not be found.</key>
-    <key alias="smtpMailSettingsHostNotConfigured">In the appsettings.json file Umbraco:CMS:Global:Smtp section, the host is not configured.</key>
+    <key alias="smtpMailSettingsNotFound"><![CDATA[In your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>), Umbraco:CMS:Global:Smtp could not be found.]]></key>
+    <key alias="smtpMailSettingsHostNotConfigured"><![CDATA[In your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>) Umbraco:CMS:Global:Smtp section, the host is not configured.]]></key>
     <key alias="smtpMailSettingsConnectionSuccess">SMTP settings are configured correctly and the service is operating as expected.</key>
-    <key alias="smtpMailSettingsConnectionFail">The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the appsettings.json file Umbraco:CMS:Global:Smtp are correct.</key>
+    <key alias="smtpMailSettingsConnectionFail"><![CDATA[The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in your configuration source, for example, appsettings.json (see <a href="https://umbra.co/configdocs" target="_blank" rel="noopener">the documentation</a>) is correct in the Umbraco:CMS:Global:Smtp section.]]></key>
     <key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
     <key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
     <key alias="scheduledHealthCheckEmailBody"><![CDATA[<html><body><p>Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:</p>%2%</body></html>]]></key>
@@ -2384,7 +2384,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
     <key alias="reminderDescription">
         <![CDATA[
             <p>
-                You should never let a production site run in debug mode. Debug mode is turned off by setting <b>Umbraco:CMS:Hosting:Debug</b> to <b>false</b> in appsettings.json, appsettings.{Environment}.json or via an environment variable.
+                You should never let a production site run in debug mode. Debug mode is turned off by setting <b>Umbraco:CMS:Hosting:Debug</b> to <b>false</b> in appsettings.json, appsettings.{Environment}.json or via an environment variable. 
             </p>
         ]]>
     </key>
