Merge branch 'develop' of github.com:hydrology-tep/documentation into…

… develop Signed-off-by: Emmanuel Mathot <[email protected]> # Conflicts: # source/community-guide/user.rst
hydrology-tep · May 12, 2017 · 58dc6ec · 58dc6ec
2 parents 87bd506 + a921797
commit 58dc6ec
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/source/admin-guide/authorization.rst b/source/admin-guide/authorization.rst
@@ -9,6 +9,13 @@ Domain
 A Domain is an organizational unit to regroup User, Group and Objects (Entity). It also contains the Thematic Communities.
 When a user is member of a domain, he can access entities which belong to this domain, according to the provileges defined in his role.
 
+The kind of a domain can be:
+
+- USER: the domain is the private domain of the user
+- GROUP: the domain is private to a group of users
+- PRIVATE: the domain is a private community (user can only join by invitation)
+- PUBLIC: the domain is a public community (all can join)
+
 Roles
 -----
 

diff --git a/source/admin-guide/control_panel.rst b/source/admin-guide/control_panel.rst
@@ -21,6 +21,7 @@ The control panel gives access to the administrator to the following pages:
 - :doc:`Logs <logs>`
 - :doc:`Authorization <authorization>`
 - :doc:`Accounting <accounting>`
+- :doc:`Database Config <dbconfig>`
 
 .. figure:: ../includes/control_panel.png
 	:figclass: img-border img-max-width
diff --git a/source/admin-guide/dbconfig.rst b/source/admin-guide/dbconfig.rst
@@ -0,0 +1,4 @@
+Database Config
+===============
+
+The database config page allow the administrator to access and edit the configuration elements of the database.
diff --git a/source/admin-guide/index.rst b/source/admin-guide/index.rst
@@ -19,4 +19,4 @@ Hydrology thematic exploitation platform administrator guide
    Logs <logs>
    Authorization <authorization>
    Accounting <accounting>
-
+   Database config <dbconfig>
diff --git a/source/admin-guide/wps_provider.rst b/source/admin-guide/wps_provider.rst
@@ -2,7 +2,8 @@ WPS providers management
 ========================
 
 | The WPS providers management page contains a list of all existing WPS providers in DB, with the possibility for an Administrator to *Create* a new WPS provider, *Update* or *Delete* an existing one.
-| The Administrator can also *Update* a WPS provider (by clicking on |update|). This action will do a request to the WPS provider (GetCapabilities) to check wethere there are new WPS services available. If so, these services will be automatically added to the list of existing WPS services in DB.
+| The Administrator can *Update* a WPS provider (by clicking on |update|). This action will do a request to the WPS provider (GetCapabilities) to check wethere there are new WPS services available. If so, these services will be automatically added to the list of existing WPS services in DB.
+| The Administrator can enable the Auto synchronization of a wps provider. This mean that new available processes will be automatically discovered and made available to the platform.
 
 .. |update| image:: ../includes/update.png
 

diff --git a/source/advanced/expert/cloud.rst b/source/advanced/expert/cloud.rst
@@ -1,5 +1,6 @@
 .. _t2cloud:
 
+
 Link your account to the Terradue Cloud Platform
 ------------------------------------------------
 
@@ -10,15 +11,15 @@ Don't have a Terradue account ?
 
 If you don't have yet an account on the Terradue Cloud Platform
 
-.. figure:: ../../includes/user_profile_cloud_no.png
+.. figure:: ../includes/user_profile_cloud_no.png
   :figclass: img-border img-max-width
   :scale: 80%
 
 1. Click on the button "Create" 
 2. Enter a password for the Terradue account (see below for password recommandations)
 3. A new account will be created on https://www.terradue.com using your EO-SSO email/username
 
-.. figure:: ../../includes/t2_password_rules.png
+.. figure:: ../includes/t2_password_rules.png
   :figclass: img-border
   :scale: 80%
 
@@ -31,8 +32,7 @@ Already have a Terradue account ?
 If you already have an account on the Terradue Cloud Platform, the portal will be able to detect it by itself and display the Opennebula Sunstone logo. 
 If not the case, it means that you have a different username/email than on your EO-SSO profile. In this case, please contact us so we can manually link your accounts.
 
-.. figure:: ../../includes/user_profile_cloud.png
+.. figure:: ../includes/user_profile_cloud.png
   :figclass: img-border img-max-width
   :scale: 80%
 
-
diff --git a/source/community-guide/user.rst b/source/community-guide/user.rst
@@ -140,8 +140,7 @@ See your accountings
 The accounting panel on your profile gives your current credit balance, as well as the list of all transactions associated to your account:
 
 - credit transactions
-- debit transactions reported by wps providers for the wps jobs you created
-- deposit transactions (see section below)
+- debit transactions reported by wps providers for the wps jobs you created, associated to a deposit
 
 .. figure:: ../includes/user_profile_accounting.png
 	:figclass: img-border
@@ -151,7 +150,7 @@ The accounting panel on your profile gives your current credit balance, as well
 Deposit
 ~~~~~~~
 
-A deposit transaction is performed when the user execute a job process using as balance the quotation returned first by the processing service for the selected parameters (it implies that the wps provider implemented the **quotation mode**). Deposit transactions can be *active* or *resolved*. An **active deposit** is accounted when calculating your account balance (covering the possible debit transactions associated to the same process). A **resolved deposit** is not accounted when calculating your account balance (but does not cover anymore the possible debit transactions associated to the same process). A deposit is automatically set from *active* to *resolved* when the job process status is not *In progress* anymore.
+A deposit transaction is stored when the user execute a job process using as balance the quotation returned first by the processing service for the selected parameters (it implies that the wps provider implemented the **quotation mode**). Deposit transactions can be *active* or *closed*. An **active deposit** is accounted when calculating your account balance (covering the possible debit transactions associated to the same process). A **closed deposit** is not accounted when calculating your account balance (but does not cover anymore the possible debit transactions associated to the same process). A deposit is automatically set from *active* to *closed* when the job process is failed or when the job is succeeded with at least one transaction recorded from the wps provider.
 
 Transaction policy
 ~~~~~~~~~~~~~~~~~~