From 77672f54a1a3464a25c8a1e0bd708b67efb5b184 Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:39:59 -0400 Subject: [PATCH] Replaced Calls plugin prefs with general page --- source/collaborate/make-calls.rst | 2 +- source/conf.py | 4 ++++ source/guides/preferences.rst | 4 ++-- .../manage-your-calls-preferences.rst | 14 ------------ .../manage-your-plugin-preferences.rst | 22 +++++++++++++++++++ 5 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 source/preferences/manage-your-calls-preferences.rst create mode 100644 source/preferences/manage-your-plugin-preferences.rst diff --git a/source/collaborate/make-calls.rst b/source/collaborate/make-calls.rst index 4af73ccbd92..e4e2ac5d263 100644 --- a/source/collaborate/make-calls.rst +++ b/source/collaborate/make-calls.rst @@ -225,7 +225,7 @@ Troubleshooting My audio doesn't work when I join a call ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you can hear the other participants in the call but they can't hear you, select the Gear icon |gear| next to the call end button in the widget. From there, you can check and change your audio output and microphone settings. Select |gear| again to close the menu. Alternatively, you can :doc:`manage your audio and microphone preferences ` in **Settings**. +If you can hear the other participants in the call but they can't hear you, select the Gear icon |gear| next to the call end button in the widget. From there, you can check and change your audio output and microphone settings. Select |gear| again to close the menu. Alternatively, you can :doc:`manage your audio and microphone preferences ` in **Settings**. My call is disconnected after a few seconds ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/source/conf.py b/source/conf.py index d6b57f66683..7a6ec3d7a55 100644 --- a/source/conf.py +++ b/source/conf.py @@ -3379,6 +3379,10 @@ def setup(_: Sphinx): "playbooks/get-started-with-playbooks.html": "https://docs.mattermost.com/guides/repeatable-processes.html", +# Preference redirects +"preferences/manage-your-calls-preferences.html": + "https://docs.mattermost.com/preferences/manage-your-plugin-preferences.html", + # Process redirects # The process directory and its contents have been archived in FY23 Q2 and all applicable content has been moved from docs.mm.com to handbook.mm.com. "process/accepting-pull-request.html": diff --git a/source/guides/preferences.rst b/source/guides/preferences.rst index fc62d1c56d4..d1302537cc2 100644 --- a/source/guides/preferences.rst +++ b/source/guides/preferences.rst @@ -26,7 +26,7 @@ Learn more Manage your display options Manage your sidebar options Manage advanced options - Manage your calls preferences + Manage your plugin preferences Customize your desktop app experience Connect to multiple workspaces @@ -39,6 +39,6 @@ Learn more * :doc:`Customize your display options ` - Customize your Mattermost display to suit your preferences. * :doc:`Manage your sidebar options ` - Customize your Mattermost channel sidebar to suit your preferences. * :doc:`Manage advanced options ` - Customize advanced Mattermost user options to suit your preferences. -* :doc:`Manage your calls preferences ` - Custome Mattermost Calls to suit your preferences. +* :doc:`Manage your plugin preferences ` - Customize Mattermost plugin preferences for Microsoft Teams and Calls. * :doc:`Customize your desktop app experience ` - Learn about additional preferences available only in the desktop app. * :doc:`Connect to multiple Mattermost workspaces ` - Learn how to connect to multiple Mattermost workspaces using the Mattermost desktop or mobile app. \ No newline at end of file diff --git a/source/preferences/manage-your-calls-preferences.rst b/source/preferences/manage-your-calls-preferences.rst deleted file mode 100644 index 958447c10b3..00000000000 --- a/source/preferences/manage-your-calls-preferences.rst +++ /dev/null @@ -1,14 +0,0 @@ -Manage your Calls preferences -============================== - -.. include:: ../_static/badges/allplans-cloud-selfhosted.rst - :start-after: :nosearch: - -Using Mattermost in a web browser or the desktop app, you can customize Mattermost Calls based on your preferences. Select the gear icon |gear| next to your profile picture, then select **Calls**. - -Audio devices -------------- - -1. Select **Edit**. -2. Choose the microphone and speaker output used for Mattermost Calls. -3. Select **Save**. \ No newline at end of file diff --git a/source/preferences/manage-your-plugin-preferences.rst b/source/preferences/manage-your-plugin-preferences.rst new file mode 100644 index 00000000000..3ac7c2148b9 --- /dev/null +++ b/source/preferences/manage-your-plugin-preferences.rst @@ -0,0 +1,22 @@ +Manage your plugin preferences +============================== + +Using Mattermost in a web browser or the desktop app, you can customize Mattermost plugin preferences for Microsoft Teams and Calls by selecting **Settings** |gear| next to your profile picture. + +Microsoft Teams plugin preferences +---------------------------------- + +.. include:: ../_static/badges/ent-cloud-selfhosted.rst + :start-after: :nosearch: + +Select **MS Teams** to connect your Mattermost and Microsoft Teams accounts, and manage notification preferences for Microsoft Teams chats and group chats. + +See the :ref:`connect your account ` and :ref:`enable notifications ` documentation for details. + +Calls plugin preferences +------------------------ + +.. include:: ../_static/badges/allplans-cloud-selfhosted.rst + :start-after: :nosearch: + +Select **Calls** to specify the audio devices, including micrphone and speaker, used for Mattermost calls. \ No newline at end of file