Merge remote-tracking branch 'origin/documentation' into release/10.3

help/cloud-edition-guide/README.md

@@ -6,26 +6,28 @@ description: OpenProject Cloud Edition guide.
 robots: index, follow
 keywords: Cloud Edition
 ---
-# Cloud edition guide
+# Cloud Edition guide
 
 Welcome to the OpenProject **Cloud edition guide**.
 
+![image-20200113133750107](image-20200113133750107.png)
+
 <div class="alert alert-info" role="alert">
 **Note**: This guide only describes the cloud management part of OpenProject. The feature descriptions are included at the respective parts in the OpenProject [user guide](../user-guide/#readme).
 </div>
 
 ## Overview
 
-| Popular Topics                                    | Description                                                  |
-| ------------------------------------------------- | :----------------------------------------------------------- |
-| [Create a free trial](./create-trial-installation) | Learn more how to create a free trial for the cloud instance. |
-|                                                   |                                                              |
-|                                                   |                                                              |
-|                                                   |                                                              |
-|                                                   |                                                              |
-|                                                   |                                                              |
-|                                                   |                                                              |
-|                                                   |                                                              |
-|                                                   |                                                              |
+| Popular Topics                                               | Description                                                  |
+| ------------------------------------------------------------ | :----------------------------------------------------------- |
+| [Create a free trial](./create-trial-installation)           | Learn more how to create a free trial for the cloud instance. |
+| [Sign in](./sign-in/)                                        | Sing in to your OpenProject Cloud Edition.                   |
+| [View payment history or download invoices](./invoices-and-billing-history) | How to see your payment history and download invoices?       |
+| [Upgrade, downgrade or cancel subscription](./manage-subscription/#update-existing-subscriptions) | How to upgrade your plan, downgrade or cancel your subscription for the Cloud Edition? |
+| Manage your subscription                                     | How to change billing address, add or edit Credit Card details? |
+
+The OpenProject Cloud Edition contains all OpenProject Community features plus the additional OpenProject premium features, as well as professional support.
 
+For the Cloud Edition the OpenProject experts will take care of the installation as well as maintenance of your OpenProject installation, so you will be able to concentrate on your core business. We will perform regular backups of your Cloud Edition. You will have the latest OpenProject release installed. Hence, you do not have to take care of updates or installation of security patches yourself.
 
+You will get a detailed feature comparison [here](https://www.openproject.org/pricing/#features).

help/cloud-edition-guide/create-trial-installation/README.md

@@ -1,7 +1,7 @@
 ---
 sidebar_navigation:
-  title: Create OpenProject Cloud Edition trial installation
-  priority: 998S
+  title: Create trial installation
+  priority: 998
 description: Create a free OpenProject Cloud Edition trial installation.
 robots: index, follow
 keywords: trial installation
@@ -13,12 +13,6 @@ You can easily set up a **14 days free trial** for the OpenProject Cloud Edition
 
 Here you can test all OpenProject functionalities thoroughly. After 14 days the trial will expire automatically, there is no further action nor cancellation required from your side. So, you have all freedom to test OpenProject unconcernedly.
 
-
-| Popular Topics                                         | Description                                                  |
-| ------------------------------------------------------ | :----------------------------------------------------------- |
-| [Create a free trial](#start-a-new-trial-installation) | Learn more how to create a free trial for the cloud instance. |
-|                                                        |                                                              |
-
 ## Start a new trial installation
 
 To create a new OpenProject trial either go to the [OpenProject website](https://www.openproject.org/) or open the [start trial page](https://start.openproject.com).

help/cloud-edition-guide/invoices/README.md

@@ -0,0 +1,43 @@
+---
+sidebar_navigation:
+  title: Invoices and billing history
+  priority: 997
+description: View the invoices and payment history.
+robots: index, follow
+keywords: invoices, payment history
+---
+
+# Invoices for the OpenProject Cloud Edition
+
+You will **receive an invoice for your OpenProject Cloud Edition via email** to the email address which you used during the booking process.
+
+The invoice lists the subscription (billing) period as well as the next billing date.
+
+You will also see the payment status. 
+For invoices via bank transfer, the money needs to be paid via bank transfer to the bank account listed at the bottom of the invoice. 
+
+<div class="alert alert-info" role="alert">
+**Note**: For the correct assignment of payments, please enter the  invoice number on your bank transfer.
+</div>
+
+![invoice](image-20200110105613725.png)
+
+## Payment history and download invoices
+
+If you want to see the billing history or download older invoices of your Cloud Edition, navigate to -> *Administration* -> *Billing* within your system's Administration.
+
+Click the green **Manage button** at the top right.
+
+![Cloud-manage](Cloud-manage.png)
+
+In the overlay window, click on the link **Billing History**.
+
+![Cloud-billing-history](Cloud-billing-history.png)
+
+Here, you will get an overview about all your past payments for the Cloud Edition. 
+
+With the **Download link** you can download the inovices.
+
+The **Load more link** will open more positions on the list.
+
+![Billing history overview](image-20200113135853806.png)

help/cloud-edition-guide/manage-subscription/README.md

@@ -0,0 +1,63 @@
+---
+sidebar_navigation:
+  title: Manage subscription
+  priority: 996
+description: View the invoices and payment history.
+robots: index, follow
+keywords: manage subscription
+---
+
+# Manage your OpenProject Cloud subscription
+
+If you want to make changes to your subscription (Up- or downgrade, cancel), navigate to -> *Administration* -> *Billing* within your system's Administration.
+
+Click the green **Manage button**.
+
+![Cloud-manage](Cloud-manage.png)
+
+In the overlay window, you can choose between several topics:
+
+| Popular Topics                                               | Description                                            |
+| ------------------------------------------------------------ | :----------------------------------------------------- |
+| [Upgrade, downgrade or cancel](#update-existing-subscriptions) | How to upgrade, downgrade or cancel a subscription?    |
+| Edit Account information                                     |                                                        |
+| Edit Billing Addresses                                       |                                                        |
+| Edit or add payment methods                                  |                                                        |
+| Edit or add payment methods                                  |                                                        |
+| [View billing history and dowload invoices](./invoices-and-billing-history) | How to view the billing history and download invoices? |
+
+## Update existing subscriptions
+
+If you want to up- or downgrade the amount of users of an existing subscription, click on the subscription listed at the top.
+
+![Cloud-edit-subscription](Cloud-edit-subscription.png)
+
+Here you can either **Edit or Cancel the existing subscription**.
+
+### Upgrade or downgrade subscription
+
+You can **upgrade an existing subscription** at any time. Open the [Manage subscription menu](#manage-your-subscription). Additional users will be billed on a prorated basis, this means you will only pay the amount of additional users until the end of the current subscription period.
+
+You can **downgrade a subscription** to the end of a current subscription period. This means the downgrade becomes active with the next payment term.
+
+Click the **Edit Subscription** link.
+
+![Cloud-edit-subscription-link](Cloud-edit-subscription-link.png)
+
+You can choose the new amount of users. Your next payment will be displayed below.
+
+Click the blue **Update your subscription now button** to save the changes.
+
+![Cloud-upgrade](Cloud-upgrade.png)
+
+### Cancel subscription
+
+To cancel your subscription, open the [Manage subscription](#manage-your-openproject-cloud-subscription) form and click to [update the subscription](#update-existing-subscriptions) you want to cancel.
+
+Click on the **Cancel Subscription link** if you want to terminate your OpenProject Cloud Edition subscription.
+
+![Cloud-cancel-subscription](Cloud-cancel-subscription.png)
+
+<div class="alert alert-info" role="alert">
+**Note**: After cancellation you will receive an email confirmation. Your subscription will be terminated at the end of the current subscription period. After cancellation your data will be kept for a certain period of time in case of reactivation of a subscription.
+</div>

help/cloud-edition-guide/sign-in/README.md

@@ -29,13 +29,21 @@ Click the green **Sign in button** and you will be logged into your OpenProject
 
 ## Forgot organization name of OpenProject Cloud Edition
 
-If you forgot the organization name of your OpenProject Cloud Edition and need to find your organization, you can click the **Find your organization** link on the Sign in page of the website.
+If you forgot the URL or the organization name of your OpenProject Cloud Edition and need to find your organization, you can click the **Find your organization** link on the Sign in page of the website.
 
 ![Sign-in-find-organization](Sign-in-find-organization.png)
 
-If you forgot the URL of your OpenProject Cloud Edition and need to **find your organization**, you will then be asked to enter your e-mail address with which you signed in to OpenProject.
+You will then be asked to enter your e-mail address with which you signed in to OpenProject.
 
-If you 
+Click the Submit button to get an email with further information.
 
 ![Forgot organization](image-20191203175438315.png)
 
+You will receive an email from OpenProject with the installations you are currently member of.
+
+
+
+![E-Mail-Instances](E-Mail-Instances.png)
+
+Click the link in the email to get directed to your installation. If you are member of several OpenProject installations, they will all be listed in this email.
+