Merge branch 'master' into azigler/issue7004

mattermost · Apr 5, 2024 · de4923e · de4923e
2 parents cdc0ed2 + a164192
commit de4923e
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 12 deletions.
diff --git a/source/_static/css/homepage-v1.css b/source/_static/css/homepage-v1.css
diff --git a/source/_static/css/homepage-v1.css.map b/source/_static/css/homepage-v1.css.map
diff --git a/source/_static/scss/partials/_blog.scss b/source/_static/scss/partials/_blog.scss
@@ -183,12 +183,37 @@ body:not([data-custom-theme="light"]) {
     font-size: 12px;
 }
 
+table.align-default {
+    min-width: 500px;
+    overflow: auto;
+}
+
+table.align-default td {
+    min-width: 200px;
+}
+
 
 ::-moz-selection {
     /* Code for Firefox */
-    background: #DEEAFA;
+    background: hsla(42, 100%, 56%, 0.2);
 }
 
 ::selection {
-    background: #DEEAFA;
+    background: hsla(42, 100%, 56%, 0.2);
+}
+
+body:not([data-custom-theme="light"]) {
+    ::-moz-selection {
+        /* Code for Firefox */
+        background: hsla(214, 100%, 46%, 0.4);
+    }
+
+    ::selection {
+        background: hsla(214, 100%, 46%, 0.4);
+    }
+}
+
+
+.bg-white {
+    background: #fff;
 }
diff --git a/source/deploy/deployment-overview.rst b/source/deploy/deployment-overview.rst
@@ -11,7 +11,7 @@ The following Mattermost network diagram illustrates a private cloud deployment
 
 .. note::
 
-  GitLab Mattermost deployment is `documented separately <https://docs.gitlab.com/omnibus/gitlab-mattermost/>`__ and not included below.
+  GitLab Mattermost deployment is `documented separately <https://docs.gitlab.com/ee/integration/mattermost//>`__ and not included below.
 
 Requirements and installation guides
 -------------------------------------

diff --git a/source/getting-started/architecture-overview.rst b/source/getting-started/architecture-overview.rst
@@ -139,43 +139,51 @@ Each AWS diagram represents a full High Availability deployment on Amazon Web Se
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment5kUsers.png
+  :class: bg-white
 
 5,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment5kaws.png
+  :class: bg-white
 
 10,000 users on Enterprise - General
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment10kUsers.png
+  :class: bg-white
 
 10,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment10kaws.png
+  :class: bg-white
 
 25,000 users on Enterprise - General
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment25kUsers.png
+  :class: bg-white
 
 25,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment25kaws.png
+  :class: bg-white
 
 50,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment50kaws.png
+  :class: bg-white
 
 Database with VIPs
 ~~~~~~~~~~~~~~~~~~
 
 The following diagram is a suggested configuration for Highly-Available databases through virtual IPs.
 
 .. image:: ../images/DatabasewithVIPs.png
+  :class: bg-white
 
 Load testing
 ~~~~~~~~~~~~

diff --git a/source/guides/community-chat.rst b/source/guides/community-chat.rst
@@ -6,7 +6,7 @@ Connect with thousands of contributors, customers, partners, and users to build,
 General channels
 ----------------
 
-- `~Contributors <https://community.mattermost.com/core/chann0els/tickets>`__
+- `~Contributors <https://community.mattermost.com/core/channels/tickets>`__
 - `~Community Team <https://community.mattermost.com/core/channels/community-team>`__
 - `~Developers <https://community.mattermost.com/core/channels/developers>`__
 - `~New Channel Notifications <https://community.mattermost.com/core/channels/new-channel-notifications>`__

diff --git a/source/install/installing-team-edition-helm-chart.rst b/source/install/installing-team-edition-helm-chart.rst
@@ -14,7 +14,7 @@ Prerequisites
 --------------
 
 - A running Kubernetes cluster.
-- `Helm v2 <https://helm.sh/docs/intro/install/)>`_.
+- `Helm v2 <https://helm.sh/docs/intro/install/>`_.
 - `Tiller <https://docs.ranchermanager.rancher.io/v2.0-v2.4/pages-for-subheaders/helm2-helm-init>`_ (the Helm server-side component) installed on the cluster.
 
 .. note::

diff --git a/source/manage/mmctl-command-line-tool.rst b/source/manage/mmctl-command-line-tool.rst
@@ -2105,6 +2105,9 @@ Set the value of a config setting by its name in dot notation. Accepts multiple
 
    mmctl config set SqlSettings.DriverName postgres
    mmctl config set SqlSettings.DataSourceReplicas "replica1" "replica2"
+   mmctl config set PluginSettings.Plugins.com.mattermost.calls.rtcdserviceurl "http://mattermost-rtcd"
+
+
 
 **Options**
 

diff --git a/source/scale/scaling-for-enterprise.rst b/source/scale/scaling-for-enterprise.rst
@@ -1,9 +1,6 @@
 Scaling for Enterprise 
 ======================
 
-.. include:: ../_static/badges/allplans-selfhosted.rst
-  :start-after: :nosearch:
-
 Mattermost is designed to scale from small teams hosted on a single server to large enterprises running in cluster-based, highly available deployment configurations.
 
 - Mattermost supports any 64-bit x86 processor architecture

diff --git a/source/upgrade/open-source-components.rst b/source/upgrade/open-source-components.rst
@@ -21,7 +21,7 @@ Desktop
  - Mattermost Desktop v4.6.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.6/NOTICE.txt>`_.
  - Mattermost Desktop v4.5.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.5/NOTICE.txt>`_.
  - Mattermost Desktop v4.4.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.4/NOTICE.txt>`_.
- - Mattermost Desktop v4.3.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.3/NOTICE.txt>`_.
+ - Mattermost Desktop v4.3.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.3.0/NOTICE.txt>`_.
  - Mattermost Desktop v4.2.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.2/NOTICE.txt>`_.
  - Mattermost Desktop v4.1.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.1/NOTICE.txt>`_.
  - Mattermost Desktop v4.0.0 - `View Open Source Components <https://github.com/mattermost/desktop/blob/release-4.0/NOTICE.txt>`_.