Commit 30564eb6 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 3a8be10b f032d2fe
......@@ -307,7 +307,7 @@ option : AWS Elastic Beanstalk.
==== AWS Elastic Beanstalk
As described in the official http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create_deploy_Java.html[Elastic
Beanstalk Java guide], there are two main options to deploy a Java application; You can
either us the "`Tomcat Platform`" or the "`Java SE platform`".
either use the "`Tomcat Platform`" or the "`Java SE platform`".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment