Add example of linked tutorial (at the end a new tutoria lis suggested

docs/accounts/billing.md

@@ -16,7 +16,7 @@ at research.csc.fi.
 * [Puhti and Mahti billing](../computing/hpc-billing.md)
 * Allas object storage billing:  1 TiB consumes **1** BU per hour. Only actual
    data stored in Allas is billed.
-* [Pouta billing](../cloud/pouta/accounting.md)
+* [Pouta billing](../cloud/pouta/vm-flavors-and-billing.md)
 * [Rahti billing](../cloud/rahti/billing.md)
 * [SD Connect and SD Desktop billing](../data/sensitive-data/sd-use-case-new-user-project-manager.md#sd-connect-bu-consumption)
 

docs/cloud/pouta/configuration.md

@@ -2,7 +2,6 @@
 
 - [VM lifecycle & saving BUs](vm-lifecycle.md)
 - [Virtual machine flavors and Billing Unit rates](vm-flavors-and-billing.md)
-- [Accounting principles and quotas](accounting.md)
 - [Images](images.md)
 - [Networking](networking.md)
 - [Storage](storage.md)

docs/cloud/pouta/index.md

@@ -33,7 +33,7 @@ Due to the nature of ePouta, it is not available as a self-service. Questions re
 
 cPouta is self-service and you can find more information on how to get access here: [Applying for cPouta access](../../accounts/how-to-add-service-access-for-project.md).
 
- ePouta access is **not** self-service. The process is described in [Applying for ePouta access](ePouta-access.md).
+ePouta access is **not** self-service. The process is described in [Applying for ePouta access](ePouta-access.md).
 
 The web interfaces of the Pouta clouds are available at following addresses:
 
@@ -46,7 +46,7 @@ Login is available for [supported account types](../../accounts/how-to-create-ne
 
 ![Pouta web login page](../img/pouta_overview_web_login.png)
 
-Once you have successfully logged in, you can continue with the [Getting Started Guide](getting-started.md). Pay also attention to the  [Security guidelines for Pouta](security.md) and the [Pouta accounting principles and quotas](accounting.md).
+Once you have successfully logged in, you can continue with the [Getting Started Guide](getting-started.md). Pay also attention to the  [Security guidelines for Pouta](security.md) and the [Pouta accounting principles and quotas](vm-flavors-and-billing.md).
 
 If you are already familiar with the basics of OpenStack, please go directly to the [Configuration](configuration.md) and [Advanced](advanced.md) sections of the Pouta documentation.
 

docs/cloud/pouta/launch-vm-from-web-gui.md

@@ -2,22 +2,12 @@
 
 !!! Warning
 
-    You should familiarize yourself with the security instructions and
+    You should familiarize yourself with the [security guidelines](security.md) and
     terms of Pouta accounting before launching your first virtual
     machine.
 
-This document explains a simple way to launch a virtual machine in the
-Pouta service. Any CSC user with a computing project can request
-access to the service as described in [Applying for Pouta access].
-To use Pouta, you need to have applied Pouta access for your project first.
-Please make sure you are familiar with the [concepts](../index.md) and
-[security issues](security.md) first. You might also want to take a
-look at the [webinar](https://www.youtube.com/watch?v=CIO8KRbgDoI).
 
-[TOC]
-
-
-<!--TOC is to get the table of contents -->
+You might also want to take a look at the [webinar](https://www.youtube.com/watch?v=CIO8KRbgDoI).
 
 The web interfaces of the Pouta clouds are available at following addresses:
 
@@ -26,39 +16,34 @@ The web interfaces of the Pouta clouds are available at following addresses:
 | [https://pouta.csc.fi](https://pouta.csc.fi)       | cPouta web interface | Accessible on the internet |
 | [https://epouta.csc.fi](https://epouta.csc.fi)     | ePouta web interface      |  Accessible only from IPs provided for accessing the management interfaces of ePouta |
 
-This _OpenStack Horizon_ based interface allows you do basic cloud computing management operations such as launch a new virtual machine and manage security settings. To use this service, you need a CSC account and a cPouta/ePouta project at CSC.
+This _OpenStack Horizon_ based interface allows you do basic cloud computing management operations such as launch a new virtual machine and manage security settings.
 
-You can log in to cPouta using several accounts. In addition to your CSC account (CSC username and password), you can also use Haka, VIRTU, and Life Science AAI accounts. The Haka, VIRTU and Life Science AAI accounts will work only if they are linked to your CSC account. Accounts can be linked at [MyCSC](https://my.csc.fi/).
+To use this service, you need a CSC account and a cPouta/ePouta project at CSC. Accounts can be linked at [MyCSC](https://my.csc.fi/).
 
 You can log in to ePouta only using your CSC account.
 
-## Preparatory steps
-
-Before creating a Virtual Machine you must do these 3 steps:
+## Prerequisites
 
-1. Select the correct **CSC project**.
+Before creating a Virtual Machine you need these two prerequisites:
 
-1. Create and setup a **SSH key pair**.
+1. A **CSC account**. Accounts can be created following [How to create new CSC user account](../../accounts/how-to-create-new-user-account.md).
 
-1. Setting a **security group** to control the firewall.
+1. A **CSC project** with the **cPouta** or the **ePouta** service enabled. You can [Create a new project](../../accounts/how-to-create-new-project.md), or ask to be added to an existing one. The project needs to have the suitable service enabled. You can follow [Applying for cPouta access](../../accounts/how-to-add-service-access-for-project.md). **But** If you need to store or process **sensitive data**, you must use ePouta instead and [Apply for ePouta access](ePouta-access.md).
 
-Before starting your first virtual machine in cPouta/ePouta, you must first set up a SSH key pair and modify the security settings so that you will be able to connect to your virtual machine.
-
-### Selecting the CSC project
+## Selecting the CSC project
 
 ![Pouta project selection](../../img/pouta_project_selection.png){ align=left }
 
 You may have more than one CSC project with access to Pouta. You can check this from [my.csc.fi](https://my.csc.fi){:target="_blank"}, where you will be able to see all the projects you have access and which ones have cPouta (or ePouta) activated as a service.
 
-Back in Pouta's interface, make sure that you select the correct project. There are two condiderations here:
+Back in [Pouta's web interface](https://pouta.csc.fi), make sure that you select the correct project. There are two considerations here:
 
-* A project is a sandbox which contains resources like Virtual Machines and networks, and anyone with access to that project will be able to see and administer all these resources. They may not be able to access a Virtual Machine, as this is determinated by the SSH keys configured in the machine, but they will be able to **delete**, **reboot**, ... etc.
+* A project is a sandbox which contains resources like Virtual Machines and networks, and **anyone with access** to that project will be able to **see**, **modify** and **delete** all these resources. They may not be able to access a Virtual Machine, as this is determined by the SSH keys configured in the machine.
 * Projects are used to determinate billing. Make sure that the costs will go to the correct billing project.
 
+## Setting up SSH keys
 
-### Setting up SSH keys
-
-To open a connection to your virtual machines in cPouta/ePouta, you first need to prove your identity to the Virtual and for that need SSH keys. This is the default (and more secure) way to access Virtual Machines. You only need to set up your SSH keys once per project.
+To open a connection to your virtual machines in cPouta/ePouta, you first need to prove your identity to the Virtual and for that need SSH keys. It is commonly called a SSH key pair because it consist on two files, the private key and the public key. This is the default (and more secure) way to access Virtual Machines. You only need to set up your SSH keys once per project.
 
 !!! info "Import public keys"
     If you are already familiar with SSH keys, you can use your existing SSH keys to access the virtual machines. In the web interface, go to the **Compute > Key Pairs** section, and select **Import Public Key**. You need to name your key, keep in mind you will need to use this name when creating Virtual Machines, so the recomendation is to keep it short and informative of the intended use. Secondly paste your public key, it must be in a single line and be in the form of `key-type hash comment`, for example a RSA key from `[email protected]`:
@@ -77,8 +62,6 @@ If you have not used SSH keypairs before, you need to create one. The web interf
 
     ![Create key](../../img/pouta-create-key.png)
 
-    **Figure** The Create Key Pair dialog
-
 #### Linux and Mac
 
 In order to install the key you downloaded in the previous step (_keyname.pem_ or _keyname.cer_), you must run this commands:
@@ -251,7 +234,7 @@ Once the SSH keys and security groups are set, you can launch a new virtual mach
 
 1. **Image Name**, this decides which Linux distribution to use. You can select the image that fits more your use case. The images provided by Pouta by default are regularly maintained up to date.
 
-1. Under the **Access & Security** tab, you need to configure two options. First you need to choose the name of the *Key Pair* you have created in the [**Preparatory Steps**](#setting-up-ssh-keys). Secondly you need to select under the [**Security Groups**](#firewalls-and-security-groups) the security group previously created.
+1. Under the **Access & Security** tab, you need to configure two options. First you need to choose the name of the *Key Pair* you have created in [**Setting up SSH keys**](#setting-up-ssh-keys). Secondly you need to select under the [**Security Groups**](#firewalls-and-security-groups) the security group previously created.
 
     !!! Warning "Key pairs cannot be added after creation"
         A public key is only added to the VM if it has been specified in this step. After clicking on **Launch**, the VM will be created, and the configured key pairs cannot be changed. If no key pair is configured, the recommended solution is to delete the VM and start from scratch.
@@ -300,6 +283,6 @@ When a virtual machine is launched, it only gets a **private IP** (`192.168.XXX.
 
 !!! warning "IP billing"
 
-    Allocated floating IPs are billed at the rate of 0,2 BU/hr. You can additionally read our [blog post](http://cloud.blog.csc.fi/2017/12/floating-ip-management.html) for management of floating IPs in a cPouta project.
+    Allocated floating IPs are billed at the rate of 0,2 BU/hr. See the [Virtual machine flavors and billing unit rates](./vm-flavors-and-billing.md) for more information.
 
 Now we can go to the [Connecting to your virtual machine](connecting-to-vm.md) section and log in to the new Virtual Machine.

docs/cloud/pouta/vm-flavors-and-billing.md

@@ -1,16 +1,25 @@
 # Virtual machine flavors and billing unit rates
 
-This article lists the types (flavors) of virtual machines and their
-cost in billing units.
+Currently, Pouta will bill for the use of 3 resources: storage volumes, floating IPs and virtual machines. The account of use of resources is done in increments of one hour. A good way to estimate usage cost is the [Billing unit calculator](https://research.csc.fi/resources/#buc) utility.
 
-The cPouta and ePouta services consume the same billing units as
-Puhti and Mahti. You can find more information in the [CSC computing environment articles].
+- **Storage volumes**: 3,5 BU / TiB hour. In the [Volumes](https://pouta.csc.fi/dashboard/project/volumes/) page of your project, you can see the existing volumes. The total size of the volume is billed, and it consumes BUs even if they are not attached to virtual machines. This is because the data is still stored on our systems.
+- **Floating IPs**: 0,2 BU / hour. Every floating IP reserved to the project is billed. See the list of reserved [Floating IPs](https://pouta.csc.fi/dashboard/project/floating_ips/) of your project. Any extra routers you create and connect to the external network will be also billed for one floating IP. The default router included in the project does not consume billing units.
+- **Virtual machines**: see below the list of [cPouta](#cpouta-flavors) and [ePouta](#epouta-flavors) flavors (The values for the memory of each flavor (in GiB) are approximated). Virtual machines consume BUs regardless whether you are using them or not. This means that a shut down or suspended virtual machine still consumes BUs, and it is because the resources are still reserved and cannot be used by other users. You can find more information about the different states of virtual machines and their BU consumption in [Virtual machine lifecycle](vm-lifecycle.md).
 
-Users can create virtual machines with larger or
-smaller compute resources based on their needs. The virtual
-machine *flavors* available in cPouta and ePouta are listed below in
-separate tables.
-Please note that the values for the memory of each flavor (in GiB) are approximated.
+## Quotas
+
+Each Pouta project has this initial default quota:
+
+| Resource | Default |
+|--------------:|:--------|
+| Instances | 8 |
+| Cores | 8 |
+| Memory | 32 GB |
+| Floating IPs | 2 |
+| Storage | 1 TB |
+
+
+Additional quota can be requested by sending an email to [csc service desk](../../support/contact.md) and explaining your use case. Every request is evaluated based on user needs versus available resources. We always aim to have enough free resources for every quota granted, but please note that there is no warranty. In some cases specific hardware, linked to specific virtual machine flavors may be full, so you would not be able to provision them even if you have the quota to do so.
 
 ## cPouta flavors
 

docs/cloud/pouta/vm-lifecycle.md

@@ -3,8 +3,6 @@
 This article explains the different states that virtual machine instances
 can have and their effect on resource usage.
 
-[TOC]
-
 Similar to other cloud providers, Pouta virtual machines also have a lifecycle. 
 Different states of virtual machines have different
 resource requirements for the underlying hardware and are therefore

docs/cloud/rahti/tutorials/deploy_from_git.md

@@ -0,0 +1,27 @@
+
+!!! success "Basic level"
+    This is a simple tutorial to show how to deploy a web server using the Rahti [web interface](../usage/getting_started.md) using a git repository as a source
+
+# Deploy from Git
+
+How to set up a static web server in Rahti from a Git repository.
+
+1. Create a project. [Instructions](../usage/projects_and_quota.md)
+
+1. In the Openshift web console, switch to the Developer perspective. Select _Add_ from the navigation panel. To create an application, under Developer Catalog list Select _Import from Git_. 
+
+    ![click_git](../../../img/click_git.png)
+
+1. Input the URL of the Git repository. OpenShift will use that URL to clone the repository.  
+
+    ![import_from_git](../../../img/import_from_git_1.png)
+
+    The `Advanced Git Options` allows you to change the "reference" (Branch, tag or commit) or the context dir. And also allows to add a secret to get access to the repository (username and password, or SSH keys).
+
+1. After inputting the URL. OpenShift will validate and analyze the repository. 
+
+    ![import_from_git](../../../img/import_from_git_2.png)
+
+1. If the analysis was successful, the last step is to click on `Create`. After few minutes, the site should be available.
+
+After this tutorial, you can check the [Webhooks](webhooks.md) article. Web hooks will allow you to automatically re-deploy this site for every change in the main master branch.

docs/cloud/rahti/tutorials/http-redirector.md

@@ -28,8 +28,8 @@
 
 1. Mount the Configmap to the nginx deployment as a volume. Go to deployment and add following code in the YAML file.
 
-   ```
-   spec:
+    ```yaml
+    spec:
         containers:
           volumeMounts:
           - mountPath: /opt/bitnami/nginx/conf/server_blocks
@@ -39,7 +39,7 @@
               defaultMode: 420
               name: nginx-config
             name: nginx-conf
-   ```
+    ```
 
     In this example, nginx-conf is the **name** of configMap, nginx-config is the **key** and the ConfigMap has to be mounted in `/opt/bitnami/nginx/conf/server_blocks/`, other images may store the nginx configuration in different folders.