You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/05/18 01:05:51 UTC

[tomee-site-generator] 11/44: fix most asciidoc errors

This is an automated email from the ASF dual-hosted git repository.

dblevins pushed a commit to branch markdown-to-asciidoc
in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git

commit b3f3da802690390e259048af4b002ada9ce0c7ba
Author: David Jencks <dj...@apache.org>
AuthorDate: Sat Feb 15 17:08:07 2020 -0800

    fix most asciidoc errors
---
 tomee/modules/ROOT/pages/azure.adoc                |   8 +-
 tomee/modules/ROOT/pages/commercial-support.adoc   |  12 +-
 tomee/modules/ROOT/pages/community/commercial.adoc |   8 +-
 .../community/contributing/contribution-tips.adoc  |  16 +-
 .../pages/community/contributing/jira-ticket.adoc  |   6 +-
 .../pages/community/contributing/process-task.adoc |  23 +-
 .../community/contributing/submit-changes.adoc     |  16 +-
 .../pages/community/contributing/workflow.adoc     |  10 +-
 tomee/modules/ROOT/pages/community/index.adoc      |  16 +-
 tomee/modules/ROOT/pages/community/social.adoc     |   6 +-
 tomee/modules/ROOT/pages/community/sources.adoc    |  14 +-
 tomee/modules/ROOT/pages/contribute.adoc           |  26 +-
 .../dev/arquillian-test-porting-initiative.adoc    |  12 +-
 .../ROOT/pages/dev/building-from-source.adoc       |  13 +-
 .../ROOT/pages/dev/cdi-tck-webappsdeployer.adoc    |   8 +-
 .../ROOT/pages/dev/configuration-and-assembly.adoc |  24 +-
 .../modules/ROOT/pages/dev/contribution-tips.adoc  |  38 +-
 tomee/modules/ROOT/pages/dev/creating-itests.adoc  |  30 +-
 .../ROOT/pages/dev/design-application-server.adoc  |   7 +-
 .../pages/dev/design-application-serverlinks.adoc  |   4 +-
 tomee/modules/ROOT/pages/dev/design-assembler.adoc |  12 +-
 .../pages/dev/design-bmp-entitybean-container.adoc |  10 +-
 .../ROOT/pages/dev/design-classic-assembler.adoc   |  12 +-
 .../pages/dev/design-cmp-entitybean-container.adoc |  10 +-
 .../pages/dev/design-configuration-factory.adoc    |  14 +-
 tomee/modules/ROOT/pages/dev/design-container.adoc |  12 +-
 .../ROOT/pages/dev/design-local-server.adoc        |   5 +-
 .../ROOT/pages/dev/design-local-serverlinks.adoc   |   4 +-
 .../dev/design-nova-configuration-factory.adoc     |  12 +-
 .../pages/dev/design-passivation-strategy.adoc     |  10 +-
 .../dev/design-random-access-file-passivater.adoc  |  10 +-
 .../ROOT/pages/dev/design-remote-server.adoc       |  12 +-
 .../ROOT/pages/dev/design-remote-serverlinks.adoc  |   4 +-
 .../ROOT/pages/dev/design-resource-manager.adoc    |  12 +-
 .../ROOT/pages/dev/design-security-service.adoc    |  10 +-
 .../ROOT/pages/dev/design-simple-passivater.adoc   |   8 +-
 .../dev/design-stateful-sessionbean-container.adoc |  10 +-
 .../design-stateless-sessionbean-container.adoc    |  10 +-
 .../ROOT/pages/dev/design-transaction-service.adoc |  12 +-
 tomee/modules/ROOT/pages/dev/design.adoc           |   9 +-
 tomee/modules/ROOT/pages/dev/git.adoc              |   4 +-
 tomee/modules/ROOT/pages/dev/itests-overview.adoc  |  26 +-
 .../ROOT/pages/dev/mastering-the-command-line.adoc |  12 +-
 .../ROOT/pages/dev/openejb-release-process.adoc    |  18 +-
 tomee/modules/ROOT/pages/dev/proxies.adoc          |   6 +-
 tomee/modules/ROOT/pages/dev/release-tomee.adoc    |  25 +-
 tomee/modules/ROOT/pages/dev/roadmap.adoc          |   5 +-
 tomee/modules/ROOT/pages/dev/rules-of-thumb.adoc   |  10 +-
 tomee/modules/ROOT/pages/dev/source-code.adoc      |  20 +-
 tomee/modules/ROOT/pages/dev/take-my-code.adoc     |   3 +-
 tomee/modules/ROOT/pages/dev/thread-dumps.adoc     |  12 +-
 .../ROOT/pages/dev/tips-and-suggestions.adoc       |  19 +-
 .../pages/dev/validation-keys-audit-report.adoc    |  11 +-
 tomee/modules/ROOT/pages/dev/website-dev.adoc      |   4 +-
 tomee/modules/ROOT/pages/dev/writing-examples.adoc |  10 +-
 .../ROOT/pages/dev/writing-validation-tests.adoc   |  10 +-
 tomee/modules/ROOT/pages/dev/xbean-finder.adoc     |   3 +-
 .../ROOT/pages/dev/xbean-usage-in-openejb.adoc     | 188 +++---
 tomee/modules/ROOT/pages/docs.adoc                 | 701 +--------------------
 tomee/modules/ROOT/pages/lightening-demos.adoc     | 108 ++--
 tomee/modules/ROOT/pages/mailing-lists.adoc        | 128 +++-
 .../modules/ROOT/pages/management-and-voting.adoc  |  20 +-
 tomee/modules/ROOT/pages/powered-by.adoc           |  10 +-
 tomee/modules/ROOT/pages/security/security.adoc    |  12 +-
 tomee/modules/ROOT/pages/security/support.adoc     |  12 +-
 tomee/modules/ROOT/pages/tomcat-activemq.adoc      |  14 +-
 tomee/modules/ROOT/pages/tomcat-cdi.adoc           |  19 +-
 .../ROOT/pages/tomcat-detailed-instructions.adoc   | 110 ++--
 tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc      |  14 +-
 tomee/modules/ROOT/pages/tomcat-ejb.adoc           |   2 +-
 tomee/modules/ROOT/pages/tomcat-installation.adoc  |  30 +-
 tomee/modules/ROOT/pages/tomcat-java-ee.adoc       |   2 +-
 tomee/modules/ROOT/pages/tomcat-javaee.adoc        |   2 +-
 tomee/modules/ROOT/pages/tomcat-jaxrs.adoc         |   2 +-
 tomee/modules/ROOT/pages/tomcat-jaxws.adoc         |   2 +-
 tomee/modules/ROOT/pages/tomcat-jms.adoc           |   2 +-
 tomee/modules/ROOT/pages/tomcat-jpa.adoc           |   2 +-
 tomee/modules/ROOT/pages/tomcat-jsf.adoc           |   2 +-
 .../modules/ROOT/pages/tomcat-object-factory.adoc  |   7 +-
 tomee/modules/ROOT/pages/tomcat.adoc               |  52 +-
 tomee/modules/ROOT/pages/webadmin.adoc             |  14 +-
 tomee/modules/ROOT/pages/webobjects.adoc           |   2 +-
 82 files changed, 580 insertions(+), 1570 deletions(-)

diff --git a/tomee/modules/ROOT/pages/azure.adoc b/tomee/modules/ROOT/pages/azure.adoc
index e7040b6..784f04e 100644
--- a/tomee/modules/ROOT/pages/azure.adoc
+++ b/tomee/modules/ROOT/pages/azure.adoc
@@ -1,7 +1,5 @@
-:doctype: book
-
-Title: Azure +++<a name="Installation-Installation">++++++</a>+++
-
 = Setting up Apache TomEE on Microsoft Azure
 
-This page will detail instructions to setup TomEE on Microsoft Azure
+This page will detail instructions to setup TomEE on Microsoft Azure.
+
+Write me!
diff --git a/tomee/modules/ROOT/pages/commercial-support.adoc b/tomee/modules/ROOT/pages/commercial-support.adoc
index fce3b75..d089050 100644
--- a/tomee/modules/ROOT/pages/commercial-support.adoc
+++ b/tomee/modules/ROOT/pages/commercial-support.adoc
@@ -1,4 +1,4 @@
-Title: Apache TomEE Commercial Support
+= Apache TomEE Commercial Support
 
 This page is dedicated to companies offering products and services around or including Apache TomEE.
 
@@ -8,15 +8,15 @@ We love all our supporters equally.
 Want to be added to this page?
 xref:0.0@tomee::add-my-offering.adoc[See here.]
 
-=== Tomitribe
+== Tomitribe
 
-http://www.tomitribe.com[Tomitribe] is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source.
+link:http://www.tomitribe.com[Tomitribe] is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source.
 Our goal is to support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training, and commercial support.
 
-http://www.tomitribe.com[Join the tribe!]
+link:http://www.tomitribe.com[Join the tribe!]
 
-=== ManageCat
+== ManageCat
 
-http://managecat.com[ManageCat] is a cloud management and service platform for Apache Tomcat  and Apache TomEE servers.
+link:http://managecat.com[ManageCat] is a cloud management and service platform for Apache Tomcat  and Apache TomEE servers.
 Involving with a lot of Apache Java EE projects, we want to transfer not  only our knowledge about Apache TomEE and also other Java EE technologies  including JPA, EJB, CDI, JSF, JSTL, JTA, JMS.
 We will help our customers to develop and deploy their  production based Java EE applications smoothly.
diff --git a/tomee/modules/ROOT/pages/community/commercial.adoc b/tomee/modules/ROOT/pages/community/commercial.adoc
index d55cabb..bc2bed9 100755
--- a/tomee/modules/ROOT/pages/community/commercial.adoc
+++ b/tomee/modules/ROOT/pages/community/commercial.adoc
@@ -10,20 +10,20 @@ The Apache TomEE PMC does not endorse or recommend any of the products or servic
 
 Want to be added to this page? See at the bottom.
 
-=== Tomitribe
+== Tomitribe
 
 https://www.tomitribe.com[Tomitribe] is a company created by several founding members of the Apache TomEE community with the mission of uniting businesses using TomEE with responsible and sustainable Open Source. Our goal is to support both the community and fuel the success of business that rely TomEE with a complete set of consulting, training, and commercial support.
 
 
-=== ManageCat
+== ManageCat
 
 ManageCat is a cloud management and service platform for Apache Tomcat and Apache TomEE servers. Involving with a lot of Apache Java EE projects, we want to transfer not only our knowledge about Apache TomEE and also other Java EE technologies including JPA, EJB, CDI, JSF, JSTL, JTA, JMS. We will help our customers to develop and deploy their production based Java EE applications smoothly.
 
-=== I want to be added there
+== I want to be added there
 
 To be listed in the Commercial Support send a xref:../security/support.adoc[mail] to the Apache TomEE PMC with a description of your offerings and the text you would like to have added.
 
-==== Policy for additions
+== Policy for additions
 The Apache TomEE PMC does not and cannot endorse or recommend any products or services.
 
 All submitted information must be factual and informational in nature and not be a marketing statement. Statements that promote your products and services over other offerings on the page will not be tolerated and will be removed. Such marketing statements can be added to your own pages on your own site.
diff --git a/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc b/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc
index 2e062c5..7067ef1 100755
--- a/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc
@@ -3,7 +3,7 @@
 :jbake-type: page
 :jbake-status: published
 
-=== Subscribe to the developer mailing list
+== Subscribe to the developer mailing list
 
 To get started send an email from the email address you want to use to the
 TomEE developers mailing list (dev-subscribe@tomee.apache.org). After you
@@ -25,7 +25,7 @@ We're really looking forward to seeing you on the list and learning more
 about you. Welcome to the adventure!
 
 
-=== What is the process?
+== What is the process?
 
 Check and follow the xref:community/contributing/workflow.adoc[workflow for contributing].
 
@@ -37,7 +37,7 @@ It's very much about the journey and there is no real end as long as you're havi
 
 Probably finding something to do when you do have time is the hardest part ... that never changes.
 
-=== Be Brave
+== Be Brave
 Don't assume everything has already been discussed a million times and you're the only one who doesn't know and so you shouldn't bother anyone and should just figure it out on your own. That thinking is your enemy. Don't do that or you will get nowhere ... very slowly. So slowly that now you feel you really can't ask about it because surely everyone assumes you know it or have done it by now. That thinking is a terrible trap. Ask questions. Post your thoughts.
 
 Don't worry about asking "stupid" questions on the list -- even simple questions have great value. They often lead to surprisingly good discussions. They also have a profound impact on the people around you, the ones you don't see.
@@ -47,7 +47,7 @@ There are always a handful of people silently reading the list and wishing they
 Maybe it's like Karaoke; if the people singing sound like you when you sing, there are better odds you might get up and sign too. Seeing people like yourself do the things you want to do is inspiring.
 
 
-===  Start Small
+==  Start Small
 You may suddenly get a creative surge and see many many things that could be done. One thing you learn about open source is that you never know when life is going to intervene and you have to stop. So it's always really good to get a little tiny thing working, checked in, and just grow it iteratively as time permits. It is a practice that is key for people of any skill level. And it goes wonderfully with Open Source as it adds plenty of space for new ideas. Stone soup starts with the sto [...]
 
 So no matter how big the idea or task, ask yourself "do I really need all of this to get started?". Start with the tiniest possible version. And then cut it down again :)
@@ -57,7 +57,7 @@ Code is easier to grow than change. And with today's refactoring tools even chan
 Start small, get it checked in (or patch submitted) and work iteratively.
 
 
-=== Things that always need doing
+== Things that always need doing
 Final variables & fields are preferred where possible, but a lot of the code is old. Feel free to add them and hand the code back.
 If you have any skills with code coverage tools, then you'll probably find way too much to do! Tests are always welcome.
 There are over a 1,000 TODO comments in the code. Maybe some should be deleted. Maybe some could be completed. They probably all should have a JIRA id on them.
@@ -68,13 +68,13 @@ No doubt there is some exception handling that can be greatly improved.
 Obviously, one could get quite bored doing just the above. But sometimes the above tasks can lead to more fun and exciting things. Anything that gets you in and looking at code and actually touching and changing it usually results in questions, discussions and ideas... then little passions and late nights and lack of sleep and caffeine abuse.
 
 
-=== Things to avoid
+== Things to avoid
 
-==== Huge patches
+=== Huge patches
 Huge patches are hard to digest. Try to avoid them whenever possible. Any step forward is a good one. Small steps allow people to see where you're headed and give input. That's true regardless if you are a committer or contributor.
 
 
-==== Be careful with reformatting
+=== Be careful with reformatting
 Try to never mix logic changes with code reformatting. It makes it nearly impossible for others to see what the actual change was.
 
 If you are a committer and want to reformat something, do the reformat as a separate commit before or after the real change. As long as they are separate and clearly marked it should be easy for people to see what is going on.
diff --git a/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc b/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc
index 5c43441..ff4a639 100644
--- a/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc
@@ -7,16 +7,16 @@
 In order to keep track of all the tasks concerning TomEE there should be a ticket in the link:https://issues.apache.org/jira/browse/TOMEE[TomEE JIRA] for each work item. +
 Before you can create tickets, you have to link:https://issues.apache.org/jira/secure/Signup!default.jspa[sign up] for an account.
 
-=== No task without a ticket
+== No task without a ticket
 Before you start working on a task you should ensure that there is a ticket for your task. +
 Browse JIRA and use the search funktion to find out if there is already a ticket for what you want to pick up.
 If not, create a new one.
 
-=== Avoiding conflicts and wasted effort
+== Avoiding conflicts and wasted effort
 If a ticket already exists and is assign to someone you should not start working on this task. +
 If you want to help, contact the assigned person using the mailing list or write a comment in the JIRA ticket.
 
-=== Pick up a task
+== Pick up a task
 To inform others that you are working on a task, the corresponding ticket in JIRA should be assigned to you. +
 If you don't have permission to assign tickets (there is no edit sign behind the Field "Assignee"), just ask on the developers mailing list.
 
diff --git a/tomee/modules/ROOT/pages/community/contributing/process-task.adoc b/tomee/modules/ROOT/pages/community/contributing/process-task.adoc
index 6a04116..0098aa1 100644
--- a/tomee/modules/ROOT/pages/community/contributing/process-task.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/process-task.adoc
@@ -4,24 +4,27 @@
 :jbake-status: published
 
 
-=== Fork project repository
-You can work on the xref:community/contributing/../sources.adoc[source code of TomEE] using github. If you don't have a github account, you can link:https://github.com/[sign up here]. +
-To create your own working area, go to the project link:https://github.com/apache/tomee[TomEE on github] and click on the link "Fork". A forked repository will be created for your account and you will be redirected to it.
+== Fork project repository
+You can work on the xref:community/sources.adoc[source code of TomEE] using github.
+If you don't have a github account, you can link:https://github.com/[sign up here].
+To create your own working area, go to the project link:https://github.com/apache/tomee[TomEE on github] and click on the link "Fork".
+A forked repository will be created for your account and you will be redirected to it.
 
-=== One branch for each ticket
+== One branch for each ticket
 Although you can work on the master branch it is advisable to create a new branch for each ticket you start to work on - even if it's only one.
 Use the JIRA id and title as name of the branch. 
 
-=== Get help
+== Get help
 If you need help or want to have feedback for your ideas write to the developes mailing list.
 
-=== Hands on
-Work on the code. Use local commit as often as you want. Use push (to your own forked repository) as often as you like. +
-Consider the xref:community/contributing/contribution-tips.adoc[contribution tips]. +
-If a task is to hard to get it done: no problem. Just ask for help. +
+== Hands on
+Work on the code. Use local commit as often as you want.
+Use push (to your own forked repository) as often as you like.
+Consider the xref:community/contributing/contribution-tips.adoc[contribution tips].
+If a task is to hard to get it done: no problem. Just ask for help.
 If you want to cancel working on a task, don't forget to unassign the JIRA ticket!
 
-=== Comments in JIRA
+== Comments in JIRA
 Use comments for the JIRA ticket to document your work.
 
 (xref:community/contributing/workflow.adoc[back to Contribution workflow])
diff --git a/tomee/modules/ROOT/pages/community/contributing/submit-changes.adoc b/tomee/modules/ROOT/pages/community/contributing/submit-changes.adoc
index e0709f6..7836eed 100644
--- a/tomee/modules/ROOT/pages/community/contributing/submit-changes.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/submit-changes.adoc
@@ -3,10 +3,10 @@
 :jbake-type: page
 :jbake-status: published
 
-=== Ensure code compiles
+== Ensure code compiles
 Actually no need to be mentioned ... 
 
-=== Ensure tests passes
+== Ensure tests passes
 On the build system for TomEE additional tests are run. If your changes cause them to fail, the build will not succeed.
 This can be avoided by running the tests before submitting the changes, the commands are:
 [source]
@@ -16,21 +16,21 @@ mvn -Pstyle pmd:check
 ----
 These are relatively quick to run - about a minute or so. 
 
-=== Smoke test
+== Smoke test
 Check at least if the server ist still starting with your changes ...
 
-=== Pull request
+== Pull request
 If you're confident of your work, the next step is to push your changes into your repository on github.
 To get your changes back into the TomEE repository you have to create a PR (pull request): on github go to your repository and select the branch where you have worked on.
 Click on "New pull request" and then on "Create pull request".
 
-=== Request review
+== Request review
 The changes in your PR can only be merged by a committer who will do a review before merging. 
 So ask on the developers mailing list for review of your PR. 
 These emails for PRs should have a description of the work in the subject line.  
 Here are some examples and why:
 
-==== Bad 
+=== Bad
 - This is an email about PR #451
 - See PR #451
 - Review PR #451
@@ -38,14 +38,14 @@ Here are some examples and why:
 
 With this style you'll get low participation on the thread as the subject is hidden.  You yourself will curse these emails in six months or a year in the future when you're looking for that valuable thread you remember, but your search reveals 10 threads all with basically only a number as the subject.  You'll either click and read all 10 PRs and email threads, or you'll more likely just give up.  Worse, you may read all 10 and not find what you're looking for.  Do your future self a fav [...]
 
-==== Ok ...
+=== Ok ...
 - Options pertaining to the configuration of Javamail - PR# 451
 - Fixing issues on failover of JMS messages - PR# 451
 - Documenting deployment of JCA Connectors - PR# 451 +
 
 These are ok, much better than just a number.  Subjects are often truncated.  The real "meat" is at the end of the sentence which makes it the first to go.  Not a show-stopper, but can make your life hard when searching or scanning.
 
-==== Best!
+=== Best!
 - Javamail configuration options - PR# 451
 - JMS Failover issues - PR# 451
 - JCA connector deployment - PR# 451 +
diff --git a/tomee/modules/ROOT/pages/community/contributing/workflow.adoc b/tomee/modules/ROOT/pages/community/contributing/workflow.adoc
index 03af685..5f7fd62 100644
--- a/tomee/modules/ROOT/pages/community/contributing/workflow.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/workflow.adoc
@@ -7,7 +7,7 @@
 
 
 
-=== JIRA ticket
+== JIRA ticket
 - create ticket in JIRA, if not already existing
 - if ticket already assigned to someone else => talk
 - assign ticket to contributor, if not already assigned +
@@ -15,7 +15,7 @@
 
 
 
-=== Process Task
+== Process Task
 - fork repository
 - create branch in own repository (name = JIRA ticket id)
 - discuss on mailing list
@@ -23,18 +23,18 @@
 - document work in JIRA ticket +
   (xref:community/contributing/process-task.adoc[more details])
 
-=== Submit Changes
+== Submit Changes
 - ensure code compiles 
 - ensure tests passes
 - create PR (pull request)
 - ask for review on mailing list +
   (xref:community/contributing/submit-changes.adoc[more details])
 
-=== Merge Changes (done by a committer)
+== Merge Changes (done by a committer)
 - review changes
 - merge code
 - change JIRA ticket status / close ticket +
 
-=== Cleanup
+== Cleanup
 - wait until PR is merged (ticket status change)
 - remove branch in own repository +
diff --git a/tomee/modules/ROOT/pages/community/index.adoc b/tomee/modules/ROOT/pages/community/index.adoc
index 63c9ee7..119f393 100755
--- a/tomee/modules/ROOT/pages/community/index.adoc
+++ b/tomee/modules/ROOT/pages/community/index.adoc
@@ -4,19 +4,19 @@
 :jbake-status: published
 
 
-=== Contribute
+== Contribute
 
-- xref:community/contributing/contribution-tips.adoc[Contribution tips]
-- xref:community/contributing/workflow.adoc[Contribution workflow]
-- xref:community/sources.adoc[Apache TomEE]
-- xref:community/contributing/website.adoc[This website]
-- xref:community/contributors.adoc[TomEE Wall Of Fame]
+* xref:community/contributing/contribution-tips.adoc[Contribution tips]
+* xref:community/contributing/workflow.adoc[Contribution workflow]
+* xref:community/sources.adoc[Apache TomEE]
+* xref:community/contributing/website.adoc[This website]
+* xref:community/contributors.adoc[TomEE Wall Of Fame]
 
-=== Social Media: cause contributing is not only about coding
+== Social Media: cause contributing is not only about coding
 
 Facebook, Twitter, Google+: if that speaks to you just follow this xref:community/social.adoc[TomEE on Social Media].
 
-=== Support
+== Support
 
 For more information about available support for TomEE please have a look on xref:../security/support.adoc[Support] page.
 
diff --git a/tomee/modules/ROOT/pages/community/social.adoc b/tomee/modules/ROOT/pages/community/social.adoc
index 2658ac9..4e9c3b4 100755
--- a/tomee/modules/ROOT/pages/community/social.adoc
+++ b/tomee/modules/ROOT/pages/community/social.adoc
@@ -4,14 +4,14 @@
 :jbake-status: published
 :icons: font
 
-=== Facebook
+== Facebook
 
 icon:facebook[size=2x] https://facebook.com/ApacheTomEE[TomEE @ Facebook]
 
-=== Twitter
+== Twitter
 
 icon:twitter[size=2x] https://twitter.com/apachetomee[TomEE @ Twitter]
 
-=== Google+
+== Google+
 
 icon:google-plus[size=2x] https://plus.google.com/communities/105208241852045684449[TomEE @ Goole+]
diff --git a/tomee/modules/ROOT/pages/community/sources.adoc b/tomee/modules/ROOT/pages/community/sources.adoc
index 14580a4..cc41423 100755
--- a/tomee/modules/ROOT/pages/community/sources.adoc
+++ b/tomee/modules/ROOT/pages/community/sources.adoc
@@ -3,13 +3,13 @@
 :jbake-type: page
 :jbake-status: published
 
-=== Github
+== Github
 
 TomEE is on Github at https://github.com/apache/tomee . The sources are synchronized by Apache on Github
 but Pull/Requests are integrated with Apache Infrastructure which means you can just submit us a patch as
 you would do on any Github project and Apache takes care of the rest of the process.
 
-=== Apache Git
+== Apache Git
 
 TomEE is using https://git-scm.com/[Git] as source content manager.
 
@@ -29,7 +29,7 @@ git clone -b tomee-1.7.x https://gitbox.apache.org/repos/asf/tomee.git tomee-1.7
 
 Master branch is the more up to date version of the codebase and currently targets TomEE 7.x branch.
 
-=== Building
+== Building
 
 TomEE is a standard Maven project and to build it you just have to use the following command:
 
@@ -42,7 +42,7 @@ TIP: you can need to tune your environment variable `MAVEN_OPTS`, a commonly use
 
 NOTE: if you are interested in testing arquillian tests with all adapters of tomee you will need to activate the dedicated profile: `-Pall-adapters`.
 
-==== Fast build
+=== Fast build
 
 Here are some shortcut builds if you just want to create a specific artifact (note it skips tests but removing `-DskipTests` you will execute them):
 
@@ -53,16 +53,16 @@ Here are some shortcut builds if you just want to create a specific artifact (no
 mvn clean install -DskipTests -pl tomee/apache-tomee -am
 ----
 
-Then TomEE archives are at `tomee/apache/tomee/target/apache-tomee-${classifier}-${version}.${extension}`.
+Then TomEE archives are at `tomee/apache/tomee/target/apache-tomee-$\{classifier}-$\{version}.$\{extension}`.
 
-=== Continuous Integration
+== Continuous Integration
 
 TomEE is using Buildbot for its continuous integration. You can access main builds (Ubuntu ones) at these address:
 
 - https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8[TomEE Master]
 - https://ci.apache.org/builders/tomee-1.7.x-ubuntu[TomEE 1.7.x]
 
-=== Issues
+== Issues
 
 Tomee uses Jira for issues, if you are looking for a problem or reporting one, use the following address:
 
diff --git a/tomee/modules/ROOT/pages/contribute.adoc b/tomee/modules/ROOT/pages/contribute.adoc
index 728aff1..c0efae4 100644
--- a/tomee/modules/ROOT/pages/contribute.adoc
+++ b/tomee/modules/ROOT/pages/contribute.adoc
@@ -1,4 +1,4 @@
-Title: Contributing
+= Contributing
 
 Contributing to the project is a great way to support the community.
 Some great links for getting involved
@@ -12,18 +12,16 @@ xref:0.0@tomee::maven/index.adoc[]
 xref:0.0@tomee::security/index.adoc[]
 xref:0.1@tomee::blog/index.adoc[]
 xref:0.1@tomee::community/index.adoc[]
+xref:7.0@tomee::docs.adoc[]
 xref:7.0@tomee::admin/cluster/index.adoc[]
 xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
 xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
 xref:7.0@tomee::advanced/setup/index.adoc[]
 xref:7.0@tomee::advanced/shading/index.adoc[]
 xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
 xref:7.0@tomee::application-composer/index.adoc[]
 xref:7.0@tomee::developer/classloading/index.adoc[]
 xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
 xref:7.0@tomee::developer/json/index.adoc[]
 xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
 xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
@@ -31,18 +29,16 @@ xref:7.0@tomee::developer/testing/index.adoc[]
 xref:7.0@tomee::developer/testing/other/index.adoc[]
 xref:7.0@tomee::developer/tools/index.adoc[]
 xref:7.0@tomee::maven/index.adoc[]
+xref:7.1@tomee::docs.adoc[]
 xref:7.1@tomee::admin/cluster/index.adoc[]
 xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
 xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
 xref:7.1@tomee::advanced/setup/index.adoc[]
 xref:7.1@tomee::advanced/shading/index.adoc[]
 xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
 xref:7.1@tomee::application-composer/index.adoc[]
 xref:7.1@tomee::developer/classloading/index.adoc[]
 xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
 xref:7.1@tomee::developer/json/index.adoc[]
 xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
 xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
@@ -53,18 +49,16 @@ xref:7.1@tomee::maven/index.adoc[]
 xref:8.0@examples::index.adoc[]
 xref:8.0_es@examples::index.adoc[]
 xref:8.0_pt@examples::index.adoc[]
+xref:8.0@tomee::docs.adoc[]
 xref:8.0@tomee::admin/cluster/index.adoc[]
 xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
 xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
 xref:8.0@tomee::advanced/setup/index.adoc[]
 xref:8.0@tomee::advanced/shading/index.adoc[]
 xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
 xref:8.0@tomee::application-composer/index.adoc[]
 xref:8.0@tomee::developer/classloading/index.adoc[]
 xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
 xref:8.0@tomee::developer/json/index.adoc[]
 xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
 xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
@@ -101,18 +95,16 @@ xref:0.0@tomee::maven/index.adoc[]
 xref:0.0@tomee::security/index.adoc[]
 xref:0.1@tomee::blog/index.adoc[]
 xref:0.1@tomee::community/index.adoc[]
+xref:7.0@tomee::docs.adoc[]
 xref:7.0@tomee::admin/cluster/index.adoc[]
 xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
 xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
 xref:7.0@tomee::advanced/setup/index.adoc[]
 xref:7.0@tomee::advanced/shading/index.adoc[]
 xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
 xref:7.0@tomee::application-composer/index.adoc[]
 xref:7.0@tomee::developer/classloading/index.adoc[]
 xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
 xref:7.0@tomee::developer/json/index.adoc[]
 xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
 xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
@@ -120,18 +112,16 @@ xref:7.0@tomee::developer/testing/index.adoc[]
 xref:7.0@tomee::developer/testing/other/index.adoc[]
 xref:7.0@tomee::developer/tools/index.adoc[]
 xref:7.0@tomee::maven/index.adoc[]
+xref:7.0@tomee::docs.adoc[]
 xref:7.1@tomee::admin/cluster/index.adoc[]
 xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
 xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
 xref:7.1@tomee::advanced/setup/index.adoc[]
 xref:7.1@tomee::advanced/shading/index.adoc[]
 xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
 xref:7.1@tomee::application-composer/index.adoc[]
 xref:7.1@tomee::developer/classloading/index.adoc[]
 xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
 xref:7.1@tomee::developer/json/index.adoc[]
 xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
 xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
@@ -142,18 +132,16 @@ xref:7.1@tomee::maven/index.adoc[]
 xref:8.0@examples::index.adoc[]
 xref:8.0_es@examples::index.adoc[]
 xref:8.0_pt@examples::index.adoc[]
+xref:7.0@tomee::docs.adoc[]
 xref:8.0@tomee::admin/cluster/index.adoc[]
 xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
 xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
 xref:8.0@tomee::advanced/setup/index.adoc[]
 xref:8.0@tomee::advanced/shading/index.adoc[]
 xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
 xref:8.0@tomee::application-composer/index.adoc[]
 xref:8.0@tomee::developer/classloading/index.adoc[]
 xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
 xref:8.0@tomee::developer/json/index.adoc[]
 xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
 xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
diff --git a/tomee/modules/ROOT/pages/dev/arquillian-test-porting-initiative.adoc b/tomee/modules/ROOT/pages/dev/arquillian-test-porting-initiative.adoc
index fc28de6..99faf76 100644
--- a/tomee/modules/ROOT/pages/dev/arquillian-test-porting-initiative.adoc
+++ b/tomee/modules/ROOT/pages/dev/arquillian-test-porting-initiative.adoc
@@ -1,12 +1,10 @@
-:doctype: book
-
-Title: Arquillian Test Porting Initiative
+= Arquillian Test Porting Initiative
 
 First things, first.
 You can contribute your ideas by clicking the blue pencile icon in the upper right.
 Edit this page and help shape the initiative!
 
-= Unite the Armies to fight the Bugs!
+== Unite the Armies to fight the Bugs!
 
 Testing is the most crucial part of any project.
 A project that incorporates as much functionality as TomEE does needs a _lot_ of tests.
@@ -23,7 +21,7 @@ An unparalleled feat.
 Such a thing has never been done at the ASF.
 Be ready to blaze some trails and be a pioneer.
 
-= The Kingdoms
+== The Kingdoms
 
 There are far more than 3,000 test classes we could port across the various projects, each using it's own flavor of home-made setup code.
 The coverage is also not what you'd expect.
@@ -43,7 +41,7 @@ In all fairness, the projects with so few test are not as "untested" as they app
 This is adequate, but not fantastic.
 *An open source project should have open tests.*
 
-= Generals Needed
+== Generals Needed
 
 This is no small feet.
 With over 3,000 tests porting them all is not realistc.
@@ -60,7 +58,7 @@ Individuals to survey the land and plan attacks with small groups of soldiers.
 Porting 50 tests yourself is impressive.
 Leading the charge on 500 tests being ported is astonishing.
 
-= Early stage
+== Early stage
 
 The tests in question are located more or less here:
 
diff --git a/tomee/modules/ROOT/pages/dev/building-from-source.adoc b/tomee/modules/ROOT/pages/dev/building-from-source.adoc
index 37f1f20..98c0e99 100644
--- a/tomee/modules/ROOT/pages/dev/building-from-source.adoc
+++ b/tomee/modules/ROOT/pages/dev/building-from-source.adoc
@@ -1,21 +1,13 @@
-:doctype: book
-
-Title: Building from source +++<a name="Buildingfromsource-Buildingfromsource">++++++</a>+++
-
 = Building from source
 
-+++<a name="Buildingfromsource-Checkingoutthesource">++++++</a>+++
+== Building from source
 
-[discrete]
 === Checking out the source
 
 To checkout the source, run this command with your subversion client.
 
    svn checkout https://svn.apache.org/repos/asf/openejb/trunk/openejb-eclipse-plugin openejb-eclipse-plugin
 
-+++<a name="Buildingfromsource-Buildingthesource">++++++</a>+++
-
-[discrete]
 === Building the source
 
 To build the plugin you will need Maven (the build has been tested with Maven 2.0.7).
@@ -26,9 +18,6 @@ To run the build, issue this command
 You should be aware that this will download any dependencies, including a copy of Eclipse.
 This will take a while for your first build.
 
-+++<a name="Buildingfromsource-ImportingtheplugincodeintoanEclipseworkspace">++++++</a>+++
-
-[discrete]
 === Importing the plugin code into an Eclipse workspace
 
 You can generate the Eclipse projects for the plugins by running the following command
diff --git a/tomee/modules/ROOT/pages/dev/cdi-tck-webappsdeployer.adoc b/tomee/modules/ROOT/pages/dev/cdi-tck-webappsdeployer.adoc
index 2d2e7a1..d0f2ce7 100644
--- a/tomee/modules/ROOT/pages/dev/cdi-tck-webappsdeployer.adoc
+++ b/tomee/modules/ROOT/pages/dev/cdi-tck-webappsdeployer.adoc
@@ -1,6 +1,4 @@
-:doctype: book
-
-Title: CDI TCK status with webapps/ deployer
+= CDI TCK status with webapps deployer
 
 To run the TCK with the webapps/ directory deployer:
 
@@ -29,7 +27,7 @@ That can be changed as well:
 
  mvn clean install -Pwebapp-deployer -Dopenejb.server.debug=true -Dserver.debug.port=5001
 
-= Possible issues in the server
+== Possible issues in the server
 
 * testBeanWithNameJavaxEnterpriseContextConversation(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
 * testBeanWithRequestScope(org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest): 500 Internal Server Error for http://127.0.0.1:51857/org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest/builtin.jsf
@@ -169,7 +167,7 @@ Kept on getting 404s.
 * testBeanTypesOnSessionBean(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.EnterpriseResolutionByTypeTest)
 * testDecoratorNotResolved(org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.decorator.DecoratorNotInjectedTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
 
-= Issues likely with the deployer itself
+== Issues likely with the deployer itself
 
 * testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
 * testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails(org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.DecoratorWithNonPassivatingInitializerMethodTest): Expected exception class org.jboss.jsr299.tck.DeploymentFailure but none was thrown
diff --git a/tomee/modules/ROOT/pages/dev/configuration-and-assembly.adoc b/tomee/modules/ROOT/pages/dev/configuration-and-assembly.adoc
index a0017b6..4c3dac8 100644
--- a/tomee/modules/ROOT/pages/dev/configuration-and-assembly.adoc
+++ b/tomee/modules/ROOT/pages/dev/configuration-and-assembly.adoc
@@ -1,15 +1,11 @@
-:doctype: book
-
-Title: Configuration and Assembly
+= Configuration and Assembly
 
 Disclaimer that we do tweak and change this code frequently, without notice.
 It is the very heart of OpenEJB.
 To keep things tight and clean, we reserve the right to change it at anytime.
 Do not consider it a stable public API.
 
-+++<a name="ConfigurationandAssembly-OverviewinCode">++++++</a>+++
-
-= Overview in Code
+== Overview in Code
 
 First a glimpse of how OpenEJB looks internally.
 Here's a test that builds OpenEJB using it's internal API.
@@ -90,9 +86,7 @@ public class StatefulTest extends TestCase {
 }
 ....
 
-+++<a name="ConfigurationandAssembly-LogicalOverview">++++++</a>+++
-
-= Logical Overview
+== Logical Overview
 
 Slightly more detailed account of the above.
 Our startup and deploy world is broken into two phases:
@@ -121,9 +115,7 @@ Some of the steps are
 
 The listings above aren't necesarrily complete or perfectly ordered, but generally show the nature of the work done in each phase.
 
-+++<a name="ConfigurationandAssembly-ConfigurationPhase">++++++</a>+++
-
-== Configuration Phase
+=== Configuration Phase
 
 A goal is that nothing gets through configuration and into assembly if it can't actually be built.
 The configuration phase is where we're supposed to wipe away any ambiguity, fully normalize the app, make sure it's internally consistent, spec compliant and generally good to go.
@@ -131,9 +123,7 @@ If it's not, no worries as we actually haven't built anything permanent yet.
 Everything in the configuration phase is temporary.
 If it fails the configuration phase we just issue an error and say "App will not be loaded" and that's it, there's nothing to undo.
 
-+++<a name="ConfigurationandAssembly-InfoObjects-DatabetweenConfigurationandAssembly">++++++</a>+++
-
-== Info Objects - Data between Configuration and Assembly
+=== Info Objects - Data between Configuration and Assembly
 
 The output of the configuration phase is what we call Info objects and the root of that tree is OpenEjbConfiguration.
 These objects are all simple, serializable data types with no methods, no constructors and no code or logic of any kind.
@@ -151,9 +141,7 @@ We could create an OpenEjbConfigurationFactory implementation that actually pull
 Perhaps, someday we write an OpenEjbConfigurationFactory implementation to wrap the existing one and look for any changed files.
 If nothing has changed since last boot, we simple deserialize an OpenEjbConfiguration tree saved from a previous boot as a way of reducing startup time on very large apps.
 
-+++<a name="ConfigurationandAssembly-Assembly">++++++</a>+++
-
-== Assembly
+=== Assembly
 
 The assembly phase is where real running things are actually built.
 This process is inherently ingrained in the details on how OpenEJB works internally.
diff --git a/tomee/modules/ROOT/pages/dev/contribution-tips.adoc b/tomee/modules/ROOT/pages/dev/contribution-tips.adoc
index 809fbea..2f7ec10 100644
--- a/tomee/modules/ROOT/pages/dev/contribution-tips.adoc
+++ b/tomee/modules/ROOT/pages/dev/contribution-tips.adoc
@@ -1,10 +1,6 @@
-:doctype: book
+= Contribution Tips
 
-Title: Contribution Tips
-
-+++<a name="ContributionTips-Firststeps">++++++</a>+++
-
-= First steps
+== First steps
 
 . Subscribe to the link:mailto:dev-subscribe@tomee.apache.org[developer mailing list] and say Hi
 . Get the source code with svn
@@ -32,9 +28,7 @@ Some of the neater ones are (ordered simple to complex):
 * http://tomee.apache.org/examples-trunk/testing-security-2/README.html[testing-security-2]
 * http://tomee.apache.org/examples-trunk/simple-webservice/README.html[simple-webservice]
 
-+++<a name="ContributionTips-Whatistheprocess?">++++++</a>+++
-
-= What is the process?
+== What is the process?
 
 ....
 public void contributeToOpenSource() {
@@ -102,9 +96,7 @@ It's very much about the journey and there is no real end as long as you're havi
 Probably finding something to do when you do have time is the hardest part ...
 that never changes.
 
-+++<a name="ContributionTips-BeBrave">++++++</a>+++
-
-= Be Brave
+== Be Brave
 
 Don't assume everything has already been discussed a million times and you're the only one who doesn't know and so you shouldn't bother anyone and should just figure it out on your own.
 That thinking is your enemy.
@@ -126,9 +118,7 @@ Maybe it's like Karaoke;
 if the people singing sound like you when you sing, there are better odds you might get up and sign too.
 Seeing people like yourself do the things you want to do is inspiring.
 
-+++<a name="ContributionTips-StartSmall">++++++</a>+++
-
-= Start Small
+== Start Small
 
 You may suddenly get a creative surge and see many many things that could be done.
 One thing you learn about open source is that you never know when life is going to intervene and you have to stop.
@@ -148,9 +138,7 @@ Don't work too long in isolation.
 
 Start small, get it checked in (or patch submitted) and work iteratively.
 
-+++<a name="ContributionTips-Thingsthatalwaysneeddoing">++++++</a>+++
-
-= Things that always need doing
+== Things that always need doing
 
 * Final variables & fields are preferred where possible, but a lot of the code is old.
 Feel free to add them and hand the code back.
@@ -171,14 +159,9 @@ But sometimes the above tasks can lead to more fun and exciting things.
 Anything that gets you in and looking at code and actually touching and changing it usually results in questions, discussions and ideas...
 then little passions and late nights and lack of sleep and caffeine abuse.
 
-+++<a name="ContributionTips-Thingstoavoid">++++++</a>+++
-
-= Things to avoid
+== Things to avoid
 
-+++<a name="ContributionTips-Hugepatches">++++++</a>+++
-
-[discrete]
-==== Huge patches
+=== Huge patches
 
 Huge patches are hard to digest.
 Try to avoid them whenever possible.
@@ -186,10 +169,7 @@ Any step forward is a good one.
 Small steps allow people to see where you're headed and give input.
 That's true regardless if you are a committer or contributor.
 
-+++<a name="ContributionTips-Becarefulwithreformatting">++++++</a>+++
-
-[discrete]
-==== Be careful with reformatting
+=== Be careful with reformatting
 
 Try to never mix logic changes with code reformatting.
 It makes it nearly impossible for others to see what the actual change was.
diff --git a/tomee/modules/ROOT/pages/dev/creating-itests.adoc b/tomee/modules/ROOT/pages/dev/creating-itests.adoc
index 10b941c..b97e195 100644
--- a/tomee/modules/ROOT/pages/dev/creating-itests.adoc
+++ b/tomee/modules/ROOT/pages/dev/creating-itests.adoc
@@ -1,8 +1,6 @@
-:doctype: book
+ Creating itests
 
-Title: Creating itests +++<a name="Creatingitests-OpenEJBitests">++++++</a>+++
-
-= OpenEJB itests
+== OpenEJB itests
 
 The OpenEJB itests module is a framework to create EJB test cases that are designed according to the JUnit rules, i.e.
 they all have setUp, tests and tearDown methods.
@@ -10,9 +8,7 @@ Since it's JUnit-based, you can do whatever you could do in JUnit.
 
 This page describes the steps to create EJB test cases.
 
-+++<a name="Creatingitests-Howitestswork">++++++</a>+++
-
-== How itests work
+=== How itests work
 
 The itests module lives in OpenEJB's repository in the _modules\itests_ directory.
 Setting up the test environment to execute the itests is based on (http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/itest/[maven-itest-plugin-1.0 plugin] ).
@@ -46,13 +42,9 @@ It's also possible that the CMP itests will be accessed directly without having
 If itests are part of a larger project structure you can disable executing it using the _maven.itest.skip_ property.
 Set it to _true_ and Maven won't run the itests.
 
-+++<a name="Creatingitests-SimpleCMP2.1itest">++++++</a>+++
-
-== Simple CMP 2.1 itest
-
-+++<a name="Creatingitests-Databasesetup">++++++</a>+++
+=== Simple CMP 2.1 itest
 
-=== Database setup
+==== Database setup
 
 The itests default database is Derby.
 The class - _org.openejb.test.DerbyTestDatabase_ - is instantiated upon executing _org.openejb.testTestManager.getDatabase()_ in each test case's _setUp()_ method.
@@ -60,9 +52,7 @@ Remember, you can define any other database using the _openejb.test.database_ pr
 
 The current implementation of database initialization is based on two DerbyTestDatabse methods: _createCMP2Model()_ and _dropCMP2Model()_ that create and drop database structure, accordingly.
 
-+++<a name="Creatingitests-CMP2.1deployment">++++++</a>+++
-
-=== CMP 2.1 deployment
+==== CMP 2.1 deployment
 
 {info:title=Information} Unless specified, all directories are relative to _modules/itests_ directory and commands are executed in it.
 \{info}
@@ -98,9 +88,7 @@ See http://wiki.apache.org/geronimo/Deployment[Geronimo Deployment]  for more in
    password="manager"
    id="org/openejb/cmp2/petstore"/>
 
-+++<a name="Creatingitests-Execution">++++++</a>+++
-
-=== Execution
+==== Execution
 
 When EJB classes, deployment descriptor and plan, maven.xml are all set up, it's time to execute your tests.
 In order to run itests you will run Maven in _modules/itests_ directory.
@@ -152,9 +140,7 @@ junit.framework.AssertionFailedError: Received Exception class java.lang.NullPoi
 
 Complete execution log is in _target/openejb/var/log/openejb.log_ of the itests module.
 
-+++<a name="Creatingitests-RunningtheTestsinEclipse.">++++++</a>+++
-
-==== Running the Tests in Eclipse.
+===== Running the Tests in Eclipse.
 
 The steps for running the iTests inside of Eclipse are given below.
 They are
diff --git a/tomee/modules/ROOT/pages/dev/design-application-server.adoc b/tomee/modules/ROOT/pages/dev/design-application-server.adoc
index 2e3ebf7..a9844be 100644
--- a/tomee/modules/ROOT/pages/dev/design-application-server.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-application-server.adoc
@@ -1,23 +1,20 @@
-Title: Design - Application Server +++<a name="Design-ApplicationServer-ApplicationServer">++++++</a>+++
+= Design - Application Server
 
 == Application Server
 
 Sub-component of xref:dev/design.adoc[OpenEJB]
 
-+++<a name="Design-ApplicationServer-Definition">++++++</a>+++
 
 == Definition
 
 Any component wishing to serve or deliver Enterprise JavaBeans.
 
-+++<a name="Design-ApplicationServer-AlsoKnownAs">++++++</a>+++
 
 == Also Known As
 
 * Server Adapter
 * Server Provider
 
-+++<a name="Design-ApplicationServer-Responsibilities">++++++</a>+++
 
 == Responsibilities
 
@@ -27,13 +24,11 @@ Any component wishing to serve or deliver Enterprise JavaBeans.
 * Provide clients with a JNDI name space for looking up beans.
 * Delegate method invocations to the container.
 
-+++<a name="Design-ApplicationServer-RelatedClasses">++++++</a>+++
 
 == Related Classes
 
 * org.apache.openejb.spi.ApplicationServer
 
-+++<a name="Design-ApplicationServer-Implementations">++++++</a>+++
 
 == Implementations
 
diff --git a/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc b/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc
index 6083c66..67bbd7b 100644
--- a/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-application-serverlinks.adoc
@@ -1 +1,3 @@
-Title: Design - Application ServerLinks !http://tomee.apache.org/images/figure-appserver.gif!
+= Design - Application ServerLinks
+
+!http://tomee.apache.org/images/figure-appserver.gif!
diff --git a/tomee/modules/ROOT/pages/dev/design-assembler.adoc b/tomee/modules/ROOT/pages/dev/design-assembler.adoc
index 229c778..319ea30 100644
--- a/tomee/modules/ROOT/pages/dev/design-assembler.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-assembler.adoc
@@ -1,21 +1,15 @@
-Title: Design - Assembler
-
-+++<a name="Design-Assembler-Assembler">++++++</a>+++
+= Design - Assembler
 
 == Assembler
 
 Sub-component of xref:dev/design.adoc[OpenEJB]
 
-+++<a name="Design-Assembler-Definition">++++++</a>+++
-
 == Definition
 
 Instantiates and assembles a configured, runnable, instance of the container system and all sub-components.
 Vendors needing extreme control over the construction of the container system can get it by implementing this class.
 Doing this comes with large amounts of resposibility and complexity and should not be done without a deep understanding of OpenEJB.
 
-+++<a name="Design-Assembler-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * Instantiate and initialize all Container implementations
@@ -26,14 +20,10 @@ Doing this comes with large amounts of resposibility and complexity and should n
 * Populate each deployment's JNDI ENC
 * Populate the IntraVM Server's global, client, JNDI namespace
 
-+++<a name="Design-Assembler-RelatedPackages">++++++</a>+++
-
 == Related Packages
 
 * org.apache.openejb.spi.Assembler
 
-+++<a name="Design-Assembler-Implementations">++++++</a>+++
-
 == Implementations
 
 * xref:dev/design-classic-assembler.adoc[Classic Assembler]
diff --git a/tomee/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc b/tomee/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
index 7b12947..fe259f5 100644
--- a/tomee/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
@@ -1,26 +1,18 @@
-Title: Design - BMP EntityBean Container
-
-+++<a name="Design-BMPEntityBeanContainer-BMPEntityBeanContainer">++++++</a>+++
+= Design - BMP EntityBean Container
 
 == BMP EntityBean Container
 
 Implementation of xref:dev/design-container.adoc[Container]
 
-+++<a name="Design-BMPEntityBeanContainer-Description">++++++</a>+++
-
 == Description
 
 Container that implements the EJB defined bean-container contract for EntityBeans with bean-managed persistence.
 
-+++<a name="Design-BMPEntityBeanContainer-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * BMP Entity Container
 * BMP Container
 
-+++<a name="Design-BMPEntityBeanContainer-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.core.entity.EntityContainer
diff --git a/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc b/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc
index 29d44a5..a103f20 100644
--- a/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc
@@ -1,34 +1,24 @@
-Title: Design - Classic Assembler
-
-+++<a name="Design-ClassicAssembler-ClassicAssembler">++++++</a>+++
+ Design - Classic Assembler
 
 == Classic Assembler
 
 Implementation of xref:dev/design-assembler.adoc[Assembler]
 
-+++<a name="Design-ClassicAssembler-Description">++++++</a>+++
-
 == Description
 
 The standard assembler supported by the OpenEJB team.
 Uses meta-data supplied via the Configuration Factory to create all components in the system.
 It is assumed the meta-data has been checked and validated, all links and references will resolve, all classes are present, and all apps compliant.
 
-+++<a name="Design-ClassicAssembler-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.assembler.classic.Assembler
 * org.apache.openejb.assembler.classic.OpenEjbConfiguration
 
-+++<a name="Design-ClassicAssembler-RelatedPackages">++++++</a>+++
-
 == Related Packages
 
 * org.apache.openejb.assembler.classic
 
-+++<a name="Design-ClassicAssembler-Sub-components">++++++</a>+++
-
 == Sub-components
 
 * xref:dev/design-configuration-factory.adoc[Configuration Factory]
diff --git a/tomee/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc b/tomee/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
index 8426af9..3e836f7 100644
--- a/tomee/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
@@ -1,27 +1,19 @@
-Title: Design - CMP EntityBean Container
-
-+++<a name="Design-CMPEntityBeanContainer-CMPEntityBeanContainer">++++++</a>+++
+= Design - CMP EntityBean Container
 
 == CMP EntityBean Container
 
 Implementation of xref:dev/design-container.adoc[Container]
 
-+++<a name="Design-CMPEntityBeanContainer-Description">++++++</a>+++
-
 == Description
 
 Container that implements the bean-container contract for CMP 1.1 and CMP 2.1 EntityBeans.
 The container adapts these old CMP EntityBeans to the new JPA Entity bean model and persists them using a JPA Persistence Provider.
 
-+++<a name="Design-CMPEntityBeanContainer-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * CMP Entity Container
 * CMP Container
 
-+++<a name="Design-CMPEntityBeanContainer-FormerlyKnownAs">++++++</a>+++
-
 == Formerly Known As
 
 * Castor Container
diff --git a/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc b/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc
index b1605c0..e39c48b 100644
--- a/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc
@@ -1,42 +1,30 @@
-Title: Design - Configuration Factory
-
-+++<a name="Design-ConfigurationFactory-ConfigurationFactory">++++++</a>+++
+ Design - Configuration Factory
 
 == Configuration Factory
 
 Sub-component of xref:dev/design-classic-assembler.adoc[Classic Assembler]
 
-+++<a name="Design-ConfigurationFactory-Definition">++++++</a>+++
-
 == Definition
 
 Creates an instance of the OpenEjbConfiguration class that contains all the data and configuration information the Classic assembler needs to construct the container system.
 The object structure in the OpenEjbConfiguration class is refered to as the InfoObjects.
 The Configuration Factory can construct, retreive, or populate the InfoObjects from any data source it chooses or by any means it chooses.
 
-+++<a name="Design-ConfigurationFactory-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Config Factory
 * InfoObject Factory
 
-+++<a name="Design-ConfigurationFactory-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * Creates an instance of the OpenEjbConfiguration
 * The data in the InfoObjects must be validated and accurately represent the system, services, jars, and beans to be constructed
 
-+++<a name="Design-ConfigurationFactory-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory
 * org.apache.openejb.assembler.classic.OpenEjbConfiguration
 
-+++<a name="Design-ConfigurationFactory-Implementations">++++++</a>+++
-
 == Implementations
 
 * XML Configuration Factory _(no longer supported)_
diff --git a/tomee/modules/ROOT/pages/dev/design-container.adoc b/tomee/modules/ROOT/pages/dev/design-container.adoc
index fd6cadf..5fc1fd2 100644
--- a/tomee/modules/ROOT/pages/dev/design-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-container.adoc
@@ -1,24 +1,18 @@
-Title: Design - Container +++<a name="Design-Container-Container">++++++</a>+++
+= Design - Container
 
 == Container
 
 Sub-component of xref:-design.adoc[OpenEJB]
 
-+++<a name="Design-Container-Definition">++++++</a>+++
-
 == Definition
 
 An Enterprise JavaBeans container enforce the container-bean contract for an EJB 1.1, 2.0, 2.1 or 3.0 bean type.
 Containers for custom container-bean contracts can also be created.
 
-+++<a name="Design-Container-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Container Provider
 
-+++<a name="Design-Container-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * Adopt the OpenEJB architecture
@@ -26,14 +20,10 @@ Containers for custom container-bean contracts can also be created.
 * Use the Security Manager assigned to the container system to assist in enforcing security and privileges
 * Implement the org.apache.openejb.Container interface
 
-+++<a name="Design-Container-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.Container
 
-+++<a name="Design-Container-Implementations">++++++</a>+++
-
 == Implementations
 
 * xref:dev/design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
diff --git a/tomee/modules/ROOT/pages/dev/design-local-server.adoc b/tomee/modules/ROOT/pages/dev/design-local-server.adoc
index a923684..351151c 100644
--- a/tomee/modules/ROOT/pages/dev/design-local-server.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-local-server.adoc
@@ -1,23 +1,20 @@
-Title: Design - Local Server +++<a name="Design-LocalServer-LocalServer">++++++</a>+++
+= Design - Local Server
 
 == Local Server
 
 Implementation of xref:dev/design-application-server.adoc[Application Server]
 
-+++<a name="Design-LocalServer-Description">++++++</a>+++
 
 == Description
 
 Allows for optimized interaction among beans and clients in the same virtual machine.
 
-+++<a name="Design-LocalServer-AlsoKnownAs">++++++</a>+++
 
 == Also Known As
 
 * IntraVM
 * IntraVM Server
 
-+++<a name="Design-LocalServer-RelatedPackages">++++++</a>+++
 
 == Related Packages
 
diff --git a/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc b/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc
index 5eaf88a..e0e3179 100644
--- a/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-local-serverlinks.adoc
@@ -1 +1,3 @@
-Title: Design - Local ServerLinks {include:Design - Application ServerLinks}
+= Design - Local ServerLinks
+
+include:design-application-serverlinks.adoc[leveloffset=+1]
diff --git a/tomee/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc b/tomee/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
index 9384b6e..add7ce8 100644
--- a/tomee/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
@@ -1,32 +1,22 @@
-Title: Design - Nova Configuration Factory
-
-+++<a name="Design-NovaConfigurationFactory-NovaConfigurationFactory">++++++</a>+++
+= Design - Nova Configuration Factory
 
 == Nova Configuration Factory
 
 Implementation of xref:dev/design-configuration-factory.adoc[Configuration Factory]
 
-+++<a name="Design-NovaConfigurationFactory-Description">++++++</a>+++
-
 == Description
 
 Populates an OpenEjbConfiguration object by combining the data from an openejb.xml file, the ejb-jar.xml and openejb-jar.xml from deployed bean jars, and service-jar.xml containing OpenEJB service implementations.
 
-+++<a name="Design-NovaConfigurationFactory-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * New Configuration Factory
 * Modular Configuration Factory
 
-+++<a name="Design-NovaConfigurationFactory-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.config.ConfigurationFactory
 
-+++<a name="Design-NovaConfigurationFactory-RelatedPackages">++++++</a>+++
-
 == Related Packages
 
 * org.apache.openejb.alt.config
diff --git a/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc b/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc
index ddca28b..9233318 100644
--- a/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc
@@ -1,29 +1,21 @@
-Title: Design - Passivation Strategy +++<a name="Design-PassivationStrategy-PassivationStrategy">++++++</a>+++
+= Design - Passivation Strategy
 
 == Passivation Strategy
 
 Sub-component of xref:dev/design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
 
-+++<a name="Design-PassivationStrategy-Definition">++++++</a>+++
-
 == Definition
 
 Used by the Stateful Container to passivate and activate stateful session beans to a temporary storage.
 
-+++<a name="Design-PassivationStrategy-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * Store and retrieve instances
 
-+++<a name="Design-PassivationStrategy-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.core.stateful.PassivationStrategy
 
-+++<a name="Design-PassivationStrategy-Implementations">++++++</a>+++
-
 == Implementations
 
 * xref:dev/design-random-access-file-passivater.adoc[Random Access File Passivater]
diff --git a/tomee/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc b/tomee/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc
index fcd24b9..780e1e7 100644
--- a/tomee/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc
@@ -1,25 +1,17 @@
-Title: Design - Random Access File Passivater
-
-+++<a name="Design-RandomAccessFilePassivater-RandomAccessFilePassivater">++++++</a>+++
+= Design - Random Access File Passivater
 
 == Random Access File Passivater
 
 Implementation of xref:dev/design-passivation-strategy.adoc[Passivation Strategy]
 
-+++<a name="Design-RandomAccessFilePassivater-Description">++++++</a>+++
-
 == Description
 
 A PassivationStrategy that bulk passivates bean instances to a random access file.
 
-+++<a name="Design-RandomAccessFilePassivater-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * RAF Passivater
 
-+++<a name="Design-RandomAccessFilePassivater-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.core.stateful.RAFPassivater
diff --git a/tomee/modules/ROOT/pages/dev/design-remote-server.adoc b/tomee/modules/ROOT/pages/dev/design-remote-server.adoc
index 4b9dc55..0b6c957 100644
--- a/tomee/modules/ROOT/pages/dev/design-remote-server.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-remote-server.adoc
@@ -1,36 +1,26 @@
-Title: Design - Remote Server +++<a name="Design-RemoteServer-RemoteServer">++++++</a>+++
+= Design - Remote Server
 
 == Remote Server
 
 Implementation of xref:dev/design-application-server.adoc[Application Server]
 
-+++<a name="Design-RemoteServer-Description">++++++</a>+++
-
 == Description
 
 Distributes EJB interface implementations to remote clients using a conversational serialization-based protocol.
 
-+++<a name="Design-RemoteServer-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * EJBd Protocol
 
-+++<a name="Design-RemoteServer-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.server.EjbDaemon
 
-+++<a name="Design-RemoteServer-RelatedPackages">++++++</a>+++
-
 == Related Packages
 
 * org.apache.openejb.client
 * org.apache.openejb.server
 
-+++<a name="Design-RemoteServer-RequiredLibraries">++++++</a>+++
-
 == Required Libraries
 
 * openejb-server-3.0.x.jar
diff --git a/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc b/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc
index e8e7a85..922e789 100644
--- a/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-remote-serverlinks.adoc
@@ -1 +1,3 @@
-Title: Design - Remote ServerLinks {include:Design - Application ServerLinks}
+= Design - Remote ServerLinks
+
+include:design-application-serverlinks.adoc[leveloffset=+1]
diff --git a/tomee/modules/ROOT/pages/dev/design-resource-manager.adoc b/tomee/modules/ROOT/pages/dev/design-resource-manager.adoc
index c0b2e15..cf1eb8f 100644
--- a/tomee/modules/ROOT/pages/dev/design-resource-manager.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-resource-manager.adoc
@@ -1,33 +1,23 @@
-Title: Design - Resource Manager
-
-+++<a name="Design-ResourceManager-ResourceManager">++++++</a>+++
+= Design - Resource Manager
 
 == Resource Manager
 
 Sub-component of xref:-design.adoc[OpenEJB]
 
-+++<a name="Design-ResourceManager-Definition">++++++</a>+++
-
 == Definition
 
 Provides the container with managed connections to transactional data sources required by beans
 
-+++<a name="Design-ResourceManager-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Connector
 * Connection Manager
 
-+++<a name="Design-ResourceManager-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * Provides beans with connection handles
 * Manages pysical connections
 
-+++<a name="Design-ResourceManager-RelatedPackages">++++++</a>+++
-
 == Related Packages
 
 * javax.resource.spi
diff --git a/tomee/modules/ROOT/pages/dev/design-security-service.adoc b/tomee/modules/ROOT/pages/dev/design-security-service.adoc
index 06702e1..e604d01 100644
--- a/tomee/modules/ROOT/pages/dev/design-security-service.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-security-service.adoc
@@ -1,31 +1,23 @@
-Title: Design - Security Service +++<a name="Design-SecurityService-SecurityService">++++++</a>+++
+= Design - Security Service
 
 == Security Service
 
 Sub-component of xref:-design.adoc[OpenEJB]
 
-+++<a name="Design-SecurityService-Definition">++++++</a>+++
-
 == Definition
 
 Provides the container with an authenticated client identity.
 
-+++<a name="Design-SecurityService-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Security Provider
 
-+++<a name="Design-SecurityService-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * Authenticate the user in an implementation specific way
 * Provides OpenEJB a reference to the current security identity of the client
 * Assists OpenEJB with role-based authorization control
 
-+++<a name="Design-SecurityService-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.spi.SecurityService
diff --git a/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc b/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc
index 8b8534f..75c424b 100644
--- a/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc
@@ -1,19 +1,13 @@
-Title: Design - Simple Passivater
-
-+++<a name="Design-SimplePassivater-SimplePassivater">++++++</a>+++
+= Design - Simple Passivater
 
 == Simple Passivater
 
 Implementation of xref:dev/design-passivation-strategy.adoc[Passivation Strategy]
 
-+++<a name="Design-SimplePassivater-Description">++++++</a>+++
-
 == Description
 
 A PassivationStrategy that idividually passivates bean instances to a binary file.
 
-+++<a name="Design-SimplePassivater-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.core.stateful.SimplePassivater
diff --git a/tomee/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc b/tomee/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
index 9874b5d..ee07015 100644
--- a/tomee/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
@@ -1,30 +1,22 @@
-Title: Design - Stateful SessionBean Container +++<a name="Design-StatefulSessionBeanContainer-StatefulSessionBeanContainer">++++++</a>+++
+= Design - Stateful SessionBean Container
 
 == Stateful SessionBean Container
 
 Implementation of xref:dev/design-container.adoc[Container]
 
-+++<a name="Design-StatefulSessionBeanContainer-Description">++++++</a>+++
-
 == Description
 
 Container that implements the EJB defined bean-container contract for Stateful SessionBeans.
 
-+++<a name="Design-StatefulSessionBeanContainer-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Stateful Session Container
 * Stateful Container
 
-+++<a name="Design-StatefulSessionBeanContainer-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.core.stateful.StatefulContainer
 
-+++<a name="Design-StatefulSessionBeanContainer-Sub-components">++++++</a>+++
-
 == Sub-components
 
 * xref:dev/design-passivation-strategy.adoc[Passivation Strategy]
diff --git a/tomee/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc b/tomee/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
index a2745eb..a6cf1ee 100644
--- a/tomee/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
@@ -1,26 +1,18 @@
-Title: Design - Stateless SessionBean Container
-
-+++<a name="Design-StatelessSessionBeanContainer-StatelessSessionBeanContainer">++++++</a>+++
+= Design - Stateless SessionBean Container
 
 == Stateless SessionBean Container
 
 Implementation of xref:dev/design-container.adoc[Container]
 
-+++<a name="Design-StatelessSessionBeanContainer-Description">++++++</a>+++
-
 == Description
 
 Container that implements the EJB defined bean-container contract for stateless SessionBeans.
 
-+++<a name="Design-StatelessSessionBeanContainer-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Stateless Session Container
 * Stateless Container
 
-+++<a name="Design-StatelessSessionBeanContainer-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.core.stateless.StatelessContainer
diff --git a/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc b/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc
index 91a801c..b705f47 100644
--- a/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc
@@ -1,31 +1,21 @@
-Title: Design - Transaction Service
-
-+++<a name="Design-TransactionService-TransactionService">++++++</a>+++
+= Design - Transaction Service
 
 == Transaction Service
 
 Sub-component of xref:dev/design.adoc[OpenEJB]
 
-+++<a name="Design-TransactionService-Definition">++++++</a>+++
-
 == Definition
 
 Provides the container with transactional integrity.
 
-+++<a name="Design-TransactionService-AlsoKnownAs">++++++</a>+++
-
 == Also Known As
 
 * Transaction Manager
 
-+++<a name="Design-TransactionService-Responsibilities">++++++</a>+++
-
 == Responsibilities
 
 * To give OpenEJB a reference to a valid implementation of javax.transaction.TransactionManager
 
-+++<a name="Design-TransactionService-RelatedClasses">++++++</a>+++
-
 == Related Classes
 
 * org.apache.openejb.spi.TransactionService
diff --git a/tomee/modules/ROOT/pages/dev/design.adoc b/tomee/modules/ROOT/pages/dev/design.adoc
index a90bc26..0e99210 100644
--- a/tomee/modules/ROOT/pages/dev/design.adoc
+++ b/tomee/modules/ROOT/pages/dev/design.adoc
@@ -1,34 +1,29 @@
-Title: Design +++<a name="Design-OpenEJB">++++++</a>+++
+= Design
 
 == OpenEJB
 
 System Design
 
-+++<a name="Design-Definition">++++++</a>+++
 
 == Definition
 
 A modular, configurable, customizable, embeddable open source EJB container system
 
-+++<a name="Design-AlsoKnownAs">++++++</a>+++
 
 == Also Known As
 
 * container system
 
-+++<a name="Design-Responsibilities">++++++</a>+++
 
 == Responsibilities
 
 * Implement EJB 3.0 Specification
 
-+++<a name="Design-RelatedClasses">++++++</a>+++
 
 == Related Classes
 
 * org.apache.openejb.OpenEJB
 
-+++<a name="Design-RequiredLibraries">++++++</a>+++
 
 == Required Libraries
 
@@ -36,8 +31,6 @@ A modular, configurable, customizable, embeddable open source EJB container syst
 * openejb-jee-3.0.x.jar
 * openejb-core-3.0.x.jar
 
-+++<a name="Design-Sub-components">++++++</a>+++
-
 == Sub-components
 
 * xref:dev/design-application-server.adoc[Application Server]
diff --git a/tomee/modules/ROOT/pages/dev/git.adoc b/tomee/modules/ROOT/pages/dev/git.adoc
index 1af690c..c9548a3 100644
--- a/tomee/modules/ROOT/pages/dev/git.adoc
+++ b/tomee/modules/ROOT/pages/dev/git.adoc
@@ -1,6 +1,6 @@
-Title: GIT for TomEE Developers
+= GIT for TomEE Developers
 
-*** The GitFlow Workflow
+== The GitFlow Workflow
 
 Notes before you begin (mostly for SVN users):
 
diff --git a/tomee/modules/ROOT/pages/dev/itests-overview.adoc b/tomee/modules/ROOT/pages/dev/itests-overview.adoc
index dcb4cb0..b6ef71b 100644
--- a/tomee/modules/ROOT/pages/dev/itests-overview.adoc
+++ b/tomee/modules/ROOT/pages/dev/itests-overview.adoc
@@ -1,8 +1,6 @@
-:doctype: book
+= iTests Overview
 
-Title: iTests Overview +++<a name="iTestsOverview-Motivation">++++++</a>+++
-
-= Motivation
+== Motivation
 
 The basic idea behind itests that makes them slightly different than plain junit tests ran by maven is that it's assumed that there are other systems (servers, databases, brokers, etc) that need to be started or connected to before the tests can run.
 The tests themselves don't setup the other systems themselves so that the tests don't become coupled with them and you can actually swap out various aspects of those systems behind the back of the tests;
@@ -13,15 +11,11 @@ It took a lot of work to get them to run as part of the maven build and the ites
 
 Definitely give those a look at:  http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/
 
-+++<a name="iTestsOverview-Pluggingin">++++++</a>+++
-
-= Plugging in
+== Plugging in
 
 You can have systems started and stopped before and after the tests in a number of ways.
 
-+++<a name="iTestsOverview-Inmaven1">++++++</a>+++
-
-== In maven 1
+=== In maven 1
 
 This series of articles established a basic technique for Container Driven Testing with Maven and OpenEJB using preGoals and postGoals to do server and databse setup and teardown before and after Maven runs the unit tests.
 http://www.theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries
@@ -37,16 +31,12 @@ http://maven.apache.org/plugins-sandbox/itest/
 
 ActiveMQ later started using the itest plugin and now has a large suite of their own JMS specific integration tests.
 
-+++<a name="iTestsOverview-Inmaven2">++++++</a>+++
-
-== In maven 2
+=== In maven 2
 
 The concept of integration tests (itests) has been built into the lifecycle of maven 2, so it is no longer required to have the itest plugin around to get the extra "itest:setup" and "itest:teardown" goals.
 See this document for more info:  http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
 
-+++<a name="iTestsOverview-Injunitsetupandteardown">++++++</a>+++
-
-== In junit setup and teardown
+=== In junit setup and teardown
 
 The ejb tests in particular require you to plug in facades for the server and the database so the client (the tests) can say "give me an initial context" or "create these tables i need" in a generic way.
 It's assumed that those systems were setup and guaranteed in working state in the itest setup phase.
@@ -60,9 +50,7 @@ Using the itest concept you could setup any system you need before hand, then ju
 So it's not limited to just a server or a database.
 You could do queue, topic, clustering heartbeat agent, directory server, etc.
 
-+++<a name="iTestsOverview-Testingmatrix">++++++</a>+++
-
-= Testing matrix
+== Testing matrix
 
 Even with just what we have we can get quite far.
 In a perfect world, we would actually test against the full matrix:
diff --git a/tomee/modules/ROOT/pages/dev/mastering-the-command-line.adoc b/tomee/modules/ROOT/pages/dev/mastering-the-command-line.adoc
index f5029a4..ed3358f 100644
--- a/tomee/modules/ROOT/pages/dev/mastering-the-command-line.adoc
+++ b/tomee/modules/ROOT/pages/dev/mastering-the-command-line.adoc
@@ -1,5 +1,5 @@
 = Linux/OSX awesomeness
-:doctype: book
+
 
 Not specific to this projec, but can be incredibly useful ways to maximizes your time.
 Mastering the command line is the best way to get things done, quick and cheaply.
@@ -8,11 +8,11 @@ Reapeat after me:
 
 * I will write a script for any tasks I do regularly
 
-= Core commands
+== Core commands
 
 Some very big time-saving commands
 
-== In shell scripts
+=== In shell scripts
 
 * *basename* - what is the file name again?
 not the path, just the file name
@@ -81,12 +81,12 @@ I wish I were a fish.
 * *tr* - echo $PATH
 * *uname* - what system am I on?
 
-== OSX commands
+=== OSX commands
 
 * *pbpaste* - paste the contents of the clipboard to stdout
 * *pbcopy* - copy stdin to the clipbboard
 
-== running shell scripts
+=== running shell scripts
 
 * *bash* - quick way to run a script if it isn't already executable
 * *chmod* - this file should be executable
@@ -101,7 +101,7 @@ I wish I were a fish.
 * *top* - what the heck is chewing up my cpu?
 * *uname* - what system am I on?
 
-= I never use
+== I never use
 
 Some people like it.
 sed -- i always use "perl -pe 's/find/replace/'")
diff --git a/tomee/modules/ROOT/pages/dev/openejb-release-process.adoc b/tomee/modules/ROOT/pages/dev/openejb-release-process.adoc
index b87f501..91c7bc2 100644
--- a/tomee/modules/ROOT/pages/dev/openejb-release-process.adoc
+++ b/tomee/modules/ROOT/pages/dev/openejb-release-process.adoc
@@ -1,6 +1,4 @@
-:doctype: book
-
-Title: OpenEJB Release Process
+= OpenEJB Release Process
 
  Note: This information is largely obsolete and remains here for reference only.
 
@@ -19,7 +17,7 @@ mvn clean deploy -Prelease -Dassemble -Dusername=dblevins -DaltDeploymentReposit
 
 {code:none} svn copy -m "TomEE 1.5.1 branch" \   https://svn.apache.org/repos/asf/tomee/tomee/trunk \   https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.1
 
-= Merging things from trunk to the branch
+== Merging things from trunk to the branch
 
 ....
 While fixing issues in the branch and trunk in parallel it may happen that some changes in trunk have not been applied to the branch. Provided you're in the branch's directory the following command applies a change from the trunk  to the branch (`{-c 575845`} is the commit number with the fix and the url points to a repo the change is in).
@@ -51,9 +49,7 @@ for n in $@; do
 done
 ....
 
-+++<a name="OpenEJBReleaseProcess-Aggregationintoastage/3.xdirectory">++++++</a>+++
-
-= Aggregation into a stage/3.x directory
+== Aggregation into a stage/3.x directory
 
 ....
 #!/bin/bash
@@ -107,9 +103,7 @@ echo $VER | ssh people.apache.org 'read VER && for n in ~/public_html/stage/repo
 echo $VER | ssh people.apache.org 'read VER && for n in ~/public_html/stage/repo/org/apache/openejb/openejb-tomcat-webapp/$VER/openejb-tomcat-webapp-$VER.war{,.asc,.md5}; do cp $n ~/public_html/stage/$VER/$(basename ${n/-tomcat-webapp-$VER/}); done'
 ....
 
-+++<a name="OpenEJBReleaseProcess-Releasenotes">++++++</a>+++
-
-= Release notes
+== Release notes
 
 ....
 #set( $rpc = $xmlrpc.connect("dblevins:xxxxx","http://issues.apache.org/jira/rpc/xmlrpc") )
@@ -163,9 +157,7 @@ Unimplemented Features, bugs, limitations
 #end
 ....
 
-+++<a name="OpenEJBReleaseProcess-README.htmlfile">++++++</a>+++
-
-= README.html file
+== README.html file
 
 some way to dynamically update this would be great.
 
diff --git a/tomee/modules/ROOT/pages/dev/proxies.adoc b/tomee/modules/ROOT/pages/dev/proxies.adoc
index 45a8bd8..a2f9da3 100644
--- a/tomee/modules/ROOT/pages/dev/proxies.adoc
+++ b/tomee/modules/ROOT/pages/dev/proxies.adoc
@@ -1,8 +1,6 @@
-:doctype: book
+= Proxies
 
-Title: Proxies +++<a name="Proxies-Where'stheJavasourcefortheproxies?">++++++</a>+++
-
-= Where's the Java source for the proxies?
+== Where's the Java source for the proxies?
 
 The short answer is we do not generate java code containing any ejb logic at all as other platforms like WebSphere and WebLogic do.
 We use dynamic proxy generation via java.lang.reflect.Proxy.
diff --git a/tomee/modules/ROOT/pages/dev/release-tomee.adoc b/tomee/modules/ROOT/pages/dev/release-tomee.adoc
index 7c9cec0..dc228b0 100644
--- a/tomee/modules/ROOT/pages/dev/release-tomee.adoc
+++ b/tomee/modules/ROOT/pages/dev/release-tomee.adoc
@@ -1,10 +1,9 @@
+= Releasing TomEE
 :experimental:
 
-#Releasing TomEE
-
  This document is aimed at guiding a release manager through the general release process. You will need either a Linux, Mac, or failing that a Linux Virtual (with at least a 50GB Drive) on Win.
 
-*** Preparation of The Branch
+== Preparation of The Branch
 
 Run menu:ant -f rat.xml[report.txt] on trunk to ensure all licences are in place.
 
@@ -25,7 +24,7 @@ An SVN trigger must be added afterwards.
 This can only be done by someone with admin permissions, such as any PMC chair or an Infra team member.
 Just drop an email to _infrastructure@apache.org_
 
-*** Create a TCK Branch
+== Create a TCK Branch
 
 Branch the TCK using the same version as the release branch from here:
 
@@ -43,7 +42,7 @@ Run menu:ant -f rat.xml[report.txt] on the branch.
 * Review the report.txt and update/add missing headers until clean.
 * _Tip_, search for *Unapproved licenses:*.
 
-*** Check SVN Authentication
+== Check SVN Authentication
 
 Pre-authenticate svn repositories to ensure your credentials are cached before using any tools.
 
@@ -54,7 +53,7 @@ Pre-authenticate svn repositories to ensure your credentials are cached before u
  svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir3
  svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir3
 
-*** Prepare Maven Authentication
+== Prepare Maven Authentication
 
 Ensure your maven .m2/settings.xml correct, and be aware that the tools currently require a clear text password:
 
@@ -88,7 +87,7 @@ Ensure your maven .m2/settings.xml correct, and be aware that the tools currentl
 		  </repositories>
 ....
 
-*** Code Signing Setup
+== Code Signing Setup
 
 If this is your first release then you will have to ensure that you have a code signing key prepared on the machine from which you perform the release.
 The process is quite intense.
@@ -121,7 +120,7 @@ The basic steps are also here, please read both before you proceed:
 * Take note of your key fingerprint using **gpg --fingerprint +++<your name="">+++**+++</your>+++
 * Go to https://id.apache.org, log in and fill OpenPGP Public Key Primary Fingerprint: with the value of your fingerprint.
 
-*** Build the Release Tools
+== Build the Release Tools
 
 Checkout the release tools using SVN from here https://svn.apache.org/repos/asf/tomee/sandbox/release-tools
 
@@ -134,7 +133,7 @@ Have a look at *run.sh* to see the entry point.
 
 Understand that the release tools are not polished, and you currently may have to edit source and re-compile.
 
-*** Site Staging <<staging,>> For some of the release steps you will need to provide documentation on the site.
+== Site Staging <<staging,>> For some of the release steps you will need to provide documentation on the site.
 Checkout the site here:
 
 https://svn.apache.org/repos/asf/tomee/site/trunk
@@ -157,7 +156,7 @@ Once you are happy with the staging you can publish to the real site using:
 
 https://cms.apache.org/tomee/publish
 
-*** Begin The Release Process
+== Begin The Release Process
 
 Ensure TCK is passing all tests, and if so create an SVN tag from the branch.
 
@@ -210,7 +209,7 @@ How you do this is up to you at this point in time.
 
 Create the next version iterations in JIRA.
 
-*** Rolling Out The Preview
+== Rolling Out The Preview
 
 ....
 Note: Before running anything below ensure you either have:
@@ -246,7 +245,7 @@ Votes are generally managed and identified using keywords such as [VOTE], [CANCE
 
 If the vote fails then discuss, fix and re-roll.
 
-*** Voted Binaries
+== Voted Binaries
 
 Once the vote has passed then release the binaries on Nexus: https://repository.apache.org/index.html#welcome
 
@@ -283,7 +282,7 @@ Commit and publish changes to the site, see xref:dev/release-tomee.adoc#staging[
 
  https://cms.apache.org/tomee/publish
 
-*** Blog
+== Blog
 
 Announce to the world that TomEE has new bells and whistles!
 
diff --git a/tomee/modules/ROOT/pages/dev/roadmap.adoc b/tomee/modules/ROOT/pages/dev/roadmap.adoc
index 22e3719..dc2c050 100644
--- a/tomee/modules/ROOT/pages/dev/roadmap.adoc
+++ b/tomee/modules/ROOT/pages/dev/roadmap.adoc
@@ -1,5 +1,4 @@
 = High level goals
-:doctype: book
 
 * Pre Certification
  ** pass the tcks
@@ -8,11 +7,11 @@
  ** fill out features, performance tune and polish
  ** release final
 
-= Post Certification requirements
+== Post Certification requirements
 
 Aside from passing the tcks, the
 
-= Post Certification goals
+== Post Certification goals
 
 Unordered list:
 
diff --git a/tomee/modules/ROOT/pages/dev/rules-of-thumb.adoc b/tomee/modules/ROOT/pages/dev/rules-of-thumb.adoc
index de6f5fa..2f62a10 100644
--- a/tomee/modules/ROOT/pages/dev/rules-of-thumb.adoc
+++ b/tomee/modules/ROOT/pages/dev/rules-of-thumb.adoc
@@ -1,17 +1,13 @@
-Title: Rules of Thumb
+= Rules of Thumb
 
-+++<a name="RulesofThumb-Configuration">++++++</a>+++
-
-=== Configuration
+== Configuration
 
 * Configuration settings should have configurable defaults at the module, ear, server and cluster level (when clustering is added).
 For example, security settings should be configurable on a per ejb, ejb jar, ear and server levels.
 * Settings should have a smooth increase in complexity from very simple to complex.
 For example, a cache setting could start with a simple max-size, and over time the user could increase the complexity by adding configuration for disk paging up to specification of complex flushing rules.
 
-+++<a name="RulesofThumb-Validation">++++++</a>+++
-
-=== Validation
+== Validation
 
 * Applications should be fully validated before handing it off to the deployment system.
 This vastly simplifies the deployment system because it assumes that an application is valid.
diff --git a/tomee/modules/ROOT/pages/dev/source-code.adoc b/tomee/modules/ROOT/pages/dev/source-code.adoc
index 6a4ddda..d9a6f06 100644
--- a/tomee/modules/ROOT/pages/dev/source-code.adoc
+++ b/tomee/modules/ROOT/pages/dev/source-code.adoc
@@ -1,4 +1,4 @@
-Title: Source Code
+= Source Code
 
 *We have moved to GIT.
 This means that anything you may find elsewhere on the site about SVN is no longer valid!*
@@ -8,7 +8,7 @@ The documentation will be updated over the next few days and weeks but if you fi
 Probably the best GIT tutorial on the planet can be found here: https://www.atlassian.com/git/ - This is a great reference for both existing and new GIT users.
 Please take a look.
 
-*** GIT Information for Everyone
+== GIT Information for Everyone
 
 You can browse the source code via the http://gitbox.apache.org/repos/asf/tomee.git[web interface].
 
@@ -36,7 +36,7 @@ ____
 
 NOTE: This method does not require the GIT client.
 
-+++<a name="SourceCode-Contributors">++++++</a>+++ *** GIT Information for TomEE Contributors
+== GIT Information for TomEE Contributors
 
 *Please read our own detailed GitFlow workflow information xref:dev/git.adoc[here]*
 
@@ -47,7 +47,7 @@ See https://help.github.com/articles/using-pull-requests/[here] for information
 
 The official Apache Committer documentation can be found https://gitbox.apache.org/#committers-getting-started[here]
 
-+++<a name="SourceCode-Continuousintegration">++++++</a>+++ *** Continuous integration
+== Continuous integration
 
 Apache TomEE continuous integration relies on http://ci.apache.org/[Apache Buildbot].
 All builders are available http://ci.apache.org/builders[from the page].
@@ -57,9 +57,11 @@ All builders are available http://ci.apache.org/builders[from the page].
 * http://ci.apache.org/builders/tomee-trunk-win-sunjdk[Apache TomEE 2.x under Windows using a Sun/Oracle JDK]
 * http://ci.apache.org/builders/tomee-trunk-win-ibmjdk6[Apache TomEE 2.x under Windows using an IBM JDK]
 
-+++<a name="SourceCode-Building">++++++</a>+++ *** Maven To build the code, you'll need to grab a copy of http://maven.apache.org[Apache Maven], version 3.0.5 or later.
+== Maven
 
-*** Memory Settings
+To build the code, you'll need to grab a copy of http://maven.apache.org[Apache Maven], version 3.0.5 or later.
+
+== Memory Settings
 
 It is pretty much guaranteed that you will need to give Maven an increase on the available memory.
 + Depending on the OS you are working on the fix can be as easy as (Note: _-XX:MaxPermSize=256M_ is ignored by Java 8):
@@ -76,7 +78,7 @@ ____
 
 on MS Windows.
 
-*** Full Build
+== Full Build
 
 A fast build that skips all tests, generates no reports and creates full distribution archives is as follows:
 
@@ -95,7 +97,7 @@ The output of those commands should end with "BUILD SUCCESSFUL"
 It is of course possible to just compile and test individual modules.
 Just change to the module directory and run the same commands as above.
 
-*** Quick Build
+== Quick Build
 
 If you are in real a hurry (and let's face it most of us are) you can run a quick build without the examples using the _quick_ profile:
 
@@ -103,7 +105,7 @@ ____
 mvn -Pquick -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install
 ____
 
-*** Binary locations
+== Binary locations
 
 Once built, the TomEE binaries will be located at:
 
diff --git a/tomee/modules/ROOT/pages/dev/take-my-code.adoc b/tomee/modules/ROOT/pages/dev/take-my-code.adoc
index 6cab6ba..0e849b2 100644
--- a/tomee/modules/ROOT/pages/dev/take-my-code.adoc
+++ b/tomee/modules/ROOT/pages/dev/take-my-code.adoc
@@ -1,4 +1,5 @@
-Title: Take My Code Gladly!
+= Take My Code Gladly!
+
 We (the individuals who makeup the community) will happily take your code.
 
 The easiest way for us to take code both legally and practically is by:
diff --git a/tomee/modules/ROOT/pages/dev/thread-dumps.adoc b/tomee/modules/ROOT/pages/dev/thread-dumps.adoc
index e6924ad..1c5bd7e 100644
--- a/tomee/modules/ROOT/pages/dev/thread-dumps.adoc
+++ b/tomee/modules/ROOT/pages/dev/thread-dumps.adoc
@@ -1,8 +1,6 @@
-:doctype: book
+= Thread Dumps
 
-Title: Thread Dumps +++<a name="ThreadDumps-Java5tools">++++++</a>+++
-
-= Java 5 tools
+== Java 5 tools
 
 This should work on any Java 5 or newer platform.
 
@@ -25,12 +23,10 @@ Thread t@59139: (state = BLOCKED)
 - java.lang.Thread.run() @bci=11, line=613 (Interpreted frame)
 ----
 
-+++<a name="ThreadDumps-OSsignals">++++++</a>+++
-
-= OS signals
+== OS signals
 
 In the case of an OS signal the thread dump is printed to the console window that started the java process.
 If you use javaw to start the process, the dump is lost.
 
 On Windows, typing _ctrl-break_ in the console window that started the Java process.
-On Unix, the command *kill -QUIT +++<pid>+++* or typing *ctrl-&#92;* in the console window that started the Java process.+++</pid>+++
+On Unix, the command *kill -QUIT <pid>* or typing *ctrl-&#92;* in the console window that started the Java process.
diff --git a/tomee/modules/ROOT/pages/dev/tips-and-suggestions.adoc b/tomee/modules/ROOT/pages/dev/tips-and-suggestions.adoc
index 6f931c0..6469c81 100644
--- a/tomee/modules/ROOT/pages/dev/tips-and-suggestions.adoc
+++ b/tomee/modules/ROOT/pages/dev/tips-and-suggestions.adoc
@@ -1,10 +1,8 @@
 = Tips and Suggestions
 
 
-[#TipsandSuggestions-Usefulinformationforcontributors]
 == Useful information for contributors
 
-[#TipsandSuggestions-JIRAusage]
 === JIRA usage
 It's good to leverage JIRA, but everything that happens there should be
 considered invisible for the most part and only reviewed on a random and
@@ -52,7 +50,6 @@ description has some good information:
 {+}If you'd like to get added to the openejb-contributors JIRA group, just
 ping the list with your JIRA id and someone will add you.{+}
 
-[#TipsandSuggestions-Commits]
 === Commits
 
 *Contributed by*: David Blevins
@@ -86,11 +83,9 @@ way though :-)
 As far as jira titles, I always *try and make them short and succinct* for
 the future release notes.
 
-[#TipsandSuggestions-SVN+JIRA]
 === SVN + JIRA
 
 
-[#TipsandSuggestions-*Contributedby*:Vamsi]
 ==== *Contributed by*: Vamsi
 
 I had trouble figuring out if a revision is related to a JIRA and what all
@@ -107,7 +102,6 @@ modify an existing file, I always check if I have to add these missing
 $Rev$ $Date$ and add those so that the file will have them from my next
 commit onwards.
 
-[#TipsandSuggestions-*Contributedby*:DavidBlevins]
 ==== *Contributed by*: David Blevins
 
 > If you put "\[jira\](jira\.html)
@@ -115,7 +109,6 @@ commit onwards.
 > email gets added as a comment with all '> quoted' text stripped out.
 PS: XXX is the JIRA issue number
 
-[#TipsandSuggestions-Details]
 ==== Details
 
 The following subject lines did work:
@@ -184,8 +177,7 @@ David
 
 </three>
 
-=== scp, ssh, and rsync examples for working with files and directories on
-people.apache.org
+=== scp, ssh, and rsync examples for working with files and directories on people.apache.org
 
 *Contributed by*: David Blevins
 
@@ -249,7 +241,6 @@ on people.apache.org
 and if you want to access your home page, you should create a dir with the
 name public_html, and then upload files to it.
 
-[#TipsandSuggestions-Acoolsubversiontip]
 === A cool subversion tip
 
 *Contributed by*: Jacek Laskowski.
@@ -331,8 +322,6 @@ svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Date
 Revision
 ----
 
-
-[#TipsandSuggestions-Maventips]
 === Maven tips
 
 *Contributed by:* Jacek and David
@@ -402,9 +391,9 @@ commands will not be executed.
 > If you want to be thorough, run with \-Dassemble.
 ----
 
-[#TipsandSuggestions-JAXBUsage]
 === JAXB Usage
-{note:title=TODO}
+
+TODO:
 Create a write up from here
 http://www.nabble.com/jaxb-question-td18023648.html
-{note}
+
diff --git a/tomee/modules/ROOT/pages/dev/validation-keys-audit-report.adoc b/tomee/modules/ROOT/pages/dev/validation-keys-audit-report.adoc
index 32d02ec..d5fb867 100644
--- a/tomee/modules/ROOT/pages/dev/validation-keys-audit-report.adoc
+++ b/tomee/modules/ROOT/pages/dev/validation-keys-audit-report.adoc
@@ -1,5 +1,12 @@
-Title: Validation Keys Audit Report {warning:title=Warning}This page is auto-generated.
-Any manual changes would be over-written the next time this page is regenerated\{warning} {info:title=Audit Result}h2.Out of a total of 144 keys, 123 have been tested.
+= Validation Keys Audit Report
+
+Warning: This page is auto-generated.
+Any manual changes would be over-written the next time this page is regenerated
+
+TODO: figure out if this page is still relevant, it certainly isn't being generated any more.
+
+== Out of a total of 144 keys, 123 have been tested.
+
 Test coverage for keys is 85.41666666666666 %.\{info} {table-plus:autoNumber=true}
 
 | abstractAnnotatedAsBean |   | ann.ejb.beanClass |   | ann.ejb.notInterface |   | ann.localRemote.generalconflict |   | asynchronous.badExceptionType |   | asynchronous.badReturnType |   | asynchronous.methodignored |   | asynchronous.missing |   | callback.missing.possibleTypo |   | cannot.validate |   | client.missingMainClass |   | ignoredClassAnnotation |   | interfaceAnnotatedAsBean |   | missing.dependent.class |   | misslocated.class |   | multiplyAnnotatedAsBean |   | timeout.ba [...]
diff --git a/tomee/modules/ROOT/pages/dev/website-dev.adoc b/tomee/modules/ROOT/pages/dev/website-dev.adoc
index e103ce8..ef59c64 100644
--- a/tomee/modules/ROOT/pages/dev/website-dev.adoc
+++ b/tomee/modules/ROOT/pages/dev/website-dev.adoc
@@ -1,4 +1,4 @@
-Title: Working on the Website
+= Working on the Website
 
 The easiest way to edit is to simply click the blue pencil icon in the upper right.
 Have fun!
@@ -26,7 +26,7 @@ Enter the optional log message and click "sumbit", then done!
 
 The login information is cached for a while, so you won't have to enter user/pass information each time.
 
-== Building Locally +++<small>+++optional+++</small>+++
+== Building Locally
 
 Should you want to build the site locally, you can do so pretty easily with the right perl modules installed.
 
diff --git a/tomee/modules/ROOT/pages/dev/writing-examples.adoc b/tomee/modules/ROOT/pages/dev/writing-examples.adoc
index bb51d84..a8c7541 100644
--- a/tomee/modules/ROOT/pages/dev/writing-examples.adoc
+++ b/tomee/modules/ROOT/pages/dev/writing-examples.adoc
@@ -1,6 +1,4 @@
-:doctype: book
-
-Title: Writing Presentable Examples
+= Writing Presentable Examples
 
 Writing an example is easy.
 Any example is a good one.
@@ -18,7 +16,7 @@ Some basic guidelines of writing examples:
 * be conscious of the cost of "setting the stage"
 * if examples get too big, split it
 
-= Noise vs signal
+== Noise vs signal
 
 It takes time to learn the example scenario (noise).
 You need to learn the scenario before you can start to see the important parts (signal).
@@ -30,7 +28,7 @@ Get to the point in as few classes as possible.
 
 You should be able to explain the entire example in two minutes.
 
-= Five ways to do the same thing
+== Five ways to do the same thing
 
 If there are five ways to do the same thing, avoid making five different scenarios.
 Copy the example to a new directory, and tweak it to show the variation.
@@ -68,7 +66,7 @@ When names and scenarios are consistent, the variations jump out quickly and wit
 
 If there are five ways to do the same thing, show the same thing five different ways.
 
-= Short Class Names
+== Short Class Names
 
 You don't need to document the example with the class name.
 Class names that are a mouthful cannot be effectively used in presentations or screencasts.
diff --git a/tomee/modules/ROOT/pages/dev/writing-validation-tests.adoc b/tomee/modules/ROOT/pages/dev/writing-validation-tests.adoc
index 572e3c4..e8c909e 100644
--- a/tomee/modules/ROOT/pages/dev/writing-validation-tests.adoc
+++ b/tomee/modules/ROOT/pages/dev/writing-validation-tests.adoc
@@ -1,6 +1,5 @@
-Title: Writing Validation Tests
+= Writing Validation Tests
 
-+++<a name="WritingValidationTests-Summary">++++++</a>+++
 
 == Summary
 
@@ -9,7 +8,6 @@ If you are writing some code which validates some rules, you should definitely w
 A little validation test framework is available to write tests specifically for Validation.
 This page explains the details of writing such tests using example snippets.
 
-+++<a name="WritingValidationTests-TheValidationFramework">++++++</a>+++
 
 == The Validation Framework
 
@@ -61,8 +59,6 @@ Here is an _example validation message_
 . The validation framework does not stop processing on the first validation failure, but keeps going and checking for other validation errors and reports them all to the user.
 This allows the user to fix all errors in one go and re-attempt deploying the application.
 
-+++<a name="WritingValidationTests-TheValidationTestFramework">++++++</a>+++
-
 == The Validation Test Framework
 
 . The test framework is specifically written with the following goals in mind:
@@ -95,9 +91,9 @@ Simply invoke the following maven command
 +
 mvn test -Dtest=ValidationKeysAuditorTest -DconfluenceUsername=YourConfluenceUsername -DconfluencePassword=YourConfluencePassword
 
-The above command will create a complete test coverage report and post it to this location xref:openejb:validation-keys-audit-report.adoc[OPENEJB:Validation Keys Audit Report]
+The above command will create a complete test coverage report and post it to this location xref:validation-keys-audit-report.adoc[Validation Keys Audit Report]
 
-*** Quick facts about ValidationRunner and things to keep in mind while writing tests
+=== Quick facts about ValidationRunner and things to keep in mind while writing tests
 
 This class is created specifically to write tests which test OpenEjb validation code.
 Specifically, it is used to check the usage of keys defined in `org.apache.openejb.config.rules.Messages.properties`.
diff --git a/tomee/modules/ROOT/pages/dev/xbean-finder.adoc b/tomee/modules/ROOT/pages/dev/xbean-finder.adoc
index 6a309e0..0870ad7 100644
--- a/tomee/modules/ROOT/pages/dev/xbean-finder.adoc
+++ b/tomee/modules/ROOT/pages/dev/xbean-finder.adoc
@@ -1,5 +1,4 @@
 = xbean-finder
-:doctype: book
 
 == AnnotationFinder
 
@@ -192,7 +191,7 @@ You just:
 Obviously, the above style to object creation couples really well to the `ResourceFinder` method that gives you Properties objects back.
 You put the class name and config for your plugin in the properties files and pass the properties right into the ObjectRecipe and more or less get a little do-it-yourself IoC plugin system.
 
-= OpenEJB/TomEE
+== OpenEJB/TomEE
 
 Here is a grep of some of the calls made to `AnnotationFinder`.
 Most of this code is in an OpenEJB class called `AnnotationDeployer` whose primary job is to merge the @annotation and +++<xml>+++metadata into one tree.+++</xml>+++
diff --git a/tomee/modules/ROOT/pages/dev/xbean-usage-in-openejb.adoc b/tomee/modules/ROOT/pages/dev/xbean-usage-in-openejb.adoc
index f65aa0e..97552c3 100644
--- a/tomee/modules/ROOT/pages/dev/xbean-usage-in-openejb.adoc
+++ b/tomee/modules/ROOT/pages/dev/xbean-usage-in-openejb.adoc
@@ -1,95 +1,82 @@
-:doctype: book
+= Xbean usage in OpenEJB
 
-Title: Xbean usage in OpenEJB +++<a name="XbeanusageinOpenEJB-HowXBeanisusedinOpenEJB">++++++</a>+++
-
-= How XBean is used in OpenEJB
+== How XBean is used in OpenEJB
 
 Below is an explanation by David Blevins on the usage of xbean in OpenEJB.
 This text was taken from an email conversation.
-To view the full conversation, click&nbsp;http://www.nabble.com/How-is-XBean-used-in-OpenEJB-3--tf2148639.html#a5959172[here]
-
-+++<a name="XbeanusageinOpenEJB-xbean-reflect">++++++</a>+++
+To view the full conversation, click http://www.nabble.com/How-is-XBean-used-in-OpenEJB-3--tf2148639.html#a5959172[here]
 
-== xbean-reflect
+=== xbean-reflect
 
 xbean-reflect is a beefed up reflection library.
 
 Earlier all pluggable components had an "init(Properties props)" method?
-&nbsp;Same concept except now we throw the component class and the properties into an "ObjectRecipe" and call create().
-&nbsp;The recipe will take the props out, convert them to the right data types,  and construct the object using the right constructor and setters.
+ Same concept except now we throw the component class and the properties into an "ObjectRecipe" and call create().
+ The recipe will take the props out, convert them to the right data types,  and construct the object using the right constructor and setters.
 
 So our Containers and stuff now use constructors and setters.
-&nbsp;Same with anything in a &nbsp;http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=markup[service-jar.xml]  file.
+ Same with anything in a  http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=markup[service-jar.xml]  file.
 
-+++<a name="XbeanusageinOpenEJB-Somecoderefs:">++++++</a>+++
-
-[discrete]
 ==== Some code refs:
 
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?revision=546308&view=markup[Assembler.java] We also use it to construct Stateful and Stateless session bean instances.
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java?revision=546308&view=markup[StatefulInstanceManager.java]
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?revision=546308&view=markup[StatelessInstanceManager.java]
 
-+++<a name="XbeanusageinOpenEJB-xbean-finder">++++++</a>+++
-
-== xbean-finder
+=== xbean-finder
 
 xbean-finder is the second coolest library ever.
-&nbsp;It's a beefed up&nbsp;
+ It's a beefed up 
 service finder for grabbing stuff in your classpath.
-&nbsp;We use it at a couple of places.
+ We use it at a couple of places.
 
-+++<a name="XbeanusageinOpenEJB-COMMANDLINETOOL:">++++++</a>+++
-
-=== COMMAND LINE TOOL:
+==== COMMAND LINE TOOL:
 
 The available commands are in properties files in "META-INF/org.openejb.cli/\{name}", where \{name} is the name of the command.
-&nbsp;See:
+ See:
 
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/[openejb cli]
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/resources/META-INF/org.openejb.cli/[openejb cli for itests]
 
-Earlier we had the "test"&nbsp;
-command hardcoded in a script, but the person may have uninstalled&nbsp;
+Earlier we had the "test" 
+command hardcoded in a script, but the person may have uninstalled 
 the itests?
-&nbsp;Well now, if you have the itests jar, the "test" command&nbsp;
+ Well now, if you have the itests jar, the "test" command 
 will be available.
-&nbsp;If you don't have the itests jar, the "test" &nbsp;
+ If you don't have the itests jar, the "test"  
 command won't be available.
-&nbsp;The "test" command itself is in the&nbsp;
+ The "test" command itself is in the 
 itests jar.
-&nbsp;You can put any command in any jar and it will&nbsp;
+ You can put any command in any jar and it will 
 automatically become available on the command line.
-&nbsp;Remove the jar&nbsp;
+ Remove the jar 
 and the command is gone.
 
-When someone types "java -jar openejb.jar start" this guy will look&nbsp;
+When someone types "java -jar openejb.jar start" this guy will look 
 for "META-INF/org.openejb.cli/start".
-&nbsp;If he finds it, he'll create&nbsp;
+ If he finds it, he'll create 
 it and execute it.
-&nbsp;If he doesn't find it, he'll list the available&nbsp;
-commands by enumerating over all the files he see's in the classpath&nbsp;
+ If he doesn't find it, he'll list the available 
+commands by enumerating over all the files he see's in the classpath 
 under the "META-INF/org.openejb.cli/" directory.
 See http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?revision=546308&view=markup[MainImpl.java]
 
-An extra cool thing is that each command has in it's properties a&nbsp;
+An extra cool thing is that each command has in it's properties a 
 "description" property.
-&nbsp;This is localized, so if the VM locale is&nbsp;
-"pl" it will look for a "description.pl" property and use its value&nbsp;
+ This is localized, so if the VM locale is 
+"pl" it will look for a "description.pl" property and use its value 
 when printing command line help.
-I'd like to give Jeremy Whitlock a big shout-out for doing such a&nbsp;
+I'd like to give Jeremy Whitlock a big shout-out for doing such a 
 bang up job on this.
-&nbsp;He and I worked out the idea and white-boarded&nbsp;
-it in the wiki, then Jeremy went off and coded up the whole thing!&nbsp;
+ He and I worked out the idea and white-boarded 
+it in the wiki, then Jeremy went off and coded up the whole thing! 
 It was fantastic.
 
-+++<a name="XbeanusageinOpenEJB-SERVERSERVICES:">++++++</a>+++
-
-=== SERVER SERVICES:
+==== SERVER SERVICES:
 
-We also use the xbean-finder to create our Server Services (aka.&nbsp;
+We also use the xbean-finder to create our Server Services (aka. 
 protocols).
-&nbsp;Our ServerService implementations are in properties&nbsp;
+ Our ServerService implementations are in properties 
 files under "META-INF/org.openejb.server.ServerService/\{protocolName}.
 See:
 
@@ -98,76 +85,57 @@ See:
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-telnet/src/main/resources/META-INF/org.apache.openejb.server.ServerService/[OpenEJB Telnet - ServerService]
 . http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/resources/META-INF/org.apache.openejb.server.ServerService/[OpenEJB HTTP - ServerService]
 
-The very first time a ServerService is constructed, we squirt the&nbsp;
-properties file into the openejb/conf/ directory so the user can edit&nbsp;
-it.
-&nbsp;The properties files for ServerServices are very xinet.d like.&nbsp;
+The very first time a ServerService is constructed, we squirt the properties file into the openejb/conf/ directory so the user can edit it.
+The properties files for ServerServices are very xinet.d like.
 For example, here is the definition of the "admin" server service:
 
-&nbsp;
-&nbsp;
-&nbsp;server &nbsp;
-&nbsp;
-&nbsp;= org.openejb.server.admin.AdminDaemon &nbsp;
-&nbsp;
-&nbsp;bind &nbsp;
-&nbsp;
-&nbsp;
-&nbsp;= 127.0.0.1 &nbsp;
-&nbsp;
-&nbsp;port &nbsp;
-&nbsp;
-&nbsp;
-&nbsp;= 4200 &nbsp;
-&nbsp;
-&nbsp;disabled &nbsp;
-&nbsp;= false &nbsp;
-&nbsp;
-&nbsp;threads &nbsp;
-&nbsp;
-= 1 &nbsp;
-&nbsp;
-&nbsp;only_from &nbsp;
-= localhost
-
-You can reconfigure the "admin" server service, for example, via the&nbsp;
-properties file in openejb/conf/admin.properties.
-&nbsp;Or you can do it&nbsp;
-on the command line as such:+++<in-a-shell>+++$ ./bin/openejb start \-Dadmin.bind=192.168.42.13 OPENEJB_HOME=/Users/dblevins/work/openejb1/target/openejb-1.1-SNAPSHOT OpenEJB 1.1-SNAPSHOT &nbsp; &nbsp;build: 20060420-2356 [http://www.openejb.org](http://www.openejb.org) resources 1 OpenEJB ready. \[init\](init\.html) OpenEJB Remote Server &nbsp; &nbsp;*\* Starting Services \*\* &nbsp; &nbsp;NAME &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; IP &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [...]
+----
+server = org.openejb.server.admin.AdminDaemon
+bind = 127.0.0.1
+port = 4200
+disabled = false
+threads = 1
+only_from = localhost
+----
+
+You can reconfigure the "admin" server service, for example, via the properties file in openejb/conf/admin.properties.
+Or you can do it on the command line as such: in-a-shell
+
+$ ./bin/openejb start \-Dadmin.bind=192.168.42.13 OPENEJB_HOME=/Users/dblevins/work/openejb1/target/openejb-1.1-SNAPSHOT OpenEJB 1.1-SNAPSHOT    build: 20060420-2356 [http://www.openejb.org](http://www.openejb.org) resources 1 OpenEJB ready. \[init\](init\.html) OpenEJB Remote Server    *\* Starting Services \*\*    NAME                 IP              PORT    webadmin             127.0.0.1       4203    httpejbd             127.0.0.1       4204    telnet               127.0.0.1       42 [...]
 
 You can override any server service property in the same way.
-&nbsp;Here&nbsp;
+Here
 are a bunch more examples:
 
-&nbsp;
-Option: -D+++<service>+++.bind=<address> &nbsp;
-&nbsp;
-openejb start \-Dejbd.bind=10.45.67.8 &nbsp;
-&nbsp;
-openejb start \-Dejbd.bind=myhost.foo.com &nbsp;
-&nbsp;
+ 
+Option: -D+++<service>+++.bind=<address>  
+ 
+openejb start \-Dejbd.bind=10.45.67.8  
+ 
+openejb start \-Dejbd.bind=myhost.foo.com  
+ 
 openejb start \-Dtelnet.bind=myhost.foo.com+++</service>+++
 
-&nbsp;
-Option: -D+++<service>+++.port=+++<port>+++&nbsp;
-&nbsp;
-openejb start \-Dejbd.port=8765 &nbsp;
-&nbsp;
-&nbsp;openejb start \-Dhttpejbd.port=8888+++</port>++++++</service>+++
-
-&nbsp;
-Option: -D+++<service>+++.only_from=+++<addresses>+++&nbsp;
-&nbsp;
-&nbsp;openejb start \-Dadmin.only_from=192.168.1.12 &nbsp;
-&nbsp;
-&nbsp;openejb start \-Dadmin.only_from=192.168.1.12,joe.foo.com,robert+++</addresses>++++++</service>+++
-
-&nbsp;
-Option: -D+++<service>+++.threads=+++<max>+++&nbsp;
-&nbsp;
-&nbsp;openejb start \-Dejbd.threads=200+++</max>++++++</service>+++
-
-&nbsp;
-Option: -D+++<service>+++.disabled=<true/false> &nbsp;
-&nbsp;
-&nbsp;openejb start \-Dtelnet.disabled=true+++</service>+++
+ 
+Option: -D+++<service>+++.port=+++<port>+++ 
+ 
+openejb start \-Dejbd.port=8765  
+ 
+ openejb start \-Dhttpejbd.port=8888+++</port>++++++</service>+++
+
+ 
+Option: -D+++<service>+++.only_from=+++<addresses>+++ 
+ 
+ openejb start \-Dadmin.only_from=192.168.1.12  
+ 
+ openejb start \-Dadmin.only_from=192.168.1.12,joe.foo.com,robert+++</addresses>++++++</service>+++
+
+ 
+Option: -D+++<service>+++.threads=+++<max>+++ 
+ 
+ openejb start \-Dejbd.threads=200+++</max>++++++</service>+++
+
+ 
+Option: -D+++<service>+++.disabled=<true/false>  
+ 
+ openejb start \-Dtelnet.disabled=true+++</service>+++
diff --git a/tomee/modules/ROOT/pages/docs.adoc b/tomee/modules/ROOT/pages/docs.adoc
index 29c446a..c8d15a0 100644
--- a/tomee/modules/ROOT/pages/docs.adoc
+++ b/tomee/modules/ROOT/pages/docs.adoc
@@ -4,703 +4,4 @@
 :jbake-status: published
 :jbake-tomeepdf:
 
-=== Administration
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[Server Configuration]
-- 
-//FIXME CHOOSE ONE
-xref:7.0@tomee::admin/file-layout.adoc[]
-xref:7.1@tomee::admin/file-layout.adoc[]
-xref:8.0@tomee::admin/file-layout.adoc[Directory Structure]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[Clustering and High Availability (HA)]
-
-=== Developers
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[IDEs - Eclipse, Intellij Idea and Netbeans]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[Build Tools and Plugins]
-- 
-//FIXME CHOOSE ONE
-xref:7.0@tomee::developer/migration/tomee-1-to-7.adoc[]
-xref:7.1@tomee::developer/migration/tomee-1-to-7.adoc[]
-xref:8.0@tomee::developer/migration/tomee-1-to-7.adoc[Migrating From TomEE 1.x to 7.x]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[TomEE and Apache Johnzon - JAX-RS JSON Provider]
-- 
-//FIXME CHOOSE ONE
-xref:7.0@tomee::developer/configuration/cxf.adoc[]
-xref:7.1@tomee::developer/configuration/cxf.adoc[]
-xref:8.0@tomee::developer/configuration/cxf.adoc[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[Understanding the TomEE ClassLoader]
-
-=== Advanced
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[`ApplicationComposer` with JBatch]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[How to Setup TomEE in Production]
-- 
-//FIXME CHOOSE ONE
-xref:0.0@tomee::download/index.adoc[]
-xref:0.0@tomee::maven/index.adoc[]
-xref:0.0@tomee::security/index.adoc[]
-xref:0.1@tomee::blog/index.adoc[]
-xref:0.1@tomee::community/index.adoc[]
-xref:7.0@tomee::admin/cluster/index.adoc[]
-xref:7.0@tomee::admin/configuration/index.adoc[]
-xref:7.0@tomee::admin/index.adoc[]
-xref:7.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.0@tomee::advanced/index.adoc[]
-xref:7.0@tomee::advanced/setup/index.adoc[]
-xref:7.0@tomee::advanced/shading/index.adoc[]
-xref:7.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.0@tomee::application-composer/index.adoc[]
-xref:7.0@tomee::developer/classloading/index.adoc[]
-xref:7.0@tomee::developer/ide/index.adoc[]
-xref:7.0@tomee::developer/index.adoc[]
-xref:7.0@tomee::developer/json/index.adoc[]
-xref:7.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.0@tomee::developer/testing/index.adoc[]
-xref:7.0@tomee::developer/testing/other/index.adoc[]
-xref:7.0@tomee::developer/tools/index.adoc[]
-xref:7.0@tomee::maven/index.adoc[]
-xref:7.1@tomee::admin/cluster/index.adoc[]
-xref:7.1@tomee::admin/configuration/index.adoc[]
-xref:7.1@tomee::admin/index.adoc[]
-xref:7.1@tomee::advanced/applicationcomposer/index.adoc[]
-xref:7.1@tomee::advanced/index.adoc[]
-xref:7.1@tomee::advanced/setup/index.adoc[]
-xref:7.1@tomee::advanced/shading/index.adoc[]
-xref:7.1@tomee::advanced/tomee-embedded/index.adoc[]
-xref:7.1@tomee::application-composer/index.adoc[]
-xref:7.1@tomee::developer/classloading/index.adoc[]
-xref:7.1@tomee::developer/ide/index.adoc[]
-xref:7.1@tomee::developer/index.adoc[]
-xref:7.1@tomee::developer/json/index.adoc[]
-xref:7.1@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:7.1@tomee::developer/testing/arquillian/index.adoc[]
-xref:7.1@tomee::developer/testing/index.adoc[]
-xref:7.1@tomee::developer/testing/other/index.adoc[]
-xref:7.1@tomee::developer/tools/index.adoc[]
-xref:7.1@tomee::maven/index.adoc[]
-xref:8.0@examples::index.adoc[]
-xref:8.0_es@examples::index.adoc[]
-xref:8.0_pt@examples::index.adoc[]
-xref:8.0@tomee::admin/cluster/index.adoc[]
-xref:8.0@tomee::admin/configuration/index.adoc[]
-xref:8.0@tomee::admin/index.adoc[]
-xref:8.0@tomee::advanced/applicationcomposer/index.adoc[]
-xref:8.0@tomee::advanced/index.adoc[]
-xref:8.0@tomee::advanced/setup/index.adoc[]
-xref:8.0@tomee::advanced/shading/index.adoc[]
-xref:8.0@tomee::advanced/tomee-embedded/index.adoc[]
-xref:8.0@tomee::application-composer/index.adoc[]
-xref:8.0@tomee::developer/classloading/index.adoc[]
-xref:8.0@tomee::developer/ide/index.adoc[]
-xref:8.0@tomee::developer/index.adoc[]
-xref:8.0@tomee::developer/json/index.adoc[]
-xref:8.0@tomee::developer/testing/applicationcomposer/index.adoc[]
-xref:8.0@tomee::developer/testing/arquillian/index.adoc[]
-xref:8.0@tomee::developer/testing/index.adoc[]
-xref:8.0@tomee::developer/testing/other/index.adoc[]
-xref:8.0@tomee::developer/tools/index.adoc[]
-xref:8.0@tomee::maven/index.adoc[Fat / Uber Jar Deployment using the Maven Shade Plugin]
-- 
-//FIXME CHOOSE ONE
-xref:7.0@tomee::advanced/client/jndi.adoc[]
-xref:7.1@tomee::advanced/client/jndi.adoc[]
-xref:8.0@tomee::advanced/client/jndi.adoc[Java Naming and Directory Interface (JNDI)]
-- 
-//FIXME CHOOSE ONE
-xref:7.0@tomee::advanced/jms/jms-configuration.adoc[]
-xref:7.1@tomee::advanced/jms/jms-configuration.adoc[]
-xref:8.0@tomee::advanced/jms/jms-configuration.adoc[Why is my ActiveMQ/JMS MDB not scaling as expected?]
+TODO this page is currently generated by JBake.
\ No newline at end of file
diff --git a/tomee/modules/ROOT/pages/lightening-demos.adoc b/tomee/modules/ROOT/pages/lightening-demos.adoc
index ca1a41e..38e59b2 100644
--- a/tomee/modules/ROOT/pages/lightening-demos.adoc
+++ b/tomee/modules/ROOT/pages/lightening-demos.adoc
@@ -1,52 +1,56 @@
-Title: Lightening Demos
-
-=== Lightening Demos Details+++<div>++++++<table class="confluenceTable">++++++<tbody>++++++<tr>++++++<th>+++Demo Name+++</th>+++
-+++<th>+++Description+++</th>+++
-+++<th>+++Sponsor+++</th>+++
-+++<th>+++Links/Comments+++</th>++++++</tr>+++
-+++<tr>++++++<td>+++TestCase Injection+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=g5l14G9RBCM">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876983">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++Simple @WebService+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=ZcSnhVlOxJc">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876894">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++Simple @Stateless bean+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=aLx2jta96xU">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876787">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++Simple @Stateful bean+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=9JqxbfzsWOQ">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876733">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++Simple @MessageDriven bean+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=HmXFxMDLCJQ">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876667">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++EntityManager injection and usage+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=s4uiIoAehgQ">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876564">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++DataSource injection and usage+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=g3lIPlegDJk">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876492">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++Alternate Descriptors+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=r1lDC40ESug">+++Youtube +++</a>+++, +++<a rel="nofollow" class="external-link" href="http://vimeo.com/16876426">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++Getting started with the OpenEJB Eclipse Plugin+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://vimeo.com/7393498">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++EJB Unit Testing with Eclipse and OpenEJB+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://vimeo.com/6149008">+++Vimeo +++</a>++++++</td>++++++</tr>+++
-+++<tr>++++++<td>+++ScreenFlow720+++</td>+++
-+++<td>+++&nbsp;+++</td>+++
-+++<td>+++David Blevins+++</td>+++
-+++<td>++++++<a rel="nofollow" class="external-link" href="http://vimeo.com/16872034">+++Vimeo +++</a>++++++</td>++++++</tr>++++++</tbody>++++++</table>++++++</div>+++
-
-_NOTE: For more details about the idea behind Lightening Demos, please read xref:-http://markmail.org/message/5jq5xun44kt7tcni.adoc[this]  e-mail thread._
+= Lightning Demos
+
+== Lightning Demos Details
+
+[cols="3*"]
+|===
+|Demo Name
+|Sponsor
+|Links/Comments
+
+|TestCase Injection
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=g5l14G9RBCM">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876983">Vimeo </a>
+
+|Simple @WebService
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=ZcSnhVlOxJc">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876894">Vimeo </a>
+
+|Simple @Stateless bean
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=aLx2jta96xU">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876787">Vimeo </a>
+
+|Simple @Stateful bean
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=9JqxbfzsWOQ">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876733">Vimeo </a>
+
+|Simple @MessageDriven bean
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=HmXFxMDLCJQ">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876667">Vimeo </a>
+
+|EntityManager injection and usage
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=s4uiIoAehgQ">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876564">Vimeo </a>
+
+|DataSource injection and usage
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=g3lIPlegDJk">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876492">Vimeo </a>
+
+|Alternate Descriptors
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://www.youtube.com/watch?v=r1lDC40ESug">Youtube </a>, <a rel="nofollow" class="external-link" href="http://vimeo.com/16876426">Vimeo </a>
+
+|Getting started with the OpenEJB Eclipse Plugin
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://vimeo.com/7393498">Vimeo </a>
+
+|EJB Unit Testing with Eclipse and OpenEJB
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://vimeo.com/6149008">Vimeo </a>
+
+|ScreenFlow720
+|David Blevins
+|<a rel="nofollow" class="external-link" href="http://vimeo.com/16872034">Vimeo </a></tbody></table></div>
+|===
+
+NOTE: For more details about the idea behind Lightening Demos, please read link:http://markmail.org/message/5jq5xun44kt7tcni.adoc[this]  e-mail thread.
diff --git a/tomee/modules/ROOT/pages/mailing-lists.adoc b/tomee/modules/ROOT/pages/mailing-lists.adoc
index ed44151..13e2cb6 100644
--- a/tomee/modules/ROOT/pages/mailing-lists.adoc
+++ b/tomee/modules/ROOT/pages/mailing-lists.adoc
@@ -1,10 +1,6 @@
-:doctype: book
+= Mailing Lists
 
-Title: Mailing Lists
-
-+++<a name="MailingLists-UserMailingList">++++++</a>+++
-
-= User Mailing List
+== User Mailing List
 
 Where the general TomEE community goes to ask questions, make suggestions, chat  with other users and developers, and keep a finger on the pulse of the project.
 
@@ -14,16 +10,40 @@ Medium volume mailing list, dedicated to the  TomEE community.
 * link:mailto:users-subscribe@tomee.apache.org[Subscribe]
 * link:mailto:users-unsubscribe@tomee.apache.org[Unsubscribe]
 
-TomEE Users Online Archives/Forums:+++<table>++++++<tr>++++++<th>+++Search+++</th>++++++<th>+++Post+++</th>++++++<th>+++Depth+++</th>++++++<th>+++Archive URL+++</th>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2002+++</td>++++++<td>+++http://openejb.markmail.org/search/?q=type:users+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2002+++</td>++++++<td>+++http://marc.info/?l=openejb-user+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(x)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2006+++</td>++++++<td>+++http://mail-archives.apache.org/mod_mbox/TomEE-users/+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(/)+++</td>++++++<td>+++2006+++</td>++++++<td>+++http://n4.nabble.com/OpenEJB-User-f979441.html+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2007+++</td>++++++<td>+++http://www.mail-archive.com/users@tomee.apache.org+++</td>++++++</tr>++++++</table>+++
-
-+++<a name="MailingLists-DeveloperMailingList">++++++</a>+++
-
-= Developer Mailing List
+TomEE Users Online Archives/Forums:
+|===
+|Search
+|Post
+|Depth
+|Archive URL
+
+|(/)
+|(x)
+|2002
+|http://openejb.markmail.org/search/?q=type:users
+
+|(/)
+|(x)
+|2002
+|http://marc.info/?l=openejb-user
+
+|(x)
+|(x)
+|2006
+|http://mail-archives.apache.org/mod_mbox/TomEE-users/
+
+|(/)
+|(/)
+|2006
+|http://n4.nabble.com/OpenEJB-User-f979441.html
+
+|(/)
+|(x)
+|2007
+|http://www.mail-archive.com/users@tomee.apache.org
+|===
+
+== Developer Mailing List
 
 If you're a developer or contributor on TomEE, this is the place for you.
 Join in on the develpment and planning discussions.
@@ -33,16 +53,40 @@ Get the scoop on the changes that take place in TomEE as our team is hard at wor
 * link:mailto:dev-subscribe@tomee.apache.org[Subscribe]
 * link:mailto:dev-unsubscribe@tomee.apache.org[Unsubscribe]
 
-TomEE Developers Online Archives/Forums:+++<table>++++++<tr>++++++<th>+++Search+++</th>++++++<th>+++Post+++</th>++++++<th>+++Depth+++</th>++++++<th>+++Archive URL+++</th>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2002+++</td>++++++<td>+++http://openejb.markmail.org/search/?q=type:development+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2002+++</td>++++++<td>+++http://marc.info/?l=openejb-development+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(x)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2006+++</td>++++++<td>+++http://mail-archives.apache.org/mod_mbox/tomee-dev/+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(/)+++</td>++++++<td>+++2006+++</td>++++++<td>+++http://n4.nabble.com/OpenEJB-Dev-f982480.html+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2007+++</td>++++++<td>+++http://www.mail-archive.com/dev@tomee.apache.org+++</td>++++++</tr>++++++</table>+++
-
-+++<a name="MailingLists-CommitMailingList">++++++</a>+++
-
-= Commit Mailing List
+TomEE Developers Online Archives/Forums:
+|===
+|Search
+|Post
+|Depth
+|Archive URL
+
+|(/)
+|(x)
+|2002
+|http://openejb.markmail.org/search/?q=type:development
+
+|(/)
+|(x)
+|2002
+|http://marc.info/?l=openejb-development
+
+|(x)
+|(x)
+|2006
+|http://mail-archives.apache.org/mod_mbox/tomee-dev/
+
+|(/)
+|(/)
+|2006
+|http://n4.nabble.com/OpenEJB-Dev-f982480.html
+
+|(/)
+|(x)
+|2007
+|http://www.mail-archive.com/dev@tomee.apache.org
+|===
+
+== Commit Mailing List
 
 Keep tabs on all the changes to our svn.
 We have mixed a few of the popular perl scripts for cvs email notification as well as added a few features that are all new.
@@ -52,8 +96,30 @@ This new list provides you with as-it-happens information regarding TomEE develo
 * link:mailto:commits-subscribe@tomee.apache.org[Subscribe]
 * link:mailto:commits-unsubscribe@tomee.apache.org[Unsubscribe]
 
-TomEE Commits Online Archives/Forums:+++<table>++++++<tr>++++++<th>+++Search+++</th>++++++<th>+++Post+++</th>++++++<th>+++Depth+++</th>++++++<th>+++Archive URL+++</th>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2002+++</td>++++++<td>+++http://openejb.markmail.org/search/?q=type:checkins+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2004+++</td>++++++<td>+++http://marc.info/?l=openejb-cvs+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(x)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2006+++</td>++++++<td>+++http://mail-archives.apache.org/mod_mbox/TomEE-commits/+++</td>++++++</tr>+++
-+++<tr>++++++<td>+++(/)+++</td>++++++<td>+++(x)+++</td>++++++<td>+++2007+++</td>++++++<td>+++http://www.mail-archive.com/commits@tomee.apache.org+++</td>++++++</tr>++++++</table>+++
+TomEE Commits Online Archives/Forums:
+|===
+|Search
+|Post
+|Depth
+|Archive URL
+
+|(/)
+|(x)
+|2002
+|http://openejb.markmail.org/search/?q=type:checkins
+
+|(/)
+|(x)
+|2004
+|http://marc.info/?l=openejb-cvs
+
+|(x)
+|(x)
+|2006
+|http://mail-archives.apache.org/mod_mbox/TomEE-commits/
+
+|(/)
+|(x)
+|2007
+|http://www.mail-archive.com/commits@tomee.apache.org
+|===
\ No newline at end of file
diff --git a/tomee/modules/ROOT/pages/management-and-voting.adoc b/tomee/modules/ROOT/pages/management-and-voting.adoc
index fe21046..7b81266 100644
--- a/tomee/modules/ROOT/pages/management-and-voting.adoc
+++ b/tomee/modules/ROOT/pages/management-and-voting.adoc
@@ -1,8 +1,6 @@
-:doctype: book
+=  Management and Voting
 
-Title: Management and Voting +++<a name="ManagementandVoting-Basicinfo">++++++</a>+++
-
-= Basic info
+==  Basic info
 
 Apache has a few roles that relate to all Apache projects:
 
@@ -20,9 +18,7 @@ pedestrians (users) always have the right of way, bikes (contributors) yield to
 Depending on what you're driving you have a greater responsibility to those around you.
 Be careful not to run anyone over.
 
-+++<a name="ManagementandVoting-PMC">++++++</a>+++
-
-= PMC
+==  PMC
 
 We don't focus on the PMC in this project so many may not have a clear concept of it.
 Every project at Apache has a PMC which at minimum represents Apache from a legal perspective.
@@ -43,19 +39,15 @@ We don't even focus on who is a committer and who is not, which is a major facto
 If someone doesn't feel like their input matters till they are a committer, or any other status, we've done something wrong.
 Fortunately, this is one of our strongest attributes and part of the magic that is this community.
 
-+++<a name="ManagementandVoting-FAQ">++++++</a>+++
-
-= FAQ
-
-+++<a name="ManagementandVoting-Q.Whosevotescount?">++++++</a>+++
+==  FAQ
 
-== Q. Whose votes count?
+===  Q. Whose votes count?
 
 Apache requires a minimum of three +1 PMC votes which have legal significance to Apache as a corporation.
 That said, all votes from the community are significant to the project and decision making and any -1 is cause for pause and discussion.
 We frequently encourage and welcome votes from anyone in the community regardless of status.
 
-== Q. Voting on people: Is it hard to vote -1 in public / Can someone get their feelings hurt ?
+===  Q. Voting on people: Is it hard to vote -1 in public / Can someone get their feelings hurt ?
 
 Yes and yes.
 Voting in public requires greater care and sensitivity on behalf of everyone;
diff --git a/tomee/modules/ROOT/pages/powered-by.adoc b/tomee/modules/ROOT/pages/powered-by.adoc
index d1e9243..5f64cd2 100644
--- a/tomee/modules/ROOT/pages/powered-by.adoc
+++ b/tomee/modules/ROOT/pages/powered-by.adoc
@@ -1,6 +1,4 @@
-:doctype: book
-
-Title: Powered By
+= Powered By
 
 This page is a list of some, in all likelihood a very small fraction actually, of the sites out there that use Apache TomEE in production.
 For security and other policy-related reasons, many organizations choose not to disclose the server they use.
@@ -13,12 +11,12 @@ We would like to see your application listed no matter how big, how small, or ho
 Please note that all the corporate logos and names used below are trademarked by their respective organizations.
 These organizations are not affiliated with this web site or with The Apache Software Foundation, and make no claims regarding The Foundation or its products.
 
-= Sites
+== Sites
 
 * http://ilikeplaces.com/[iLikePlaces]
 
-= Software
+== Software
 
-= Services
+== Services
 
 * http://metawerx.net[Metawerx] - offers Apache TomEE hosting and provides detailed statistics and support services.
diff --git a/tomee/modules/ROOT/pages/security/security.adoc b/tomee/modules/ROOT/pages/security/security.adoc
index b43c662..a213c34 100755
--- a/tomee/modules/ROOT/pages/security/security.adoc
+++ b/tomee/modules/ROOT/pages/security/security.adoc
@@ -4,7 +4,7 @@
 :jbake-status: published
 :jbake-tomeepdf:
 
-=== Security updates
+== Security updates
 
 Please note that, except in rare circumstances, binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache TomEE version where that vulnerability has been fixed.
 
@@ -31,7 +31,7 @@ The private security mailing address is: security (at) apache (dot) org
 
 Note that all networked servers are subject to denial of service attacks, and we cannot promise magic workarounds to generic problems (such as a client streaming lots of data to your server, or re-requesting the same URL repeatedly). In general our philosophy is to avoid any attacks which can cause the server to consume resources in a non-linear relationship to the size of inputs.
 
-=== Third-party projects
+== Third-party projects
 
 Apache is built with the following components. Please see the security advisories information for each component for more information on the security vulnerabilities and issues that may affect that component.
 
@@ -44,7 +44,7 @@ Apache is built with the following components. Please see the security advisorie
 
 By default any regular TomEE releases uses latest sub project releases, so that we can follow all security fixes as much as possible.
 
-=== Apache TomEE versioning details
+== Apache TomEE versioning details
 
 As security is a key concern in many companies, TomEE team also considers to deliver specific security fixes for those external projects being fixed. For instance, if Tomcat fixes a security issue in Tomcat x.y.z, used in TomEE a.b.c, we will consider packaging a new security update release using the new Tomcat release.
 
@@ -56,15 +56,15 @@ In order to achieve a smoothly migration patch between a TomEE version and a sec
 
 Optionally we can concatenate a security update to the version if TomEE source base if not impacted but only a dependency. Note this didn't happen yet.
 
-=== Additional information
+== Additional information
 
-==== Secunia
+=== Secunia
 
 Secunia is an international IT security company specialising in vulnerability management based in Copenhagen, Denmark.
 
 There is an Apache Software Foundation vendor declared so you can follow all vulnerabilities related to Apache products. Of course, a Apache TomEE product is also available so you can search for know advisories.
 
-=== Links
+== Links
 
 - http://apache.org/security/
 - http://apache.org/security/projects.html
diff --git a/tomee/modules/ROOT/pages/security/support.adoc b/tomee/modules/ROOT/pages/security/support.adoc
index 2793321..94de8a0 100755
--- a/tomee/modules/ROOT/pages/security/support.adoc
+++ b/tomee/modules/ROOT/pages/security/support.adoc
@@ -10,25 +10,25 @@ Please be aware when asking questions that the Apache Software Foundation does n
 All community support comes from volunteers on a volunteer basis.
 Joining the xref:../community/index.adoc[Community] as a volunteer and helping your fellow users is highly encouraged!
 
-=== Mailing Lists
+== Mailing Lists
 
 - mailto:users@tomee.apache.org[User Mailing List] (mailto:users-subscribe@tomee.apache.org[Subscribe now] | mailto:users-unsubscribe@tomee.apache.org[Unsubscribe]): for all your questions or to share the issues you can meet
 - mailto:dev@tomee.apache.org[Dev Mailing List] (mailto:dev-subscribe@tomee.apache.org[Subscribe now] | mailto:dev-unsubscribe@tomee.apache.org[Unsubscribe]): to speak about the project and developments
 - mailto:commits@tomee.apache.org[Commits Mailing List] (mailto:commits-subscribe@tomee.apache.org[Subscribe now] | mailto:commits-unsubscribe@tomee.apache.org[Unsubscribe]): receive commits by mail
 
 
-=== IRC
+== IRC
 
 http://webchat.freenode.net/?channels=openejb[openejb @ freenode] is the channel most of us use.
 
-=== Forums
+== Forums
 
 Our forum (mailing lists archives) can be accessed through http://tomee-openejb.979440.n4.nabble.com/[Nabble].
 
-=== Bugtracker/JIRA
+== Bugtracker/JIRA
 
 If you encounter a bug or want to submit a patch just go on our https://issues.apache.org/jira/browse/TOMEE[JIRA].
 
-=== Commercial Support
+== Commercial Support
 
-If you need advanced support with SLA please have a look to our xref:../community/commercial.adoc[Commercial] page.
+If you need advanced support with SLA please have a look to our xref:community/commercial.adoc[Commercial] page.
diff --git a/tomee/modules/ROOT/pages/tomcat-activemq.adoc b/tomee/modules/ROOT/pages/tomcat-activemq.adoc
index bd2b43a..9719696 100644
--- a/tomee/modules/ROOT/pages/tomcat-activemq.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-activemq.adoc
@@ -1,11 +1,12 @@
-Title: Tomcat and ActiveMQ
+= Tomcat and ActiveMQ
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with ActiveMQ added and integrated and ready to go!
 
 In a plain Servlet, Filter or Listener you can do fun things like injection of JMS Topics or Queues:
 
-....
+[source,java]
+----
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServlet;
 import javax.jms.Topic;
@@ -47,11 +48,14 @@ public class MyServet extends HttpServlet {
     }
 
 }
-....
+----
 
 No need to add even a single library!
 In the above scenario even the "foo" Topic and the "bar" Queue would be automatically created with no configuration necessary.
 
-xref:downloads.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
+xref:downloads-ng.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
 
-{include:apache-tomee.mdtext}
+
+TODO what?
+
+include:apache-tomee.adoc
diff --git a/tomee/modules/ROOT/pages/tomcat-cdi.adoc b/tomee/modules/ROOT/pages/tomcat-cdi.adoc
index af725d4..70f3901 100644
--- a/tomee/modules/ROOT/pages/tomcat-cdi.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-cdi.adoc
@@ -1,9 +1,10 @@
-Title: Tomcat CDI
+= Tomcat CDI
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with CDI added and integrated and ready to go!
 
-....
+[source,java]
+----
 import javax.annotation.Resource;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
@@ -25,13 +26,15 @@ public class MyServlet extends HttpServlet {
 
     }
 }
-....
+----
 
 Where `Car` could be any POJO with a no-arg constructor.
 Additionally it's quite easy to create a factory to create the car you want injected.
 Simply do as follows:
 
-....
+[source,java]
+----
+
 import javax.enterprise.inject.Produces;
 
 public class AssemblyLine {
@@ -41,7 +44,7 @@ public class AssemblyLine {
         return new Car("Ferrari", "458 Italia", 2012);
     }
 }
-....
+----
 
 So when will the `Car` be created?
 In the above it will be created when `MyServlet` is created.
@@ -59,6 +62,8 @@ Any jar in your webapp with the above will automatically be CDI enabled and all
 All this is setup and ready to go!
 Spend your time learning and having fun and writing your app, don't spend it chasing down libraries and integrating things the hard way.
 
-xref:downloads.adoc[Download] TomEE and you're minutes away from having fun with CDI on Tomcat.
+xref:downloads-ng.adoc[Download] TomEE and you're minutes away from having fun with CDI on Tomcat.
+
+TODO what?
 
-{include:apache-tomee.mdtext}
+include:apache-tomee.adoc
diff --git a/tomee/modules/ROOT/pages/tomcat-detailed-instructions.adoc b/tomee/modules/ROOT/pages/tomcat-detailed-instructions.adoc
index 4f1ae64..0607f61 100644
--- a/tomee/modules/ROOT/pages/tomcat-detailed-instructions.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-detailed-instructions.adoc
@@ -1,20 +1,14 @@
-:doctype: book
+= Tomcat Detailed Instructions
 
-Title: Tomcat Detailed Instructions \{composition-setup}
-
-+++<a name="TomcatDetailedInstructions-{anchor:detailedinstructions}DetailedInstallationInstructions">++++++</a>+++
-
-= {anchor:detailed instructions} Detailed Installation Instructions
+== Detailed Installation Instructions
 
 These instructions assume you have a standard Tomcat installation running on port 8080.
 If you do not have an existing Tomcat installation, or want to start with a fresh installation for OpenEJB, the xref:tomcat-installation.adoc[Tomcat Installation]  will show you how to setup and verify a Tomcat installation.
 
-+++<a name="TomcatDetailedInstructions-Addopenejb.wartoTomcat">++++++</a>+++
-
-== Add openejb.war to Tomcat
+=== Add openejb.war to Tomcat
 
 The TomEE plugin for Tomcat is distributed as a standalone war file containing all of the necessary files and an installer Servlet.
-The war can be obtained from the http://tomee.apache.org/downloads.html[download page] .  Once downloaded, simply copy the file into the Tomcat webapps directory.
+The war can be obtained from the xref:downloads.adoc[download page] .  Once downloaded, simply copy the file into the Tomcat webapps directory.
 
 {deck:id=Copy openejb.war} {card:label=Windows}{noformat:nopanel=true} C:>copy openejb.war apache-tomcat-6.0.14\webapps\openejb.war 	1 file(s) copied.
 
@@ -28,30 +22,26 @@ Directory of C:\apache-tomcat-6.0.14\webapps
 09/20/2007 03:02 PM +++<DIR>+++docs 09/20/2007 03:01 PM +++<DIR>+++examples 09/20/2007 03:01 PM +++<DIR>+++host-manager 09/20/2007 03:03 PM +++<DIR>+++manager 09/19/2007 09:31 AM 13,394,733 openejb.war 09/20/2007 03:01 PM +++<DIR>+++ROOT 1 File(s) 13,394,733 bytes 7 Dir(s) 5,100,126,208 bytes free+++</DIR>++++++</DIR>++++++</DIR>++++++</DIR>++++++</DIR>++++++</DIR>++++++</DIR>+++
 
 ....
-{card:label=Unix}{noformat:nopanel=true}
 $ cp openejb.war apache-tomcat-6.0.14/webapps/openejb.war
 
 $ ls apache-tomcat-6.0.14/webapps/
 ROOT/	      docs/	    examples/	  host-manager/ manager/      openejb.war
 ....
 
-\{deck}
-
-+++<a name="TomcatDetailedInstructions-RunInstallerServlet">++++++</a>+++
-
-== Run Installer Servlet
+=== Run Installer Servlet
 
 The OpenEJB Plugin for Tomcat contains an installer servlet which adds the OpenEJB listener and JavaAgent to the Tomcat installation.
 To run the installer, you must first start Tomcat.
 
-{deck:id=Start Tomcat} {card:label=Windows}{noformat:nopanel=true} C:>set JRE_HOME=C:\Program Files\Java\jre1.5.0_06
+----
+C:>set JRE_HOME=C:\Program Files\Java\jre1.5.0_06
 
 C:>cd apache-tomcat-6.0.14\bin
 
 C:\apache-tomcat-6.0.14\bin>startup.bat Using CATALINA_BASE:   C:\apache-tomcat-6.0.14 Using CATALINA_HOME:   C:\apache-tomcat-6.0.14 Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp Using JRE_HOME:        C:\your\java\installation
+----
 
-....
-{card:label=Unix}{noformat:nopanel=true}
+----
 $ cd apache-tomcat-6.0.14/bin
 
 apache-tomcat-6.0.14/bin$ chmod u+x *.sh
@@ -61,37 +51,34 @@ Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
 Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
 Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
 Using JRE_HOME:        /your/java/installation
-....
+----
 
-\{deck}
-
-_NOTE:_ Your output will be different from the example above due to differences in installation locations.
+NOTE: Your output will be different from the example above due to differences in installation locations.
 
 It is a good idea to wait a 5-60 seconds (depending on the speed of your computer) for Tomcat to fully start.
 Once Tomcat is fully started, simply visit http://localhost:8080/openejb/installer  and click the 'install' button to run the installer.
 The installer should report that the installation was successful.
 If it didn't work click [OPENEJB:here|#problems] .
 
-\{warning} The installer servlet adds the OpenEJB JavaAgent declaration to the catalina.sh and catalina.bat files.
+WARNING: The installer servlet adds the OpenEJB JavaAgent declaration to the catalina.sh and catalina.bat files.
 If you are using an IDE or some other mechanism to start Tomcat, you will need to xref:manual-installation#javaagent.adoc[manually]  add the JavaAgent declaration to the Java VM options of the launcher you are using.
-\{warning}
-
-+++<a name="TomcatDetailedInstructions-RestartTomcat">++++++</a>+++
 
-== Restart Tomcat
+=== Restart Tomcat
 
 OpenEJB uses OpenJPA for persistence and OpenJPA currently requires a JavaAgent to function.
 Unfortunately, there is no way to install a JavaAgent at runtime, so you will have to restart Tomcat to enable the JavaAgent.
 Simply execute the shutdown command, wait 5-60 seconds (depending on the speed of your computer) for Tomcat to fully stop, and run the startup command to restart Tomcat.
 
-{deck:id=Start Tomcat} {card:label=Windows}{noformat:nopanel=true} C:>cd apache-tomcat-6.0.14\bin
+----
+C:>cd apache-tomcat-6.0.14\bin
 
 C:\apache-tomcat-6.0.14\bin>shutdown.bat Using CATALINA_BASE:   C:\apache-tomcat-6.0.14 Using CATALINA_HOME:   C:\apache-tomcat-6.0.14 Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp Using JRE_HOME:        C:\your\java\installation
 
 C:\apache-tomcat-6.0.14\bin>startup.bat Using CATALINA_BASE:   C:\apache-tomcat-6.0.14 Using CATALINA_HOME:   C:\apache-tomcat-6.0.14 Using CATALINA_TMPDIR: C:\apache-tomcat-6.0.14\temp Using JRE_HOME:        C:\your\java\installation
 
-....
-{card:label=Unix}{noformat:nopanel=true}
+----
+
+----
 $ cd apache-tomcat-6.0.14/bin
 
 apache-tomcat-6.0.14/bin$ ./shutdown.sh
@@ -105,35 +92,28 @@ Using CATALINA_BASE:   /your/tomcat/installation/apache-tomcat-6.0.14
 Using CATALINA_HOME:   /your/tomcat/installation/apache-tomcat-6.0.14
 Using CATALINA_TMPDIR: /your/tomcat/installation/apache-tomcat-6.0.14/temp
 Using JRE_HOME:        /your/java/installation
-....
-
-\{deck}
+----
 
-_NOTE:_ Your output will be different from the example above due to differences in installation locations.
+NOTE: Your output will be different from the example above due to differences in installation locations.
 
 Once Tomcat is fully started, simply visit http://localhost:8080/openejb/installer  to verify the installation is complete.
 
-+++<a name="TomcatDetailedInstructions-Examples,TutorialsandTests">++++++</a>+++
+== Examples, Tutorials and Tests
 
-= Examples, Tutorials and Tests
-
-+++<a name="TomcatDetailedInstructions-ejb-examples.war">++++++</a>+++
-
-== ejb-examples.war
+=== ejb-examples.war
 
 Download the http://people.apache.org/~dain/openejb-temp/examples[ejb-examples.war] , copy it into the Tomcat webapps directory, and visit [http://localhost:8080/ejb-examples] .
 
-+++<a name="TomcatDetailedInstructions-OpenEJBiTests">++++++</a>+++
-
-== OpenEJB iTests
+=== OpenEJB iTests
 
 OpenEJB uses a large test suite to verify the final server assembly, and you can use this to verify your OpenEJB installation.
 Simply download the http://people.apache.org/~dain/openejb-temp/itests[openejb-itests.war and openejb-standalone-client.jar]  and copy it the war into the Tomcat webapps directory.
 It will take a bit to load the application because it contains a huge number of EJBs.
 Finally, run the test client executable jar.
 
-{deck:id=Start Tomcat} {card:label=Windows}{noformat:nopanel=true} C:>java -jar openejb-itests-standalone-client.jar tomcat *__**__**__**__**__**__**__***__**_
-
+.Start Tomcat
+----
+C:>java -jar openejb-itests-standalone-client.jar tomcat *__**__**__**__**__**__**__***__**_
 [cols=24*]
 |===
 | _
@@ -162,7 +142,8 @@ Finally, run the test client executable jar.
 | _
 |===
 
-Running EJB compliance tests on HTTP/Tomcat Server *__**__**__**__**__**__**__***__**_ WARNING: No test suite configuration file specified, assuming system properties contain all  needed information.
+Running EJB compliance tests on HTTP/Tomcat Server *__**__**__**__**__**__**__***__**_
+WARNING: No test suite configuration file specified, assuming system properties contain all  needed information.
 To specify a test suite configuration file by setting its location using the system property "openejb.testsuite.properties"  test server = org.apache.openejb.test.TomcatRemoteTestServer entry = java.naming.provider.url:http://127.0.0.1:8080/openejb/ejb entry = java.naming.factory.initial:org.apache.openejb.client.RemoteInitialContextFactory .........................................
 .........................................
 .........................................
@@ -193,8 +174,11 @@ OK (889 tests)
 
 CLIENT JNDI PROPERTIES java.naming.provider.url = http://127.0.0.1:8080/openejb/ejb java.naming.factory.initial = org.apache.openejb.client.RemoteInitialContextFactory *__**__**__**__**__**__**__***__**_
 
-....
-{card:label=Unix}{noformat:nopanel=true}
+----
+
+
+.Unix
+----
 $ java -jar openejb-itests-standalone-client.jar tomcat
 _________________________________________________
 |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|
@@ -239,20 +223,16 @@ CLIENT JNDI PROPERTIES
 java.naming.provider.url = http://127.0.0.1:8080/openejb/ejb
 java.naming.factory.initial = org.apache.openejb.client.RemoteInitialContextFactory
 _________________________________________________
-....
-
-\{deck}
+----
 
-{tip:title=Failures}The tests should completely pass the first time they are run.
-If you execute the test client a second time, 21 tests fail for some unknown reason.\{tip}
 
-+++<a name="TomcatDetailedInstructions-{anchor:problems}Problems?">++++++</a>+++
 
-= {anchor:problems} Problems?
+TIP: The tests should completely pass the first time they are run.
+If you execute the test client a second time, 21 tests fail for some unknown reason.\{tip}
 
-+++<a name="TomcatDetailedInstructions-HTTPStatus403">++++++</a>+++
+== Problems?
 
-== HTTP Status 403
+=== HTTP Status 403
 
 Did you get a "HTTP Status 403" error page containing the description "Access to the specified resource () has been forbidden." when visiting http://localhost:8080/openejb ?
 
@@ -263,20 +243,16 @@ If you want to access the openejb.war from another computer, you will need to ei
 The easiest way to remove the valve it to simply delete the webapps/openejb/META-INF/context.xml file and and the webapps/openejb.war file _while Tomcat is stopped_.
 The openejb.war file must be removed because some versions of Tomcat will use the context.xml file packed in the openejb.war file regardless of what is in the unpacked directory.
 
-+++<a name="TomcatDetailedInstructions-OtherIssues">++++++</a>+++
+=== Other Issues
 
-== Other Issues
-
-If you are having problems with the installation, please send a message to the OpenEJB users xref:openejb:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
+If you are having problems with the installation, please send a message to the OpenEJB users xref:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
 
 * OpenEJB Version
 * Tomcat Version
 * Java Version (execute java -version)
 * Operating System Type and Version
 
-+++<a name="TomcatDetailedInstructions-Limitations">++++++</a>+++
-
-= Limitations
+== Limitations
 
 _Tomcat 6.x_ - Currently, only Tomcat 6.x is supported due to API difference between 5.5.x and 6.x.
 It is expected that 5.5 will be supported in the future, but there are no plans to support 5.0.x due to the lack of annotation support in 5.0.x.
@@ -290,9 +266,7 @@ _JavaAgent_ - OpenEJB uses OpenJPA to provide JPA and CMP persistence, and OpenJ
 This requirement is something that the OpenJPA project is working on removing.
 Once removed, the OpenEJB plugin for Tomcat will no longer need to modify the startup shell scripts and you will not need to restart Tomcat after the OpenEJB installation.
 
-+++<a name="TomcatDetailedInstructions-Misc">++++++</a>+++
-
-= Misc
+== Misc
 
 This document is a starting point for using OpenEJB in Tomcat and will evolve based on user contributions.
 If you wish to contribute to this document, feel very welcome to click the 'Edit' link in the upper right and make changes and add new HOWTO's and other docs.
diff --git a/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc b/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc
index b7d4281..d065d5d 100644
--- a/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc
@@ -1,23 +1,22 @@
-:doctype: book
+= Tomcat ejb-refs
 
-Title: Tomcat ejb-refs +++<a name="Tomcatejb-refs-Via@EJBAnnotation">++++++</a>+++
-
-= Via @EJB Annotation
+== Via @EJB Annotation
 
 Which an be as simple as adding this to your Servlet, Filter, or Listener:
 
+----
  @EJB
  private HelloLocal helloLocal;
+----
 
 See the xref:0.0@tomee::injection-of-other-ejbs-example.adoc[@EJB Injection Example]  for a running example.
 The example uses one ejb to refer to another ejb, but the same rules apply for servlets.
 
-+++<a name="Tomcatejb-refs-Addingejb-refinyourweb.xml">++++++</a>+++
-
-= Adding ejb-ref in your web.xml
+== Adding ejb-ref in your web.xml
 
 Or on the older xml-style:
 
+----
  <ejb-ref>
   <description> EJB Reference to the bean deployed to OpenEJB </description>
   <ejb-ref-name>ejb/hello</ejb-ref-name>
@@ -25,3 +24,4 @@ Or on the older xml-style:
   <home>org.acme.HelloHome</home>
   <remote>org.acme.Hello</remote>
  </ejb-ref>
+----
\ No newline at end of file
diff --git a/tomee/modules/ROOT/pages/tomcat-ejb.adoc b/tomee/modules/ROOT/pages/tomcat-ejb.adoc
index f174fc1..78a3df9 100644
--- a/tomee/modules/ROOT/pages/tomcat-ejb.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-ejb.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat EJB
+= Tomcat EJB
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with EJB added and integrated and ready to go!
diff --git a/tomee/modules/ROOT/pages/tomcat-installation.adoc b/tomee/modules/ROOT/pages/tomcat-installation.adoc
index 81d0ab6..e215c62 100644
--- a/tomee/modules/ROOT/pages/tomcat-installation.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-installation.adoc
@@ -1,10 +1,6 @@
-:doctype: book
+= Tomcat Installation
 
-Title: Tomcat Installation \{composition-setup} \{composition-setup}
-
-+++<a name="TomcatInstallation-Overview">++++++</a>+++
-
-= Overview
+== Overview
 
 Tomcat installation is very simple, and can be describes as "Unpack and Run".
 These instructions were written using Tomcat 6.0.14 but any recent 6.x version should work.
@@ -18,15 +14,11 @@ otherwise skip to the <<download.html,OPENEJB:Download Tomcat>>  section.
 . Visit http://localhost:8080/
 . Run bin/shutdown.sh or bin/shutdown.bat
 
-+++<a name="TomcatInstallation-{anchor:download}DownloadTomcat">++++++</a>+++
-
-= {anchor:download} Download Tomcat
+== {anchor:download} Download Tomcat
 
 Download Tomcat 6 zip file from http://tomcat.apache.org/download-60.cgi#6.0.14[here] .
 
-+++<a name="TomcatInstallation-UnpackTomcat">++++++</a>+++
-
-= Unpack Tomcat
+== Unpack Tomcat
 
 Unpack the Tomcat zip file  which will create a new directory containing the complete Tomcat installation.
 
@@ -56,7 +48,7 @@ NOTICE	       RUNNING.txt    conf/	     logs/	    webapps/
 
 \{deck}
 
-= [OPENEJB:Windows](openejb:windows.html)
+== [OPENEJB:Windows](openejb:windows.html)
 
 Set JAVA_HOME environment variable
 
@@ -67,7 +59,7 @@ The following command will set the JAVA_HOME environment variable:
 
  {deck}
 
-= [OPENEJB:Unix]
+== [OPENEJB:Unix]
 
 Make shell scripts executable
 
@@ -83,7 +75,7 @@ apache-tomcat-6.0.14$ chmod u+x bin/*.sh
 
 +++<a name="TomcatInstallation-StartTomcat">++++++</a>+++
 
-= Start Tomcat
+== Start Tomcat
 
 Execute the following command to start the Tomcat server:
 
@@ -106,15 +98,11 @@ Using JRE_HOME:        /your/java/installation
 
 _NOTE:_ Your output will be different from the example above due to differences in installation location.
 
-+++<a name="TomcatInstallation-VerifyTomcatisRunning">++++++</a>+++
-
-= Verify Tomcat is Running
+== Verify Tomcat is Running
 
 Visit http://localhost:8080/  and you should see the Tomcat welcome page.
 
-+++<a name="TomcatInstallation-StopTomcat">++++++</a>+++
-
-= Stop Tomcat
+== Stop Tomcat
 
 Shutdown Tomcat by executing the following command:
 
diff --git a/tomee/modules/ROOT/pages/tomcat-java-ee.adoc b/tomee/modules/ROOT/pages/tomcat-java-ee.adoc
index c25b1bd..5cf8f76 100644
--- a/tomee/modules/ROOT/pages/tomcat-java-ee.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-java-ee.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat Java EE
+= Tomcat Java EE
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 
diff --git a/tomee/modules/ROOT/pages/tomcat-javaee.adoc b/tomee/modules/ROOT/pages/tomcat-javaee.adoc
index f02a02f..9acd903 100644
--- a/tomee/modules/ROOT/pages/tomcat-javaee.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-javaee.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat JavaEE
+= Tomcat JavaEE
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 
diff --git a/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc b/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc
index 238b7f0..fb91e14 100644
--- a/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-jaxrs.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat JAX-RS
+= Tomcat JAX-RS
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with JAX-RS added and integrated and ready to go!
diff --git a/tomee/modules/ROOT/pages/tomcat-jaxws.adoc b/tomee/modules/ROOT/pages/tomcat-jaxws.adoc
index 246b6d8..3e68e11 100644
--- a/tomee/modules/ROOT/pages/tomcat-jaxws.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-jaxws.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat JAX-WS
+= Tomcat JAX-WS
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with JAX-WS added and integrated and ready to go!
diff --git a/tomee/modules/ROOT/pages/tomcat-jms.adoc b/tomee/modules/ROOT/pages/tomcat-jms.adoc
index 45445ee..640057f 100644
--- a/tomee/modules/ROOT/pages/tomcat-jms.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-jms.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat JMS
+= Tomcat JMS
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with JMS added and integrated and ready to go!
diff --git a/tomee/modules/ROOT/pages/tomcat-jpa.adoc b/tomee/modules/ROOT/pages/tomcat-jpa.adoc
index 97da567..8b0c07b 100644
--- a/tomee/modules/ROOT/pages/tomcat-jpa.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-jpa.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat JPA
+=Tomcat JPA
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with JPA added and integrated and ready to go!
diff --git a/tomee/modules/ROOT/pages/tomcat-jsf.adoc b/tomee/modules/ROOT/pages/tomcat-jsf.adoc
index 0adcfcf..1cc96f4 100644
--- a/tomee/modules/ROOT/pages/tomcat-jsf.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-jsf.adoc
@@ -1,4 +1,4 @@
-Title: Tomcat CDI
+= Tomcat CDI
 
 Tomcat + Java EE = TomEE, the Java Enterprise Edition of Tomcat.
 With TomEE you get Tomcat with JSF added and integrated and ready to go!
diff --git a/tomee/modules/ROOT/pages/tomcat-object-factory.adoc b/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
index 588d3ac..2825ad1 100644
--- a/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
@@ -1,3 +1,6 @@
-Title: Tomcat Object Factory _The TomcatEjbFactory as discussed in the http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OnJava article "OpenEJB: EJB for Tomcat"]  is no longer required._
+= Tomcat Object Factory
 
-As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with usage of the xref:openejbx30:injection-of-other-ejbs-example.adoc[@EJB annotation]  in the Servlet, Filter or Listener or with the +++<ejb-ref>+++or+++</ejb-ref>++++++<ejb-local-ref>+++declared in the web.xml. See the [Tomcat Integration](openejbx30:tomcat.html) page for the most up-to-date details on using OpenEJB inside Tomcat.+++</ejb-local-ref>+++
+_The TomcatEjbFactory as discussed in the http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OnJava article "OpenEJB: EJB for Tomcat"]  is no longer required._
+
+As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with usage of the xref:openejbx30:injection-of-other-ejbs-example.adoc[@EJB annotation]  in the Servlet, Filter or Listener or with the ejb-ref or ejb-local-ref declared in the web.xml.
+See the xref:tomcat.adoc[Tomcat Integration] page for the most up-to-date details on using OpenEJB inside Tomcat.
diff --git a/tomee/modules/ROOT/pages/tomcat.adoc b/tomee/modules/ROOT/pages/tomcat.adoc
index 86aca41..f34520c 100644
--- a/tomee/modules/ROOT/pages/tomcat.adoc
+++ b/tomee/modules/ROOT/pages/tomcat.adoc
@@ -1,10 +1,6 @@
-:doctype: book
+= Tomcat
 
-Title: Tomcat
-
-+++<a name="Tomcat-Introduction">++++++</a>+++
-
-= Introduction
+== Introduction
 
 The OpenEJB plugin for Tomcat makes all of the OpenEJB features available to Servlets, including:
 
@@ -24,9 +20,7 @@ _Requirements:_
 * Tomcat 6.x or 5.5
 * Java 1.5 or 1.6
 
-+++<a name="Tomcat-{anchor:quickinstructions}InstallationfortheImpatient">++++++</a>+++
-
-= Installation for the Impatient
+== Installation for the Impatient
 
 Assuming you have a xref:tomcat-installation.adoc[normal working Tomcat 6.x or 5.5 installation] :
 
@@ -35,21 +29,15 @@ Assuming you have a xref:tomcat-installation.adoc[normal working Tomcat 6.x or 5
 . Start Tomcat if it is not already running
 . (optional) Visit http://localhost:8080/openejb/installer  and click the 'install' button
 
-+++<a name="Tomcat-Examples,TutorialsandTests">++++++</a>+++
+== Examples, Tutorials and Tests
 
-= Examples, Tutorials and Tests
-
-+++<a name="Tomcat-ejb-examples.war">++++++</a>+++
-
-== ejb-examples.war
+=== ejb-examples.war
 
 See the webapps/ejb-examples/ directory in the xref:openejb:download.adoc[openejb-examples zip] .
 
-+++<a name="Tomcat-{anchor:problems}Problems?">++++++</a>+++ #Problems?
-
-+++<a name="Tomcat-HTTPStatus403">++++++</a>+++
+== Problems?
 
-== HTTP Status 403
+=== HTTP Status 403
 
 Did you get a "HTTP Status 403" error page containing the description "Access to the specified resource () has been forbidden." when visiting http://localhost:8080/openejb ?
 
@@ -62,9 +50,7 @@ The easiest way to remove the valve it to simply delete the webapps/openejb/META
 Warning that Tomcat keeps a copy of all context.xml files under conf/Catalina/localhost/+++<appname>+++.xml, so you may need to delete the conf/Catalina/localhost/openejb.xml file as well.
 The openejb.war file must be removed because some versions of Tomcat will use the context.xml file packed in the openejb.war file regardless of what is in the unpacked directory.+++</appname>+++
 
-+++<a name="Tomcat-DuplicateDeploymentIdException:">++++++</a>+++
-
-== DuplicateDeploymentIdException:
+=== DuplicateDeploymentIdException:
 
 If you try to deploy the same ejb in two different web applications, then you will get the following exception (in conf/openejb.log):
 
@@ -77,44 +63,34 @@ To fix the issue, do the following:
 +
 openejb.deploymentId.format=\{moduleId}/\{ejbName}
 
-+++<a name="Tomcat-java.lang.OutOfMemoryError:PermGenspace">++++++</a>+++
-
-== java.lang.OutOfMemoryError: PermGen space
+=== java.lang.OutOfMemoryError: PermGen space
 
 By default, the JVM starts with a small PermGen.
 Tomcat does not increase this limit, so you may encounter this exception by the time Tomcat deploys and executes your application.
 If you get this exception, you should consider increasing the PermGen allocation for the Tomcat JVM.
 You can achieve this by adding "-XX:MaxPermSize=256m" to the CATALINA_OPTS environment variable before starting Tomcat.
 
-+++<a name="Tomcat-OtherIssues">++++++</a>+++
-
-== Other Issues
+=== Other Issues
 
-If you are having problems with the installation, please send a message to the OpenEJB users xref:openejb:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
+If you are having problems with the installation, please send a message to the OpenEJB users xref:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
 
 * OpenEJB Version
 * Tomcat Version
 * Java Version (execute java -version)
 * Operating System Type and Version
 
-+++<a name="Tomcat-Limitations">++++++</a>+++
-
-= Limitations
+== Limitations
 
 _JavaAgent_ - OpenEJB uses OpenJPA to provide JPA and CMP persistence, and OpenJPA currently requires a JavaAgent to function properly.
 This requirement is something that the OpenJPA project is working on removing.
 Once removed, the OpenEJB plugin for Tomcat will no longer need to modify the startup shell scripts and you will not need to restart Tomcat after the OpenEJB installation.
 
-+++<a name="Tomcat-Misc">++++++</a>+++
-
-= Misc
+== Misc
 
 This document is a starting point for using OpenEJB in Tomcat and will evolve based on user contributions.
 If you wish to contribute to this document, feel very welcome to click the 'Edit' link in the lower right and make changes and add new HOWTO's and other docs.
 
-+++<a name="Tomcat-JSFInjectionSupport">++++++</a>+++
-
-= JSF Injection Support
+== JSF Injection Support
 
 Now you can inject EJB's into JSF managed beans.
 Currently we have tested with JSF 1.2 RI (Mojarra) and MyFaces v1.2.3 . We would definitely appreciate any feedback on other JSF implementations.
diff --git a/tomee/modules/ROOT/pages/webadmin.adoc b/tomee/modules/ROOT/pages/webadmin.adoc
index 99d7099..ad6d75d 100644
--- a/tomee/modules/ROOT/pages/webadmin.adoc
+++ b/tomee/modules/ROOT/pages/webadmin.adoc
@@ -1,6 +1,6 @@
-:doctype: book
+= Webadmin
 
-Title: Webadmin The Webadmin is a new addition to OpenEJB 1.0 and very innovative in that it lets you plug-in your own admin beans.
+The Webadmin is a new addition to OpenEJB 1.0 and very innovative in that it lets you plug-in your own admin beans.
 Here are some screenshots:
 
 * http://tomee.apache.org/images/webadmin-main.png[Main]
@@ -11,8 +11,6 @@ Here are some screenshots:
 * http://tomee.apache.org/images/webadmin-ejbviewer.png[EJB Viewer]
 * http://tomee.apache.org/images/webadmin-objectinvoker.png[Object and EJB Invoker]
 
-+++<a name="Webadmin-EnablingtheWebadminin1.0beta1">++++++</a>+++
-
 == Enabling the Webadmin in 1.0 beta 1
 
 The Webadmin console is in the 1.0 beta 1 release.
@@ -46,9 +44,7 @@ Ready!
 
 Now you can open your browser to go to http://localhost:4203/
 
-+++<a name="Webadmin-WebAdminBeans">++++++</a>+++
-
-= WebAdmin Beans
+== WebAdmin Beans
 
 To create an EJB and have it included as part of the WebAdmin, simply subclass from WebAdminBean and include it in your ejb-jar.xml file as such:
 
@@ -67,7 +63,7 @@ WebAdminBeans are grouped together by the 'menu-section' portion of their ejb-na
 The 'menu-item' is the clickable link that causes the EJB code to be execute.
 Very simple and makes it possible to package administrative components with your EJB applications.
 
-= WebAdmin Plugins
+== WebAdmin Plugins
 
 [cols=2*]
 |===
@@ -76,7 +72,7 @@ Very simple and makes it possible to package administrative components with your
 | http://beangen.sourceforge.net]
 |===
 
-= Developers guide
+== Developers guide
 
 Below is David Blevins' email on how webadmin worked.
 Please have a look at the text below before you start working on porting the existing WebAdmin to version 3.
diff --git a/tomee/modules/ROOT/pages/webobjects.adoc b/tomee/modules/ROOT/pages/webobjects.adoc
index f8d989d..fac4f64 100644
--- a/tomee/modules/ROOT/pages/webobjects.adoc
+++ b/tomee/modules/ROOT/pages/webobjects.adoc
@@ -1,4 +1,4 @@
-Title: WebObjects
+= WebObjects
 
 We don't officially support the WebObjects OpenEJB integration, but we are happy to offer up this page for those users to place information on usage of EJBs in WebObjects 5.1.