From a694d5e4cac2ed5f560c9939a04d9729c477c724 Mon Sep 17 00:00:00 2001
From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Mon, 5 Sep 2011 15:11:55 +0000
Subject: [PATCH] updates to web site

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4564 e3abac25-378b-4346-85de-24260fe3988d
---
 website/index.html            |    4 ++--
 website/man_awscloud.html     |   31 ++++++++++++++++---------------
 website/manual_qs_client.html |    6 +++++-
 website/manual_qs_va.html     |    6 +++++-
 website/manual_qs_war.html    |    6 +++++-
 website/quick_start.html      |    6 +++++-
 6 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/website/index.html b/website/index.html
index 9f84bdb..99606e2 100644
--- a/website/index.html
+++ b/website/index.html
@@ -51,9 +51,9 @@ page</title>
   <div class="brick_header"><h2>For Users</h2></div>
     <div class="brick_content">
         <strong>The Server: </strong><a href="http://www.compbio.dundee.ac.uk/jabaws/archive/jabaws-vm.zip">JABAWS Virtual Appliance:</a> (520M)
-    	<br/>
+    	or <a href="man_awscloud.html" title="Amazon Machine Image">JABAWS AMI</a> for the Amazon EC2 Cloud<br/>
     	<strong>The Client: </strong><a href="http://www.jalview.org/download.html">Jalview</a> (18M)
-		<p>To use JABA Web Services on most operating systems, just download and <a href="manual_qs_va.html#qsc">install</a> the JABAWS Virtual Appliance (VA) and point Jalview at it.</p>
+		<p>To use JABA Web Services on most operating systems, just download and <a href="manual_qs_va.html#qsc">install</a> the JABAWS Virtual Appliance (VA) or even easier - just start JABAWS machine on the cloud and point Jalview at it!</p>
      </div>
   </div>
   </td>
diff --git a/website/man_awscloud.html b/website/man_awscloud.html
index 2623fa3..24a07e1 100644
--- a/website/man_awscloud.html
+++ b/website/man_awscloud.html
@@ -55,19 +55,20 @@
 <h2 id="headtitle">JABAWS MANUAL</h2>
 
 <h2>JABAWS Server in the Amazon Cloud</h2>
-<ul><li><a href="#whatisvm">What is JABAWS in the Cloud?</a></li>
-    <li><a href="#whenvm">How to use JABAWS on the Amazon EC2 cloud</a></li>
+<ul>
+  <li><a href="#jabawsOnCloud">JABAWS on the Cloud</a></li>
+    <li><a href="#jabawsOnCloudHow">How to use JABAWS on the Amazon EC2 cloud</a></li>
     </ul>
 <div id="jabaws_on_cloud">
-  <h3><a name="whatisvm" id="whatisvm"></a>What is JABAWS in the Cloud?</h3>
-<p>We provide pre-configured JABAWS Amazon Machine Image (AMI) which you can use on <a href="http://aws.amazon.com/what-is-aws">Amazon EC2 cloud</a>. When to use JABAWS in the cloud? </p>
-<ul>
-  <li>you need to perform large scale calculations but do not have a cluster</li>
-  <li>your organization already uses the cloud, in that case it may be easier and more cost effective to use JABAWS on the cloud </li>
-  <li>want to have you instance always ready </li>
+  <h3><a name="jabawsOnCloud" id="jabawsOnCloud"></a>JABAWS on the Cloud</h3>
+  <p>We provide pre-configured JABAWS Amazon Machine Image (AMI) which you can use on the <a href="http://aws.amazon.com/what-is-aws">Amazon EC2 cloud</a>. Typical use cases are </p>
+  <ul>
+  <li>you need to perform large scale calculations but do not have the resources available locally </li>
+  <li>your organization already uses the Amazon cloud and you do not want to do any special arrangements for the JABAWS  </li>
+  <li>you want to benefit from the Amazon automatic scaling and monitoring to make sure JABAWS is always ready </li>
 </ul>
 <p>If you know what to do than JABAWS AMI ID is <strong>ami-40fecd34</strong>, manifest <strong>846107356395/JABAWS2</strong> to get you started, if not read on. </p>
-<h3><a name="whenvm" id="whenvm"/></a>How to use JABAWS on the Amazon EC2 cloud </h3>
+<h3><a name="jabawsOnCloudHow" id="jabawsOnCloudHow"/></a>How to use JABAWS on the Amazon EC2 cloud </h3>
 <ol>
   <li><a href="https://www.amazon.com/ap/signin/175-8261537-7969810?_encoding=UTF8&openid.assoc_handle=aws&openid.return_to=https%3A//aws-portal.amazon.com/gp/aws/developer/registration/index.html/175-8261537-7969810&openid.mode=checkid_setup&openid.ns=http%3A//specs.openid.net/auth/2.0&openid.claimed_id=http%3A//specs.openid.net/auth/2.0/identifier_select&openid.pape.max_auth_age=600&siteState=awsMode%3A%3Aregistration%3A%3AheaderMessage%3A%3AAmazon Web Services Sign Up%3A%3A&pageId=aws.ssop&openid.pape.preferred_auth_policies=http%3A//schemas.openid.net/pape/policies/2007/06/multi-factor-physical&marketplaceId=ATVPDKIKX0DER&accountStatusPolicy=P1&openid.ns.pape=http%3A//specs.openid.net/extensions/pape/1.0&openid.identity=http%3A//specs.openid.net/auth/2.0/identifier_select&authCookies=1">Create  Amazon Web Services account</a>. </li>
   <li><a href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#selectInstance=&launchAmi=&s=Home">Log in into the Amazon Web Services (AWS) console.</a> Make sure you are in the EU West (Ireland) region. JABAWS image is not available in other regions as yet. See  marker 1. </li>
@@ -76,27 +77,27 @@
 <img src="images/aws_console_launch.gif" alt="AWS console" width="687" height="704">
 <li>Go to the &quot;Community AMI&quot; tab and search for JABAWS, then click select.</li>
 <img src="images/aws_launch.gif" alt="select AMI" width="864" height="262">
-  <li>Choose the &quot;hardware&quot; for your JABAWS server instance. &quot;Large&quot; instance should be sufficient for a single user needs. If you are planning to use this instance as a server for the lab, you may want to select more powerful machine. Once you have chosen the hardware click continue. </li>
+  <li>Choose the &quot;hardware&quot; for your JABAWS server instance. &quot;Large&quot; instance should be sufficient for a single user needs. If you are planning to use this instance as a server for the lab, you may want to select a more powerful machine. Once you have chosen the hardware click continue. </li>
 
-<img src="images/aws_launch_instance.gif" alt="select hardware" width="872" height="590">
+  <img src="images/aws_launch_instance.gif" alt="select hardware" width="872" height="590">
 
-  <li>You should not need to customize anything on this page, continue to the next, you do not have to specify any key-value pairs on the next page either. </li>
+  <li>You should not need to customize anything on this page, continue to the next. </li>
 
   <img src="images/aws_launch_instance2.gif" alt="keys" width="872" height="592">
 
   <li> At the &quot;Create a key pair&quot; step, choose &quot;Proceed without a key pair&quot; unless you want to access JABAWS server via SSH. </li>
 
 <img src="images/aws_launch_instance3.gif" width="872" height="592">
-  <li>Create a new security group with a single port HTTP (80) as shown below. You may want to add SSH (22) port if you are planning to manage your instance via SSH. </li>
+  <li>Create a new security group with a single HTTP (80) port as shown below. You may want to add SSH (22) port if you are planning to manage your instance via SSH. For starting/stopping your JABAWS instance SSH is not necessary, you can do this from the Amazon Webservices Console (AWS). </li>
 
   <img src="images/aws_launch_instance_sec_group.gif" alt="ese" width="856" height="588">
   <li>Review the configuration and launch the instance, then click &quot;view your instances on the Instances page&quot;. </li>
 <img src="images/aws_launch_instance5.gif" width="870" height="430">
 <li>At this point you should have JABAWS instance up and running. Your AWS console should look something like this: </li>
 <img src="images/aws_launch_instance_done.gif" width="812" height="848">
-<li>Now you can consume JABAWS web services from the public DNS address of your JABAWS server instance. To register it with Jalview, for instance, just add the new JABAWS web server. Prefix your instance public DNS address with http:// e.g. type: http://&lt;public DNS&gt; for the instance on the screenshot it would be http://ec2-46-137-50-196.eu-west-1.compute.amazonaws.com. Done. Bear in mind though that your instance public DNS is likely to be different. </li>
+<li>Now you can consume JABAWS web services by accessing the public DNS address of your JABAWS server instance. For instance, to register it with Jalview, just add the new JABAWS web server. Prefix your instance public DNS address with http:// e.g. type: http://&lt;public DNS&gt;. The JABAWS instance on the screenshot can be accessed on http://ec2-46-137-50-196.eu-west-1.compute.amazonaws.com.   </li>
 </ol>
-<p>If you need to run JABAWS for large organization you might want to configure load balancer and auto scaling to let JABAWS serve large number of users. Please get in contact with us if you are interested in exploring such configurations. </p>
+<p>If you need to run JABAWS for large organization you might want to configure load balancer and auto scaling. Please get in contact with us if you are interested in exploring such configurations. </p>
 <p>&nbsp;</p>
 </div><!-- end of jabaws_on_cloud div -->
 </div>
diff --git a/website/manual_qs_client.html b/website/manual_qs_client.html
index 116f548..8033191 100644
--- a/website/manual_qs_client.html
+++ b/website/manual_qs_client.html
@@ -47,7 +47,11 @@
     <td><a href="manual_qs_va.html#qsc">JABAWS Virtual Appliance (VA)</a></td>
 </tr>
 <tr>
-	<td>Running JABAWS for my group, lab, or organization</td>
+  <td>Running JABAWS  on the <strong>cloud</strong>, for one or many users</td>
+  <td><a href="man_awscloud.html">JABAWS AMI</a></td>
+</tr>
+<tr>
+	<td>Running JABAWS for my group, lab, or organization on the <strong>local</strong> infrastructure </td>
     <td><a href="manual_qs_war.html#qsc">JABAWS Web Application aRchive (WAR)</a></td>
 </tr>
 <tr>
diff --git a/website/manual_qs_va.html b/website/manual_qs_va.html
index dac6368..6810163 100644
--- a/website/manual_qs_va.html
+++ b/website/manual_qs_va.html
@@ -45,7 +45,11 @@
     <td><a href="manual_qs_va.html#qsc">JABAWS Virtual Appliance (VA)</a></td>
 </tr>
 <tr>
-	<td>Running JABAWS for my group, lab, or organization</td>
+  <td>Running JABAWS  on the <strong>cloud</strong>, for one or many users</td>
+  <td><a href="man_awscloud.html">JABAWS AMI</a></td>
+</tr>
+<tr>
+	<td>Running JABAWS for my group, lab, or organization on the <strong>local</strong> infrastructure </td>
     <td><a href="manual_qs_war.html#qsc">JABAWS Web Application aRchive (WAR)</a></td>
 </tr>
 <tr>
diff --git a/website/manual_qs_war.html b/website/manual_qs_war.html
index 481d802..5dc65c3 100644
--- a/website/manual_qs_war.html
+++ b/website/manual_qs_war.html
@@ -48,7 +48,11 @@
     <td><a href="manual_qs_va.html#qsc">JABAWS Virtual Appliance (VA)</a></td>
 </tr>
 <tr>
-	<td>Running JABAWS for my group, lab, or organization</td>
+  <td>Running JABAWS  on the <strong>cloud</strong>, for one or many users</td>
+  <td><a href="man_awscloud.html">JABAWS AMI</a></td>
+</tr>
+<tr>
+	<td>Running JABAWS for my group, lab, or organization on the <strong>local</strong> infrastructure </td>
     <td><a href="manual_qs_war.html#qsc">JABAWS Web Application aRchive (WAR)</a></td>
 </tr>
 <tr>
diff --git a/website/quick_start.html b/website/quick_start.html
index 86f6384..b7cc4b8 100644
--- a/website/quick_start.html
+++ b/website/quick_start.html
@@ -46,7 +46,11 @@
     <td><a href="manual_qs_va.html#qsc">JABAWS Virtual Appliance (VA)</a></td>
 </tr>
 <tr>
-	<td>Running JABAWS for my group, lab, or organization</td>
+  <td>Running JABAWS  on the <strong>cloud</strong>, for one or many users</td>
+  <td><a href="man_awscloud.html">JABAWS AMI</a></td>
+</tr>
+<tr>
+	<td>Running JABAWS for my group, lab, or organization on the <strong>local</strong> infrastructure </td>
     <td><a href="manual_qs_war.html#qsc">JABAWS Web Application aRchive (WAR)</a></td>
 </tr>
 <tr>
-- 
1.7.10.2