Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Improve linking of documentation around message deletion. 

This should help users confirm their understanding of how deletion
works in Zulip starting from the actual deletion UI.
This commit is contained in:
Tim Abbott 2020-10-29 17:08:36 -07:00
parent c591141d7c
commit 5bfafae764
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/zerver/app/delete_message.html
View File

@ -1,7 +1,12 @@
<div id="delete_message_modal" class="modal modal-bg hide new-style" tabindex="-1" role="dialog" aria-labelledby="delete_message_modal_label" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ _('Close') }}"><span aria-hidden="true">&times;</span></button>
<h3 id="delete_message_modal_label">{{ _("Delete message") }} </h3>
<h3 id="delete_message_modal_label">
{{ _("Delete message") }}
<a href="/help/edit-or-delete-a-message#delete-a-message" target="_blank" rel="noopener noreferrer">
<i class="fa fa-question-circle-o" aria-hidden="true"></i>
</a>
</h3>
</div>
<div class="modal-body">
<div class="content">

8
templates/zerver/help/configure-message-editing-and-deletion.md
View File

@ -2,10 +2,10 @@
{!admin-only.md!}
There are several settings that control who can edit and delete messages and
topics. By default, users have 10 minutes after posting a message to edit
it, they can edit any topic at any time, and they cannot delete their
messages.
There are several settings that control who can [edit and delete
messages](/help/edit-or-delete-a-message) and topics. By default,
users have 10 minutes after posting a message to edit it, they can
edit any topic at any time, and they cannot delete their messages.
Different organizations have different message editing needs, so this area
is highly configurable. Two things are true under any configuration:

12
templates/zerver/help/edit-or-delete-a-message.md
View File

@ -38,11 +38,12 @@ icon instead. Clicking the file icon will allow you to view the
## Delete a message
Deleting the content of a message will cause the message to be displayed as
`(deleted)`. The original sender and timestamp of the message will still be
displayed, and the original content of the message is still accessible via
Zulip's edit history feature. This can be the least confusing option for
other users.
Editing a message to delete its content will cause the message to be
displayed as `(deleted)`. The original sender and timestamp of the
message will still be displayed, and the original content of the
message is still accessible via Zulip's [edit
history](/help/view-a-messages-edit-history) feature. This can be the
least confusing option for other users.
### Delete a message completely
@ -93,3 +94,4 @@ permissions to delete that message.
* [Delete a topic](/help/delete-a-topic)
* [Delete a stream](/help/delete-a-stream)
* [Message retention policy](/help/message-retention-policy)
* [Configure editing and deletion policies](/help/configure-message-editing-and-deletion)