Ended up completely removing the tutorial section and instead re-writing and re-organizing the user guide chapter. It now reflects our published features.xml and ORM 5.0. I'm also in the middle of re-working the old quickstart projects as well, but will control them in our hibernate/hibernate-demos repo.