diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index 72b682278b..5321b6f3c9 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -6,12 +6,11 @@
- To complete this step, you must know some information regarding your database server - (”connection string”). Please contact your ISP if necessary. If you’re installingon - a local machine or server you might need information from your system administrator.
-- If you do not have any database available, you can choose the embedded - database which does not require any information from you ISP or system administrators.
+ To complete this step you will either need a blank database or if you do not have a blank database available, you can choose the SQL CE 4 embedded + database (This is the recommended approach for first time users or if you are unsure). ++ If you are not using the SQL CE 4 embedded database you will need the connection details for your database, such as the + "server name and password". You may need to contact your system administrator or web host for this information.
- 3. Instructions: Please fill out the below fields to connect to - your database.
+ 3. Instructions: Please fill out the connection information for your database.
- Your database has been upgraded to the final version
+ Your database has been upgraded to version:
<%=umbraco.GlobalSettings.CurrentVersion%>.
Press Continue to proceed.
By clicking the accept button (or modify the Umbraco Configuration Status in web.config), you accept the license for this software as specified in the text below.
+By clicking the "accept and continue" button (or by modifying the Umbraco Configuration Status in the web.config), you accept the license for this software as specified in the text below.
Copyright (c) 2002 - <%=DateTime.Now.Year %> Umbraco I/S
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright and this permisson notice shall be included in all copies or substantial postions of the software.
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRENTY OF ANY KIND, EPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USER OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright and this permisson notice shall be included in all copies or substantial portions of the software.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USER OR OTHER DEALINGS IN THE SOFTWARE.
That’s all. That didn’t hurt did it?
You are just a few minutes away from getting up and running. The installer will