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:49 UTC

[tomee-site-generator] 09/44: script-fix xrefs

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 4131ceb7f06d3a0781e0594d0d49559f5727b467
Author: David Jencks <dj...@apache.org>
AuthorDate: Sun Feb 9 21:48:35 2020 -0800

    script-fix xrefs
---
 tomee/modules/ROOT/pages/commercial-support.adoc   |   2 +-
 .../community/contributing/contribution-tips.adoc  |   2 +-
 .../pages/community/contributing/jira-ticket.adoc  |   2 +-
 .../pages/community/contributing/process-task.adoc |   6 +-
 .../community/contributing/submit-changes.adoc     |   2 +-
 .../pages/community/contributing/workflow.adoc     |   6 +-
 tomee/modules/ROOT/pages/community/index.adoc      |  12 +-
 tomee/modules/ROOT/pages/contribute.adoc           | 136 +++-
 tomee/modules/ROOT/pages/dev/asf.adoc              |  26 +-
 .../ROOT/pages/dev/design-application-server.adoc  |   6 +-
 tomee/modules/ROOT/pages/dev/design-assembler.adoc |   4 +-
 .../pages/dev/design-bmp-entitybean-container.adoc |   2 +-
 .../ROOT/pages/dev/design-classic-assembler.adoc   |   4 +-
 .../pages/dev/design-cmp-entitybean-container.adoc |   2 +-
 .../pages/dev/design-configuration-factory.adoc    |   4 +-
 tomee/modules/ROOT/pages/dev/design-container.adoc |   8 +-
 .../ROOT/pages/dev/design-local-server.adoc        |   2 +-
 .../dev/design-nova-configuration-factory.adoc     |   2 +-
 .../pages/dev/design-passivation-strategy.adoc     |   6 +-
 .../dev/design-random-access-file-passivater.adoc  |   2 +-
 .../ROOT/pages/dev/design-remote-server.adoc       |   2 +-
 .../ROOT/pages/dev/design-simple-passivater.adoc   |   2 +-
 .../dev/design-stateful-sessionbean-container.adoc |   4 +-
 .../design-stateless-sessionbean-container.adoc    |   2 +-
 .../ROOT/pages/dev/design-transaction-service.adoc |   2 +-
 tomee/modules/ROOT/pages/dev/design.adoc           |  12 +-
 tomee/modules/ROOT/pages/dev/release-tomee.adoc    |   2 +-
 tomee/modules/ROOT/pages/dev/source-code.adoc      |   2 +-
 tomee/modules/ROOT/pages/docs.adoc                 | 710 ++++++++++++++++++++-
 tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc      |   2 +-
 tomee/modules/ROOT/pages/tomee-1.5.0.adoc          |  68 +-
 .../ROOT/pages/tomee-1.7.0-release-notes.adoc      |  68 +-
 tomee/modules/ROOT/pages/tomee-1.7.1.adoc          |   7 +-
 tomee/modules/ROOT/pages/tomee-1.7.2.adoc          |   7 +-
 tomee/modules/ROOT/pages/tomee-1.7.3.adoc          |   7 +-
 tomee/modules/ROOT/pages/tomee-1.7.4.adoc          |  14 +-
 tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc       |  12 +-
 tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc       |  12 +-
 tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc       |  19 +-
 tomee/modules/ROOT/pages/tomee-7.0.1.adoc          |  12 +-
 40 files changed, 1104 insertions(+), 98 deletions(-)

diff --git a/tomee/modules/ROOT/pages/commercial-support.adoc b/tomee/modules/ROOT/pages/commercial-support.adoc
index 52e412b..fce3b75 100644
--- a/tomee/modules/ROOT/pages/commercial-support.adoc
+++ b/tomee/modules/ROOT/pages/commercial-support.adoc
@@ -6,7 +6,7 @@ The Apache TomEE PMC does not endorse or recommend any of the products or servic
 We love all our supporters equally.
 
 Want to be added to this page?
-xref:add-my-offering.adoc[See here.]
+xref:0.0@tomee::add-my-offering.adoc[See here.]
 
 === Tomitribe
 
diff --git a/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc b/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc
index c5f26ac..2e062c5 100755
--- a/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/contribution-tips.adoc
@@ -27,7 +27,7 @@ about you. Welcome to the adventure!
 
 === What is the process?
 
-Check and follow the xref:workflow.adoc[workflow for contributing].
+Check and follow the xref:community/contributing/workflow.adoc[workflow for contributing].
 
 After a while when people feel comfortable with you as contributor, they vote you in as a committer and ... big surprise ... there's almost no change in the daily routine. You get access to svn and pretty much everything else stays the same. Instead of submitting patches, now you have to help review them and commit them. Instead of learning how to contribute to an open source project, now you have to learn how to help others get involved. And of course it doesn't happen all at once, you  [...]
 
diff --git a/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc b/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc
index d9b2090..5c43441 100644
--- a/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/jira-ticket.adoc
@@ -20,4 +20,4 @@ If you want to help, contact the assigned person using the mailing list or write
 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.
 
-(xref:workflow.adoc[back to Contribution workflow])
+(xref:community/contributing/workflow.adoc[back to Contribution workflow])
diff --git a/tomee/modules/ROOT/pages/community/contributing/process-task.adoc b/tomee/modules/ROOT/pages/community/contributing/process-task.adoc
index df1821f..6a04116 100644
--- a/tomee/modules/ROOT/pages/community/contributing/process-task.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/process-task.adoc
@@ -5,7 +5,7 @@
 
 
 === Fork project repository
-You can work on the xref:../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]. +
+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.
 
 === One branch for each ticket
@@ -17,11 +17,11 @@ If you need help or want to have feedback for your ideas write to the developes
 
 === 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:contribution-tips.adoc[contribution tips]. +
+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
 Use comments for the JIRA ticket to document your work.
 
-(xref:workflow.adoc[back to Contribution workflow])
+(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 66a6db5..e0709f6 100644
--- a/tomee/modules/ROOT/pages/community/contributing/submit-changes.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/submit-changes.adoc
@@ -52,4 +52,4 @@ These are ok, much better than just a number.  Subjects are often truncated.  Th
 
 Here we flip it.  The real subject as at the beginning.  The verbs and generic nouns like "options" come after.  When you can pull it off, huge respect. 
 
-(xref:workflow.adoc[back to Contribution workflow])
+(xref:community/contributing/workflow.adoc[back to Contribution workflow])
diff --git a/tomee/modules/ROOT/pages/community/contributing/workflow.adoc b/tomee/modules/ROOT/pages/community/contributing/workflow.adoc
index 125aa88..03af685 100644
--- a/tomee/modules/ROOT/pages/community/contributing/workflow.adoc
+++ b/tomee/modules/ROOT/pages/community/contributing/workflow.adoc
@@ -11,7 +11,7 @@
 - create ticket in JIRA, if not already existing
 - if ticket already assigned to someone else => talk
 - assign ticket to contributor, if not already assigned +
-  (xref:jira-ticket.adoc[more details])
+  (xref:community/contributing/jira-ticket.adoc[more details])
 
 
 
@@ -21,14 +21,14 @@
 - discuss on mailing list
 - work on code
 - document work in JIRA ticket +
-  (xref:process-task.adoc[more details])
+  (xref:community/contributing/process-task.adoc[more details])
 
 === Submit Changes
 - ensure code compiles 
 - ensure tests passes
 - create PR (pull request)
 - ask for review on mailing list +
-  (xref:submit-changes.adoc[more details])
+  (xref:community/contributing/submit-changes.adoc[more details])
 
 === Merge Changes (done by a committer)
 - review changes
diff --git a/tomee/modules/ROOT/pages/community/index.adoc b/tomee/modules/ROOT/pages/community/index.adoc
index f4726e1..63c9ee7 100755
--- a/tomee/modules/ROOT/pages/community/index.adoc
+++ b/tomee/modules/ROOT/pages/community/index.adoc
@@ -6,15 +6,15 @@
 
 === Contribute
 
-- xref:contributing/contribution-tips.adoc[Contribution tips]
-- xref:contributing/workflow.adoc[Contribution workflow]
-- xref:sources.adoc[Apache TomEE]
-- xref:contributing/website.adoc[This website]
-- xref: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
 
-Facebook, Twitter, Google+: if that speaks to you just follow this xref:social.adoc[TomEE on Social Media].
+Facebook, Twitter, Google+: if that speaks to you just follow this xref:community/social.adoc[TomEE on Social Media].
 
 === Support
 
diff --git a/tomee/modules/ROOT/pages/contribute.adoc b/tomee/modules/ROOT/pages/contribute.adoc
index df74b77..728aff1 100644
--- a/tomee/modules/ROOT/pages/contribute.adoc
+++ b/tomee/modules/ROOT/pages/contribute.adoc
@@ -5,7 +5,73 @@ Some great links for getting involved
 
 * xref:dev/source-code.adoc[Source Code]
 * xref:dev/contribution-tips.adoc[Contribution Tips]
-* xref:dev/index.adoc[Developer Documentation]
+* 
+//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[Developer Documentation]
 
 *** Contributing doesn't always mean code.
 If you love the project and want to see it grow, follow it on Facebook and Twitter.
@@ -28,7 +94,73 @@ Do your part and watch the project grow grow grow!
 Most of the pages on this site can be edited by you.
 If you find a spelling mistake, or just want to improve the documentation then please do!
 
-If you want to edit the xref:examples-trunk/index.adoc[Examples Documentation] then check-out the xref:dev/source-code.adoc[Source Code] and edit or create the README.md in the example directory you want to improve.
+If you want to edit the 
+//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[Examples Documentation] then check-out the xref:dev/source-code.adoc[Source Code] and edit or create the README.md in the example directory you want to improve.
 
 *** Committers
 
diff --git a/tomee/modules/ROOT/pages/dev/asf.adoc b/tomee/modules/ROOT/pages/dev/asf.adoc
index 55cfcf8..ae221ba 100644
--- a/tomee/modules/ROOT/pages/dev/asf.adoc
+++ b/tomee/modules/ROOT/pages/dev/asf.adoc
@@ -2,22 +2,22 @@ Title: ASF ASF Board meetings are the third Wednesday of each month:
 
 Reports must be filed monthly for the first three months after Incubation:
 
-* xref:june2007.adoc[June 18, 2007]
-* xref:july2007.adoc[July 16, 2007]
-* xref:august2007.adoc[August 13, 2007]
+* xref:dev/june2007.adoc[June 18, 2007]
+* xref:dev/july2007.adoc[July 16, 2007]
+* xref:dev/august2007.adoc[August 13, 2007]
 
 Then quarterly after that starting the month after:
 
-* xref:october2007.adoc[October 15, 2007]
-* xref:january2008.adoc[January 14, 2008]
-* xref:april2008.adoc[April 14, 2008]
-* xref:july2008.adoc[July 14, 2008]
-* xref:october2008.adoc[October 13, 2008]
+* xref:dev/october2007.adoc[October 15, 2007]
+* xref:dev/january2008.adoc[January 14, 2008]
+* xref:dev/april2008.adoc[April 14, 2008]
+* xref:dev/july2008.adoc[July 14, 2008]
+* xref:dev/october2008.adoc[October 13, 2008]
 * xref:january2009.adoc[January 19, 2009]
-* xref:april2009.adoc[April 13, 2009]
-* xref:july2009.adoc[July 13, 2009]
-* xref:october2009.adoc[October 21, 2009]
-* xref:january2010.adoc[January 20, 2010]
+* xref:dev/april2009.adoc[April 13, 2009]
+* xref:dev/july2009.adoc[July 13, 2009]
+* xref:dev/october2009.adoc[October 21, 2009]
+* xref:dev/january2010.adoc[January 20, 2010]
 * xref:april2010.adoc[April 21, 2010]
-* xref:july2010.adoc[July 21, 2010]
+* xref:dev/july2010.adoc[July 21, 2010]
 * xref:october2010.adoc[October 20, 2010]
diff --git a/tomee/modules/ROOT/pages/dev/design-application-server.adoc b/tomee/modules/ROOT/pages/dev/design-application-server.adoc
index a30ce6f..2e3ebf7 100644
--- a/tomee/modules/ROOT/pages/dev/design-application-server.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-application-server.adoc
@@ -2,7 +2,7 @@ Title: Design - Application Server +++<a name="Design-ApplicationServer-Applicat
 
 == Application Server
 
-Sub-component of xref:design.adoc[OpenEJB]
+Sub-component of xref:dev/design.adoc[OpenEJB]
 
 +++<a name="Design-ApplicationServer-Definition">++++++</a>+++
 
@@ -37,5 +37,5 @@ Any component wishing to serve or deliver Enterprise JavaBeans.
 
 == Implementations
 
-* xref:design-local-server.adoc[Local Server]
-* xref:design-remote-server.adoc[Remote Server]
+* xref:dev/design-local-server.adoc[Local Server]
+* xref:dev/design-remote-server.adoc[Remote Server]
diff --git a/tomee/modules/ROOT/pages/dev/design-assembler.adoc b/tomee/modules/ROOT/pages/dev/design-assembler.adoc
index d1fc0ee..229c778 100644
--- a/tomee/modules/ROOT/pages/dev/design-assembler.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-assembler.adoc
@@ -4,7 +4,7 @@ Title: Design - Assembler
 
 == Assembler
 
-Sub-component of xref:design.adoc[OpenEJB]
+Sub-component of xref:dev/design.adoc[OpenEJB]
 
 +++<a name="Design-Assembler-Definition">++++++</a>+++
 
@@ -36,4 +36,4 @@ Doing this comes with large amounts of resposibility and complexity and should n
 
 == Implementations
 
-* xref:design-classic-assembler.adoc[Classic Assembler]
+* 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 8ea23f1..7b12947 100644
--- a/tomee/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
@@ -4,7 +4,7 @@ Title: Design - BMP EntityBean Container
 
 == BMP EntityBean Container
 
-Implementation of xref:design-container.adoc[Container]
+Implementation of xref:dev/design-container.adoc[Container]
 
 +++<a name="Design-BMPEntityBeanContainer-Description">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc b/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc
index 8c0c318..29d44a5 100644
--- a/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-classic-assembler.adoc
@@ -4,7 +4,7 @@ Title: Design - Classic Assembler
 
 == Classic Assembler
 
-Implementation of xref:design-assembler.adoc[Assembler]
+Implementation of xref:dev/design-assembler.adoc[Assembler]
 
 +++<a name="Design-ClassicAssembler-Description">++++++</a>+++
 
@@ -31,4 +31,4 @@ It is assumed the meta-data has been checked and validated, all links and refere
 
 == Sub-components
 
-* xref:design-configuration-factory.adoc[Configuration Factory]
+* 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 4bbe80b..8426af9 100644
--- a/tomee/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
@@ -4,7 +4,7 @@ Title: Design - CMP EntityBean Container
 
 == CMP EntityBean Container
 
-Implementation of xref:design-container.adoc[Container]
+Implementation of xref:dev/design-container.adoc[Container]
 
 +++<a name="Design-CMPEntityBeanContainer-Description">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc b/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc
index a743b99..b1605c0 100644
--- a/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-configuration-factory.adoc
@@ -4,7 +4,7 @@ Title: Design - Configuration Factory
 
 == Configuration Factory
 
-Sub-component of xref:design-classic-assembler.adoc[Classic Assembler]
+Sub-component of xref:dev/design-classic-assembler.adoc[Classic Assembler]
 
 +++<a name="Design-ConfigurationFactory-Definition">++++++</a>+++
 
@@ -40,4 +40,4 @@ The Configuration Factory can construct, retreive, or populate the InfoObjects f
 == Implementations
 
 * XML Configuration Factory _(no longer supported)_
-* xref:design-nova-configuration-factory.adoc[Nova Configuration Factory]
+* xref:dev/design-nova-configuration-factory.adoc[Nova Configuration Factory]
diff --git a/tomee/modules/ROOT/pages/dev/design-container.adoc b/tomee/modules/ROOT/pages/dev/design-container.adoc
index cbc87c5..fd6cadf 100644
--- a/tomee/modules/ROOT/pages/dev/design-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-container.adoc
@@ -36,7 +36,7 @@ Containers for custom container-bean contracts can also be created.
 
 == Implementations
 
-* xref:design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
-* xref:design-stateless-sessionbean-container.adoc[Stateless SessionBean Container]
-* xref:design-bmp-entitybean-container.adoc[BMP EntityBean Container]
-* xref:design-cmp-entitybean-container.adoc[CMP EntityBean Container]
+* xref:dev/design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
+* xref:dev/design-stateless-sessionbean-container.adoc[Stateless SessionBean Container]
+* xref:dev/design-bmp-entitybean-container.adoc[BMP EntityBean Container]
+* xref:dev/design-cmp-entitybean-container.adoc[CMP EntityBean Container]
diff --git a/tomee/modules/ROOT/pages/dev/design-local-server.adoc b/tomee/modules/ROOT/pages/dev/design-local-server.adoc
index 82f5bf3..a923684 100644
--- a/tomee/modules/ROOT/pages/dev/design-local-server.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-local-server.adoc
@@ -2,7 +2,7 @@ Title: Design - Local Server +++<a name="Design-LocalServer-LocalServer">++++++<
 
 == Local Server
 
-Implementation of xref:design-application-server.adoc[Application Server]
+Implementation of xref:dev/design-application-server.adoc[Application Server]
 
 +++<a name="Design-LocalServer-Description">++++++</a>+++
 
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 efa409e..9384b6e 100644
--- a/tomee/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
@@ -4,7 +4,7 @@ Title: Design - Nova Configuration Factory
 
 == Nova Configuration Factory
 
-Implementation of xref:design-configuration-factory.adoc[Configuration Factory]
+Implementation of xref:dev/design-configuration-factory.adoc[Configuration Factory]
 
 +++<a name="Design-NovaConfigurationFactory-Description">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc b/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc
index c8bb253..ddca28b 100644
--- a/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-passivation-strategy.adoc
@@ -2,7 +2,7 @@ Title: Design - Passivation Strategy +++<a name="Design-PassivationStrategy-Pass
 
 == Passivation Strategy
 
-Sub-component of xref:design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
+Sub-component of xref:dev/design-stateful-sessionbean-container.adoc[Stateful SessionBean Container]
 
 +++<a name="Design-PassivationStrategy-Definition">++++++</a>+++
 
@@ -26,5 +26,5 @@ Used by the Stateful Container to passivate and activate stateful session beans
 
 == Implementations
 
-* xref:design-random-access-file-passivater.adoc[Random Access File Passivater]
-* xref:design-simple-passivater.adoc[Simple Passivater]
+* xref:dev/design-random-access-file-passivater.adoc[Random Access File Passivater]
+* xref:dev/design-simple-passivater.adoc[Simple 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 9542345..fcd24b9 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
@@ -4,7 +4,7 @@ Title: Design - Random Access File Passivater
 
 == Random Access File Passivater
 
-Implementation of xref:design-passivation-strategy.adoc[Passivation Strategy]
+Implementation of xref:dev/design-passivation-strategy.adoc[Passivation Strategy]
 
 +++<a name="Design-RandomAccessFilePassivater-Description">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design-remote-server.adoc b/tomee/modules/ROOT/pages/dev/design-remote-server.adoc
index 8c51758..4b9dc55 100644
--- a/tomee/modules/ROOT/pages/dev/design-remote-server.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-remote-server.adoc
@@ -2,7 +2,7 @@ Title: Design - Remote Server +++<a name="Design-RemoteServer-RemoteServer">++++
 
 == Remote Server
 
-Implementation of xref:design-application-server.adoc[Application Server]
+Implementation of xref:dev/design-application-server.adoc[Application Server]
 
 +++<a name="Design-RemoteServer-Description">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc b/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc
index fc20cd2..8b8534f 100644
--- a/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-simple-passivater.adoc
@@ -4,7 +4,7 @@ Title: Design - Simple Passivater
 
 == Simple Passivater
 
-Implementation of xref:design-passivation-strategy.adoc[Passivation Strategy]
+Implementation of xref:dev/design-passivation-strategy.adoc[Passivation Strategy]
 
 +++<a name="Design-SimplePassivater-Description">++++++</a>+++
 
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 f7b893b..9874b5d 100644
--- a/tomee/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
@@ -2,7 +2,7 @@ Title: Design - Stateful SessionBean Container +++<a name="Design-StatefulSessio
 
 == Stateful SessionBean Container
 
-Implementation of xref:design-container.adoc[Container]
+Implementation of xref:dev/design-container.adoc[Container]
 
 +++<a name="Design-StatefulSessionBeanContainer-Description">++++++</a>+++
 
@@ -27,4 +27,4 @@ Container that implements the EJB defined bean-container contract for Stateful S
 
 == Sub-components
 
-* xref:design-passivation-strategy.adoc[Passivation Strategy]
+* 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 27e1e8e..a2745eb 100644
--- a/tomee/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
@@ -4,7 +4,7 @@ Title: Design - Stateless SessionBean Container
 
 == Stateless SessionBean Container
 
-Implementation of xref:design-container.adoc[Container]
+Implementation of xref:dev/design-container.adoc[Container]
 
 +++<a name="Design-StatelessSessionBeanContainer-Description">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc b/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc
index 521ef7a..91a801c 100644
--- a/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc
+++ b/tomee/modules/ROOT/pages/dev/design-transaction-service.adoc
@@ -4,7 +4,7 @@ Title: Design - Transaction Service
 
 == Transaction Service
 
-Sub-component of xref:design.adoc[OpenEJB]
+Sub-component of xref:dev/design.adoc[OpenEJB]
 
 +++<a name="Design-TransactionService-Definition">++++++</a>+++
 
diff --git a/tomee/modules/ROOT/pages/dev/design.adoc b/tomee/modules/ROOT/pages/dev/design.adoc
index 5c6b695..a90bc26 100644
--- a/tomee/modules/ROOT/pages/dev/design.adoc
+++ b/tomee/modules/ROOT/pages/dev/design.adoc
@@ -40,9 +40,9 @@ A modular, configurable, customizable, embeddable open source EJB container syst
 
 == Sub-components
 
-* xref:design-application-server.adoc[Application Server]
-* xref:design-transaction-service.adoc[Transaction Service]
-* xref:design-security-service.adoc[Security Service]
-* xref:design-resource-manager.adoc[Resource Manager]
-* xref:design-container.adoc[Container]
-* xref:design-assembler.adoc[Assembler]
+* xref:dev/design-application-server.adoc[Application Server]
+* xref:dev/design-transaction-service.adoc[Transaction Service]
+* xref:dev/design-security-service.adoc[Security Service]
+* xref:dev/design-resource-manager.adoc[Resource Manager]
+* xref:dev/design-container.adoc[Container]
+* xref:dev/design-assembler.adoc[Assembler]
diff --git a/tomee/modules/ROOT/pages/dev/release-tomee.adoc b/tomee/modules/ROOT/pages/dev/release-tomee.adoc
index 3e5aa58..7c9cec0 100644
--- a/tomee/modules/ROOT/pages/dev/release-tomee.adoc
+++ b/tomee/modules/ROOT/pages/dev/release-tomee.adoc
@@ -279,7 +279,7 @@ list_mirrors | while read n; do
 done | sort | grep 'http'
 ....
 
-Commit and publish changes to the site, see xref:release-tomee.adoc#staging[Site Staging]
+Commit and publish changes to the site, see xref:dev/release-tomee.adoc#staging[Site Staging]
 
  https://cms.apache.org/tomee/publish
 
diff --git a/tomee/modules/ROOT/pages/dev/source-code.adoc b/tomee/modules/ROOT/pages/dev/source-code.adoc
index 95dc05e..6a4ddda 100644
--- a/tomee/modules/ROOT/pages/dev/source-code.adoc
+++ b/tomee/modules/ROOT/pages/dev/source-code.adoc
@@ -38,7 +38,7 @@ NOTE: This method does not require the GIT client.
 
 +++<a name="SourceCode-Contributors">++++++</a>+++ *** GIT Information for TomEE Contributors
 
-*Please read our own detailed GitFlow workflow information xref:git.adoc[here]*
+*Please read our own detailed GitFlow workflow information xref:dev/git.adoc[here]*
 
 We will be using the https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow[Gitflow Workflow] from day one.
 Please read and understand how this works.
diff --git a/tomee/modules/ROOT/pages/docs.adoc b/tomee/modules/ROOT/pages/docs.adoc
index c58321e..29c446a 100644
--- a/tomee/modules/ROOT/pages/docs.adoc
+++ b/tomee/modules/ROOT/pages/docs.adoc
@@ -5,22 +5,702 @@
 :jbake-tomeepdf:
 
 === Administration
-- xref:admin/configuration/index.adoc[Server Configuration]
-- xref:admin/file-layout.adoc[Directory Structure]
-- xref:admin/cluster/index.adoc[Clustering and High Availability (HA)]
+- 
+//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
-- xref:developer/ide/index.adoc[IDEs - Eclipse, Intellij Idea and Netbeans]
-- xref:developer/testing/index.adoc[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer]
-- xref:developer/tools/index.adoc[Build Tools and Plugins]
-- xref:developer/migration/tomee-1-to-7.adoc[Migrating From TomEE 1.x to 7.x]
-- xref:developer/json/index.adoc[TomEE and Apache Johnzon - JAX-RS JSON Provider]
-- xref:developer/configuration/cxf.adoc[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)]
-- xref:developer/classloading/index.adoc[Understanding the TomEE ClassLoader]
+- 
+//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
-- xref:advanced/applicationcomposer/index.adoc[`ApplicationComposer` with JBatch]
-- xref:advanced/setup/index.adoc[How to Setup TomEE in Production]
-- xref:advanced/shading/index.adoc[Fat / Uber Jar Deployment using the Maven Shade Plugin]
-- xref:advanced/client/jndi.adoc[Java Naming and Directory Interface (JNDI)]
-- xref:advanced/jms/jms-configuration.adoc[Why is my ActiveMQ/JMS MDB not scaling as expected?]
+- 
+//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?]
diff --git a/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc b/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc
index 6c78c8e..b7d4281 100644
--- a/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-ejb-refs.adoc
@@ -9,7 +9,7 @@ Which an be as simple as adding this to your Servlet, Filter, or Listener:
  @EJB
  private HelloLocal helloLocal;
 
-See the xref:injection-of-other-ejbs-example.adoc[@EJB Injection Example]  for a running example.
+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>+++
diff --git a/tomee/modules/ROOT/pages/tomee-1.5.0.adoc b/tomee/modules/ROOT/pages/tomee-1.5.0.adoc
index fa01c08..bbac300 100644
--- a/tomee/modules/ROOT/pages/tomee-1.5.0.adoc
+++ b/tomee/modules/ROOT/pages/tomee-1.5.0.adoc
@@ -12,6 +12,72 @@ In addition to the previously supported Apache Commons-DBCP, the 1.5 release add
 The two additional pools offer great alternatives to applications under heavy load.
 JMX instrumentation and statistics have also been added generically to all pools and provide a great level of monitoring and management.
 
-Other major features include deploy-time enhancement for JPA Entities via Apache OpenJPA, support including JPA providers in webapps, ability to mock and inject mocks in unit tests and a powerful new xref:maven/index.adoc[TomEE Maven Plugin] which can provision servers, install libraries, deploy webapps and more.
+Other major features include deploy-time enhancement for JPA Entities via Apache OpenJPA, support including JPA providers in webapps, ability to mock and inject mocks in unit tests and a powerful new 
+//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 Maven Plugin] which can provision servers, install libraries, deploy webapps and more.
 
 We'd like to thank everyone who gave feedback and contibuted to improve Apache TomEE on a daily basis!
diff --git a/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc b/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc
index 5dd2aa2..f551164 100644
--- a/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc
+++ b/tomee/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc
@@ -145,7 +145,73 @@ property (configurable in application.properties) to deactivate timers
 * [https://issues.apache.org/jira/browse/TOMEE-1114[TOMEE-1114]] - TomEE Maven Plugin should support OpenEJB standalone
 * [https://issues.apache.org/jira/browse/TOMEE-1121[TOMEE-1121]] - add openejb.cxf-rs.wadl-generator.ignoreRequests to configure and not force ignoreRequests on wadlgenerator
 * [https://issues.apache.org/jira/browse/TOMEE-1127[TOMEE-1127]] - New Event: @Observes LifecycleEvent
-* [https://issues.apache.org/jira/browse/TOMEE-1132[TOMEE-1132]] - add javaagents parameter to xref:maven/index.adoc[tomee-maven-plugin]
+* [https://issues.apache.org/jira/browse/TOMEE-1132[TOMEE-1132]] - add javaagents parameter to 
+//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-maven-plugin]
 * [https://issues.apache.org/jira/browse/TOMEE-1133[TOMEE-1133]] - support @CdiExtensions on test class for ApplicationComposer
 * [https://issues.apache.org/jira/browse/TOMEE-1140[TOMEE-1140]] - Support CDI LoginModule
 * [https://issues.apache.org/jira/browse/TOMEE-1144[TOMEE-1144]] - provide an exec war goal to tomee plugin
diff --git a/tomee/modules/ROOT/pages/tomee-1.7.1.adoc b/tomee/modules/ROOT/pages/tomee-1.7.1.adoc
index 0b3e2e0..80f0dd5 100644
--- a/tomee/modules/ROOT/pages/tomee-1.7.1.adoc
+++ b/tomee/modules/ROOT/pages/tomee-1.7.1.adoc
@@ -53,7 +53,12 @@ A complete xref:tomee-1.7.1-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-1.7.1-release-notes.adoc[tomee-1.7.1-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
 
 *** Java EE7 and Beyond
diff --git a/tomee/modules/ROOT/pages/tomee-1.7.2.adoc b/tomee/modules/ROOT/pages/tomee-1.7.2.adoc
index 01b3ab3..e71aaa1 100644
--- a/tomee/modules/ROOT/pages/tomee-1.7.2.adoc
+++ b/tomee/modules/ROOT/pages/tomee-1.7.2.adoc
@@ -38,7 +38,12 @@ A complete xref:tomee-1.7.2-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-1.7.2-release-notes.adoc[tomee-1.7.2-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
 
 *** Java EE7 and Beyond
diff --git a/tomee/modules/ROOT/pages/tomee-1.7.3.adoc b/tomee/modules/ROOT/pages/tomee-1.7.3.adoc
index b629575..a64e670 100644
--- a/tomee/modules/ROOT/pages/tomee-1.7.3.adoc
+++ b/tomee/modules/ROOT/pages/tomee-1.7.3.adoc
@@ -39,7 +39,12 @@ A complete xref:tomee-1.7.3-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-1.7.3-release-notes.adoc[tomee-1.7.3-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
 
 *** Java EE7 and Beyond
diff --git a/tomee/modules/ROOT/pages/tomee-1.7.4.adoc b/tomee/modules/ROOT/pages/tomee-1.7.4.adoc
index c39de3e..1efa4e9 100644
--- a/tomee/modules/ROOT/pages/tomee-1.7.4.adoc
+++ b/tomee/modules/ROOT/pages/tomee-1.7.4.adoc
@@ -2,7 +2,12 @@
 
 The Apache TomEE community is pleased to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.4], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.68], including numerous fixes and updates.
 Part of this release an important security fix is included if EJBd is active on your instance (true by default).
-More on xref:security/tomee.adoc[CVE-2016-0779].
+More on 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::security/tomee.adoc[]
+xref:7.0@tomee::developer/tools/maven/tomee.adoc[]
+xref:7.1@tomee::developer/tools/maven/tomee.adoc[]
+xref:8.0@tomee::developer/tools/maven/tomee.adoc[CVE-2016-0779].
 
 Please note that the TomEE 1.7.4 drop in WAR file will not work on Apache Tomcat 8.
 If you are interested in a Tomcat 8.x version then please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
@@ -40,7 +45,12 @@ A complete xref:tomee-1.7.4-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-1.7.4-release-notes.adoc[tomee-1.7.4-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
 
 *** Java EE7 and Beyond
diff --git a/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc b/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc
index 0f92252..e6f2ff0 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc
@@ -1,6 +1,9 @@
 = Apache TomEE 7.0.0-M1 released, Dec 11th 2015
 
-The Apache TomEE community is proud to announce the release of xref:download/tomee-7.0.0-M1.adoc[Apache TomEE 7.0.0-M1], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.30] and is our first milestone release towards EE7.
+The Apache TomEE community is proud to announce the release of 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::tomee-7.0.0-M1.adoc[]
+xref:0.1@tomee::tomee-7.0.0-M1.adoc[Apache TomEE 7.0.0-M1], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.30] and is our first milestone release towards EE7.
 We know this has been a long time coming, so we thank you for your patience and support.
 
 Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
@@ -42,5 +45,10 @@ A complete xref:tomee-7.0.0-M1-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-7.0.0-M1-release-notes.adoc[tomee-7.0.0-M1-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc b/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc
index f8d1981..21e7472 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc
@@ -1,6 +1,9 @@
 = Apache TomEE 7.0.0-M2 released, Feb 29th 2016
 
-The Apache TomEE community is proud to announce the release of xref:download/tomee-7.0.0-M2.adoc[Apache TomEE 7.0.0-M2], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.32] and is our first milestone release towards EE7.
+The Apache TomEE community is proud to announce the release of 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::tomee-7.0.0-M2.adoc[]
+xref:0.1@tomee::tomee-7.0.0-M2.adoc[Apache TomEE 7.0.0-M2], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.32] and is our first milestone release towards EE7.
 We know this has been a long time coming, so we thank you for your patience and support.
 
 Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
@@ -42,5 +45,10 @@ A complete xref:tomee-7.0.0-M2-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-7.0.0-M2-release-notes.adoc[tomee-7.0.0-M2-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc b/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc
index a14e9a1..4c1f818 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc
@@ -1,8 +1,16 @@
 = Apache TomEE 7.0.0-M3 released, Mar 06th 2016
 
-The Apache TomEE community is proud to announce the release of xref:download/tomee-7.0.0-M3.adoc[Apache TomEE 7.0.0-M3], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.32] and is our first milestone release towards EE7.
+The Apache TomEE community is proud to announce the release of 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::tomee-7.0.0-M3.adoc[]
+xref:0.1@tomee::tomee-7.0.0-M3.adoc[Apache TomEE 7.0.0-M3], which is based on http://tomcat.apache.org/tomcat-8.0-doc/index.html[Apache Tomcat 8.0.32] and is our first milestone release towards EE7.
 Part of this release an important security fix is included if EJBd is active on your instance (true by default).
-More on xref:security/tomee.adoc[CVE-2016-0779].
+More on 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::security/tomee.adoc[]
+xref:7.0@tomee::developer/tools/maven/tomee.adoc[]
+xref:7.1@tomee::developer/tools/maven/tomee.adoc[]
+xref:8.0@tomee::developer/tools/maven/tomee.adoc[CVE-2016-0779].
 
 Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
 
@@ -43,5 +51,10 @@ A complete xref:tomee-7.0.0-M3-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-7.0.0-M3-release-notes.adoc[tomee-7.0.0-M3-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].
diff --git a/tomee/modules/ROOT/pages/tomee-7.0.1.adoc b/tomee/modules/ROOT/pages/tomee-7.0.1.adoc
index e943ed3..b73a55d 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.1.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.1.adoc
@@ -1,6 +1,9 @@
 = Apache TomEE 7.0.1 released, June 27th 2016
 
-The Apache TomEE community is proud to announce the release of xref:download/tomee-7.0.1.adoc[Apache TomEE 7.0.1], which is based on http://tomcat.apache.org/tomcat-8.5-doc/index.html[Apache Tomcat 8.5.3] and mainly aims to fix a security issue found in Tomcat 8.5.2.
+The Apache TomEE community is proud to announce the release of 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::tomee-7.0.1.adoc[]
+xref:0.1@tomee::tomee-7.0.1.adoc[Apache TomEE 7.0.1], which is based on http://tomcat.apache.org/tomcat-8.5-doc/index.html[Apache Tomcat 8.5.3] and mainly aims to fix a security issue found in Tomcat 8.5.2.
 
 Please feel free to check out and xref:contribute.adoc[contribute to the developer branch] - We are always interested in any help from the community that we can get.
 
@@ -41,5 +44,10 @@ A complete xref:tomee-7.0.1-release-notes.adoc[Changelog] can be viewed here:
 
 xref:tomee-7.0.1-release-notes.adoc[tomee-7.0.1-release-notes.html]
 
-Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+Please feel free to jump in feet first and 
+//FIXME CHOOSE ONE
+xref:0.0@tomee::documentation.adoc[]
+xref:7.0@tomee::documentation.adoc[]
+xref:7.1@tomee::documentation.adoc[]
+xref:8.0@tomee::documentation.adoc[get started with TomEE].
 You will nearly always find someone to help you on one of our xref:support.adoc[support channels].