Skip to content

Commit 243148f

Browse files
authored
Merge pull request #12495 from nextcloud/add/select-talk-room
document select talk room on calendar
2 parents 60a8f48 + 7a87679 commit 243148f

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

user_manual/groupware/calendar.rst

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ hard drive or delete it forever.
7272

7373
.. figure:: images/calendar_dropdown.png
7474

75-
Click on the "pen" icon of the respective calendar. You will see a new popup that will allow you to change
75+
Click on the "pen" icon of the respective calendar. You will see a new popup that will allow you to change
7676
the calendar name and color, and buttons to delete or export the calendar.
7777

7878
.. figure:: images/calendar_settings.png
@@ -81,7 +81,7 @@ Calendar Transparency
8181
~~~~~~~~~~~~~~~~~~~~~
8282

8383
You can toggle the checkbox "Never show me as busy (set calendar to transparent)" to influence if this calendars' events
84-
are taken into account in Free/Busy calculations. If checked, no events in this calendar will be taken into account, your schedule will
84+
are taken into account in Free/Busy calculations. If checked, no events in this calendar will be taken into account, your schedule will
8585
always be free, regardless of an events' settings.
8686

8787
.. figure:: images/calendar_transparency.png
@@ -121,8 +121,8 @@ On the public page, users are able to get the subscription link for the calendar
121121
Calendar Widget
122122
~~~~~~~~~~~~~~~
123123

124-
You can embed your calendars into supported apps like ``Talk``, ``Notes``, etc...
125-
by either sharing the public link to make the embed viewable (read-only) to all users
124+
You can embed your calendars into supported apps like ``Talk``, ``Notes``, etc...
125+
by either sharing the public link to make the embed viewable (read-only) to all users
126126
or by using the internal link to make it private.
127127

128128
Subscribe to a Calendar
@@ -179,6 +179,12 @@ If you want to edit advanced details such as the **Attendees** or **Reminders**,
179179
want to set the event as a repeating-event, click on the ``More`` button to open the advanced
180180
sidebar editor.
181181

182+
Add Talk conversation
183+
~~~~~~~~~~~~~~~~~~~~~
184+
You can include an existing Talk conversation in your event by clicking "Add Talk conversation". To view the list of existing Talk conversations, ensure the Talk app is enabled. If you'd like to create a new Talk conversation, you can do so directly from the same modal.
185+
186+
.. figure:: images/add-talk-room.png
187+
182188
.. note:: If you always want to open the advanced sidebar editor instead of the
183189
simple event editor popup, you can set a ``Skip simple event
184190
editor`` checkmark in the ``Settings & Import`` section of the app.
101 KB
Loading

0 commit comments

Comments
 (0)