Permalink
Browse files

Merge remote branch 'origin/master' into use_composer

Conflicts:
	deps.lock
  • Loading branch information...
dbu committed May 20, 2012
2 parents b188a69 + e082c41 commit 78da470993da935b43390aa3716f062b752fc546
Showing with 7 additions and 5 deletions.
  1. +2 −0 .gitignore
  2. +5 −5 README.md
View
@@ -11,3 +11,5 @@ nbproject
.idea
vagrant/.vagrant
.DS_Store
+
+jackrabbit/
View
@@ -40,16 +40,16 @@ You can also use a different PHPCR implementation but this is what is most teste
## Prepare the phpcr repository
-Once your repository is set up, you need to [register the node types](https://github.com/doctrine/phpcr-odm/wiki/Custom-node-type-phpcr%3Amanaged) for phpcr-odm:
-
- app/console doctrine:phpcr:register-system-node-types
-
-Next you need to create a workspace that will hold the data for the sandbox.
+First you need to create a workspace that will hold the data for the sandbox.
The default parameters.yml defines the workspace to be 'sandbox'. You can
change this of course. If you do, also adjust the following command.
app/console doctrine:phpcr:workspace:create sandbox
+Once your workspace is set up, you need to [register the node types](https://github.com/doctrine/phpcr-odm/wiki/Custom-node-type-phpcr%3Amanaged) for phpcr-odm:
+
+ app/console doctrine:phpcr:register-system-node-types
+
## Import the fixtures

0 comments on commit 78da470

Please sign in to comment.