Merge branch 'master' into hanzei-patch-1

source/about/certifications-and-compliance.rst

@@ -56,13 +56,13 @@ Data management
 
 - **Data Retention:** Use :doc:`data retention </comply/data-retention-policy>` to automatically erase data after a set period of time, a feature that meets the Right to Erasure principle. In Team Edition, you can use database scripts to achieve the same result.
 - **Profile Deletion:** Delete a user’s personal information via :ref:`mmctl user delete <manage/mmctl-command-line-tool:mmctl user delete>`. This permanently deletes all user information including messages created by the user.
-- **Self-Hosted Push Notification Service:** Self-host your own push notification service, or deploy mobile apps with any EMM provider that supports `AppConfig <https://www.appconfig.org/members/>`_ to meet security and compliance policies. See :doc:`our Mobile App deployment documentation </deploy/mobile-overview>` to learn more.
+- **Self-Hosted Push Notification Service:** Self-host your own push notification service, or deploy mobile apps with any EMM provider that supports `AppConfig <https://www.appconfig.org/>`_ to meet security and compliance policies. See :doc:`our Mobile App deployment documentation </deploy/mobile-overview>` to learn more.
 
 Data portability
 ^^^^^^^^^^^^^^^^^
 
 - **Data Import:** Use the :doc:`bulk loading tool </onboard/bulk-loading-data>` to migrate data from an existing messaging system, or for pre-populating a new installation with data. :ref:`Review this guide <onboard/migrating-to-mattermost:migrate from slack>` which summarizes the different approaches and meets the `Right to Data Portability <https://gdpr-info.eu/art-20-gdpr/>`_ principle.
-- **Data Export:** Use :doc:`compliance exports </comply/compliance-export>` to export conversations from public, private and direct message channels in XML or EML format. Those in Team Edition can export conversations directly from the database, both `in PostgreSQL <https://www.a2hosting.com/kb/developer-corner/postgresql/import-and-export-a-postgresql-database>`_ and `in MySQL <https://www.itworld.com/article/2833078/it-management/3-ways-to-import-and-export-a-mysql-database.html>`_.
+- **Data Export:** Use :doc:`compliance exports </comply/compliance-export>` to export conversations from public, private and direct message channels in XML or EML format. Those in Team Edition can export conversations directly from the database, both in PostgreSQL and in MySQL.
 
 Accessibility compliance
 -------------------------
@@ -87,7 +87,7 @@ Mattermost, Inc. implements a number of controls and processes to comply with U.
 
 4. **Legal restrictions:** Our commercial software contains legal terms that apply to both administrators and end users prohibiting use that would violate U.S. trade laws.
 
-U.S. trade laws referenced here can be found online at: https://www.bis.doc.gov/ and https://ofac.treasury.gov/.
+U.S. trade laws referenced here can be found online at: https://www.bis.gov and https://ofac.treasury.gov/.
 
 If you feel your organization is miscategorized under U.S. trade laws or sanctions, please email [email protected]. 
 
@@ -137,7 +137,7 @@ This overview is specific to the `U.S. Export Administration Regulations <https:
 General information
 ~~~~~~~~~~~~~~~~~~~~
 
-Start by taking a look at the `U.S. Bureau of Industry and Security <https://www.bis.doc.gov/>`_ website. Then, navigate to `Part 730 <https://www.bis.doc.gov/index.php/documents/regulation-docs/410-part-730-general-information/file>`_ of the U.S. Export Administration Regulations to understand what the regulations cover and what is “Subject to
+Start by taking a look at the `U.S. Bureau of Industry and Security <https://www.bis.gov/>`_ website. Then, navigate to `Part 730 <https://www.bis.doc.gov/index.php/documents/regulation-docs/410-part-730-general-information/file>`_ of the U.S. Export Administration Regulations to understand what the regulations cover and what is “Subject to
 the EAR” under `734.2 <https://www.bis.doc.gov/index.php/documents/regulation-docs/412-part-734-scope-of-the-export-administration-regulations/file>`_ (“export controlled”).
 
 Export classification and licensing

source/about/cloud-subscriptions.rst

@@ -17,7 +17,7 @@ Buy a Cloud subscription
 
 4. Click **Upgrade** to confirm.
 
-To upgrade to Mattermost Enterprise, `contact sales <https://mattermost.com/contact-sales/>`__.
+To upgrade to Mattermost Enterprise, `contact sales <https://mattermost.com/contact-sales/>`_.
 
 View subscription information
 -----------------------------
@@ -86,21 +86,21 @@ 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 Cloud Professional, or Mattermost Cloud Enterprise and you wish to cancel, please `contact us <https://customers.mattermost.com/cloud/contact-us>`_.
 
 When will support for other regions be available?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Mattermost Cloud Enterprise will support data residency based on feedback from our customers.
 
-If you require your data to reside in an area outside of the United States, please contact the product team via `[email protected] <[email protected]>`__, or consider `deploying one of our Self-Hosted options <https://mattermost.com/deploy>`__ that provides full control of your data. You may also work with `one of our European partners <https://mattermost.com/partners>`__ for deploying and hosting your Mattermost server.
+If you require your data to reside in an area outside of the United States, please contact the product team via `[email protected] <[email protected]>`_, or consider `deploying one of our Self-Hosted options <https://mattermost.com/deploy>`_ that provides full control of your data. You may also work with `one of our European partners <https://mattermost.com/partners>`_ for deploying and hosting your Mattermost server.
 
 How is Mattermost Cloud secured?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Mattermost Cloud has encryption at-rest and in-transit. We're SOC2 Type 1 certified and working towards SOC2 Type 2.
 
-Mattermost Cloud Enterprise is available to be deployed in a secure, private environment within a dedicated cloud offering to a single customer. This architecture provides the isolation and security of an on-premises deployment while ensuring consistent performance and uptime of your Mattermost workspace. `Please contact Mattermost Sales for more information on this option <https://mattermost.com/contact-sales/>`__.
+Mattermost Cloud Enterprise is available to be deployed in a secure, private environment within a dedicated cloud offering to a single customer. This architecture provides the isolation and security of an on-premises deployment while ensuring consistent performance and uptime of your Mattermost workspace. Contact `Mattermost Sales <https://mattermost.com/contact-sales/>`_ for more information on this option.
 
 What are the alternatives, and why should I choose Mattermost Cloud?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -117,7 +117,7 @@ Mattermost Cloud Enterprise can be deployed as a dedicated Mattermost environmen
 How is customer data in Mattermost Cloud Enterprise encrypted?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Mattermost uses AWS-provided functionality to enable encryption-at-rest for both databases and file stores. See `Encrypting Amazon RDS resources - Amazon Relational Database Service <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Encryption.html>`__ and `Protecting data using server-side encryption - Amazon Simple Storage Service <https://docs.aws.amazon.com/AmazonS3/latest/userguide/serv-side-encryption.html>`__ for details.
+Mattermost uses AWS-provided functionality to enable encryption-at-rest for both databases and file stores. See `Encrypting Amazon RDS resources - Amazon Relational Database Service <https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Encryption.html>`_ and `Protecting data using server-side encryption - Amazon Simple Storage Service <https://docs.aws.amazon.com/AmazonS3/latest/userguide/serv-side-encryption.html>`_ for details.
 
 Whether customer data should be stored in Mattermost Cloud depends heavily on the nature of the data and compliance requirements. We recommend that customers set up their own internal policies or controls around what can and cannot be put into Mattermost.
 
@@ -134,7 +134,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 `three offerings <https://mattermost.com/pricing/>`_: Free, Professional, Enterprise, with a virtual private Cloud add-on available for Enterprise.
 
 These offerings are deployed in the following ways:
 

source/about/corporate-directory-integration.rst

@@ -39,7 +39,7 @@ Active Directory/LDAP authentication
 
 .. note:: 
    - New user accounts are created when new users log in with their AD/LDAP credentials. You can optionally pre-create user accounts using the :doc:`bulk loading </onboard/bulk-loading-data>` tool.
-   - If you're using email or username and password authentication :ref:`users can switch to AD/LDAP manually <onboard/ad-ldap:getting started>`, and the `conversion to AD/LDAP can also be done using the :ref:`mmctl user migrate auth <manage/mmctl-command-line-tool:mmctl user migrate auth>` command by an IT admin.
+   - If you're using email or username and password authentication :ref:`users can switch to AD/LDAP manually <onboard/ad-ldap:getting started>`, and the conversion to AD/LDAP can also be done using the :ref:`mmctl user migrate auth <manage/mmctl-command-line-tool:mmctl user migrate auth>` command by an IT admin.
 
 For very large AD/LDAP instances you can also configure max page size to divide a Mattermost AD/LDAP query into several pieces to not overtax the authentication server when synchronizing.
 

source/about/editions-and-offerings.rst

@@ -67,19 +67,19 @@ Features include:
 - :doc:`Multi-factor authentication </onboard/multi-factor-authentication>`.
 - Single Sign-on with :doc:`GitLab </onboard/sso-gitlab>` using the OAuth 2.0 standard.
 - :doc:`Granular system permissions </onboard/advanced-permissions>`.
-- Highly customizable `third-party bots, integrations <https://mattermost.com/marketplace/#publicApps>`__, and :doc:`command line tools </manage/mmctl-command-line-tool>`.
-- Extensive integration support via `webhooks, APIs, drivers <https://developers.mattermost.com/integrate/other-integrations/>`__, and `third-party extensions <https://mattermost.com/marketplace/>`__.
+- Highly customizable `third-party bots, integrations <https://mattermost.com/marketplace/#publicApps>`_, and :doc:`command line tools </manage/mmctl-command-line-tool>`.
+- Extensive integration support via `webhooks, APIs, drivers <https://developers.mattermost.com/integrate/other-integrations/>`_, and `third-party extensions <https://mattermost.com/marketplace/>`_.
 - Multiple languages including English (Australian, US), Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Persian, Polish, Portuguese (Brazil), Romanian, Russian, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese.
-- `Community support <https://mattermost.com/support/>`__.
+- `Community support <https://mattermost.com/support/>`_.
 
-See a complete list of features `here <https://mattermost.com/pricing>`__.
+See a complete list of features `here <https://mattermost.com/pricing>`_.
 
 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 `the Mattermost sales organization <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 at https://mattermost.com/trial/.
+* *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.
 
 This offering includes all the features of Mattermost Free, plus: 
@@ -91,18 +91,18 @@ This offering includes all the features of Mattermost Free, plus:
 - :ref:`Advanced team permissions <onboard/advanced-permissions:team override scheme>`.
 - :ref:`Read-only announcement channels <manage/team-channel-members:channel moderation>`.
 - :doc:`System-wide announcement banners </manage/announcement-banner>`.
-- O365 integration with `Microsoft Teams Calling <https://mattermost.com/marketplace/microsoft-teams-meetings/>`__ and `Jira multi-server <https://mattermost.com/marketplace/jira-plugin/>`__.
-- `Next business day support via online ticketing system <https://mattermost.com/support/>`__.
+- O365 integration with `Microsoft Teams Calling <https://mattermost.com/marketplace/microsoft-teams-meetings/>`_ and `Jira multi-server <https://mattermost.com/marketplace/jira-plugin/>`_.
+- `Next business day support via online ticketing system <https://mattermost.com/support/>`_.
 
-See a complete list of features `here <https://mattermost.com/pricing>`__.
+See a `complete list of Mattermost features <https://mattermost.com/pricing>`_.
 
 Mattermost Enterprise 
 ~~~~~~~~~~~~~~~~~~~~~
 
 Mattermost Enterprise is an enterprise-grade collaboration system that supports and helps you scale your mission-critical enterprise workflows, meet strict enterprise security, compliance, and privacy requirements, as well as provide executive reporting, dashboards, and productivity metrics.
 
-* *Self-hosted deployments* - **Mattermost Enterprise** is available to our self-hosted community who either run, or upgrade to, our self-hosted commercial Mattermost Enterprise Edition, who purchase by `contacting the Mattermost sales organization <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 at https://mattermost.com/trial/.
-* *Cloud deployments* - For our cloud community, **Mattermost Enterprise** can be purchased by `contacting the Mattermost sales organization <https://mattermost.com/contact-sales/>`__.
+* *Self-hosted deployments* - **Mattermost Enterprise** is available to our self-hosted community who either run, or upgrade to, our self-hosted commercial Mattermost Enterprise Edition, who purchase 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 at https://mattermost.com/trial/.
+* *Cloud deployments* - For our cloud community, **Mattermost Enterprise** can be purchased by `contacting Mattermost Sales <https://mattermost.com/contact-sales/>`_.
 
 This offering includes all the features of Mattermost Professional, plus: 
 
@@ -121,13 +121,13 @@ This offering includes all the features of Mattermost Professional, plus:
 - :doc:`High availability support with multi-node database deployment </scale/high-availability-cluster>`.
 - :doc:`Horizontal scaling through cluster-based deployment </scale/scaling-for-enterprise>`.
 - :doc:`Advanced performance monitoring </scale/performance-monitoring>`.
-- `Eligibility for Premier Support add-on <https://mattermost.com/support/>`__.
+- `Eligibility for Premier Support add-on <https://mattermost.com/support/>`_.
 - 99% uptime SLA guarantee (Cloud only, via dedicated virtual secure Cloud add-on option).
 
 Other Mattermost plans
 ----------------------
 
-Mattermost introduced a new pricing and packaging structure on October 13, 2021. The plans listed below will reach end-of-life on October 31, 2023. We're no longer selling these products to new customers. For existing customers, we highly recommend working with your Mattermost Account team to plan for a migration to our new plans, but we will honor existing pricing and features for renewals and expansions of E10/20 until October 31, 2022. Please contact our `Sales team <https://mattermost.com/contact-us/>`__ with questions.
+Mattermost introduced a new pricing and packaging structure on October 13, 2021. The plans listed below will reach end-of-life on October 31, 2023. We're no longer selling these products to new customers. For existing customers, we highly recommend working with your Mattermost Account team to plan for a migration to our new plans, but we will honor existing pricing and features for renewals and expansions of E10/20 until October 31, 2022. Please contact our `Sales team <https://mattermost.com/contact-sales/>`_ with questions.
 
 Mattermost Enterprise Edition E10
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -148,4 +148,4 @@ As the platform matures and new features are added, they're evaluated to be incl
 
 We recognize there aren't any features that are only useful to managers, directors, and executives. Individual practitioners may want certain features; however, we think that other buyers are relatively more likely to care about it. We also recognize that there may be some features that are put into an edition to find later there is much demand for it by individuals or a singular team; we will not hesitate to move that feature. We value feedback from our community and iterate based on that feedback. Simultaneously, we also need to offer commercial products that hold value and do our best to find the right balance. We believe the more of Mattermost that you use, the more likely it is that you benefit from the advanced editions we offer.
 
-You can provide us with feedback via `our idea portal <https://mattermost.com/suggestions/>`__, where ideas and input influences the future of the platform.
+You can provide us with feedback via `our idea portal <https://mattermost.com/suggestions/>`, where ideas and input influences the future of the platform.