# HG changeset patch
# User charlie ablett <cablett@gitlab.com>
# Date 1652057795 0
#      Mon May 09 00:56:35 2022 +0000
# Node ID 984389782f87fb2845f03cce6a3868aa433d9b6f
# Parent  e146c458914bac44fcaf07a58a7b328eeb3dede3
Update text for delete vs expunge for clarity

diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template
--- a/files/gitlab-config-template/gitlab.rb.template
+++ b/files/gitlab-config-template/gitlab.rb.template
@@ -275,7 +275,7 @@
 # gitlab_rails['incoming_email_idle_timeout'] = 60
 ####! The file name for internal `mail_room` JSON logfile
 # gitlab_rails['incoming_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log"
-####! Permanently remove messages from the mailbox when they are deleted after delivery
+####! Permanently remove messages from the mailbox when they are marked as deleted after delivery
 # gitlab_rails['incoming_email_expunge_deleted'] = false
 
 #### Inbox options (for Microsoft Graph)
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -167,7 +167,7 @@
     # file path of internal `mail_room` JSON logs
     log_path: <%= @incoming_email_log_file %>
 
-    # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+    # Whether to expunge (permanently remove) messages from the mailbox when they are marked as deleted after delivery
     expunge_deleted: <%= @incoming_email_expunge_deleted %>
 
     # How mailroom delivers email content to Rails. There are two methods at the moment: