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 01d5f92d8d48a1d90ad3e9c14f275487dfffee19
Author: David Jencks <[email protected]>
AuthorDate: Wed Mar 4 22:48:26 2020 -0800

    xref fixes, add 2 html files from svn
---
 tomee/modules/ROOT/pages/contribute.adoc           |  13 +-
 tomee/modules/ROOT/pages/faq.adoc                  |  21 +--
 tomee/modules/ROOT/pages/security/tomee.adoc       |   2 +-
 .../modules/ROOT/pages/tomcat-object-factory.adoc  |   2 +-
 tomee/modules/ROOT/pages/tomcat.adoc               |   4 +-
 .../pages/tomee-1.0.0-beta2-release-notes.adoc     | 161 +++++++++++++++++++++
 .../ROOT/pages/tomee-1.7.4-release-notes.adoc      |  14 ++
 tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc       |  12 +-
 tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc       |   7 +-
 tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc       |  19 +--
 tomee/modules/ROOT/pages/tomee-7.0.1.adoc          |  10 +-
 11 files changed, 212 insertions(+), 53 deletions(-)

diff --git a/tomee/modules/ROOT/pages/contribute.adoc 
b/tomee/modules/ROOT/pages/contribute.adoc
index 9c9a02b..9ccf65d 100644
--- a/tomee/modules/ROOT/pages/contribute.adoc
+++ b/tomee/modules/ROOT/pages/contribute.adoc
@@ -5,9 +5,10 @@ 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]
+* xref:developer/index.adoc[Developer Documentation]
+
+== Contributing doesn't always mean code.
 
-*** Contributing doesn't always mean code.
 If you love the project and want to see it grow, follow it on Facebook and 
Twitter.
 
 * http://twitter.com/ApacheTomEE
@@ -24,13 +25,15 @@ The more people we reach the more the project grows.
 Doing these things as often as possible are simple and powerful ways to help.
 Do your part and watch the project grow grow grow!
 
-*** Edit This Site Top right, next to the Twitter symbol, there is an edit 
symbol <<edit,contribute>>.
+== Edit This Site
+
+Top right, next to the Twitter symbol, there is an edit symbol 
<<edit,contribute>>.
 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 xref:{examples-vc}::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
+== Committers
 
 [cols=4*]
 |===
diff --git a/tomee/modules/ROOT/pages/faq.adoc 
b/tomee/modules/ROOT/pages/faq.adoc
index a48a38c..6a51375 100644
--- a/tomee/modules/ROOT/pages/faq.adoc
+++ b/tomee/modules/ROOT/pages/faq.adoc
@@ -1,35 +1,28 @@
-Title: FAQ +++<a name="FAQ-&nbsp;General">++++++</a>+++
+= FAQ
 
-== &nbsp;General
+== General
 
-&nbsp;
-
-+++<a name="FAQ-WhatspecversiondoesOpenEJBsupport?">++++++</a>+++
 
 === What spec version does OpenEJB support?
 
 OpenEJB supports the Enterprise JavaBeans 3.0 specification and previous 
versions 2.1, 2.0 and 1.1.
 
-+++<a 
name="FAQ-Idon'tplantouseEJBs,sowhywouldIembedOpenEJBintoTomcat.">++++++</a>+++
 
 === I don't plan to use EJBs, so why would I embed OpenEJB into Tomcat.
 
 Adding OpenEJB to Tomcat gives servlets several new Java EE 5 capabilities 
such as JPA, JAX-WS, JMS, J2EE Connectors, transactions, and more as well as 
enhancing the injection features of Tomcat 6 to now support injection of JavaEE 
objects like Topics, Queues, EntityManagers, JMS ConnectionFactories, JavaMail 
Sessions, as well as simpler data types such as Dates, Classes, URI, URL, List, 
Map, Set, Properties, and more.
 In the case of Tomcat 5.5 which doesn't support dependency injection at all, 
even more is gained.
 
-+++<a name="FAQ-CanIrunOpenEJBwithaJVMforanyvendor?">++++++</a>+++
 
 === Can I run OpenEJB with a JVM for any vendor?
 
 The Sun, Mac, and IBM vms are regularly tested, however any vm should work.
 
-+++<a name="FAQ-WhichversionofJavaisrequiredtorunOpenEJB?">++++++</a>+++
 
 === Which version of Java is required to run OpenEJB?
 
 Java versions 5 or 6, aka Java 1.5 or 1.6.
 
-+++<a name="FAQ-DoIneedApacheMaventoworkwithOpenEJB?">++++++</a>+++
 
 === Do I need Apache Maven to work with OpenEJB?
 
@@ -45,7 +38,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 xref:openejbx30:application-discovery-via-the-classpath.adoc[Application 
discovery via the classpath]  for various ways to have your applications 
discovered.
+See xref: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
 
@@ -55,7 +48,8 @@ Create an openejb.xml file in any directory that gets added 
to your test classpa
 For maven, something that winds up directly under "target/classes/" or 
"target/test-classes/" will work just fine.
 Then in your test case do this:
 
-....
+[source,java]
+----
    protected void setUp() throws Exception {
        Properties properties = new Properties();
        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,  
"org.apache.openejb.client.LocalInitialContextFactory");
@@ -65,21 +59,18 @@ Then in your test case do this:
 
        initialContext = new InitialContext(properties);
    }
-....
+----
 
 The file itself doesn't have to be called "openejb.xml", you could have a few 
different files like that for different testing scenarios each with a name that 
describes the basic setup.
 
-+++<a name="FAQ-Container-ManagedPersistence">++++++</a>+++
 
 == Container-Managed Persistence
 
-+++<a name="FAQ-WhatenginedoesOpenEJBuseforCMP?">++++++</a>+++
 
 === What engine does OpenEJB use for CMP?
 
 The CMP engine is written as a layer over JPA with OpenJPA doing the 
persistence work.
 
-+++<a name="FAQ-WhatistheformatfortheCMPmappingfiles?">++++++</a>+++
 
 === What is the format for the CMP mapping files?
 
diff --git a/tomee/modules/ROOT/pages/security/tomee.adoc 
b/tomee/modules/ROOT/pages/security/tomee.adoc
index 04ab14f..54f3178 100644
--- a/tomee/modules/ROOT/pages/security/tomee.adoc
+++ b/tomee/modules/ROOT/pages/security/tomee.adoc
@@ -10,7 +10,7 @@ NOTE: Vulnerabilities that are not TomEE vulnerabilities but 
have either been in
 
 Please note that binary patches are never provided.
 If you need to apply a source code patch, use the building instructions for 
the Apache TomEE version that you are using.
-For TomEE 1.x those are xref:../dev/building-tomee-1.adoc[Building TomEE 1.x].
+For TomEE 1.x those are xref:/dev/building-tomee-from-source.adoc[Building 
TomEE from source].
 
 If you need help on building or configuring TomEE or other help on following 
the instructions to mitigate the known vulnerabilities listed here, please send 
your questions to the public xref:../support.adoc[Users mailing list]
 
diff --git a/tomee/modules/ROOT/pages/tomcat-object-factory.adoc 
b/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
index a017cd1..db2bd54 100644
--- a/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
+++ b/tomee/modules/ROOT/pages/tomcat-object-factory.adoc
@@ -6,5 +6,5 @@
 
 _The TomcatEjbFactory as discussed in the 
link:http://www.onjava.com/pub/a/onjava/2003/02/12/ejb_tomcat.html[OnJava 
article "OpenEJB: EJB for Tomcat"]  is no longer required._
 
-As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with 
usage of the xref:injection-of-other-ejbs-example.adoc[@EJB annotation]  in the 
Servlet, Filter or Listener or with the ejb-ref or ejb-local-ref declared in 
the web.xml.
+As of OpenEJB 3.0 references from Servlets to EJBs happen automatically with 
usage of the xref:{common-vc}::injection-of-other-ejbs-example.adoc[@EJB 
annotation]  in the Servlet, Filter or Listener or with the ejb-ref or 
ejb-local-ref declared in the web.xml.
 See the xref:{common-vc}::tomcat.adoc[Tomcat Integration] page for the most 
up-to-date details on using OpenEJB inside Tomcat.
diff --git a/tomee/modules/ROOT/pages/tomcat.adoc 
b/tomee/modules/ROOT/pages/tomcat.adoc
index f0abcd1..99eb266 100644
--- a/tomee/modules/ROOT/pages/tomcat.adoc
+++ b/tomee/modules/ROOT/pages/tomcat.adoc
@@ -24,7 +24,7 @@ _Requirements:_
 
 Assuming you have a xref:tomcat-installation.adoc[normal working Tomcat 6.x or 
5.5 installation] :
 
-. Download xref:downloads-ng.adoc[openejb.war]
+. Download xref:download-ng.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
@@ -33,7 +33,7 @@ Assuming you have a xref:tomcat-installation.adoc[normal 
working Tomcat 6.x or 5
 
 === ejb-examples.war
 
-See the webapps/ejb-examples/ directory in the 
xref:downloads-ng.adoc[openejb-examples zip] .
+See the webapps/ejb-examples/ directory in the 
xref:download-ng.adoc[openejb-examples zip] .
 
 == Problems?
 
diff --git a/tomee/modules/ROOT/pages/tomee-1.0.0-beta2-release-notes.adoc 
b/tomee/modules/ROOT/pages/tomee-1.0.0-beta2-release-notes.adoc
new file mode 100644
index 0000000..5f13204
--- /dev/null
+++ b/tomee/modules/ROOT/pages/tomee-1.0.0-beta2-release-notes.adoc
@@ -0,0 +1,161 @@
+= Apache TomEE 1.0.0-beta-2 Release Notes
+
+
+2012-01-23
+
+== Upgrades:
+
+  * [TOMEE-81] Upgrade HSQLDB to 2.2.4
+  * [TOMEE-109] Upgrade to XBean 3.9
+  * [TOMEE-112] Upgrade wss4j to 1.6.3
+  * [TOMEE-117] Upgrade OpenWebBeans to 1.1.3
+  * [TOMEE-118] Upgrade CXF to 2.5.1
+  * [TOMEE-119] Upgrade ActiveMQ to 5.5.1
+  * [TOMEE-113] Upgrade Commons Fileupload to 1.2.2
+  * [TOMEE-114] Upgrade Commons Discovery to 0.5
+  * [TOMEE-116] Upgrade Commons Pool to 1.5.7
+
+== New Features:
+
+  * [TOMEE-6] Arquillian adapter
+  * [TOMEE-84] TomEE Embedded Container
+  * [TOMEE-86] Implementation of EJBContainer.createEJBContainer for TomEE 
Embedded
+  * [TOMEE-96] All-in-one TomEE Embedded jar
+  * [TOMEE-95] Command line 'java -jar tomee-embedded.jar myAwesome.war' 
launching
+  * [TOMEE-58] New concept of persistence-fragment.xml file
+  * [TOMEE-71] Ability to reload Persistence units via JMX
+  * [TOMEE-72] Example: Reloading Persistence unit properties dynamically
+  * [TOMEE-104] Allow custom JAX-RS providers to be used
+  * [TOMEE-99] Example: CDI @Alternative and @Stereotype
+  * [TOMEE-101] Example: CDI Events and @Observes
+  * [TOMEE-97] Beginning documentation for Meta-Annotation support
+  * [TOMEE-37] TomEE webapps based Deployer implementation
+  * [OPENEJB-1454] Meta Annotation Support
+  * [OPENEJB-1691] Dynamic @Proxy beans
+  * [OPENEJB-1430] Scanning an JMX Registration of @ObjectName mbeans in 
applications
+  * [OPENEJB-1737] Example: Dynamic JMX MBean example
+  * [OPENEJB-1517] EJBContainer.createEJBContainer MODULES supports various 
org.apache.openejb.jee.* types
+  * [OPENEJB-1571] CDI Injection for clients of EJBContainer and tests using 
ApplicationComposer
+  * [OPENEJB-1706] CDI Injection support for MDBs
+  * [OPENEJB-1744] Example: MDBs as CDI beans
+  * [OPENEJB-1654] System property overrides for MDB ActivationConfig
+  * [OPENEJB-1690] Ability to define DataSources, Topics, Queues and other 
resources in applications with a META-INF/resources.xml file
+  * [OPENEJB-1453] Metatyping for EJB and Dependency Injection Annotations
+  * [OWB-621] Alternative configuration method for buggy container or pre 
servlet api 2.5 container
+
+== Improvements:
+
+  * [TOMEE-102] Cleaned up error handling of closed jars at shutdown
+  * [TOMEE-107] Reduced logging of harmless "Could not install our singleton 
service" message
+  * [TOMEE-106] Better handling of DataSource "maxWait" property, supports ints
+  * [TOMEE-108] Smarter default of Log4j, Slf4j and JULI logging 
implementation selection
+  * [TOMEE-100] Trim internal objects from logging
+  * [TOMEE-93] Ensure JAX-RS @HeaderParam matching is case insensitive 
+  * [TOMEE-91] Improved error handling and resolving of REST @Path URLs
+  * [TOMEE-82] SQLLoginModule support for HSQLDB 2.x
+  * [TOMEE-83] Improved ability to imply type of <env-entry>
+  * [TOMEE-87] Expanded scope of Global JNDI
+  * [TOMEE-123] Eliminate webapp lib scanning from known libs
+  * [TOMEE-73] Example: JAX-RS example with Application
+  * [TOMEE-60] More Optimization in scanning of webapp libs
+  * [OPENEJB-1746] More helpful information on ConcurrentAccessTimeoutException
+  * [OPENEJB-48] Log the location of the openejb.conf file being used
+  * [OPENEJB-1747] Avoid NPE when a custom mdb container uses badly defined 
activation properties
+  * [OPENEJB-1749] Better logging of @Stateful @PreDestroy exceptions
+  * [OPENEJB-1701] Improved Multipoint and Multicast discovery logging
+  * [OPENEJB-1750] Improved documentation on Windows Service installer
+  * [OPENEJB-1700] deploying rest ejb as ejb when it is returned by 
Application.getClasses()/getSingletons()
+  * [OPENEJB-1754] Reduce logging of failed security checks due to being 
unauthorized
+  * [OPENEJB-1753] New 'openejb.descriptors.output.folder' property for 
location of generated descriptors
+  * [OPENEJB-1722] manage JtaPlatform instead of TransactionManagerLookup when 
hibernate 4 as JPA provider
+  * [OPENEJB-1752] Tolerate toString() issues with ejb method return values 
when logging on DEBUG
+  * [OPENEJB-1751] Ability to deactivate all internal JMX MBeans
+  * [OPENEJB-1742] Respect 'openjpa.Specification' persistence.xml property
+  * [OPENEJB-1743] Better MDB/CDI support 
+  * [OPENEJB-1741] Faster jar scanning at deploy
+  * [OPENEJB-1699] managing @ApplicationPath for rest
+  * [OPENEJB-1738] MDB Queue/Topic name defaults to MappedName
+  * [OPENEJB-1715] Add ServiceTracker in Activator class to wait till we find 
the ServiceManagerProxy
+  * [OWB-623] Relax check on @AroundInvoke Interceptors 'throws Exception' 
+  * [OWB-627] Automatically destroy @Dependent contextual instances created 
with Instance<T>
+  * [OWB-475] support for optional beans
+
+== Bugs:
+
+  * [TOMEE-56] jsp group properties order not respected
+  * [TOMEE-103] Further reduction of possible LinkageError in log files
+  * [TOMEE-105] fixing contextroot in TomcatWebAppBuilder for windows
+  * [TOMEE-51] Deployment without web.xml not possible. With web.xml, tests do 
not run.
+  * [TOMEE-11] conf/logging.properties conflicts with juli configuration for 
Tomcat
+  * [TOMEE-10] JNDI Browser in the openejb.war does not show @LocalBean views 
as EJBs
+  * [TOMEE-94] context.xml ignored in internally created Tomcat 
StandardContexts
+  * [TOMEE-90] Fixed REST Service undeployment issue
+  * [TOMEE-98] Possible name conflict with internal "Comp" bean
+  * [TOMEE-47] ServletContext.getResource(path).getInputStream() fails
+  * [TOMEE-43] library-directory ignored
+  * [TOMEE-42] TCCL.getResources() returns duplicated when deploying with 
OpenEJB deployer
+  * [TOMEE-80] Avoid hibernate HHH015010 at startup
+  * [TOMEE-89] Fixed lifecycle issue in CDI BeforeBeanDiscovery
+  * [TOMEE-85] Fixed issues with rootUrl in persistence units of webapps
+  * [TOMEE-39] context.xml of WAR not loaded
+  * [TOMEE-88] Possible EL related issue prevents startup
+  * [TOMEE-30] OpenEJBLifecycle.startApplication brutly cast Object in 
StartupObject
+  * [TOMEE-33] seam-international-timeanddate fails to deploy
+  * [TOMEE-34] seam-remoting-helloworld fails to deploy
+  * [TOMEE-35] Unable to lookup BeanManager from JNDI
+  * [TOMEE-36] NullPointerException when Missing required persistence.xml for 
@PersistenceUnit
+  * [TOMEE-120] Fixed issue preventing serveral Web Service applications from 
being deployed simultaneously
+  * [TOMEE-77] Ignore REST Applications without default constructor
+  * [TOMEE-1] TomEE Beta 1.0.0 doesn't start with MyFaces CODI
+  * [TOMEE-27] UnknownModuleTypeException thrown when no-web.xml webapp 
deployed
+  * [TOMEE-76] Avoid NullPointerException in no-web.xml applications
+  * [TOMEE-29] Applications always seem to be refreshed/redployed
+  * [TOMEE-74] Fixed serialization issue with ValidationFactory references
+  * [TOMEE-79] Fixed "no root logger" warning
+  * [TOMEE-78] Issue finding openejb.war in Tomcat
+  * [TOMEE-110] Fixed Tomcat issue with JSF code/prelude ordering
+  * [TOMEE-111] Avoid overriting files in Tomcat installer if already installed
+  * [TOMEE-61] allow ROOT to contain rest service
+  * [TOMEE-115] Issue in OWB preventing CDI Extensions from adding 
Interceptors to EJBs
+  * [OPENEJB-1523] TomEE 6.0.26 / 3.1.4: NPE in 
org.apache.catalina.startup.HostConfig.manageApp
+  * [OPENEJB-1730] Reliability of multipoint discovery heartrates less than 1 
second
+  * [OPENEJB-1745] Fix null pointer in discardInstance when releaseInstance 
has already been called
+  * [OPENEJB-1748] Fixed undeploy race condition
+  * [OPENEJB-1710] ClassCastException when deploying ear files containing 
persistence.xml
+  * [OPENEJB-1709] TomEE webapps (See rest-example) doesn't work under Windows 
(Path - Problem with backslash "\")
+  * [OPENEJB-1708] Servlet Injection
+  * [OPENEJB-1443] EntityManager in non-transactional business methods using 
queries can be used only once
+  * [OPENEJB-1729] Reliability of Multipoint remove event when last peer 
disappears
+  * [OPENEJB-1702] Multicast and Multipoint 'heart_rate' property ignored
+  * [OPENEJB-1704] undeploy or shutdown call ejbCreate() on stateless session 
beans
+  * [OPENEJB-1711] Multithreaded filling of @Stateless pools to PoolMin at 
bean startup
+  * [OPENEJB-1733] Parameters are not always available in custom interceptor 
when the bean is a webservice
+  * [OWB-620] any disabled bean of passivating scope will wrongly be detected 
as 'not passivatable'
+  * [OWB-622] beanmanager injection in afterBeanDiscovery method parameter
+  * [OWB-624] AnnotatedTypes registered in BeforeBeanDiscovery might get 
processed twice
+  * [OWB-615] remove @Overrides for interfaces to be java5 compatible
+  * [OWB-597] StackOverFlow when injecting product in same bean where 
@Produces is placed
+  * [OWB-589] " ... requires a passivation capable dependency ..." for 
producer method with return type String and non serializable injected dependency
+  * [OWB-616] javax.el.ExpressionFactory has final methods! CDI doesn't allow 
that. - Test on final **PRIVATE** methods too?
+  * [OWB-619] @New beans must only exist if there is at least one injection 
point for them 
+  * [OWB-618] we sometimes invoke a dispose method without having created the 
bean upfront
+  * [OWB-562] non-enabled alternative beans with passivating scope fail 
validation during deployment
+  * [OWB-630] AmbiguousResolutionException thrown for Decorators that Decorate 
multiple beans where any of those beans are passivation capable.
+  * [OWB-631] openwebbeans-resource misses openwebbeans.properties
+  * [OWB-565] missing check for producer methods
+  * [OWB-625] BeanManager.resolve throw java.util.NoSuchElementException with 
an empty set parameter
+  * [OWB-629] NoClassDefFoundError for optional dependencies
+  * [OWB-515] interceptors don't support inheritance without an overridden 
method annotated with @AroundInvoke
+
+== Tasks & Sub-Tasks:
+
+  * [TOMEE-31] upgrade hsqldb to version 2.2.4
+  * [TOMEE-122] WebService subcontext mapping adjustable with 
tomee.jaxws.subcontext property
+  * [TOMEE-121] WebServices mapped into /<webappcontext>/webservices/<name>
+  * [TOMEE-75] Resolve default persistence provider before Assembly
+  * [OPENEJB-1638] Add Readme.md files for examples 
+  * [OPENEJB-1723] Unit tests and changes for ActivationConfigOverride
+  * [OPENEJB-1755] Repackaging LocalInitialContextFactory into 
org.apache.openejb.core
+  * [OPENEJB-1697] TomEE related renaming
+  * [OPENEJB-1705] Example: Simple CDI Interceptor
+
diff --git a/tomee/modules/ROOT/pages/tomee-1.7.4-release-notes.adoc 
b/tomee/modules/ROOT/pages/tomee-1.7.4-release-notes.adoc
new file mode 100644
index 0000000..4a18420
--- /dev/null
+++ b/tomee/modules/ROOT/pages/tomee-1.7.4-release-notes.adoc
@@ -0,0 +1,14 @@
+= Release Notes - TomEE - Version 1.7.4
+
+Release Notes - TomEE - Version 1.7.4
+
+== Bug
+
+* link:https://issues.apache.org/jira/browse/TOMEE-1638[TOMEE-1638] - 
tomee:exec on Windows produces invalid tomee.zip due to backslash directory 
separators
+* link:https://issues.apache.org/jira/browse/TOMEE-1686[TOMEE-1686] - 
org.apache.openejb.core.cmp.CmpContainer#findEJBObject supposes args array is 
not empty
+* link:https://issues.apache.org/jira/browse/TOMEE-1705[TOMEE-1705] - Destroy 
application attempts to initialize lazily loaded resources
+
+==  Dependency upgrade
+
+* link:https://issues.apache.org/jira/browse/TOMEE-1677[TOMEE-1677] - tomcat 
7.0.68
+
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 c21bef6..c22665d 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M1.adoc
@@ -1,9 +1,6 @@
 = Apache TomEE 7.0.0-M1 released, Dec 11th 2015
 
-The Apache TomEE community is proud to announce the release of 
-//FIXME CHOOSE ONE
-xref:tomee-7.0.0-M1.adoc[]
-xref: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 
xref:tomee-7.0.0-M1.adoc[Apache TomEE 7.0.0-M1], which is based on 
link: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.
@@ -16,11 +13,12 @@ The Apache TomEE 7.0.0-M1 release files can be downloaded 
from here:
 
 
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
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
 Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml 
entries to point to the latest versions:
 
-....
+[source,xml]
+----
 <dependency>
        <groupId>org.apache.tomee</groupId>
        <artifactId>javaee-api</artifactId>
@@ -39,7 +37,7 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or 
TomEE pom.xml entri
        <artifactId>tomee</artifactId>
        <version>7.0.0-M1</version>
 </dependency>
-....
+----
 
 A complete xref:tomee-7.0.0-M1-release-notes.adoc[Changelog] can be viewed 
here:
 
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 00608ed..2f69089 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M2.adoc
@@ -16,11 +16,12 @@ The Apache TomEE 7.0.0-M2 release files can be downloaded 
from here:
 
 
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
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
 Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml 
entries to point to the latest versions:
 
-....
+[source,xml]
+----
 <dependency>
        <groupId>org.apache.tomee</groupId>
        <artifactId>javaee-api</artifactId>
@@ -39,7 +40,7 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or 
TomEE pom.xml entri
        <artifactId>tomee</artifactId>
        <version>7.0.0-M2</version>
 </dependency>
-....
+----
 
 A complete xref:tomee-7.0.0-M2-release-notes.adoc[Changelog] can be viewed 
here:
 
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 0216e91..41feedc 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.0-M3.adoc
@@ -1,16 +1,8 @@
 = Apache TomEE 7.0.0-M3 released, Mar 06th 2016
 
-The Apache TomEE community is proud to announce the release of 
-//FIXME CHOOSE ONE
-xref:tomee-7.0.0-M3.adoc[]
-xref: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 
xref: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 
-//FIXME CHOOSE ONE
-xref: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].
+More on xref:security/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.
 
@@ -22,11 +14,12 @@ The Apache TomEE 7.0.0-M3 release files can be downloaded 
from here:
 
 
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
+== Update Maven POM Files - The OpenEJB version and groupId have been aligned
 
 Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml 
entries to point to the latest versions:
 
-....
+[source,xml]
+----
 <dependency>
        <groupId>org.apache.tomee</groupId>
        <artifactId>javaee-api</artifactId>
@@ -45,7 +38,7 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or 
TomEE pom.xml entri
        <artifactId>tomee</artifactId>
        <version>7.0.0-M3</version>
 </dependency>
-....
+----
 
 A complete xref:tomee-7.0.0-M3-release-notes.adoc[Changelog] can be viewed 
here:
 
diff --git a/tomee/modules/ROOT/pages/tomee-7.0.1.adoc 
b/tomee/modules/ROOT/pages/tomee-7.0.1.adoc
index 5585f04..9bdf4f7 100644
--- a/tomee/modules/ROOT/pages/tomee-7.0.1.adoc
+++ b/tomee/modules/ROOT/pages/tomee-7.0.1.adoc
@@ -1,9 +1,6 @@
 = Apache TomEE 7.0.1 released, June 27th 2016
 
-The Apache TomEE community is proud to announce the release of 
-//FIXME CHOOSE ONE
-xref:tomee-7.0.1.adoc[]
-xref: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 
xref: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.
 
@@ -19,7 +16,8 @@ 
xref:download/tomee-7.0.1.adoc[http://tomee.apache.org/download/tomee-7.0.1.html
 
 Simply update your existing Maven JavaEE-API, OpenEJB and or TomEE pom.xml 
entries to point to the latest versions:
 
-....
+[source,xml]
+----
 <dependency>
        <groupId>org.apache.tomee</groupId>
        <artifactId>javaee-api</artifactId>
@@ -38,7 +36,7 @@ Simply update your existing Maven JavaEE-API, OpenEJB and or 
TomEE pom.xml entri
        <artifactId>tomee</artifactId>
        <version>7.0.1</version>
 </dependency>
-....
+----
 
 A complete xref:tomee-7.0.1-release-notes.adoc[Changelog] can be viewed here:
 

Reply via email to