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

[tomee-site-generator] 07/44: run link-to-ref

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 d3194ef39b454d32d6fda40044263892cb80ea95
Author: David Jencks <dj...@apache.org>
AuthorDate: Sun Feb 9 14:01:45 2020 -0800

    run link-to-ref
---
 .../modules/ROOT/pages/commercial-support.adoc     |  2 +-
 .../modules/ROOT/pages/community/commercial.adoc   |  4 +--
 .../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 ++--
 oldcontent/modules/ROOT/pages/community/index.adoc | 14 +++++-----
 oldcontent/modules/ROOT/pages/contribute.adoc      |  8 +++---
 oldcontent/modules/ROOT/pages/dev/asf.adoc         | 32 +++++++++++-----------
 .../ROOT/pages/dev/design-application-server.adoc  |  6 ++--
 .../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 +--
 .../modules/ROOT/pages/dev/design-container.adoc   | 10 +++----
 .../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-resource-manager.adoc    |  2 +-
 .../ROOT/pages/dev/design-security-service.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 +-
 oldcontent/modules/ROOT/pages/dev/design.adoc      | 12 ++++----
 .../modules/ROOT/pages/dev/release-tomee.adoc      |  2 +-
 oldcontent/modules/ROOT/pages/dev/source-code.adoc |  2 +-
 .../ROOT/pages/dev/writing-validation-tests.adoc   |  2 +-
 oldcontent/modules/ROOT/pages/docs.adoc            | 30 ++++++++++----------
 .../modules/ROOT/pages/download-archive.adoc       |  2 +-
 oldcontent/modules/ROOT/pages/download-ng.adoc     |  2 +-
 oldcontent/modules/ROOT/pages/faq.adoc             |  2 +-
 .../modules/ROOT/pages/lightening-demos.adoc       |  2 +-
 .../modules/ROOT/pages/security/security.adoc      |  2 +-
 .../modules/ROOT/pages/security/support.adoc       |  4 +--
 oldcontent/modules/ROOT/pages/support.adoc         |  2 +-
 oldcontent/modules/ROOT/pages/tomcat-activemq.adoc |  2 +-
 oldcontent/modules/ROOT/pages/tomcat-cdi.adoc      |  2 +-
 .../ROOT/pages/tomcat-detailed-instructions.adoc   |  6 ++--
 oldcontent/modules/ROOT/pages/tomcat-ejb-refs.adoc |  2 +-
 oldcontent/modules/ROOT/pages/tomcat-jms.adoc      |  2 +-
 oldcontent/modules/ROOT/pages/tomcat-jpa.adoc      |  2 +-
 .../modules/ROOT/pages/tomcat-object-factory.adoc  |  2 +-
 oldcontent/modules/ROOT/pages/tomcat.adoc          | 10 +++----
 oldcontent/modules/ROOT/pages/tomee-1.5.0.adoc     |  4 +--
 oldcontent/modules/ROOT/pages/tomee-1.5.1.adoc     |  2 +-
 oldcontent/modules/ROOT/pages/tomee-1.6.0.1.adoc   |  4 +--
 oldcontent/modules/ROOT/pages/tomee-1.6.0.2.adoc   |  4 +--
 .../ROOT/pages/tomee-1.7.0-release-notes.adoc      |  2 +-
 oldcontent/modules/ROOT/pages/tomee-1.7.0.adoc     |  4 +--
 oldcontent/modules/ROOT/pages/tomee-1.7.1.adoc     | 12 ++++----
 oldcontent/modules/ROOT/pages/tomee-1.7.2.adoc     | 12 ++++----
 oldcontent/modules/ROOT/pages/tomee-1.7.3.adoc     | 12 ++++----
 oldcontent/modules/ROOT/pages/tomee-1.7.4.adoc     | 14 +++++-----
 oldcontent/modules/ROOT/pages/tomee-7.0.0-M1.adoc  | 14 +++++-----
 oldcontent/modules/ROOT/pages/tomee-7.0.0-M2.adoc  | 14 +++++-----
 oldcontent/modules/ROOT/pages/tomee-7.0.0-M3.adoc  | 16 +++++------
 oldcontent/modules/ROOT/pages/tomee-7.0.1.adoc     | 14 +++++-----
 62 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/oldcontent/modules/ROOT/pages/commercial-support.adoc b/oldcontent/modules/ROOT/pages/commercial-support.adoc
index 0c941aa..52e412b 100644
--- a/oldcontent/modules/ROOT/pages/commercial-support.adoc
+++ b/oldcontent/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?
-link:add-my-offering.html[See here.]
+xref:add-my-offering.adoc[See here.]
 
 === Tomitribe
 
diff --git a/oldcontent/modules/ROOT/pages/community/commercial.adoc b/oldcontent/modules/ROOT/pages/community/commercial.adoc
index 13adda6..d55cabb 100755
--- a/oldcontent/modules/ROOT/pages/community/commercial.adoc
+++ b/oldcontent/modules/ROOT/pages/community/commercial.adoc
@@ -21,11 +21,11 @@ ManageCat is a cloud management and service platform for Apache Tomcat and Apach
 
 === I want to be added there
 
-To be listed in the Commercial Support send a link:../security/support.html[mail] to the Apache TomEE PMC with a description of your offerings and the text you would like to have added.
+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
 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.
 
-When in doubt, email the Apache TomEE PMC list (see link:../security/support.html[Mailing Lists]) and ask. We are be happy to help.
+When in doubt, email the Apache TomEE PMC list (see xref:../security/support.adoc[Mailing Lists]) and ask. We are be happy to help.
diff --git a/oldcontent/modules/ROOT/pages/community/contributing/contribution-tips.adoc b/oldcontent/modules/ROOT/pages/community/contributing/contribution-tips.adoc
index 59d6282..c5f26ac 100755
--- a/oldcontent/modules/ROOT/pages/community/contributing/contribution-tips.adoc
+++ b/oldcontent/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 link:workflow.html[workflow for contributing].
+Check and follow the xref: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/oldcontent/modules/ROOT/pages/community/contributing/jira-ticket.adoc b/oldcontent/modules/ROOT/pages/community/contributing/jira-ticket.adoc
index e7e3c43..d9b2090 100644
--- a/oldcontent/modules/ROOT/pages/community/contributing/jira-ticket.adoc
+++ b/oldcontent/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.
 
-(link:workflow.html[back to Contribution workflow])
+(xref:workflow.adoc[back to Contribution workflow])
diff --git a/oldcontent/modules/ROOT/pages/community/contributing/process-task.adoc b/oldcontent/modules/ROOT/pages/community/contributing/process-task.adoc
index 3da95ca..df1821f 100644
--- a/oldcontent/modules/ROOT/pages/community/contributing/process-task.adoc
+++ b/oldcontent/modules/ROOT/pages/community/contributing/process-task.adoc
@@ -5,7 +5,7 @@
 
 
 === Fork project repository
-You can work on the link:../sources.html[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:../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 link:contribution-tips.html[contribution tips]. +
+Consider the xref: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.
 
-(link:workflow.html[back to Contribution workflow])
+(xref:workflow.adoc[back to Contribution workflow])
diff --git a/oldcontent/modules/ROOT/pages/community/contributing/submit-changes.adoc b/oldcontent/modules/ROOT/pages/community/contributing/submit-changes.adoc
index 29beada..66a6db5 100644
--- a/oldcontent/modules/ROOT/pages/community/contributing/submit-changes.adoc
+++ b/oldcontent/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. 
 
-(link:workflow.html[back to Contribution workflow])
+(xref:workflow.adoc[back to Contribution workflow])
diff --git a/oldcontent/modules/ROOT/pages/community/contributing/workflow.adoc b/oldcontent/modules/ROOT/pages/community/contributing/workflow.adoc
index 307a5a1..125aa88 100644
--- a/oldcontent/modules/ROOT/pages/community/contributing/workflow.adoc
+++ b/oldcontent/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 +
-  (link:jira-ticket.html[more details])
+  (xref:jira-ticket.adoc[more details])
 
 
 
@@ -21,14 +21,14 @@
 - discuss on mailing list
 - work on code
 - document work in JIRA ticket +
-  (link:process-task.html[more details])
+  (xref:process-task.adoc[more details])
 
 === Submit Changes
 - ensure code compiles 
 - ensure tests passes
 - create PR (pull request)
 - ask for review on mailing list +
-  (link:submit-changes.html[more details])
+  (xref:submit-changes.adoc[more details])
 
 === Merge Changes (done by a committer)
 - review changes
diff --git a/oldcontent/modules/ROOT/pages/community/index.adoc b/oldcontent/modules/ROOT/pages/community/index.adoc
index a222d62..f4726e1 100755
--- a/oldcontent/modules/ROOT/pages/community/index.adoc
+++ b/oldcontent/modules/ROOT/pages/community/index.adoc
@@ -6,18 +6,18 @@
 
 === Contribute
 
-- link:contributing/contribution-tips.html[Contribution tips]
-- link:contributing/workflow.html[Contribution workflow]
-- link:sources.html[Apache TomEE]
-- link:contributing/website.html[This website]
-- link:contributors.html[TomEE Wall Of Fame]
+- 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]
 
 === Social Media: cause contributing is not only about coding
 
-Facebook, Twitter, Google+: if that speaks to you just follow this link:social.html[TomEE on Social Media].
+Facebook, Twitter, Google+: if that speaks to you just follow this xref:social.adoc[TomEE on Social Media].
 
 === Support
 
-For more information about available support for TomEE please have a look on link:../security/support.html[Support] page.
+For more information about available support for TomEE please have a look on xref:../security/support.adoc[Support] page.
 
 
diff --git a/oldcontent/modules/ROOT/pages/contribute.adoc b/oldcontent/modules/ROOT/pages/contribute.adoc
index 36cc39b..df74b77 100644
--- a/oldcontent/modules/ROOT/pages/contribute.adoc
+++ b/oldcontent/modules/ROOT/pages/contribute.adoc
@@ -3,9 +3,9 @@ Title: Contributing
 Contributing to the project is a great way to support the community.
 Some great links for getting involved
 
-* link:dev/source-code.html[Source Code]
-* link:dev/contribution-tips.html[Contribution Tips]
-* link:dev/index.html[Developer Documentation]
+* xref:dev/source-code.adoc[Source Code]
+* xref:dev/contribution-tips.adoc[Contribution Tips]
+* xref:dev/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 +28,7 @@ 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 link:examples-trunk/index.html[Examples Documentation] then check-out the link:dev/source-code.html[Source Code] and edit or create the README.md in the example directory you want to improve.
+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.
 
 *** Committers
 
diff --git a/oldcontent/modules/ROOT/pages/dev/asf.adoc b/oldcontent/modules/ROOT/pages/dev/asf.adoc
index 3346915..55cfcf8 100644
--- a/oldcontent/modules/ROOT/pages/dev/asf.adoc
+++ b/oldcontent/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:
 
-* link:june2007.html[June 18, 2007]
-* link:july2007.html[July 16, 2007]
-* link:august2007.html[August 13, 2007]
+* xref:june2007.adoc[June 18, 2007]
+* xref:july2007.adoc[July 16, 2007]
+* xref:august2007.adoc[August 13, 2007]
 
 Then quarterly after that starting the month after:
 
-* link:october2007.html[October 15, 2007]
-* link:january2008.html[January 14, 2008]
-* link:april2008.html[April 14, 2008]
-* link:july2008.html[July 14, 2008]
-* link:october2008.html[October 13, 2008]
-* link:january2009.html[January 19, 2009]
-* link:april2009.html[April 13, 2009]
-* link:july2009.html[July 13, 2009]
-* link:october2009.html[October 21, 2009]
-* link:january2010.html[January 20, 2010]
-* link:april2010.html[April 21, 2010]
-* link:july2010.html[July 21, 2010]
-* link:october2010.html[October 20, 2010]
+* 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: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:april2010.adoc[April 21, 2010]
+* xref:july2010.adoc[July 21, 2010]
+* xref:october2010.adoc[October 20, 2010]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-application-server.adoc b/oldcontent/modules/ROOT/pages/dev/design-application-server.adoc
index 70fccbd..a30ce6f 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-application-server.adoc
+++ b/oldcontent/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 link:design.html[OpenEJB]
+Sub-component of xref:design.adoc[OpenEJB]
 
 +++<a name="Design-ApplicationServer-Definition">++++++</a>+++
 
@@ -37,5 +37,5 @@ Any component wishing to serve or deliver Enterprise JavaBeans.
 
 == Implementations
 
-* link:design-local-server.html[Local Server]
-* link:design-remote-server.html[Remote Server]
+* xref:design-local-server.adoc[Local Server]
+* xref:design-remote-server.adoc[Remote Server]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-assembler.adoc b/oldcontent/modules/ROOT/pages/dev/design-assembler.adoc
index 2291035..d1fc0ee 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-assembler.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-assembler.adoc
@@ -4,7 +4,7 @@ Title: Design - Assembler
 
 == Assembler
 
-Sub-component of link:design.html[OpenEJB]
+Sub-component of xref: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
 
-* link:design-classic-assembler.html[Classic Assembler]
+* xref:design-classic-assembler.adoc[Classic Assembler]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc b/oldcontent/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
index 6a97943..8ea23f1 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-bmp-entitybean-container.adoc
@@ -4,7 +4,7 @@ Title: Design - BMP EntityBean Container
 
 == BMP EntityBean Container
 
-Implementation of link:design-container.html[Container]
+Implementation of xref:design-container.adoc[Container]
 
 +++<a name="Design-BMPEntityBeanContainer-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-classic-assembler.adoc b/oldcontent/modules/ROOT/pages/dev/design-classic-assembler.adoc
index c969e82..8c0c318 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-classic-assembler.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-classic-assembler.adoc
@@ -4,7 +4,7 @@ Title: Design - Classic Assembler
 
 == Classic Assembler
 
-Implementation of link:design-assembler.html[Assembler]
+Implementation of xref: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
 
-* link:design-configuration-factory.html[Configuration Factory]
+* xref:design-configuration-factory.adoc[Configuration Factory]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc b/oldcontent/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
index e71ca60..4bbe80b 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-cmp-entitybean-container.adoc
@@ -4,7 +4,7 @@ Title: Design - CMP EntityBean Container
 
 == CMP EntityBean Container
 
-Implementation of link:design-container.html[Container]
+Implementation of xref:design-container.adoc[Container]
 
 +++<a name="Design-CMPEntityBeanContainer-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-configuration-factory.adoc b/oldcontent/modules/ROOT/pages/dev/design-configuration-factory.adoc
index 3937c5e..a743b99 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-configuration-factory.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-configuration-factory.adoc
@@ -4,7 +4,7 @@ Title: Design - Configuration Factory
 
 == Configuration Factory
 
-Sub-component of link:design-classic-assembler.html[Classic Assembler]
+Sub-component of xref: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)_
-* link:design-nova-configuration-factory.html[Nova Configuration Factory]
+* xref:design-nova-configuration-factory.adoc[Nova Configuration Factory]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-container.adoc b/oldcontent/modules/ROOT/pages/dev/design-container.adoc
index c17735f..cbc87c5 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-container.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-container.adoc
@@ -2,7 +2,7 @@ Title: Design - Container +++<a name="Design-Container-Container">++++++</a>+++
 
 == Container
 
-Sub-component of link:-design.html[OpenEJB]
+Sub-component of xref:-design.adoc[OpenEJB]
 
 +++<a name="Design-Container-Definition">++++++</a>+++
 
@@ -36,7 +36,7 @@ Containers for custom container-bean contracts can also be created.
 
 == Implementations
 
-* link:design-stateful-sessionbean-container.html[Stateful SessionBean Container]
-* link:design-stateless-sessionbean-container.html[Stateless SessionBean Container]
-* link:design-bmp-entitybean-container.html[BMP EntityBean Container]
-* link:design-cmp-entitybean-container.html[CMP EntityBean Container]
+* 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]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-local-server.adoc b/oldcontent/modules/ROOT/pages/dev/design-local-server.adoc
index d1fe96a..82f5bf3 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-local-server.adoc
+++ b/oldcontent/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 link:design-application-server.html[Application Server]
+Implementation of xref:design-application-server.adoc[Application Server]
 
 +++<a name="Design-LocalServer-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc b/oldcontent/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
index 4e6d874..efa409e 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-nova-configuration-factory.adoc
@@ -4,7 +4,7 @@ Title: Design - Nova Configuration Factory
 
 == Nova Configuration Factory
 
-Implementation of link:design-configuration-factory.html[Configuration Factory]
+Implementation of xref:design-configuration-factory.adoc[Configuration Factory]
 
 +++<a name="Design-NovaConfigurationFactory-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-passivation-strategy.adoc b/oldcontent/modules/ROOT/pages/dev/design-passivation-strategy.adoc
index 04a37b5..c8bb253 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-passivation-strategy.adoc
+++ b/oldcontent/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 link:design-stateful-sessionbean-container.html[Stateful SessionBean Container]
+Sub-component of xref: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
 
-* link:design-random-access-file-passivater.html[Random Access File Passivater]
-* link:design-simple-passivater.html[Simple Passivater]
+* xref:design-random-access-file-passivater.adoc[Random Access File Passivater]
+* xref:design-simple-passivater.adoc[Simple Passivater]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc b/oldcontent/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc
index 177be08..9542345 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-random-access-file-passivater.adoc
+++ b/oldcontent/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 link:design-passivation-strategy.html[Passivation Strategy]
+Implementation of xref:design-passivation-strategy.adoc[Passivation Strategy]
 
 +++<a name="Design-RandomAccessFilePassivater-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-remote-server.adoc b/oldcontent/modules/ROOT/pages/dev/design-remote-server.adoc
index b7020fc..8c51758 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-remote-server.adoc
+++ b/oldcontent/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 link:design-application-server.html[Application Server]
+Implementation of xref:design-application-server.adoc[Application Server]
 
 +++<a name="Design-RemoteServer-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-resource-manager.adoc b/oldcontent/modules/ROOT/pages/dev/design-resource-manager.adoc
index cd609bd..c0b2e15 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-resource-manager.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-resource-manager.adoc
@@ -4,7 +4,7 @@ Title: Design - Resource Manager
 
 == Resource Manager
 
-Sub-component of link:-design.html[OpenEJB]
+Sub-component of xref:-design.adoc[OpenEJB]
 
 +++<a name="Design-ResourceManager-Definition">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-security-service.adoc b/oldcontent/modules/ROOT/pages/dev/design-security-service.adoc
index a5c98d5..06702e1 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-security-service.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-security-service.adoc
@@ -2,7 +2,7 @@ Title: Design - Security Service +++<a name="Design-SecurityService-SecurityServ
 
 == Security Service
 
-Sub-component of link:-design.html[OpenEJB]
+Sub-component of xref:-design.adoc[OpenEJB]
 
 +++<a name="Design-SecurityService-Definition">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-simple-passivater.adoc b/oldcontent/modules/ROOT/pages/dev/design-simple-passivater.adoc
index b609fe7..fc20cd2 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-simple-passivater.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-simple-passivater.adoc
@@ -4,7 +4,7 @@ Title: Design - Simple Passivater
 
 == Simple Passivater
 
-Implementation of link:design-passivation-strategy.html[Passivation Strategy]
+Implementation of xref:design-passivation-strategy.adoc[Passivation Strategy]
 
 +++<a name="Design-SimplePassivater-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc b/oldcontent/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
index 9464ce6..f7b893b 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-stateful-sessionbean-container.adoc
+++ b/oldcontent/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 link:design-container.html[Container]
+Implementation of xref: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
 
-* link:design-passivation-strategy.html[Passivation Strategy]
+* xref:design-passivation-strategy.adoc[Passivation Strategy]
diff --git a/oldcontent/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc b/oldcontent/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
index 0e96d4d..27e1e8e 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-stateless-sessionbean-container.adoc
@@ -4,7 +4,7 @@ Title: Design - Stateless SessionBean Container
 
 == Stateless SessionBean Container
 
-Implementation of link:design-container.html[Container]
+Implementation of xref:design-container.adoc[Container]
 
 +++<a name="Design-StatelessSessionBeanContainer-Description">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design-transaction-service.adoc b/oldcontent/modules/ROOT/pages/dev/design-transaction-service.adoc
index 10592bc..521ef7a 100644
--- a/oldcontent/modules/ROOT/pages/dev/design-transaction-service.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design-transaction-service.adoc
@@ -4,7 +4,7 @@ Title: Design - Transaction Service
 
 == Transaction Service
 
-Sub-component of link:design.html[OpenEJB]
+Sub-component of xref:design.adoc[OpenEJB]
 
 +++<a name="Design-TransactionService-Definition">++++++</a>+++
 
diff --git a/oldcontent/modules/ROOT/pages/dev/design.adoc b/oldcontent/modules/ROOT/pages/dev/design.adoc
index 76d89d3..5c6b695 100644
--- a/oldcontent/modules/ROOT/pages/dev/design.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/design.adoc
@@ -40,9 +40,9 @@ A modular, configurable, customizable, embeddable open source EJB container syst
 
 == Sub-components
 
-* link:design-application-server.html[Application Server]
-* link:design-transaction-service.html[Transaction Service]
-* link:design-security-service.html[Security Service]
-* link:design-resource-manager.html[Resource Manager]
-* link:design-container.html[Container]
-* link:design-assembler.html[Assembler]
+* 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]
diff --git a/oldcontent/modules/ROOT/pages/dev/release-tomee.adoc b/oldcontent/modules/ROOT/pages/dev/release-tomee.adoc
index e6ac32c..3e5aa58 100644
--- a/oldcontent/modules/ROOT/pages/dev/release-tomee.adoc
+++ b/oldcontent/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 link:release-tomee.html#staging[Site Staging]
+Commit and publish changes to the site, see xref:release-tomee.adoc#staging[Site Staging]
 
  https://cms.apache.org/tomee/publish
 
diff --git a/oldcontent/modules/ROOT/pages/dev/source-code.adoc b/oldcontent/modules/ROOT/pages/dev/source-code.adoc
index 7b7de37..95dc05e 100644
--- a/oldcontent/modules/ROOT/pages/dev/source-code.adoc
+++ b/oldcontent/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 link:git.html[here]*
+*Please read our own detailed GitFlow workflow information xref: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/oldcontent/modules/ROOT/pages/dev/writing-validation-tests.adoc b/oldcontent/modules/ROOT/pages/dev/writing-validation-tests.adoc
index 5ed212a..572e3c4 100644
--- a/oldcontent/modules/ROOT/pages/dev/writing-validation-tests.adoc
+++ b/oldcontent/modules/ROOT/pages/dev/writing-validation-tests.adoc
@@ -95,7 +95,7 @@ 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 link:openejb:validation-keys-audit-report.html[OPENEJB:Validation Keys Audit Report]
+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]
 
 *** Quick facts about ValidationRunner and things to keep in mind while writing tests
 
diff --git a/oldcontent/modules/ROOT/pages/docs.adoc b/oldcontent/modules/ROOT/pages/docs.adoc
index c007b6a..c58321e 100644
--- a/oldcontent/modules/ROOT/pages/docs.adoc
+++ b/oldcontent/modules/ROOT/pages/docs.adoc
@@ -5,22 +5,22 @@
 :jbake-tomeepdf:
 
 === Administration
-- link:admin/configuration/index.html[Server Configuration]
-- link:admin/file-layout.html[Directory Structure]
-- link:admin/cluster/index.html[Clustering and High Availability (HA)]
+- xref:admin/configuration/index.adoc[Server Configuration]
+- xref:admin/file-layout.adoc[Directory Structure]
+- xref:admin/cluster/index.adoc[Clustering and High Availability (HA)]
 
 === Developers
-- link:developer/ide/index.html[IDEs - Eclipse, Intellij Idea and Netbeans]
-- link:developer/testing/index.html[Unit Testing - Arquillian, OpenEJB JUnit, TomEE Embedded and ApplicationComposer]
-- link:developer/tools/index.html[Build Tools and Plugins]
-- link:developer/migration/tomee-1-to-7.html[Migrating From TomEE 1.x to 7.x]
-- link:developer/json/index.html[TomEE and Apache Johnzon - JAX-RS JSON Provider]
-- link:developer/configuration/cxf.html[Apache CXF Configuration - JAX-RS (RESTful Services) and JAX-WS (Web Services)]
-- link:developer/classloading/index.html[Understanding the TomEE ClassLoader]
+- 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]
 
 === Advanced
-- link:advanced/applicationcomposer/index.html[`ApplicationComposer` with JBatch]
-- link:advanced/setup/index.html[How to Setup TomEE in Production]
-- link:advanced/shading/index.html[Fat / Uber Jar Deployment using the Maven Shade Plugin]
-- link:advanced/client/jndi.html[Java Naming and Directory Interface (JNDI)]
-- link:advanced/jms/jms-configuration.html[Why is my ActiveMQ/JMS MDB not scaling as expected?]
+- 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?]
diff --git a/oldcontent/modules/ROOT/pages/download-archive.adoc b/oldcontent/modules/ROOT/pages/download-archive.adoc
index 5d16183..830eabc 100644
--- a/oldcontent/modules/ROOT/pages/download-archive.adoc
+++ b/oldcontent/modules/ROOT/pages/download-archive.adoc
@@ -5,7 +5,7 @@
 :jbake-tomeepdf:
 :icons: font
 
-- link:download-ng.html[The current versions can be found here]
+- xref:download-ng.adoc[The current versions can be found here]
 
 IMPORTANT: Note: Only the TomEE 1.x WebProfile and JAX-RS distributions are certified.
 IMPORTANT: Note: Please note the 8.0.0-M releases are milestone releases intended for evaluation purposes and should not be used in production.
diff --git a/oldcontent/modules/ROOT/pages/download-ng.adoc b/oldcontent/modules/ROOT/pages/download-ng.adoc
index 0c416f7..39bf563 100755
--- a/oldcontent/modules/ROOT/pages/download-ng.adoc
+++ b/oldcontent/modules/ROOT/pages/download-ng.adoc
@@ -68,4 +68,4 @@ IMPORTANT: Note: Only the TomEE 1.x WebProfile and JAX-RS distributions are cert
 |===
 
 
-- link:download-archive.html[Older versions can be found here]
+- xref:download-archive.adoc[Older versions can be found here]
diff --git a/oldcontent/modules/ROOT/pages/faq.adoc b/oldcontent/modules/ROOT/pages/faq.adoc
index 22cbd23..a48a38c 100644
--- a/oldcontent/modules/ROOT/pages/faq.adoc
+++ b/oldcontent/modules/ROOT/pages/faq.adoc
@@ -45,7 +45,7 @@ The short answer is yes.
 The basic approach for all embedding scenarios is to 1) add OpenEJB to your classpath, and 2) construct your InitialContext using org.apache.openejb.client.LocalInitialContextFactory.
 The LocalInitialContextFactory will boot OpenEJB in your vm and all ejb applications visible in the classpath will be deployed.
 See http://tomee.apache.org/embedding-openejb.html for details on how to embed openejb in your application and IDE.
-See link:openejbx30:application-discovery-via-the-classpath.html[Application discovery via the classpath]  for various ways to have your applications discovered.
+See xref:openejbx30:application-discovery-via-the-classpath.adoc[Application discovery via the classpath]  for various ways to have your applications discovered.
 
 === During embedded testing, how can I externalize all my DataSource
 
diff --git a/oldcontent/modules/ROOT/pages/lightening-demos.adoc b/oldcontent/modules/ROOT/pages/lightening-demos.adoc
index 940303a..ca1a41e 100644
--- a/oldcontent/modules/ROOT/pages/lightening-demos.adoc
+++ b/oldcontent/modules/ROOT/pages/lightening-demos.adoc
@@ -49,4 +49,4 @@ Title: Lightening Demos
 +++<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 link:-http://markmail.org/message/5jq5xun44kt7tcni.html[this]  e-mail thread._
+_NOTE: For more details about the idea behind Lightening Demos, please read xref:-http://markmail.org/message/5jq5xun44kt7tcni.adoc[this]  e-mail thread._
diff --git a/oldcontent/modules/ROOT/pages/security/security.adoc b/oldcontent/modules/ROOT/pages/security/security.adoc
index 004f3f2..b43c662 100755
--- a/oldcontent/modules/ROOT/pages/security/security.adoc
+++ b/oldcontent/modules/ROOT/pages/security/security.adoc
@@ -25,7 +25,7 @@ Questions about:
 - obtaining further information on a published vulnerability
 - availability of patches and/or new releases
 
-should be addressed to the link:support.html[users mailing list].
+should be addressed to the xref:support.adoc[users mailing list].
 
 The private security mailing address is: security (at) apache (dot) org
 
diff --git a/oldcontent/modules/ROOT/pages/security/support.adoc b/oldcontent/modules/ROOT/pages/security/support.adoc
index af5d330..2793321 100755
--- a/oldcontent/modules/ROOT/pages/security/support.adoc
+++ b/oldcontent/modules/ROOT/pages/security/support.adoc
@@ -8,7 +8,7 @@
 Support for Apache TomEE is given freely by the community.
 Please be aware when asking questions that the Apache Software Foundation does not have paid developers or dedicated support staff.
 All community support comes from volunteers on a volunteer basis.
-Joining the link:../community/index.html[Community] as a volunteer and helping your fellow users is highly encouraged!
+Joining the xref:../community/index.adoc[Community] as a volunteer and helping your fellow users is highly encouraged!
 
 === Mailing Lists
 
@@ -31,4 +31,4 @@ If you encounter a bug or want to submit a patch just go on our https://issues.a
 
 === Commercial Support
 
-If you need advanced support with SLA please have a look to our link:../community/commercial.html[Commercial] page.
+If you need advanced support with SLA please have a look to our xref:../community/commercial.adoc[Commercial] page.
diff --git a/oldcontent/modules/ROOT/pages/support.adoc b/oldcontent/modules/ROOT/pages/support.adoc
index 87101c9..e8a048f 100644
--- a/oldcontent/modules/ROOT/pages/support.adoc
+++ b/oldcontent/modules/ROOT/pages/support.adoc
@@ -38,4 +38,4 @@ 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 community as a volunteer and helping your fellow users is highly encouraged!
 
-For commercial support or to commercially support the community see link:commercial-support.html[Commercial Support] page.
+For commercial support or to commercially support the community see xref:commercial-support.adoc[Commercial Support] page.
diff --git a/oldcontent/modules/ROOT/pages/tomcat-activemq.adoc b/oldcontent/modules/ROOT/pages/tomcat-activemq.adoc
index 3d2b338..bd2b43a 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-activemq.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat-activemq.adoc
@@ -52,6 +52,6 @@ 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.
 
-link:downloads.html[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
+xref:downloads.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
 
 {include:apache-tomee.mdtext}
diff --git a/oldcontent/modules/ROOT/pages/tomcat-cdi.adoc b/oldcontent/modules/ROOT/pages/tomcat-cdi.adoc
index 14c7ec0..af725d4 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-cdi.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat-cdi.adoc
@@ -59,6 +59,6 @@ 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.
 
-link:downloads.html[Download] TomEE and you're minutes away from having fun with CDI on Tomcat.
+xref:downloads.adoc[Download] TomEE and you're minutes away from having fun with CDI on Tomcat.
 
 {include:apache-tomee.mdtext}
diff --git a/oldcontent/modules/ROOT/pages/tomcat-detailed-instructions.adoc b/oldcontent/modules/ROOT/pages/tomcat-detailed-instructions.adoc
index 7720fef..4f1ae64 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-detailed-instructions.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat-detailed-instructions.adoc
@@ -7,7 +7,7 @@ Title: Tomcat Detailed Instructions \{composition-setup}
 = {anchor:detailed 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 link:tomcat-installation.html[Tomcat Installation]  will show you how to setup and verify a Tomcat installation.
+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>+++
 
@@ -73,7 +73,7 @@ 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.
-If you are using an IDE or some other mechanism to start Tomcat, you will need to link:manual-installation#javaagent.html[manually]  add the JavaAgent declaration to the Java VM options of the launcher you are using.
+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>+++
@@ -267,7 +267,7 @@ The openejb.war file must be removed because some versions of Tomcat will use th
 
 == Other Issues
 
-If you are having problems with the installation, please send a message to the OpenEJB users link:openejb:mailing-lists.html[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:openejb:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
 
 * OpenEJB Version
 * Tomcat Version
diff --git a/oldcontent/modules/ROOT/pages/tomcat-ejb-refs.adoc b/oldcontent/modules/ROOT/pages/tomcat-ejb-refs.adoc
index e665c2b..6c78c8e 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-ejb-refs.adoc
+++ b/oldcontent/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 link:injection-of-other-ejbs-example.html[@EJB Injection Example]  for a running example.
+See the xref: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/oldcontent/modules/ROOT/pages/tomcat-jms.adoc b/oldcontent/modules/ROOT/pages/tomcat-jms.adoc
index 534c04c..45445ee 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-jms.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat-jms.adoc
@@ -52,6 +52,6 @@ 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.
 
-link:downloads.html[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
+xref:downloads.adoc[Download] TomEE and you're minutes away from a functioning JMS application on Tomcat.
 
 {include:apache-tomee.mdtext}
diff --git a/oldcontent/modules/ROOT/pages/tomcat-jpa.adoc b/oldcontent/modules/ROOT/pages/tomcat-jpa.adoc
index 6d99db5..97da567 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-jpa.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat-jpa.adoc
@@ -60,6 +60,6 @@ To make the above work all you need is a `WEB-INF/persistence.xml` file in your
 
 DataSources will automatically be created if they haven't be configured explicitly.
 
-link:downloads.html[Download] TomEE and you're minutes away from a functioning JPA application on Tomcat.
+xref:downloads.adoc[Download] TomEE and you're minutes away from a functioning JPA application on Tomcat.
 
 {include:apache-tomee.mdtext}
diff --git a/oldcontent/modules/ROOT/pages/tomcat-object-factory.adoc b/oldcontent/modules/ROOT/pages/tomcat-object-factory.adoc
index e304040..588d3ac 100644
--- a/oldcontent/modules/ROOT/pages/tomcat-object-factory.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat-object-factory.adoc
@@ -1,3 +1,3 @@
 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._
 
-As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with usage of the link:openejbx30:injection-of-other-ejbs-example.html[@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>+++
+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>+++
diff --git a/oldcontent/modules/ROOT/pages/tomcat.adoc b/oldcontent/modules/ROOT/pages/tomcat.adoc
index eaa80d7..86aca41 100644
--- a/oldcontent/modules/ROOT/pages/tomcat.adoc
+++ b/oldcontent/modules/ROOT/pages/tomcat.adoc
@@ -16,7 +16,7 @@ The OpenEJB plugin for Tomcat makes all of the OpenEJB features available to Ser
 
 In addition, WAR files can contain EJB modules and JPA persistence units eliminating the annoying construction of .ear files.
 Adding EJBs and JPA Persistence beans to your application is as simple as adding the @Stateless, @Stateful, @MessageDriven or @Entity to a class.
-The packaging is refered to as link:openejb:collapsed-ear.html[OPENEJB:Collapsed EAR]  style as the war file, ejb jar, and persistence unit files are merged into one archive and share the same classloader.
+The packaging is refered to as xref:openejb:collapsed-ear.adoc[OPENEJB:Collapsed EAR]  style as the war file, ejb jar, and persistence unit files are merged into one archive and share the same classloader.
 
 _Requirements:_
 
@@ -28,9 +28,9 @@ _Requirements:_
 
 = Installation for the Impatient
 
-Assuming you have a link:tomcat-installation.html[normal working Tomcat 6.x or 5.5 installation] :
+Assuming you have a xref:tomcat-installation.adoc[normal working Tomcat 6.x or 5.5 installation] :
 
-. Download link:openejb:download.html[openejb.war]
+. Download xref:openejb:download.adoc[openejb.war]
 . Copy openejb.war to ${catalina.base}/webapps/openejb.war (Note: the file _must_ be named openejb.war)
 . Start Tomcat if it is not already running
 . (optional) Visit http://localhost:8080/openejb/installer  and click the 'install' button
@@ -43,7 +43,7 @@ Assuming you have a link:tomcat-installation.html[normal working Tomcat 6.x or 5
 
 == ejb-examples.war
 
-See the webapps/ejb-examples/ directory in the link:openejb:download.html[openejb-examples zip] .
+See the webapps/ejb-examples/ directory in the xref:openejb:download.adoc[openejb-examples zip] .
 
 +++<a name="Tomcat-{anchor:problems}Problems?">++++++</a>+++ #Problems?
 
@@ -90,7 +90,7 @@ You can achieve this by adding "-XX:MaxPermSize=256m" to the CATALINA_OPTS envir
 
 == Other Issues
 
-If you are having problems with the installation, please send a message to the OpenEJB users link:openejb:mailing-lists.html[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:openejb:mailing-lists.adoc[mailing list]  containing any error message(s) and the following information:
 
 * OpenEJB Version
 * Tomcat Version
diff --git a/oldcontent/modules/ROOT/pages/tomee-1.5.0.adoc b/oldcontent/modules/ROOT/pages/tomee-1.5.0.adoc
index 50cdf37..fa01c08 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.5.0.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.5.0.adoc
@@ -1,7 +1,7 @@
 = Apache TomEE 1.5 Released!
 
 We are excited to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.5].
-The volume of feedback on the 1.0.0 Final drove such an impressive number of fixes and features into TomEE that the release number has been updated to reflect link:tomee-1.5.0-release-notes.html[the changes].
+The volume of feedback on the 1.0.0 Final drove such an impressive number of fixes and features into TomEE that the release number has been updated to reflect xref:tomee-1.5.0-release-notes.adoc[the changes].
 
 The team is proud to announce certification of a new Apache TomEE stack that includes the Web Profile plus JAX-RS for RESTful Web Services.
 The new 'TomEE JAXRS' distribution shows TomEE's commitment to progressing its certification efforts beyond the Web Profile and is a great alternative to the TomEE Plus distribution.
@@ -12,6 +12,6 @@ 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 link:maven/index.html[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 xref: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/oldcontent/modules/ROOT/pages/tomee-1.5.1.adoc b/oldcontent/modules/ROOT/pages/tomee-1.5.1.adoc
index 1d43ea8..bdeffc1 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.5.1.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.5.1.adoc
@@ -2,7 +2,7 @@
 
 ____
 We are excited to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.5.1].
-The volume of feedback on the 1.5.1 Final drove such an impressive number of fixes and improvements into TomEE link:tomee-1.5.1-release-notes.html[the changes].
+The volume of feedback on the 1.5.1 Final drove such an impressive number of fixes and improvements into TomEE xref:tomee-1.5.1-release-notes.adoc[the changes].
 ____
 
 We'd like to thank everyone who gave feedback and contributed to improve Apache TomEE on a daily basis!
diff --git a/oldcontent/modules/ROOT/pages/tomee-1.6.0.1.adoc b/oldcontent/modules/ROOT/pages/tomee-1.6.0.1.adoc
index 7ccc1a5..facfd71 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.6.0.1.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.6.0.1.adoc
@@ -20,9 +20,9 @@ The Apache TomEE Release 1.6.0.1 files can be found here:
 
 http://tomee.apache.org/downloads.html
 
-A complete link:tomee-1.6.0.1-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.6.0.1-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.6.0.1-release-notes.html[tomee-1.6.0.1-release-notes.html]
+xref:tomee-1.6.0.1-release-notes.adoc[tomee-1.6.0.1-release-notes.html]
 
 To see the full http://tomcat.apache.org/tomcat-7.0-doc/changelog.html[Changelog] of Apache Tomcat since version 7.0.51 follow this link:
 
diff --git a/oldcontent/modules/ROOT/pages/tomee-1.6.0.2.adoc b/oldcontent/modules/ROOT/pages/tomee-1.6.0.2.adoc
index 9d85b56..1788c28 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.6.0.2.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.6.0.2.adoc
@@ -12,6 +12,6 @@ The Apache TomEE Release 1.6.0.2 files can be found here:
 
 http://tomee.apache.org/downloads.html
 
-A complete link:tomee-1.6.0.2-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.6.0.2-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.6.0.2-release-notes.html[tomee-1.6.0.2-release-notes.html]
+xref:tomee-1.6.0.2-release-notes.adoc[tomee-1.6.0.2-release-notes.html]
diff --git a/oldcontent/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc b/oldcontent/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc
index d369a9d..5dd2aa2 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.7.0-release-notes.adoc
@@ -145,7 +145,7 @@ 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 link:maven/index.html[tomee-maven-plugin]
+* [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-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/oldcontent/modules/ROOT/pages/tomee-1.7.0.adoc b/oldcontent/modules/ROOT/pages/tomee-1.7.0.adoc
index f5d4e1b..203123f 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.7.0.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.7.0.adoc
@@ -57,9 +57,9 @@ Or just update your existing Maven JavaEE-API, OpenEJB and or TomEE entries to p
 </dependency>
 ....
 
-A complete link:tomee-1.7.0-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.7.0-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.7.0-release-notes.html[tomee-1.7.0-release-notes.html]
+xref:tomee-1.7.0-release-notes.adoc[tomee-1.7.0-release-notes.html]
 
 So please feel free to jump in feet first and http://tomee.apache.org/documentation.html[get started with TomEE].
 You will nearly always find someone to help you on one of our http://tomee.apache.org/support.html[support channels].
diff --git a/oldcontent/modules/ROOT/pages/tomee-1.7.1.adoc b/oldcontent/modules/ROOT/pages/tomee-1.7.1.adoc
index 3f8f4f6..0b3e2e0 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.7.1.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.7.1.adoc
@@ -5,11 +5,11 @@ As promised we are committed to providing the best for our community, and so wit
 This version is still shipped upon Apache Tomcat 7.0.55.
 
 Please note that the TomEE 1.7.1 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 link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 The Apache TomEE 1.7.1 release files can be downloaded from here:
 
-link:downloads.html[http://tomee.apache.org/downloads.html]
+xref:downloads.adoc[http://tomee.apache.org/downloads.html]
 
 *** Important Notes:
 
@@ -49,12 +49,12 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-1.7.1-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.7.1-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.7.1-release-notes.html[tomee-1.7.1-release-notes.html]
+xref:tomee-1.7.1-release-notes.adoc[tomee-1.7.1-release-notes.html]
 
-Please feel free to jump in feet first and link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-1.7.2.adoc b/oldcontent/modules/ROOT/pages/tomee-1.7.2.adoc
index 2a930bb..01b3ab3 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.7.2.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.7.2.adoc
@@ -3,11 +3,11 @@
 The Apache TomEE community is delighted to announce the release of http://tomee.apache.org/downloads.html[Apache TomEE 1.7.2], which is based on http://tomcat.apache.org/tomcat-7.0-doc/index.html[Apache Tomcat 7.0.61], including numerous fixes and updates.
 
 Please note that the TomEE 1.7.2 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 link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 The Apache TomEE 1.7.2 release files can be downloaded from here:
 
-link:downloads.html[http://tomee.apache.org/downloads.html]
+xref:downloads.adoc[http://tomee.apache.org/downloads.html]
 
 *** Update Maven POM Files
 
@@ -34,12 +34,12 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-1.7.2-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.7.2-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.7.2-release-notes.html[tomee-1.7.2-release-notes.html]
+xref:tomee-1.7.2-release-notes.adoc[tomee-1.7.2-release-notes.html]
 
-Please feel free to jump in feet first and link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-1.7.3.adoc b/oldcontent/modules/ROOT/pages/tomee-1.7.3.adoc
index 5b555a9..b629575 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.7.3.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.7.3.adoc
@@ -4,11 +4,11 @@ The Apache TomEE community is pleased to announce the release of http://tomee.ap
 We know this has been a long time coming, so we thank you for your patience and support.
 
 Please note that the TomEE 1.7.3 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 link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 The Apache TomEE 1.7.3 release files can be downloaded from here:
 
-link:downloads.html[http://tomee.apache.org/downloads.html]
+xref:downloads.adoc[http://tomee.apache.org/downloads.html]
 
 *** Update Maven POM Files
 
@@ -35,12 +35,12 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-1.7.3-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.7.3-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.7.3-release-notes.html[tomee-1.7.3-release-notes.html]
+xref:tomee-1.7.3-release-notes.adoc[tomee-1.7.3-release-notes.html]
 
-Please feel free to jump in feet first and link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-1.7.4.adoc b/oldcontent/modules/ROOT/pages/tomee-1.7.4.adoc
index 2cb8116..c39de3e 100644
--- a/oldcontent/modules/ROOT/pages/tomee-1.7.4.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-1.7.4.adoc
@@ -2,14 +2,14 @@
 
 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 link:security/tomee.html[CVE-2016-0779].
+More on xref:security/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 link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 The Apache TomEE 1.7.4 release files can be downloaded from here:
 
-link:downloads.html[http://tomee.apache.org/downloads.html]
+xref:downloads.adoc[http://tomee.apache.org/downloads.html]
 
 *** Update Maven POM Files
 
@@ -36,12 +36,12 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-1.7.4-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-1.7.4-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-1.7.4-release-notes.html[tomee-1.7.4-release-notes.html]
+xref:tomee-1.7.4-release-notes.adoc[tomee-1.7.4-release-notes.html]
 
-Please feel free to jump in feet first and link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-7.0.0-M1.adoc b/oldcontent/modules/ROOT/pages/tomee-7.0.0-M1.adoc
index b4b9801..0f92252 100644
--- a/oldcontent/modules/ROOT/pages/tomee-7.0.0-M1.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-7.0.0-M1.adoc
@@ -1,9 +1,9 @@
 = Apache TomEE 7.0.0-M1 released, Dec 11th 2015
 
-The Apache TomEE community is proud to announce the release of link:download/tomee-7.0.0-M1.html[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 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.
 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 link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 This version is not certified and is provided to the community as a milestone preview of the current development version.
 It is however an extremly well tested version.
@@ -11,7 +11,7 @@ So please do test your applications and give us your feedback.
 
 The Apache TomEE 7.0.0-M1 release files can be downloaded from here:
 
-link:download/tomee-7.0.0-M1.html[http://tomee.apache.org/download/tomee-7.0.0-M1.html]
+xref:download/tomee-7.0.0-M1.adoc[http://tomee.apache.org/download/tomee-7.0.0-M1.html]
 
 *** Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
@@ -38,9 +38,9 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-7.0.0-M1-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-7.0.0-M1-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-7.0.0-M1-release-notes.html[tomee-7.0.0-M1-release-notes.html]
+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 link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-7.0.0-M2.adoc b/oldcontent/modules/ROOT/pages/tomee-7.0.0-M2.adoc
index c74b873..f8d1981 100644
--- a/oldcontent/modules/ROOT/pages/tomee-7.0.0-M2.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-7.0.0-M2.adoc
@@ -1,9 +1,9 @@
 = Apache TomEE 7.0.0-M2 released, Feb 29th 2016
 
-The Apache TomEE community is proud to announce the release of link:download/tomee-7.0.0-M2.html[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 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.
 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 link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 This version is not certified and is provided to the community as a milestone preview of the current development version.
 It is however an extremly well tested version.
@@ -11,7 +11,7 @@ So please do test your applications and give us your feedback.
 
 The Apache TomEE 7.0.0-M2 release files can be downloaded from here:
 
-link:download/tomee-7.0.0-M2.html[http://tomee.apache.org/download/tomee-7.0.0-M2.html]
+xref:download/tomee-7.0.0-M2.adoc[http://tomee.apache.org/download/tomee-7.0.0-M2.html]
 
 *** Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
@@ -38,9 +38,9 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-7.0.0-M2-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-7.0.0-M2-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-7.0.0-M2-release-notes.html[tomee-7.0.0-M2-release-notes.html]
+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 link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-7.0.0-M3.adoc b/oldcontent/modules/ROOT/pages/tomee-7.0.0-M3.adoc
index df0af6e..a14e9a1 100644
--- a/oldcontent/modules/ROOT/pages/tomee-7.0.0-M3.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-7.0.0-M3.adoc
@@ -1,10 +1,10 @@
 = Apache TomEE 7.0.0-M3 released, Mar 06th 2016
 
-The Apache TomEE community is proud to announce the release of link:download/tomee-7.0.0-M3.html[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 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.
 Part of this release an important security fix is included if EJBd is active on your instance (true by default).
-More on link:security/tomee.html[CVE-2016-0779].
+More on xref:security/tomee.adoc[CVE-2016-0779].
 
-Please feel free to check out and link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 This version is not certified and is provided to the community as a milestone preview of the current development version.
 It is however an extremly well tested version.
@@ -12,7 +12,7 @@ So please do test your applications and give us your feedback.
 
 The Apache TomEE 7.0.0-M3 release files can be downloaded from here:
 
-link:download/tomee-7.0.0-M3.html[http://tomee.apache.org/download/tomee-7.0.0-M3.html]
+xref:download/tomee-7.0.0-M3.adoc[http://tomee.apache.org/download/tomee-7.0.0-M3.html]
 
 *** Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
@@ -39,9 +39,9 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-7.0.0-M3-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-7.0.0-M3-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-7.0.0-M3-release-notes.html[tomee-7.0.0-M3-release-notes.html]
+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 link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref: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/oldcontent/modules/ROOT/pages/tomee-7.0.1.adoc b/oldcontent/modules/ROOT/pages/tomee-7.0.1.adoc
index 33c62ea..e943ed3 100644
--- a/oldcontent/modules/ROOT/pages/tomee-7.0.1.adoc
+++ b/oldcontent/modules/ROOT/pages/tomee-7.0.1.adoc
@@ -1,8 +1,8 @@
 = Apache TomEE 7.0.1 released, June 27th 2016
 
-The Apache TomEE community is proud to announce the release of link:download/tomee-7.0.1.html[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 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.
 
-Please feel free to check out and link:contribute.html[contribute to the developer branch] - We are always interested in any help from the community that we can get.
+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.
 
 This version is not certified and is provided to the community as a milestone preview of the current development version.
 It is however an extremly well tested version.
@@ -10,7 +10,7 @@ So please do test your applications and give us your feedback.
 
 The Apache TomEE 7.0.1 release files can be downloaded from here:
 
-link:download/tomee-7.0.1.html[http://tomee.apache.org/download/tomee-7.0.1.html]
+xref:download/tomee-7.0.1.adoc[http://tomee.apache.org/download/tomee-7.0.1.html]
 
 == Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
@@ -37,9 +37,9 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml entri
 </dependency>
 ....
 
-A complete link:tomee-7.0.1-release-notes.html[Changelog] can be viewed here:
+A complete xref:tomee-7.0.1-release-notes.adoc[Changelog] can be viewed here:
 
-link:tomee-7.0.1-release-notes.html[tomee-7.0.1-release-notes.html]
+xref:tomee-7.0.1-release-notes.adoc[tomee-7.0.1-release-notes.html]
 
-Please feel free to jump in feet first and link:documentation.html[get started with TomEE].
-You will nearly always find someone to help you on one of our link:support.html[support channels].
+Please feel free to jump in feet first and xref:documentation.adoc[get started with TomEE].
+You will nearly always find someone to help you on one of our xref:support.adoc[support channels].