From 849e3a16930b2063b5dd04b3695b9d1f169074da Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:31:53 -0600
Subject: [PATCH 01/26] Update content: Domain invitation email

---
 .../templates/emails/domain_invitation.txt      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt
index f0612a67f..a1e029d6b 100644
--- a/src/registrar/templates/emails/domain_invitation.txt
+++ b/src/registrar/templates/emails/domain_invitation.txt
@@ -4,19 +4,28 @@ Hi.
 {{ requester_email }} has added you as a manager on {{ domain.name }}.
 
 YOU NEED A LOGIN.GOV ACCOUNT
+
 You’ll need a Login.gov account to manage your .gov domain. Login.gov provides
 a simple and secure process for signing into many government services with one
 account. If you don’t already have one, follow these steps to create your
 Login.gov account <https://login.gov/help/get-started/create-your-account/>.
 
+
 DOMAIN MANAGEMENT
+
 As a .gov domain manager you can add or update information about your domain.
 You’ll also serve as a contact for your .gov domain. Please keep your contact
-information updated. Learn more about domain management <https://get.gov/help/>.
+information updated. 
+
+- Learn more about domain management <https://beta.get.gov/help/domain-management>. 
+
+- Manage your domains <https://manage.get.gov>.
+
 
 SOMETHING WRONG?
+
 If you’re not affiliated with {{ domain.name }} or think you received this
-message in error, contact the .gov team <https://get.gov/help/#contact-us>.
+message in error, reply to this email.
 
 
 THANK YOU
@@ -28,5 +37,5 @@ using a .gov domain.
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
-{% endautoescape %}
\ No newline at end of file
+Learn about .gov <https://get.gov>
+{% endautoescape %}

From e86e00b827fbe91674f9e1e42424d4640fe2b2ec Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:38:43 -0600
Subject: [PATCH 02/26] WIthdrawn email: subject line

---
 .../templates/emails/domain_request_withdrawn_subject.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/domain_request_withdrawn_subject.txt b/src/registrar/templates/emails/domain_request_withdrawn_subject.txt
index ab935fb1d..5ceaa29af 100644
--- a/src/registrar/templates/emails/domain_request_withdrawn_subject.txt
+++ b/src/registrar/templates/emails/domain_request_withdrawn_subject.txt
@@ -1 +1 @@
-Your .gov domain request has been withdrawn
\ No newline at end of file
+Update on your .gov request: {{ application.requested_domain.name }}

From 9eeda25d5b183a389d522ca9ec6e1658693cab3c Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:42:47 -0600
Subject: [PATCH 03/26] Updates to withdrawn email

---
 .../emails/domain_request_withdrawn.txt       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt
index 333fdb3b7..fe9918788 100644
--- a/src/registrar/templates/emails/domain_request_withdrawn.txt
+++ b/src/registrar/templates/emails/domain_request_withdrawn.txt
@@ -1,15 +1,18 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
 Hi {{ application.submitter.first_name }}.
 
-Your .gov domain request has been withdrawn.
-DOMAIN REQUESTED: {{ application.requested_domain.name }}
-REQUEST #: {{ application.id }}
-STATUS: Withdrawn
+Your .gov domain request has been withdrawn and will not be reviewed by our team.
 
+DOMAIN REQUESTED: {{ application.requested_domain.name }}
+STATUS: Withdrawn
 
 YOU CAN EDIT YOUR WITHDRAWN REQUEST
 
-The details of your withdrawn request are included below. You can edit and resubmit this application by logging into the registrar. <https://manage.get.gov/>.
+You can edit and resubmit this request by logging in to the registrar. <https://manage.get.gov/>.
+
+SOMETHING WRONG?
+
+If you didn’t ask for this domain request to be withdrawn or think you received this message in error, reply to this email. 
 
 THANK YOU
 
@@ -17,10 +20,7 @@ THANK YOU
 
 ----------------------------------------------------------------
 
-{% include 'emails/includes/application_summary.txt' %}
-----------------------------------------------------------------
-
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
-{% endautoescape %}
\ No newline at end of file
+Learn about .gov <https://get.gov>
+{% endautoescape %}

From c933d3dfc8d8d051d55df2fec69689e4071acd57 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Mon, 8 Jan 2024 17:10:35 -0600
Subject: [PATCH 04/26] Updates to domain approval email

---
 .../emails/status_change_approved.txt         | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt
index e16b3e3e7..f91cac760 100644
--- a/src/registrar/templates/emails/status_change_approved.txt
+++ b/src/registrar/templates/emails/status_change_approved.txt
@@ -5,27 +5,39 @@ Congratulations! Your .gov domain request has been approved.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-REQUEST #: {{ application.id }}
 STATUS: In review
 
-Now that your .gov domain has been approved, there are a few more things to do before your domain can be used. 
+You can manage your approved domain on the .gov registrar. <https://manage.get.gov>
 
 
-YOU MUST ADD DOMAIN NAME SERVER INFORMATION
+ADD DOMAIN NAME SERVER INFORMATION
 
-Before your .gov domain can be used, you have to connect it to your Domain Name System (DNS) hosting service. At this time, we don’t provide DNS hosting services.
-Go to the domain management page to add your domain name server information <https://manage.get.gov/domain/{{ application.approved_domain.id }}/nameservers>.
+Before your .gov domain can be used, you’ll first need to connect it to a Domain Name System (DNS) hosting service. At this time, we don’t provide DNS hosting services. 
 
-Get help with adding your domain name server information <https://get.gov/help/domain-management/#manage-dns-information-for-your-domain>.
+After you’ve set up hosting, you’ll need to enter your name server information on the .gov registrar. 
+
+Learn more about: 
+
+- Finding a DNS hosting service <https://get.gov/domains/moving/#find-dns-hosting-services>
+
+- Adding name servers <https://get.gov/help/domain-management/#manage-dns-name-servers>.
 
 
 ADD DOMAIN MANAGERS, SECURITY EMAIL
 
-We strongly recommend that you add other points of contact who will help manage your domain. We also recommend that you provide a security email. This email will allow the public to report security issues on your domain. Security emails are made public. 
+Currently, you’re the only person who can manage this domain. Please keep your contact information updated. 
 
-Go to the domain management page to add domain contacts <https://manage.get.gov/domain/{{ application.approved_domain.id }}/your-contact-information> and a security email <https://manage.get.gov/domain/{{ application.approved_domain.id }}/security-email>.
+We strongly recommend adding other domain managers who can serve as additional contacts. We also recommend providing a security email that the public can use to report security issues on your domain. 
 
-Get help with managing your .gov domain <https://get.gov/help/domain-management/>.
+You can add domain managers and a security email on the .gov registrar. 
+
+Learn more about:
+
+- Adding domain managers <https://beta.get.gov/help/domain-management/#add-a-domain-manager-to-your-.gov-domain>
+
+- Adding a security email <https://beta.get.gov/help/domain-management/#add-or-update-the-security-email-for-your-.gov-domain>
+
+- Domain security best practices <https://beta.get.gov/domains/security/> 
 
 
 THANK YOU
@@ -36,5 +48,5 @@ THANK YOU
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

From b50737ed632fc27b880439104edf43646d759cbf Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Mon, 8 Jan 2024 17:11:41 -0600
Subject: [PATCH 05/26] Update status - approved

---
 src/registrar/templates/emails/status_change_approved.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt
index f91cac760..9ac98d781 100644
--- a/src/registrar/templates/emails/status_change_approved.txt
+++ b/src/registrar/templates/emails/status_change_approved.txt
@@ -5,7 +5,7 @@ Congratulations! Your .gov domain request has been approved.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-STATUS: In review
+STATUS: Approved
 
 You can manage your approved domain on the .gov registrar. <https://manage.get.gov>
 

From 4c04b5e6a064d94077993356c63d0907d3a2ea14 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:16:13 -0600
Subject: [PATCH 06/26] Withdrawn email - updates

---
 .../templates/emails/domain_request_withdrawn.txt         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt
index fe9918788..463f4ae60 100644
--- a/src/registrar/templates/emails/domain_request_withdrawn.txt
+++ b/src/registrar/templates/emails/domain_request_withdrawn.txt
@@ -1,21 +1,19 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 Your .gov domain request has been withdrawn and will not be reviewed by our team.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 STATUS: Withdrawn
 
-YOU CAN EDIT YOUR WITHDRAWN REQUEST
 
-You can edit and resubmit this request by logging in to the registrar. <https://manage.get.gov/>.
+YOU CAN EDIT YOUR WITHDRAWN REQUEST
+You can edit and resubmit this request by logging in to the registrar <https://manage.get.gov/>.
 
 SOMETHING WRONG?
-
 If you didn’t ask for this domain request to be withdrawn or think you received this message in error, reply to this email. 
 
 THANK YOU
-
 .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 
 ----------------------------------------------------------------

From 5082a17c0e4ea235ffa79eb1ea4c006c26d0d9ea Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:23:47 -0600
Subject: [PATCH 07/26] Invitation updates

---
 .../templates/emails/domain_invitation.txt     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt
index a1e029d6b..ef26ddb14 100644
--- a/src/registrar/templates/emails/domain_invitation.txt
+++ b/src/registrar/templates/emails/domain_invitation.txt
@@ -3,33 +3,29 @@ Hi.
 
 {{ requester_email }} has added you as a manager on {{ domain.name }}.
 
-YOU NEED A LOGIN.GOV ACCOUNT
+You can manage your approved domain on the .gov registrar. <https://manage.get.gov>
 
+
+YOU NEED A LOGIN.GOV ACCOUNT
 You’ll need a Login.gov account to manage your .gov domain. Login.gov provides
 a simple and secure process for signing into many government services with one
-account. If you don’t already have one, follow these steps to create your
+account. 
+
+If you don’t already have one, follow these steps to create your
 Login.gov account <https://login.gov/help/get-started/create-your-account/>.
 
-
 DOMAIN MANAGEMENT
-
 As a .gov domain manager you can add or update information about your domain.
 You’ll also serve as a contact for your .gov domain. Please keep your contact
 information updated. 
 
-- Learn more about domain management <https://beta.get.gov/help/domain-management>. 
-
-- Manage your domains <https://manage.get.gov>.
-
+Learn more about domain management <https://beta.get.gov/help/domain-management>. 
 
 SOMETHING WRONG?
-
 If you’re not affiliated with {{ domain.name }} or think you received this
 message in error, reply to this email.
 
-
 THANK YOU
-
 .Gov helps the public identify official, trusted information. Thank you for
 using a .gov domain.
 

From 72f9fef8d8f1cf1831fe37280ac724fe9e31ecd4 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:16:47 -0600
Subject: [PATCH 08/26] Approved subject line

---
 .../templates/emails/status_change_approved_subject.txt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/status_change_approved_subject.txt b/src/registrar/templates/emails/status_change_approved_subject.txt
index 32756d463..5ceaa29af 100644
--- a/src/registrar/templates/emails/status_change_approved_subject.txt
+++ b/src/registrar/templates/emails/status_change_approved_subject.txt
@@ -1 +1 @@
-Your .gov domain request is approved
\ No newline at end of file
+Update on your .gov request: {{ application.requested_domain.name }}

From ece2fb1e9952c24f7242fcf2072cc1d638641785 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:17:11 -0600
Subject: [PATCH 09/26] Rejected subject line

---
 .../templates/emails/status_change_rejected_subject.txt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/status_change_rejected_subject.txt b/src/registrar/templates/emails/status_change_rejected_subject.txt
index a15cc1575..5ceaa29af 100644
--- a/src/registrar/templates/emails/status_change_rejected_subject.txt
+++ b/src/registrar/templates/emails/status_change_rejected_subject.txt
@@ -1 +1 @@
-Your .gov domain request has been rejected
\ No newline at end of file
+Update on your .gov request: {{ application.requested_domain.name }}

From 15a0e648d92b9effee53a3cfadf5e0100c07d406 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:17:36 -0600
Subject: [PATCH 10/26] Submission subject line

---
 .../templates/emails/submission_confirmation_subject.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/submission_confirmation_subject.txt b/src/registrar/templates/emails/submission_confirmation_subject.txt
index 34b958b3a..5ceaa29af 100644
--- a/src/registrar/templates/emails/submission_confirmation_subject.txt
+++ b/src/registrar/templates/emails/submission_confirmation_subject.txt
@@ -1 +1 @@
-Thank you for applying for a .gov domain
+Update on your .gov request: {{ application.requested_domain.name }}

From d4e258cdf55164dc30e946a9e67922753dc31eee Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:24:28 -0600
Subject: [PATCH 11/26] Domain invitation updates 2

---
 src/registrar/templates/emails/domain_invitation.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt
index ef26ddb14..a7ebf75d9 100644
--- a/src/registrar/templates/emails/domain_invitation.txt
+++ b/src/registrar/templates/emails/domain_invitation.txt
@@ -3,7 +3,7 @@ Hi.
 
 {{ requester_email }} has added you as a manager on {{ domain.name }}.
 
-You can manage your approved domain on the .gov registrar. <https://manage.get.gov>
+You can manage this domain on the .gov registrar. <https://manage.get.gov>
 
 
 YOU NEED A LOGIN.GOV ACCOUNT
@@ -19,12 +19,13 @@ As a .gov domain manager you can add or update information about your domain.
 You’ll also serve as a contact for your .gov domain. Please keep your contact
 information updated. 
 
-Learn more about domain management <https://beta.get.gov/help/domain-management>. 
+Learn more about domain management <https://get.gov/help/domain-management>. 
 
 SOMETHING WRONG?
 If you’re not affiliated with {{ domain.name }} or think you received this
 message in error, reply to this email.
 
+
 THANK YOU
 .Gov helps the public identify official, trusted information. Thank you for
 using a .gov domain.

From 7b3f02d945761cb55d35a901b172161b99bad791 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:34:46 -0600
Subject: [PATCH 12/26] Updates to submission email

---
 .../emails/submission_confirmation.txt        | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt
index b25704052..8029ee834 100644
--- a/src/registrar/templates/emails/submission_confirmation.txt
+++ b/src/registrar/templates/emails/submission_confirmation.txt
@@ -1,29 +1,26 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 We received your .gov domain request.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-REQUEST #: {{ application.id }}
-STATUS: Received
-
-
-NEED TO MAKE CHANGES?
-
-If you need to change your request you have to first withdraw it. Once you
-withdraw the request you can edit it and submit it again. Changing your request
-might add to the wait time. Learn more about withdrawing your request.
+STATUS: Submitted
 
 
 NEXT STEPS
+We’ll review your request. This usually takes 20 business days. During this review we’ll verify that:
+- Your organization is eligible for a .gov domain
+- You work at the organization and/or can make requests on its behalf 
+- Your requested domain meets our naming requirements 
 
-- We’ll review your request. This usually takes 20 business days.
+We’ll email you if we have questions and when we complete our review. You can check the status of your request at any time on the registrar homepage. <https://manage.get.gov>
 
-- You can check the status of your request at any time.
-  <https://manage.get.gov/application/{{ application.id }}>
+NEED TO MAKE CHANGES?
+To make changes to your domain request, you have to withdraw it first. Withdrawing your request may extend the time it takes for the .gov team to complete their review. 
+
+Learn more about withdrawing your request <https://get.gov/help/domain-requests/#withdraw-your-domain-request>.
 
-- We’ll email you with questions or when we complete our review.
 
 
 THANK YOU
@@ -38,5 +35,5 @@ requesting a .gov domain.
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

From 2e3a0069f675ce9fd50c207fda1c3cf082140101 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:03:46 -0600
Subject: [PATCH 13/26] Submission updates 2

---
 .../templates/emails/submission_confirmation.txt          | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt
index 8029ee834..020825f94 100644
--- a/src/registrar/templates/emails/submission_confirmation.txt
+++ b/src/registrar/templates/emails/submission_confirmation.txt
@@ -7,7 +7,7 @@ DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
 STATUS: Submitted
 
-
+----------------------------------------------------------------
 NEXT STEPS
 We’ll review your request. This usually takes 20 business days. During this review we’ll verify that:
 - Your organization is eligible for a .gov domain
@@ -21,12 +21,8 @@ To make changes to your domain request, you have to withdraw it first. Withdrawi
 
 Learn more about withdrawing your request <https://get.gov/help/domain-requests/#withdraw-your-domain-request>.
 
-
-
 THANK YOU
-
-.Gov helps the public identify official, trusted information. Thank you for
-requesting a .gov domain.
+.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 
 ----------------------------------------------------------------
 

From 6f285bf3b89dbd56e9fb00bda1ef0e2a126f44bd Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:10:33 -0600
Subject: [PATCH 14/26] Withdrawn updates 2

---
 src/registrar/templates/emails/domain_request_withdrawn.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt
index 463f4ae60..d5bde66da 100644
--- a/src/registrar/templates/emails/domain_request_withdrawn.txt
+++ b/src/registrar/templates/emails/domain_request_withdrawn.txt
@@ -4,8 +4,10 @@ Hi, {{ application.submitter.first_name }}.
 Your .gov domain request has been withdrawn and will not be reviewed by our team.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
+REQUEST RECEIVED ON: {{ application.submission_date|date }}
 STATUS: Withdrawn
 
+----------------------------------------------------------------
 
 YOU CAN EDIT YOUR WITHDRAWN REQUEST
 You can edit and resubmit this request by logging in to the registrar <https://manage.get.gov/>.

From 620314c833b5a1561e48c0a3420c8be8fe99b2ca Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:18:10 -0600
Subject: [PATCH 15/26] Spacing issue

---
 src/registrar/templates/emails/submission_confirmation.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt
index 020825f94..0780a1e8c 100644
--- a/src/registrar/templates/emails/submission_confirmation.txt
+++ b/src/registrar/templates/emails/submission_confirmation.txt
@@ -8,6 +8,7 @@ REQUEST RECEIVED ON: {{ application.submission_date|date }}
 STATUS: Submitted
 
 ----------------------------------------------------------------
+
 NEXT STEPS
 We’ll review your request. This usually takes 20 business days. During this review we’ll verify that:
 - Your organization is eligible for a .gov domain

From ff0307943a4d3a7fc0044a1a19d24218219b4a0c Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:24:23 -0600
Subject: [PATCH 16/26] Updates to approved 2

---
 .../templates/emails/status_change_approved.txt   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt
index 9ac98d781..7bb6509cc 100644
--- a/src/registrar/templates/emails/status_change_approved.txt
+++ b/src/registrar/templates/emails/status_change_approved.txt
@@ -9,39 +9,28 @@ STATUS: Approved
 
 You can manage your approved domain on the .gov registrar. <https://manage.get.gov>
 
+----------------------------------------------------------------
 
 ADD DOMAIN NAME SERVER INFORMATION
-
 Before your .gov domain can be used, you’ll first need to connect it to a Domain Name System (DNS) hosting service. At this time, we don’t provide DNS hosting services. 
 
 After you’ve set up hosting, you’ll need to enter your name server information on the .gov registrar. 
 
 Learn more about: 
-
 - Finding a DNS hosting service <https://get.gov/domains/moving/#find-dns-hosting-services>
-
 - Adding name servers <https://get.gov/help/domain-management/#manage-dns-name-servers>.
 
-
 ADD DOMAIN MANAGERS, SECURITY EMAIL
-
 Currently, you’re the only person who can manage this domain. Please keep your contact information updated. 
 
-We strongly recommend adding other domain managers who can serve as additional contacts. We also recommend providing a security email that the public can use to report security issues on your domain. 
-
-You can add domain managers and a security email on the .gov registrar. 
+We strongly recommend adding other domain managers who can serve as additional contacts. We also recommend providing a security email that the public can use to report security issues on your domain. You can add domain managers and a security email on the .gov registrar. 
 
 Learn more about:
-
 - Adding domain managers <https://beta.get.gov/help/domain-management/#add-a-domain-manager-to-your-.gov-domain>
-
 - Adding a security email <https://beta.get.gov/help/domain-management/#add-or-update-the-security-email-for-your-.gov-domain>
-
 - Domain security best practices <https://beta.get.gov/domains/security/> 
 
-
 THANK YOU
-
 .Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
 
 ----------------------------------------------------------------

From 4d65b7662e307be5eec90929a4ce3a6aff3c137f Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:32:01 -0600
Subject: [PATCH 17/26] Updates to rejection email

---
 .../emails/status_change_rejected.txt         | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/registrar/templates/emails/status_change_rejected.txt b/src/registrar/templates/emails/status_change_rejected.txt
index 1b177573c..39953907a 100644
--- a/src/registrar/templates/emails/status_change_rejected.txt
+++ b/src/registrar/templates/emails/status_change_rejected.txt
@@ -1,32 +1,30 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 Your .gov domain request has been rejected.
 
 DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
-REQUEST #: {{ application.id }}
 STATUS: Rejected
 
-
-YOU CAN SUBMIT A NEW REQUEST
-
-The details of your request are included below. If your organization is eligible for a .gov 
-domain and you meet our other requirements, you can submit a new request. Learn 
-more about .gov domains <https://get.gov/help/domains/>.
-
-
-THANK YOU
-
-.Gov helps the public identify official, trusted information. Thank you for
-requesting a .gov domain.
-
 ----------------------------------------------------------------
 
-{% include 'emails/includes/application_summary.txt' %}
+YOU CAN SUBMIT A NEW REQUEST
+If your organization is eligible for a .gov domain and you meet our other requirements, you can submit a new request. 
+
+Learn more about:
+- Eligibility for a .gov domain <https://get.gov/domains/eligibility>
+- Choosing a .gov domain name <https://get.gov/domains/choosing>
+
+NEED ASSISTANCE?
+If you have questions about this domain request or need help choosing a new domain name, reply to this email.
+
+THANK YOU
+.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
+
 ----------------------------------------------------------------
 
 The .gov team
 Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+Learn about .gov <https://get.gov>
 {% endautoescape %}

From f02cf3f892bdbc9d7c8c08e5e926e4030beda07e Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:35:52 -0600
Subject: [PATCH 18/26] Fix spacing issues

---
 src/registrar/templates/emails/status_change_approved.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt
index 7bb6509cc..08a1f78b0 100644
--- a/src/registrar/templates/emails/status_change_approved.txt
+++ b/src/registrar/templates/emails/status_change_approved.txt
@@ -20,6 +20,7 @@ Learn more about:
 - Finding a DNS hosting service <https://get.gov/domains/moving/#find-dns-hosting-services>
 - Adding name servers <https://get.gov/help/domain-management/#manage-dns-name-servers>.
 
+
 ADD DOMAIN MANAGERS, SECURITY EMAIL
 Currently, you’re the only person who can manage this domain. Please keep your contact information updated. 
 
@@ -30,6 +31,7 @@ Learn more about:
 - Adding a security email <https://beta.get.gov/help/domain-management/#add-or-update-the-security-email-for-your-.gov-domain>
 - Domain security best practices <https://beta.get.gov/domains/security/> 
 
+
 THANK YOU
 .Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
 

From d6716425a2c2cea63659d273afb632c0802ee35b Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:42:12 -0600
Subject: [PATCH 19/26] Fix spacing issues

---
 src/registrar/templates/emails/status_change_rejected.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/templates/emails/status_change_rejected.txt b/src/registrar/templates/emails/status_change_rejected.txt
index 39953907a..c5afaf711 100644
--- a/src/registrar/templates/emails/status_change_rejected.txt
+++ b/src/registrar/templates/emails/status_change_rejected.txt
@@ -16,9 +16,11 @@ Learn more about:
 - Eligibility for a .gov domain <https://get.gov/domains/eligibility>
 - Choosing a .gov domain name <https://get.gov/domains/choosing>
 
+
 NEED ASSISTANCE?
 If you have questions about this domain request or need help choosing a new domain name, reply to this email.
 
+
 THANK YOU
 .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 

From b3e5a7c033e0be94fb419938e164f0125fa3fa87 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:47:27 -0600
Subject: [PATCH 20/26] More fixes

---
 src/registrar/templates/emails/status_change_approved.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt
index 08a1f78b0..7665b1b1c 100644
--- a/src/registrar/templates/emails/status_change_approved.txt
+++ b/src/registrar/templates/emails/status_change_approved.txt
@@ -7,7 +7,7 @@ DOMAIN REQUESTED: {{ application.requested_domain.name }}
 REQUEST RECEIVED ON: {{ application.submission_date|date }}
 STATUS: Approved
 
-You can manage your approved domain on the .gov registrar. <https://manage.get.gov>
+You can manage your approved domain on the .gov registrar <https://manage.get.gov>.
 
 ----------------------------------------------------------------
 
@@ -27,9 +27,9 @@ Currently, you’re the only person who can manage this domain. Please keep your
 We strongly recommend adding other domain managers who can serve as additional contacts. We also recommend providing a security email that the public can use to report security issues on your domain. You can add domain managers and a security email on the .gov registrar. 
 
 Learn more about:
-- Adding domain managers <https://beta.get.gov/help/domain-management/#add-a-domain-manager-to-your-.gov-domain>
-- Adding a security email <https://beta.get.gov/help/domain-management/#add-or-update-the-security-email-for-your-.gov-domain>
-- Domain security best practices <https://beta.get.gov/domains/security/> 
+- Adding domain managers <https://get.gov/help/domain-management/#add-a-domain-manager-to-your-.gov-domain>
+- Adding a security email <https://get.gov/help/domain-management/#add-or-update-the-security-email-for-your-.gov-domain>
+- Domain security best practices <https://get.gov/domains/security/> 
 
 
 THANK YOU

From 0a1d0fd33421c4e3376f48a8d49b59add34da533 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:52:40 -0600
Subject: [PATCH 21/26] Spacing issues

---
 src/registrar/templates/emails/domain_request_withdrawn.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt
index d5bde66da..671149aaa 100644
--- a/src/registrar/templates/emails/domain_request_withdrawn.txt
+++ b/src/registrar/templates/emails/domain_request_withdrawn.txt
@@ -12,9 +12,11 @@ STATUS: Withdrawn
 YOU CAN EDIT YOUR WITHDRAWN REQUEST
 You can edit and resubmit this request by logging in to the registrar <https://manage.get.gov/>.
 
+
 SOMETHING WRONG?
 If you didn’t ask for this domain request to be withdrawn or think you received this message in error, reply to this email. 
 
+
 THANK YOU
 .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 

From b6fd21f0df2476125e382184ea94a2831a0c10d1 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 18:00:16 -0600
Subject: [PATCH 22/26] More spacing issues

---
 src/registrar/templates/emails/submission_confirmation.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt
index 0780a1e8c..16a951ac1 100644
--- a/src/registrar/templates/emails/submission_confirmation.txt
+++ b/src/registrar/templates/emails/submission_confirmation.txt
@@ -17,11 +17,13 @@ We’ll review your request. This usually takes 20 business days. During this re
 
 We’ll email you if we have questions and when we complete our review. You can check the status of your request at any time on the registrar homepage. <https://manage.get.gov>
 
+
 NEED TO MAKE CHANGES?
 To make changes to your domain request, you have to withdraw it first. Withdrawing your request may extend the time it takes for the .gov team to complete their review. 
 
 Learn more about withdrawing your request <https://get.gov/help/domain-requests/#withdraw-your-domain-request>.
 
+
 THANK YOU
 .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
 

From abd071b97ebb68e4cc3bdd82a80cb81de6415061 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Tue, 9 Jan 2024 18:08:37 -0600
Subject: [PATCH 23/26] Updates to invitation email 3

---
 src/registrar/templates/emails/domain_invitation.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt
index a7ebf75d9..ca15b0689 100644
--- a/src/registrar/templates/emails/domain_invitation.txt
+++ b/src/registrar/templates/emails/domain_invitation.txt
@@ -3,8 +3,9 @@ Hi.
 
 {{ requester_email }} has added you as a manager on {{ domain.name }}.
 
-You can manage this domain on the .gov registrar. <https://manage.get.gov>
+You can manage this domain on the .gov registrar <https://manage.get.gov>.
 
+----------------------------------------------------------------
 
 YOU NEED A LOGIN.GOV ACCOUNT
 You’ll need a Login.gov account to manage your .gov domain. Login.gov provides
@@ -14,6 +15,7 @@ account.
 If you don’t already have one, follow these steps to create your
 Login.gov account <https://login.gov/help/get-started/create-your-account/>.
 
+
 DOMAIN MANAGEMENT
 As a .gov domain manager you can add or update information about your domain.
 You’ll also serve as a contact for your .gov domain. Please keep your contact
@@ -21,14 +23,14 @@ information updated.
 
 Learn more about domain management <https://get.gov/help/domain-management>. 
 
+
 SOMETHING WRONG?
 If you’re not affiliated with {{ domain.name }} or think you received this
 message in error, reply to this email.
 
 
 THANK YOU
-.Gov helps the public identify official, trusted information. Thank you for
-using a .gov domain.
+.Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
 
 ----------------------------------------------------------------
 

From 123862eb4910e21334b3b9a50e835bb258d973d6 Mon Sep 17 00:00:00 2001
From: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:27:26 -0600
Subject: [PATCH 24/26] Typos

---
 src/registrar/templates/emails/domain_invitation.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt
index ca15b0689..b9e4ba853 100644
--- a/src/registrar/templates/emails/domain_invitation.txt
+++ b/src/registrar/templates/emails/domain_invitation.txt
@@ -9,7 +9,7 @@ You can manage this domain on the .gov registrar <https://manage.get.gov>.
 
 YOU NEED A LOGIN.GOV ACCOUNT
 You’ll need a Login.gov account to manage your .gov domain. Login.gov provides
-a simple and secure process for signing into many government services with one
+a simple and secure process for signing in to many government services with one
 account. 
 
 If you don’t already have one, follow these steps to create your
@@ -17,7 +17,7 @@ Login.gov account <https://login.gov/help/get-started/create-your-account/>.
 
 
 DOMAIN MANAGEMENT
-As a .gov domain manager you can add or update information about your domain.
+As a .gov domain manager, you can add or update information about your domain.
 You’ll also serve as a contact for your .gov domain. Please keep your contact
 information updated. 
 

From 9cfa30f0539189f2c81d3b38f83fb5e63514dc1f Mon Sep 17 00:00:00 2001
From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:41:14 -0500
Subject: [PATCH 25/26] Added comma after "Hi" to be consistent with other
 greetings

---
 src/registrar/templates/emails/status_change_approved.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/status_change_approved.txt b/src/registrar/templates/emails/status_change_approved.txt
index 7665b1b1c..bc548bfb6 100644
--- a/src/registrar/templates/emails/status_change_approved.txt
+++ b/src/registrar/templates/emails/status_change_approved.txt
@@ -1,5 +1,5 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi {{ application.submitter.first_name }}.
+Hi, {{ application.submitter.first_name }}.
 
 Congratulations! Your .gov domain request has been approved.
 

From 0379c8aa5fbad4a614742b1873fb153a2d8cb4c6 Mon Sep 17 00:00:00 2001
From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:51:50 -0500
Subject: [PATCH 26/26] Change "logging in" to "signing in"

---
 src/registrar/templates/emails/domain_request_withdrawn.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/emails/domain_request_withdrawn.txt b/src/registrar/templates/emails/domain_request_withdrawn.txt
index 671149aaa..ba40c2f08 100644
--- a/src/registrar/templates/emails/domain_request_withdrawn.txt
+++ b/src/registrar/templates/emails/domain_request_withdrawn.txt
@@ -10,7 +10,7 @@ STATUS: Withdrawn
 ----------------------------------------------------------------
 
 YOU CAN EDIT YOUR WITHDRAWN REQUEST
-You can edit and resubmit this request by logging in to the registrar <https://manage.get.gov/>.
+You can edit and resubmit this request by signing in to the registrar <https://manage.get.gov/>.
 
 
 SOMETHING WRONG?