commit abfc2bbc0a68d84f32d8b99a25efe8bc5c9f472f
parent 0045e747e0c861048775d678a92465ab77503c60
Author: Felicitus <felicitus@felicitus.org>
Date: Sun, 18 Dec 2011 00:41:28 +0100
Merge branch 'master' of github.com:partkeepr/PartKeepr
Diffstat:
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/documentation/QUICK-INSTALL b/documentation/QUICK-INSTALL
@@ -92,13 +92,13 @@ Then wait a minute or so, after everything is completed successfully
(remember that 777 on the whole project might be a good idea until the final
path layout has been stabilized).
-You can then fire up your browser and point it to the build/ directory. Note
+You can then fire up your browser and point it to the frontend/ directory. Note
that you need chrome/chromium with console.log support OR Firefox with the
firebug extension. Otherwise, your browser complains about the missing
console.log function. These console.log statements are necessary for debugging
and development.
-If you make changes to any file in the frontend/ directory, you need to
+If you make changes to any file in the src/frontend/ directory, you need to
re-build the project. To speed up things, you can use "phing build.quick" to
skip most files you usually don't change - everything in 3rdparty and
the huge image directories.
diff --git a/documentation/installation/UBUNTU-11.04 b/documentation/installation/UBUNTU-11.04
@@ -83,5 +83,5 @@ phing build
# Restart apache2 to make sure php5 is enabled
/etc/init.d/apache2 restart
-# Open up your browser and navigate to http://localhost/PartKeepr/build
+# Open up your browser and navigate to http://localhost/PartKeepr/frontend
# The frontend should now appear
diff --git a/testing/SetupDatabase.php b/testing/SetupDatabase.php
@@ -179,7 +179,7 @@ if ($migration) {
echo "All done.\n\n";
echo "You need to execute `php doctrine.php migrations:migrate` in the PartKeepr root directory to apply migrations now.\n\n";
-echo "Use the user 'admin' with password 'admin' to login. Access the frontend using the `build` directory.\n";
+echo "Use the user 'admin' with password 'admin' to login. Access the frontend using the `frontend` directory.\n";
apc_clear_cache();
apc_clear_cache("user");
