Fixed wrong revertions mentioned by @dbu
update documentation for jackalope configuration
add more xml configuration examples
typo fixes discovered while using examples for configuration tests
Update the_model.rst

When installing via composer as per the documentation, the example does not work with phpcr-odm 1.0. It is necessary to add use Doctrine\Common\DataFixtures\OrderedFixtureInterface;, implement both the FixtureInterface and OrderedFixtureInterface classes and specify a getOrder function with a value larger than that in LoadSimpleCmsData.php, otherwise the following error message is thrown when running php app/console running doctrine:phpcr:fixtures:load:

Property "parent" mapped as ParentDocument may not be empty in document of
class "Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page"
Update the_model.rst

Fixing typo
Merge pull request #428 from rodrigorigotti/patch-1

Update the_model.rst
Merge pull request #427 from coxwebdesign/patch-1

Update the_model.rst
final cleanups
Merge pull request #419 from symfony-cmf/phpcr-parameter-updates

Phpcr parameter updates
[#419] Continueing the great work of @dbu
Ported DoctrineCacheBundle to master
Merge branch 'master' into dev

Conflicts:
	bundles/phpcr_odm.rst
	cookbook/editions/cmf_sandbox.rst