Skip to content

Commit

Permalink
Merge branch 'master' into CLD-6817
Browse files Browse the repository at this point in the history
  • Loading branch information
@stafot
stafot authored Dec 15, 2023
2 parents 74727ec + 5e992cb commit 13c883e
Show file tree
Hide file tree
Showing 56 changed files with 679 additions and 251 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,6 @@ The following software is required to build the documentation:
cd build
```
7. Then, preview your changes by opening the `source/html/index.html` file.
7. Then, preview your changes by opening the `build/html/index.html` file.
Build errors are written to the `build/warnings.log` file.
12 changes: 12 additions & 0 deletions source/_static/badges/academy-channels.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
:orphan:
:nosearch:

.. raw:: html

<a href="https://mattermost.com/pl/mattermost-academy-channels-training" class="mm-badge mm-badge--academy" target="_blank">
<img src="../_static/images/badges/academy-callout-image.jpg" alt="" />
<div class="mm-badge__copy">
<span class="mm-badge__accent-text">Mattermost Academy</span>
<span class="mm-badge__title">Learn about Mattermost channels</span>
</div>
</a>
2 changes: 1 addition & 1 deletion source/_static/badges/academy-file-storage.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<img src="../_static/images/badges/academy-callout-image.jpg" alt="" />
<div class="mm-badge__copy">
<span class="mm-badge__accent-text">Mattermost Academy</span>
<span class="mm-badge__title">Learn about Mattermost file storage</span>
<span class="mm-badge__title">Learn about file storage</span>
</div>
</a>
2 changes: 1 addition & 1 deletion source/about/editions-and-offerings.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Features include:
- `Granular system permissions </onboard/advanced-permissions.html>`__.
- Highly customizable `third-party bots, integrations <https://mattermost.com/marketplace/#publicApps>`__, and `command line tools </manage/mmctl-command-line-tool.html>`__.
- 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, Italian, Japanese, Korean, Persian, Polish, Portuguese (Brazil), Romanian, Russian, Spanish, Swedish, Turkish, and Ukrainian.
- 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/>`__.

See a complete list of features `here <https://mattermost.com/pricing>`__.
Expand Down
0 ...install/common-prod-deploy-kubernetes.rst → ...archive/common-prod-deploy-kubernetes.rst
View file
File renamed without changes.
28 changes: 14 additions & 14 deletions source/collaborate/install-desktop-app.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ You can `download the desktop app directly from our Downloads page <https://matt

**Install the Mattermost Desktop App**

1. Download the latest version of the Mattermost desktop app: `32/64-bit version of Windows <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-setup-5.5.1-win.exe>`__
2. From the **\Downloads** folder, right-click on the file ``mattermost-desktop-setup-5.5.1-win.exe``, then select **Open** to start an installer for the app. Once finished, the Mattermost desktop app opens automatically.
1. Download the latest version of the Mattermost desktop app: `32/64-bit version of Windows <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-setup-5.6.0-win.exe>`__
2. From the **\Downloads** folder, right-click on the file ``mattermost-desktop-setup-5.6.0-win.exe``, then select **Open** to start an installer for the app. Once finished, the Mattermost desktop app opens automatically.

**MSI Installer and group policies (beta)**

You can download the latest version of the Mattermost desktop app MSI installer (Beta):

- MSI for `64-bit version of Windows <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-x64.msi>`__
- MSI for `32-bit version of Windows <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-x86.msi>`__
- MSI for `64-bit version of Windows <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-x64.msi>`__
- MSI for `32-bit version of Windows <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-x86.msi>`__

The following group policies are available:

Expand Down Expand Up @@ -72,8 +72,8 @@ You can `download the desktop app directly from our Downloads page <https://matt

1. Download the latest version of the Mattermost desktop app:

- `Intel systems <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-mac-x64.dmg>`__
- `M1 systems <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-mac-m1.dmg>`__ (Beta)
- `Intel systems <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-mac-x64.dmg>`__
- `M1 systems <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-mac-m1.dmg>`__ (Beta)

2. Double-click the download to open the disk image.

Expand Down Expand Up @@ -127,22 +127,22 @@ You can `download the desktop app directly from our Downloads page <https://matt

1. Download the latest version of the Mattermost desktop app:

- 64-bit systems `mattermost-desktop-5.5.1-linux-x86_64.rpm <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-linux-x86_64.rpm>`__
- 32-bit systems `mattermost-desktop-5.5.1-linux-i686.rpm <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-linux-i686.rpm>`__
- 64-bit systems `mattermost-desktop-5.6.0-linux-x86_64.rpm <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-linux-x86_64.rpm>`__
- 32-bit systems `mattermost-desktop-5.6.0-linux-i686.rpm <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-linux-i686.rpm>`__

2. At the command line, execute one of the following commands based on the package you downloaded:

- 64-bit systems:

.. code-block:: none
sudo rpm -i mattermost-desktop-5.5.1-linux-x86_64.rpm
sudo rpm -i mattermost-desktop-5.6.0-linux-x86_64.rpm
- 32-bit systems:

.. code-block:: none
sudo rpm -i mattermost-desktop-5.5.1-linux-i686.rpm
sudo rpm -i mattermost-desktop-5.6.0-linux-i686.rpm
3. Run Mattermost as a desktop app.

Expand All @@ -152,13 +152,13 @@ You can `download the desktop app directly from our Downloads page <https://matt

.. code-block:: none
sudo rpm -u mattermost-desktop-5.5.1-linux-x86_64.rpm
sudo rpm -u mattermost-desktop-5.6.0-linux-x86_64.rpm
- 32-bit systems:

.. code-block:: none
sudo rpm -u mattermost-desktop-5.5.1-linux-i686.rpm
sudo rpm -u mattermost-desktop-5.6.0-linux-i686.rpm
.. tip::
You can review the current version of your desktop app by selecting the **More** |more-icon-vertical| icon located in the top left corner of the desktop app, then selecting **Help > Version...**.
Expand All @@ -169,8 +169,8 @@ You can `download the desktop app directly from our Downloads page <https://matt

1. Download the latest version of the Mattermost desktop app:

- 64-bit systems: `mattermost-desktop-5.5.1-linux-x64.tar.gz <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-linux-x64.tar.gz>`__
- 32-bit systems: `mattermost-desktop-5.5.1-linux-ia32.tar.gz <https://releases.mattermost.com/desktop/5.5.1/mattermost-desktop-5.5.1-linux-ia32.tar.gz>`__
- 64-bit systems: `mattermost-desktop-5.6.0-linux-x64.tar.gz <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-linux-x64.tar.gz>`__
- 32-bit systems: `mattermost-desktop-5.6.0-linux-ia32.tar.gz <https://releases.mattermost.com/desktop/5.6.0/mattermost-desktop-5.6.0-linux-ia32.tar.gz>`__

2. Extract the archive to a convenient location, then execute ``mattermost-desktop`` located inside the extracted directory.

Expand Down
4 changes: 2 additions & 2 deletions source/collaborate/react-with-emojis-gifs.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ Emojis and GIFs are small, digital images, animated images, or icons you can use
Quick emoji reactions
-----------------------

React to messages quickly with recently used emojis. Hover over a message to access recently used emojis.
Hover over a message to react quickly using your most recent emojis. You can react with up to 50 emojis per message.

.. image:: ../images/recent-emojis.png
:alt: React to messages quickly by selecting one of your most recently used emojis.

Recently used emojis are sorted based on how often you've used them.
Recently used emojis are sorted based on how often you've used them.

.. tip::

Expand Down
14 changes: 12 additions & 2 deletions source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2033,6 +2033,16 @@ def setup(_: Sphinx):
"https://docs.mattermost.com/guides/preferences.html",
"guides/welcome-to-mattermost.html#mattermost-interface-changes":
"https://docs.mattermost.com/guides/deployment.html#changelogs",
"guides/configure-app-framework.html":
"https://docs.mattermost.com/deploy/configure-app-framework",
"guides/deploy-http.html":
"https://docs.mattermost.com//deploy/deploy-http",
"guides/deploy-aws.html":
"https://docs.mattermost.com//deploy/deploy-aws",
"guides/package-aws.html":
"https://docs.mattermost.com//deploy/package-aws",
"guides/deploy-openfaas.html":
"https://docs.mattermost.com/deploy/deploy-openfaas",

# Help redirects resulting from the June 2021 docs reorganization project.
"help/apps/desktop-changelog.html":
Expand Down Expand Up @@ -3311,9 +3321,9 @@ def setup(_: Sphinx):
# built documents.
#
# The short X.Y version.
# version = '9.2'
# version = '9.3'
# The full version, including alpha/beta/rc tags.
# release = '9.2'
# release = '9.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions source/configure/developer-mode-configuration-settings.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ Enable client debugging

+---------------------------------------------------+---------------------------------------------------------------------------------------------+
| Enable or disable client-side debugging settings | - System Config path: **Environment > Developer** |
| found in *Settings > Advanced > Debugging* for | - ``config.json setting``: ``".ServiceSettings.EnableClientPerformanceDebugging": false",`` |
| individual users. | - Environment variable: ``MM_SERVICESETTINGS_ENABLECLIENTPERFORMANCEDEBUGGING`` |
| found in **Settings > Advanced > Debugging** | - ``config.json setting``: ``".ServiceSettings.EnableClientPerformanceDebugging": false",`` |
| for individual users. | - Environment variable: ``MM_SERVICESETTINGS_ENABLECLIENTPERFORMANCEDEBUGGING`` |
| | |
| - **true**: Those settings are visible and can | |
| be enabled by users. | |
Expand Down
4 changes: 4 additions & 0 deletions source/configure/optimize-your-workspace.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ The following optimization areas can alert you to workspace suggestions, warning
| | | |
| | - **Session Length**: The default value may not provide an optimal user experience. | - `Set up SSL </onboard/ssl-client-certificate.html>`__ |
| | | - `Configure session length </configure/configuration-settings.html#session-lengths>`__ |
| | - **File Storage**: Write access to the configured file storage location is required. | - `Configure file storage </configure/environment-configuration-settings.html#file-storage>`__ |
| | | |
| | .. include:: ../_static/badges/academy-file-storage.rst | |
| | :start-after: :nosearch: | |
+-----------------------+----------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Workspace access | Is the Mattermost workspace may not be accessible to users? | If your web server settings don't pass a live URL test, your workspace may not be accessible to others. |
| | | See the `Environment Configuration Settings </configure/configuration-settings.html#environment>`__ product documentation to learn more: |
Expand Down
18 changes: 9 additions & 9 deletions source/configure/site-configuration-settings.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,10 @@ Default server language
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------+
| The default language for system messages and logs. | - System Config path: **Site Configuration > Localization** |
| | - ``config.json`` setting: ``.LocalizationSettings.DefaultServerLocale`` |
| Options: ``"bg"``, ``"de"``, ``"en"``, ``en-AU``, ``"es"``, ``"fa"``, | - Environment variable: ``MM_LOCALIZATIONSETTINGS_DEFAULTSERVERLOCALE`` |
| Options: ``"bg"``, ``"de"``, ``"en"``, ``"en-AU"``, ``"es"``, ``"fa"``, | - Environment variable: ``MM_LOCALIZATIONSETTINGS_DEFAULTSERVERLOCALE`` |
| ``"fr"``, ``"hu"``, ``"it"``, ``"ja"``, ``"ko"``, ``"nl"``, ``"pl"``, | |
| ``"pt-br"``, ``"ro"``, ``"ru"``, ``"sv"``, ``"tr"``, ``uk``, ``"zh_CN"``, | |
| and ``"zh_TW"``. | |
| ``"pt-br"``, ``"ro"``, ``"ru"``, ``"sv"``, ``"tr"``, ``"uk"``, ``"vi"``, | |
| ``"zh_CN"``, and ``"zh_TW"``. | |
| | |
| Default is ``"en"``. | |
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------+
Expand All @@ -368,10 +368,10 @@ Default client language
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------+
| The default language for new users and pages where the user isn't logged in. | - System Config path: **Site Configuration > Localization** |
| | - ``config.json`` setting: ``.LocalizationSettings.DefaultClientLocale`` |
| Options: ``"bg"``, ``"de"``, ``"en"``, ``en-AU``, ``"es"``, ``"fa"``, | - Environment variable: ``MM_LOCALIZATIONSETTINGS_DEFAULTCLIENTLOCALE`` |
| Options: ``"bg"``, ``"de"``, ``"en"``, ``"en-AU"``, ``"es"``, ``"fa"``, | - Environment variable: ``MM_LOCALIZATIONSETTINGS_DEFAULTCLIENTLOCALE`` |
| ``"fr"``, ``"hu"``, ``"it"``, ``"ja"``, ``"ko"``, ``"nl"``, ``"pl"``, | |
| ``"pt-br"``, ``"ro"``, ``"ru"``, ``"sv"``, ``"tr"``, ``uk``, ``"zh_CN"``, | |
| and ``"zh_TW"``. | |
| ``"pt-br"``, ``"ro"``, ``"ru"``, ``"sv"``, ``"tr"``, ``"uk"``, ``"vi"``, | |
| ``"zh_CN"``, and ``"zh_TW"``. | |
| | |
| Default is ``"en"``. | |
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------+
Expand All @@ -394,10 +394,10 @@ Available languages
| in addition to any other languages. For example, to limit the language | |
| choices to US English and Español (es), the string would be ``”en,es”``. | |
| | |
| Options: ``"bg"``, ``"de"``, ``"en"``, ``en-AU``, ``"es"``, ``"fa"``, | |
| Options: ``"bg"``, ``"de"``, ``"en"``, ``"en-AU"``, ``"es"``, ``"fa"``, | |
| ``"fr"``, ``"hu"``, ``"it"``, ``"ja"``, ``"ko"``, ``"nl"``, ``"pl"``, | |
| ``"pt-br"``, ``"ro"``, ``"ru"``, ``"sv"``, ``"tr"``, ``uk``, ``"zh_CN"``, | |
| and ``"zh_TW"``. | |
| ``"pt-br"``, ``"ro"``, ``"ru"``, ``"sv"``, ``"tr"``, ``"uk"``, ``"vi"``, | |
| ``"zh_CN"``, and ``"zh_TW"``. | |
| | |
| Default is ``"en"``. | |
+--------------------------------------------------------------------------------+---------------------------------------------------------------------------+
Expand Down
0 source/guides/configure-app-framework.rst → source/deploy/configure-app-framework.rst
View file
File renamed without changes.
Loading

0 comments on commit 13c883e

Please sign in to comment.