You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2016/08/11 18:51:59 UTC

[1/2] airavata-docs git commit: Fixing merging issues

Repository: airavata-docs
Updated Branches:
  refs/heads/master c8b3416cc -> 7b1b267d5


Fixing merging issues


Project: http://git-wip-us.apache.org/repos/asf/airavata-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-docs/commit/3069b86e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-docs/tree/3069b86e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-docs/diff/3069b86e

Branch: refs/heads/master
Commit: 3069b86ea3bb2800fa8289b3fbab4923c0cc3334
Parents: c8b3416
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Thu Aug 11 14:49:50 2016 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Thu Aug 11 14:49:50 2016 -0400

----------------------------------------------------------------------
 WSO2-IS-Configuration.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-docs/blob/3069b86e/WSO2-IS-Configuration.md
----------------------------------------------------------------------
diff --git a/WSO2-IS-Configuration.md b/WSO2-IS-Configuration.md
index 96c8f74..dd0a786 100644
--- a/WSO2-IS-Configuration.md
+++ b/WSO2-IS-Configuration.md
@@ -1,8 +1,8 @@
-## WSO2 IS (Identity Server)
+## WSO2 Identity Server (IS)
 
-The steps are for IS configuration when IS is hosted by AIravata team. n this situation you will be a tenant created under Airavata hosted IS.
+The steps below are for IS configuration when IS is hosted by Airavata team. In this situation you will be a tenant created under Airavata hosted IS.
 
-### First You Need to;
+### Request a Tenant Account
 1. Request from Airavata team for a new Tenant account. For this use
 <br><a href="http://airavata.apache.org/community/mailing-lists.html" target="_blank">Airavata mailing list</a>
 OR
@@ -17,8 +17,8 @@ OR
     - Username and password to login to WSO2 IS
 <br>
 <br>
-### Configuration
-1. Login to IS server as the gateway admin; Tenant user.
+### Configure Your Tenant
+1. Login to IS server as the gateway admin tenant user.
     - Use the URL provided by the Airavata team; <a href="https://idp.scigap.org:9443/carbon/admin/login.jsp" target="_blank">WSO2 URL for Gateway Admin</a>
     - Use the username and password provided by you. (Please change your password in first login)
 2. Navigate to Main Tab -->Service Providers --> Add


[2/2] airavata-docs git commit: Minor modification in instructions

Posted by er...@apache.org.
Minor modification in instructions


Project: http://git-wip-us.apache.org/repos/asf/airavata-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-docs/commit/7b1b267d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-docs/tree/7b1b267d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-docs/diff/7b1b267d

Branch: refs/heads/master
Commit: 7b1b267d55a038e1c98387038b52635cfca57088
Parents: 3069b86
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Thu Aug 11 14:51:54 2016 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Thu Aug 11 14:51:54 2016 -0400

----------------------------------------------------------------------
 WSO2-IS-Configuration.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-docs/blob/7b1b267d/WSO2-IS-Configuration.md
----------------------------------------------------------------------
diff --git a/WSO2-IS-Configuration.md b/WSO2-IS-Configuration.md
index dd0a786..8fdfe57 100644
--- a/WSO2-IS-Configuration.md
+++ b/WSO2-IS-Configuration.md
@@ -12,7 +12,8 @@ OR
     - Last name
     - Preferred username & password as the admin (This is the username you will use to login to WSO2 IS and gateway as the admin user)
     - Email account
-3. Once the tenant is created you will receive
+3. When Airavata team receives your request they will communicate with you if more information is required.
+4. Once the tenant is created you will receive
     - URL for WSO2 IS
     - Username and password to login to WSO2 IS
 <br>