Merge branch 'master' into MM-61381_telemetry_events_with_skus

source/collaborate/browse-channels.rst

@@ -17,11 +17,34 @@ Browse channels
 
 .. tab:: Mobile
 
-  1. Tap the **Plus** |plus| icon located in the top right corner of the app to see all available public channels you can join that you're not already a member of.
+  1. Tap the **Plus** |plus| icon located in the top right corner of the app.
+
+  .. image:: ../images/mobile-select-a-channel.jpg
+      :alt: Tap the plus icon to view additional options.
+      :scale: 30
+
   2. Tap **Browse Channels**. 
-  3. Search for channels by name or filter the list of channels to show only public or archived channels. 
+
+  .. image:: ../images/create-channel-or-open-direct-message-on-mobile.jpg
+      :alt: Click on Browse Channels to view the list of public channels.
+      :scale: 30
+
+  3. Search for channels by name or filter the list of channels to show only public, archived or shared channels. 
+
+  .. image:: ../images/mobile-browse-public-channels-using-search.jpg
+      :alt: Type the name of a channel in search to find it from the list.
+      :scale: 30
+
+  .. image:: ../images/mobile-browse-public-channels-using-filters.jpg
+      :alt: Tap on Show to select from available filters such as Public channels, Archived channels, etc.
+      :scale: 30
+
   4. Tap a channel to become a member of that channel.
 
+  .. image:: ../images/mobile-browse-public-channels.jpg
+      :alt: Tap on the public channel name that you want to join.
+      :scale: 30
+
   .. tip::
 
     You can filter the list of channels by public, archived, or shared channels.

source/collaborate/manage-channel-members.rst

@@ -28,27 +28,55 @@ Using Mattermost in a web browser or the desktop app, any member of a channel ca
 .. tab:: Mobile
 
   1. Tap the channel name at the top of the screen.
+
+  .. image:: ../images/mobile-channel-name-click.jpg
+      :alt: Click on the channel name to explore available options.
+      :scale: 30
+
   2. Tap **Add members**. 
+
+  .. image:: ../images/mobile-edit-channel.jpg
+      :alt: Tap on Add members to add members to the channel.
+      :scale: 30
+
   3. Select members to add to the channel. You can scroll through the alphabetical list of members, or search for members in the Search field.
+
+  .. image:: ../images/mobile-select-members-to-add-to-a-channel.jpg
+      :alt: Select a user from the list and search one using the search field that you want to add to the channel.
+      :scale: 30
+
   4. Tap **Add Members**.
 
+  .. image:: ../images/mobile-add-selected-member-to-a-channel.jpg
+      :alt: Click on Add Members to add the member(s) to the current channel.
+      :scale: 30
+
 .. note::
 
    You can also @mention users to add them to a channel. If they're not a channel member, Mattermost prompts you to add them.
+
+   .. image:: ../images/mobile-add-user-to-a-channel-by-mentioning.jpg
+      :alt: If a user mentioned in a channel is not a member already, then Mattermost prompts to add the user.
+      :scale: 40
 
 Add users from their profile
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Using a web browser or the desktop app, you can also add users to channels within their profile pop-over.
 
 1. Select a user's profile image.
-2. Select **Add to a Channel**.
+2. Tap on |add-user-icon| icon.
 
-  .. image:: ../images/add-member-pop.png
-    :alt: Use options on a user's profile pop-over to add a member to a channel.
+.. image:: ../images/add-member-pop.jpg
+   :alt: Use options on a user's profile pop-over to add a member to a channel.
+   :scale: 30
 
 3. Type to find a channel name, then select a channel and choose **Add**.
 
+.. image:: ../images/mobile-add-user-from-profile.jpg
+   :alt: Type the channel name and tap on Add to add the user to it.
+   :scale: 30
+
 Leave a channel
 ----------------
 
@@ -60,9 +88,24 @@ You can leave public or private channels any time.
 
 .. tab:: Mobile
 
-  1. In a channel, tap |more-icon| in the top right corner.
+  1. In a channel, tap |more-icon-vertical| in the top right corner.
+
+  .. image:: ../images/mobile-select-more-options-for-a-channel.jpg
+      :alt: Tap on More options to access available options for the channel you want to leave.
+      :scale: 30
+
   2. Tap **Leave channel**.
 
+  .. image:: ../images/mobile-select-view-info-for-a-channel.jpg
+      :alt: Tap on Leave channel to leave the current channel.
+      :scale: 30
+
+  3. Tap on **Leave** to confirm you choice.
+
+  .. image:: ../images/mobile-confirm-leave-a-channel.jpg
+      :alt: Tap on Leave to confirm your choice.
+      :scale: 30
+
 Remove other members from a channel
 -----------------------------------
 
@@ -80,9 +123,48 @@ Any member of a channel can remove other members from a channel.
 
 .. tab:: Mobile
 
-  1. In a channel, tap |more-icon| in the top right corner.
+  1. In a channel, tap |more-icon-vertical| in the top right corner.
+
+  .. image:: ../images/mobile-select-more-options-for-a-channel.jpg
+      :alt: Tap on More options to access available options for the channel you want to leave.
+      :scale: 30
+
   2. Tap **View Info**.
+
+  .. image:: ../images/mobile-select-view-info-for-a-channel.jpg
+      :alt: Tap on View info to view additional information about the channel.
+      :scale: 30
+
   3. Tap **Members**.
+
+  .. image:: ../images/mobile-edit-channel.jpg
+      :alt: Tap on View info to view additional information about the channel.
+      :scale: 30
+
   4. Tap **Manage** in the top right corner of the screen.
+
+  .. image:: ../images/mobile-view-members-of-a-channel.jpg
+      :alt: Tap on Manage to access the user role of the members.
+      :scale: 30
+
   5. Tap a user role to change it, and tap **Remove from Channel**.
-  6. Tap **Done**.
+
+  .. image:: ../images/mobile-manage-channel-members-list.jpg
+      :alt: Tap on Manage to access the user role of the members.
+      :scale: 30
+
+  .. image:: ../images/mobile-remove-user-from-a-channel.jpg
+      :alt: Tap on Remove from channel to remove the selected user.
+      :scale: 30
+
+  6. Tap **Remove**.
+
+  .. image:: ../images/mobile-confirm-remove-user-from-channel.jpg
+      :alt: Tap on Remove to confirm your choice.
+      :scale: 30
+
+  7. Tap **Done**.
+
+  .. image:: ../images/mobile-exit-after-removing-user-from-a-channel.jpg
+      :alt: Tap on Done to exit and return to the channel.
+      :scale: 30

source/conf.py

@@ -2739,6 +2739,8 @@ def setup(_: Sphinx):
         "https://docs.mattermost.com/about/cloud-subscriptions.html",
 "manage/team-channel-members.html#channel-moderation":
         "https://docs.mattermost.com/manage/team-channel-members.html#advanced-access-controls.html",
+"manage/announcement-banner.html":
+        "https://docs.mattermost.com/manage/system-wide-notifications.html",
 "manage/announcement-banner.html#configure-an-announcement-banner":
         "https://docs.mattermost.com/manage/system-wide-notifications.html#configure-system-wide-notifications",
 "manage/announcement-banner.html#announcement-banner":
@@ -4035,6 +4037,9 @@ def setup(_: Sphinx):
     :alt: Offline availability status icon in Mattermost.
 .. |checkmark| image:: /images/check-circle-green.svg
     :alt: Green checkmark icon used to indicate that a given feature is included in a specific package, deployment, or plan.
+.. |add-user-icon| image:: /images/account-plus-outline_F0801.svg
+    :alt: Account plus outline icon used to add user to a channel.
+    :class: theme-icon
 """
 # rst_epilog = """
 # .. |mm_badge_version| replace:: 7.2