Merge branch 'master' into MM-57874-live-captions

source/about/cloud-subscriptions.rst

@@ -6,77 +6,30 @@ Mattermost Cloud Subscriptions are offered as an annual subscription.
 Buy a Cloud subscription
 ------------------------
 
-1. Select **View Plans** at the top of the Mattermost window.
-2. Select Professional by clicking **Upgrade**.
-3. Provide your credit card details.
-
-.. note::
-
-  - Your credit card will be verified and you'll be charged immediately.
-  - A minimum of ten seats is required.
-
-4. Click **Upgrade** to confirm.
-
 To upgrade to Mattermost Enterprise, `contact sales <https://mattermost.com/contact-sales/>`_.
 
 View subscription information
 -----------------------------
 
-When you've purchased a subscription, you can view the details of your Mattermost Cloud account, including the annual cost per user and the number of users currently registered in your workspace. You can also find a summary of your last invoice in the same page.
-
-Billing period
---------------
-
-When you begin your Mattermost Cloud subscription, your credit card is billed immediately. Your subscription automatically renews annually, however you can opt-out of auto-renewal.
-
-If there's a payment failure, your invoice will show **Payment Failed**. Please review the accuracy of your credit card information in **Payment Information**. Unresolved failed payments may result in a delinquency and an interruption to your subscription.
-
-Payment information
-~~~~~~~~~~~~~~~~~~~
-
-Mattermost uses a third-party payment processor, Stripe, to safely collect and store your credit card information. 
-
-Credit cards are the only form of payment for customers on a monthly billing cycle. All major credit cards are accepted. You can only store information for one credit card in your account.
-
-We offer pricing and billing only in U.S. Dollars (USD) at this time. Payment will be made in USD converted using the exchange rate at the time of the transaction.
+When you've purchased a subscription, you can view the details of your Mattermost Cloud account, including the annual cost per user and the number of users currently registered in your workspace.
 
 Sales tax and VAT
 ~~~~~~~~~~~~~~~~~
 
 Mattermost reserves the right to assess applicable taxes as required by local law. Depending on location, you may be charged transaction taxes when purchasing our product. Prices on our website are exclusive of sales tax or VAT.
 
-Failed or late payments
------------------------
-
-You'll be notified immediately of failed payments both in-product, with a banner, and via email. The notifications provide directions on how to update payment information. Once payment information is updated, you'll be charged right away for the amount owing.
-
-If you have not paid or resolved the failed payment after 90 days, your workspace will be downgraded to Mattermost Free and subject to the data limits of that plan. If there is no activity on your workspace 60 days after the downgrade, your workspace will be deleted.
-
-Add more users to your Cloud Professional subscription
-------------------------------------------------------
-
-You can add users to your workspace anytime. You may incur retroactive charges during renewal or at the end of your annual subscription. You can view any upcoming charges in **System Console > Subscriptions**.
-
-- If the number of users is less than 10% of initial number of users when you subscribed to your annual plan, you won't be billed for the cost of additional users retroactively
-- If the number of users is greater than 10% of the initial number of users when you subscribed to your annual plan, you will be billed the cost of additional users, pro-rated during renewal or at the end of your annual subcsription.
-
-Example:
-
-- You subscribed to Cloud Professional on January 2023 for 100 users. Throughout your subscription term, you add 8 users. You will not be retroactively billed for the cost of additional users.
-- You subscribed to Cloud Professional on January 2023 for 100 users. On March 2023, you add 5 users. On September 2023, you add another 10 users for a total of 15 users during your subscription term. You will be billed pro-rated for the cost of additional users incurred in March and September.
-
 Renew your subscription
 -----------------------
 
-Cloud subscriptions renew automatically, unless you opt out of renewal.
+To renew your subscription to Mattermost Enterprise, `contact sales <https://mattermost.com/contact-sales/>`_.
 
 Frequently asked questions
 ---------------------------
 
 How am I billed for my annual Cloud subscription?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When you purchase your subscription, your credit card is charged immediately. Thereafter, your subscription auto-renews every year. You can opt-out of auto-renewal in the System Console. You'll still receive reminders when your subscription is due for renewal.
+When you purchase your subscription, your credit card is charged immediately.
 
 What happens if I want to buy Mattermost Enterprise during my trial?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -86,7 +39,7 @@ You will have to contact our sales team to upgrade to Mattermost Enterprise. You
 How do I cancel my subscription? 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you have an annual subscription to Mattermost Cloud Professional, or Mattermost Cloud Enterprise and you wish to cancel, please `contact us <https://customers.mattermost.com/cloud/contact-us>`_.
+If you have an annual subscription to Mattermost Professional or Cloud Enterprise and you wish to cancel, please `contact sales <https://mattermost.com/contact-sales/>`_.
 
 When will support for other regions be available?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -134,7 +87,7 @@ Mattermost Cloud is hosted in AWS `us-east-1` region. Cross-region failover is p
 What environments and rings are Cloud offerings deployed with?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Mattermost Cloud provides `three offerings <https://mattermost.com/pricing/>`_: Free, Professional, Enterprise, with a virtual private Cloud add-on available for Enterprise.
+Mattermost Cloud provides `two offerings <https://mattermost.com/pricing/>`_: Professional, Enterprise, with a virtual private Cloud add-on available for Enterprise.
 
 These offerings are deployed in the following ways:
 

source/about/editions-and-offerings.rst

@@ -79,8 +79,7 @@ Mattermost Professional
 
 Mattermost Professional is the set of collaboration features that enables you to build and scale your sophisticated technical workflows across multiple cross-functional teams to deliver mission-critical software.
 
-* *Self-hosted deployments* - **Mattermost Professional** is available to our self-hosted community who either run, or upgrade to, our self-hosted commercial Mattermost Enterprise Edition (see :doc:`deployment guides </guides/deployment>`), who purchase the appropriate subscription license key either through :doc:`online purchase </about/self-hosted-subscriptions>`, through a `channel reseller <https://mattermost.com/partners/#resellers>`_ or by contacting `Mattermost Sales <https://mattermost.com/contact-sales/>`_, and who then install the license key onto their Mattermost server. A 30-day free trial to preview the features in this subscription can be activated either in-product (**System Console > Edition and License > Start trial**) or via `an online request <https://mattermost.com/trial/>`_.
-* *Cloud deployments* - For our cloud community, the **Mattermost Professional** feature set is available through :doc:`online purchase </about/cloud-subscriptions>`. Some workspace limits may apply.
+* *Self-hosted deployments* - **Mattermost Professional** is available to our self-hosted community who either run, or upgrade to, our self-hosted commercial Mattermost Enterprise Edition (see :doc:`deployment guides </guides/deployment>`), who purchase the appropriate subscription license key through a `channel reseller <https://mattermost.com/partners/#resellers>`_ or by contacting `Mattermost Sales <https://mattermost.com/contact-sales/>`_, and who then install the license key onto their Mattermost server. A 30-day free trial to preview the features in this subscription can be activated in-product (**System Console > Edition and License > Start trial**).
 
 This offering includes all the features of Mattermost Free, plus: 
 

source/about/faq-product.rst

@@ -105,14 +105,16 @@ Production Level Quality
 - Tested on several platforms
 
 Beta Level Quality
-- Support best-effort only. `Premier Support <https://mattermost.com/support/>`__ is recommended for use in production environments
+- Support best effort only. `Premier Support <https://mattermost.com/support/>`__ is recommended for use in production environments
 - Core functionality is stable, but iteration based on feedback is ongoing
+- Full testing of all edge cases is still in progress 
 - Detailed documentation may not be available yet
-- Data schema may not be complete, and may require manual migrations to future versions
 
 Experimental Level Quality
 - Not recommended for use in production
 - Unknown level of stability
 - Feature set covers a small or specific set of use cases. Additional use and edge cases will be added over time
 - Data loss can occur as data schemas and configurations may change
-- Minimal documentation is available
+- Minimal documentation is available
+
+Please see our `handbook <https://handbook.mattermost.com/operations/research-and-development/processes/feature-labels>`__ for a more detailed explanation of how we define feature labels. 

source/about/self-hosted-subscriptions.rst

@@ -4,38 +4,7 @@ Self-hosted subscriptions
 Buy a subscription
 ------------------
 
-To purchase a commercial subscription for Mattermost Professional or Mattermost Enterprise please visit: https://mattermost.com/pricing/
-
-For Mattermost v7.7 and later you can also buy a Mattermost subscription from within Mattermost:
-
-1. In Mattermost, select **View Plans** in the global header or via **System Console > View plans**.
-2. Select **Upgrade**. A minimum of ten users is required.
-3. Provide payment details.
-4. Enter the number of user seats you're purchasing. This number has to be equal to, or greater than, the current number of activated users in your Mattermost deployment.
-5. Select **Upgrade**.
-
-When your purchase is complete, a license is automatically applied to instance and your subscription is active immediately.
-
-If your deployment doesn't have internet access, please continue to use the Customer Portal or, contact our sales team for assistance.
-
-Mattermost v7.6 and earlier releases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you're using Mattermost v7.6 and below, you can buy a Mattermost subscription via the `Customer Portal page <https://customers.mattermost.com>`_. If you haven't created an account yet, follow the steps provided. Otherwise, you can log in with your existing credentials. When you buy a Mattermost subscription for a self-hosted deployment, you'll receive an activation license.
-
-Once you're logged in:
-
-1. Choose a subscription, and enter the number of users in the **Order summary** field. This indicates the number of users you can have on this subscription's instance. For more information about how users are defined, visit the `Mattermost pricing page <https://mattermost.com/pricing-self-managed/>`_ and frequently asked questions further down the page.
-2. (Optional for Enterprise subscriptions) You can add `Premier Support <https://mattermost.com/support/>`_. This is an additional cost and is automatically added to your order total.
-3. Select **Next Step**.
-4. Enter your billing and payment information.
-5. Accept the **Terms**.
-6. Select **Complete**.
-7. Choose **Download the license key**.
-
-.. note::
-
-   If you experience any problems with your transaction, please contact our Support team via the Customer Portal. If possible, keep the error message/number that you received on hand as it may help with their investigation.
+To purchase a commercial subscription for Mattermost Professional or Mattermost Enterprise, please visit our pricing page online: https://mattermost.com/pricing/
 
 Apply your license
 ------------------
@@ -50,7 +19,7 @@ System admin access is required in order to apply the license. If you're not a M
 Mattermost installed
 ~~~~~~~~~~~~~~~~~~~~
 
-On the Customer Portal **Subscriptions** page, select **Download License** to download the license key for your subscription. In Mattermost, follow the steps provided in **System Console > About > Edition and License** to apply your license key.
+Check your email for a purchase confirmation from Mattermost. Download the attached license. In Mattermost, follow the steps provided in **System Console > About > Edition and License** to apply your license key.
 
 You can also use the :ref:`mmctl <manage/mmctl-command-line-tool:mmctl license>` to apply the license.
 
@@ -59,39 +28,10 @@ Mattermost not yet installed
 
 If you haven't yet installed and deployed a Mattermost instance, visit the :doc:`Deployment Guide </deploy/deployment-overview>` to get started. For information on creating a system admin account, visit our :doc:`Administrator Tasks </getting-started/admin-onboarding-tasks>` documentation.
 
-View subscription information
------------------------------
-
-Self-hosted subscriptions purchased via the `Customer Portal <https://customers.mattermost.com>`_ are stored and listed in the Customer Portal.
-
-Here you can view license details, including their start date, end date and licensed number of users, and have full access to your billing history, making it easier to manage purchases and renewal dates.
-
-You can access your Customer Portal account to view information about your:
-
-- Subscription purchases
-- Licenses
-- Customer Portal account password
-- Organization information
-- Payment methods
-- Renewals
-- Activated users (available in a future release)
-
-Subscription and licenses not purchased via the Customer Portal won't be listed.
-
 Add more users to your subscription
 -----------------------------------
 
-If you have a self-hosted license in the Customer Portal, you can add additional users to your subscription via the `Customer Portal page <https://customers.mattermost.com>`_.
-
-1. Select **Purchase additional seats**.
-2. Enter your account and billing details.
-3. When the transaction is complete, select whether you'd like to download your updated license or having it emailed to you.completes, they will have to either
-
-Once you have your updated license, upload it via **System Console > License and Edition**.
-
-This process adds additional users to your existing subscription and is not a new license. Your license renewal date doesn't change when you add additional users and receive an updated license. Billing is pro-rated based on the time left in your billing cycle.
-
-If you don't have a self-hosted license in the Customer Portal and want to add users, `contact us <https://mattermost.com/contact-us/>`_.
+If at any time you'd like to add more users to your Mattermost subscription, `contact us <https://mattermost.com/contact-us/>`_.
 
 Quarterly true-up reports
 -------------------------
@@ -134,37 +74,7 @@ If you have a Mattermost deployment prior to v7.9, a system admin needs to take
 Renew your subscription
 -----------------------
 
-From Mattermost Server v5.32, you can renew your self-hosted Mattermost subscription with a credit card if you have a standard Mattermost contract. When you renew your license, you can also increase the number of activated users.
-
-If you haven't upgraded to v5.32, contact Mattermost Support at support@mattermost.com to renew your license.
-
-If you're a reseller, have a non-standard contract, or want to adjust the number of activated users on your license during the license period, please contact Mattermost Sales at sales@mattermost.com.
-
-System admins will be alerted 60 days prior to license expiry via a banner in Mattermost. Select **Renew license now** to start the renewal process in the Customer Portal. You can also dismiss the banner and renew your license at a later date via **System Console > Edition and License**.
-
-When you select **Renew license now**, you're taken to the renewal page in the Customer Portal, which lists your license information and account details. This is pre-populated based on the email address associated with your existing license subscription.
-
-Process your license renewal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1. Enter your **Account Details**, **Additional Contact**, and **Payment Details**.
-2. Confirm the `Mattermost Edition <https://mattermost.com/pricing-self-managed>`_.
-
-  * You can upgrade within the Customer Portal, but it's not possible to downgrade.
-
-3. Confirm the listed number of activated users is correct. 
-
- * You can increase the number of licensed users, but you can't decrease it.
-
-4. Select **Complete purchase**. 
-
-An email with the new license key and information on how to upload the license in the System Console will be sent to the email address provided.
-
-You can watch a video overview of the renewal process on YouTube:
-
-.. raw:: html
-
-   <iframe width="560" height="315" src="https://www.youtube.com/embed/Sz_1nhVufHY" alt="Video on self hosted subscription" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+System admins will be alerted 60 days prior to license expiry via a banner in Mattermost. You can also dismiss the banner and renew your license at a later date via **System Console > Edition and License**. To renew your license, please `contact sales <https://mattermost.com/contact-sales/>`_
 
 Frequently asked questions
 --------------------------
@@ -230,22 +140,7 @@ Once a new license is applied, the banner will no longer be visible.
 
 If you don't plan to renew your subscription, revoke the expired license in **System Console > Edition and License**.
 
-Can other members of my organization use the Customer Portal account to manage our subscription?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We currently support a single account/user per organization. The ability to add multiple users per organization will be available in a future release.
-
 Where can I find the license agreement for Mattermost Enterprise Edition?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Mattermost Enterprise Edition is the name for the binary of the Mattermost self-hosted Professional and Enterprise editions. This edition can be used for free without a license key as commercial software functionally equivalent to the open source Mattermost Team Edition licensed under MIT. When a license key is purchased and applied to Mattermost Enterprise Edition, additional features unlock. The license agreement for Mattermost Enterprise Edition is included in the software and also available `here <https://mattermost.com/enterprise-edition-license/>`_.
-
-How do I delete my Customer Portal account?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Please contact Mattermost Support for assistance with deleting your Customer Portal account.
-
-What happens to my subscription when I delete my account?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When an account is deleted, the license key remains valid. When the subscription is close to expiring, you'll need to create a new profile in order to renew it.