Peter M. Groen / knowledgetree

Commit d945624ac583c24618859c0e75b308cd35ccaa37

Authored by unknown
2 parents 40173dfb 6fd959d6

Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 4 changed files with 10 additions and 8 deletions
setup/migrate/steps/migrateDatabase.php
  View file @d945624
... ... @@ -171,7 +171,7 @@ class migrateDatabase extends Step
171 171 $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
172 172 if($noFile) {
173 173 $this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
174   - $this->error[]['msg'] = "Please ensure that all KnowledgeTree Services are running.";
  174 + $this->error[]['msg'] = "Please ensure that your KnowledgeTree Mysql service is running.";
175 175 $this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
176 176 $this->temp_variables['manual_export'] = "";
177 177 } else {
... ...
setup/upgrade/steps/upgradeBackup.php
  View file @d945624
... ... @@ -208,7 +208,7 @@ class upgradeBackup extends Step {
208 208 $prefix = '';
209 209 if (!WINDOWS_OS)
210 210 {
211   - $prefix .= "./";
  211 + $prefix .= "";//$prefix .= "./";
212 212 }
213 213  
214 214 if (@stat($dbSocket) !== false)
... ...
setup/upgrade/templates/complete.tpl
  View file @d945624
... ... @@ -20,7 +20,8 @@
20 20 <br/>
21 21 <br/>
22 22 <?php } else { ?>
23   - To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
  23 + To start the services, using the instructions below:
  24 +<!-- execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.-->
24 25 <br/>
25 26 <br/>
26 27 <?php } ?>
... ... @@ -30,11 +31,11 @@
30 31 <br/>
31 32 [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
32 33 <br/>
33   - Click [Install Services]
  34 + Right-Click and run [Install Services] as administrator
34 35 <br/>
35 36 [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
36 37 <br/>
37   - Click [Start Services]
  38 + Right-Click and run [Start Services] as administrator
38 39 <br/>
39 40 <br/>
40 41 <b>Alternatively:</b>
... ...
setup/wizard/templates/complete.tpl
  View file @d945624
... ... @@ -23,7 +23,8 @@
23 23 <br/>
24 24 <br/>
25 25 <?php } else { ?>
26   - To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
  26 + To start the services, using the instructions below:
  27 +<!-- execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.-->
27 28 <br/>
28 29 <br/>
29 30 <?php } ?>
... ... @@ -33,11 +34,11 @@
33 34 <br/>
34 35 [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
35 36 <br/>
36   - Click [Install Services]
  37 + Right-Click and run [Install Services] as administrator
37 38 <br/>
38 39 [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
39 40 <br/>
40   - Click [Start Services]
  41 + Right-Click and run [Start Services] as administrator
41 42 <br/>
42 43 <br/>
43 44 <b>Alternatively:</b>
... ...