Merge pull request #7946 from nextcloud/backport/7945/stable23

[stable23] Update talk screenshares part2
nextcloud · Jan 19, 2022 · 1e09829 · 1e09829
2 parents ca43578 + d128023
commit 1e09829
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 7 deletions.
diff --git a/user_manual/talk/images/add-participants.png b/user_manual/talk/images/add-participants.png
diff --git a/user_manual/talk/images/call-settings.png b/user_manual/talk/images/call-settings.png
diff --git a/user_manual/talk/images/chat-message-menu.png b/user_manual/talk/images/chat-message-menu.png
diff --git a/user_manual/talk/images/chat-room-settings.png b/user_manual/talk/images/chat-room-settings.png
diff --git a/user_manual/talk/images/chat-with-one-user.png b/user_manual/talk/images/chat-with-one-user.png
diff --git a/user_manual/talk/images/creating-group-room.png b/user_manual/talk/images/creating-group-room.png
diff --git a/user_manual/talk/images/drag-and-drop.png b/user_manual/talk/images/drag-and-drop.png
diff --git a/user_manual/talk/images/emoji-picker.png b/user_manual/talk/images/emoji-picker.png
diff --git a/user_manual/talk/images/join-call.png b/user_manual/talk/images/join-call.png
diff --git a/user_manual/talk/images/new-room.png b/user_manual/talk/images/new-room.png
diff --git a/user_manual/talk/images/open-settings.png b/user_manual/talk/images/open-settings.png
diff --git a/user_manual/talk/images/participant-menu.png b/user_manual/talk/images/participant-menu.png
diff --git a/user_manual/talk/images/share-files-in-chat-selection.png b/user_manual/talk/images/share-files-in-chat-selection.png
diff --git a/user_manual/talk/images/share-files-in-chat.png b/user_manual/talk/images/share-files-in-chat.png
diff --git a/user_manual/talk/images/talk-settings.png b/user_manual/talk/images/talk-settings.png
diff --git a/user_manual/talk/images/talk-upload-files.png b/user_manual/talk/images/talk-upload-files.png
diff --git a/user_manual/talk/talk_basics.rst b/user_manual/talk/talk_basics.rst
@@ -77,15 +77,15 @@ Here you can also create a direct link to the message or mark it unread so you w
 Managing a conversation
 ---------------
 
-You are always moderator in your new conversation. In the participant list on the right you can elevate other participants to moderators using the ``...`` menu to the right of their user name, or remove them from the conversation. 
+You are always moderator in your new conversation. In the participant list you can promote other participants to moderators using the ``...`` menu to the right of their user name, assign them custom permissions or remove them from the conversation.
 
 .. image:: images/participant-menu.png
 
-Moderators can configure the conversation. Select ``Configuration settings`` from the ``...`` menu of the conversation on the top to access the settings.
+Moderators can configure the conversation. Select ``Configuration settings`` from the gear menu of the conversation on the top to access the settings.
 
 .. image:: images/open-settings.png
 
-Here you can configure the name, guest access, if the conversation is visible to others on the server and more.
+Here you can configure the description, guest access, if the conversation is visible to others on the server and more.
 
 .. image:: images/chat-room-settings.png
 
@@ -96,16 +96,14 @@ When you're in a conversation, you can start a call any time with the ``Start ca
 
 .. image:: images/join-call.png
 
-During a call, you can mute your microphone and disable your video with the buttons on your video on the bottom-right, or using the shortcuts ``M`` to mute audio and ``V`` to disable video. You can also use the space bar to toggle mute. When you are muted, pressing space will unmute you so you can speak until you let go of the space bar. If you are unmuted, pressing space will mute you until you let go.
+During a call, you can mute your microphone and disable your video with the buttons on the right side of the top bar, or using the shortcuts ``M`` to mute audio and ``V`` to disable video. You can also use the space bar to toggle mute. When you are muted, pressing space will unmute you so you can speak until you let go of the space bar. If you are unmuted, pressing space will mute you until you let go.
 
 You can hide your video (useful during a screen share) with the little arrow just above the video stream. Bring it back with the little arrow again.
 
-You can access your settings and choose a different webcam, microphone and other settings in the ``...`` menu  on your video.
+You can access your settings and choose a different webcam, microphone and other settings in the ``...`` menu in the top bar.
 
 .. image:: images/call-menu.png
 
-.. image:: images/call-settings.png
-
 .. image:: images/talk-settings.png
 
 Starting a screen share