diff --git a/include/i18n/en_US/templates/page/access-link.yaml b/include/i18n/en_US/templates/page/access-link.yaml
index cd445d171e1e9b243ffc5aa8a969e4245f18eda3..977e11b72bc6da1a9c38c319cc0619171d06d805 100644
--- a/include/i18n/en_US/templates/page/access-link.yaml
+++ b/include/i18n/en_US/templates/page/access-link.yaml
@@ -6,8 +6,9 @@
#
---
notes: >
- Ticket access link sent to clients for guest-only systems where the ticket
- number and email address will trigger an access link sent via email
+ This template defines the notification for Clients that an access link was
+ sent to their email. The ticket number and email address trigger the access
+ link.
name: "Ticket [#%{ticket.number}] Access Link"
body: >
<h3><strong>Hi %{recipient.name.first},</strong></h3>
diff --git a/include/i18n/en_US/templates/page/banner-client.yaml b/include/i18n/en_US/templates/page/banner-client.yaml
index 5bab4cd11c11027a3ca93740d481cb6f040a2a35..d46d6ca2deadf1bc0bc7c1936457b44854a4b16f 100644
--- a/include/i18n/en_US/templates/page/banner-client.yaml
+++ b/include/i18n/en_US/templates/page/banner-client.yaml
@@ -5,9 +5,8 @@
# your clients about your login and registration policies.
---
notes: >
- This forms the header on the staff login page. It can be useful to
- inform your clients about your login and registration policies.
+ This composes the header on the Client Log In page. It can be useful to
+ inform your Clients about your log in and registration policies.
name: "Sign in to %{company.name}"
body: >
- To better serve you, we encourage our clients to register for an account
- and verify the email address we have on record.
+ To better serve you, we encourage our Clients to register for an account.
\ No newline at end of file
diff --git a/include/i18n/en_US/templates/page/banner-staff.yaml b/include/i18n/en_US/templates/page/banner-staff.yaml
index cde341856b768d108f378bf7f2d5086e0fd7714e..918dfc9c8ef8db93b985a67057910641c91c3ef6 100644
--- a/include/i18n/en_US/templates/page/banner-staff.yaml
+++ b/include/i18n/en_US/templates/page/banner-staff.yaml
@@ -4,6 +4,8 @@
# This is the initial message and banner shown on the staff login page
---
notes: >
- This is the initial message and banner shown on the staff login page
+ This is the initial message and banner shown on the Staff Log In page.
+ The first input field refers to the red-formatted text that appears at the top.
+ The latter textarea is for the banner content which should serve as a disclaimer.
name: "Authentication Required"
body: ""
diff --git a/include/i18n/en_US/templates/page/landing.yaml b/include/i18n/en_US/templates/page/landing.yaml
index 529c8e31778eb4811b5c6c66dd6d7de2aac92d20..ceedc21a3bffc95c97b080da3006e5e00c6d0e1a 100644
--- a/include/i18n/en_US/templates/page/landing.yaml
+++ b/include/i18n/en_US/templates/page/landing.yaml
@@ -5,12 +5,13 @@
# the two links for creating new tickets and viewing ticket status.
#
---
-notes: |
- The landing page is served on the front page of the customer portal
- above the two links for creating new tickets and viewing ticket status.
+notes: >
+ The Landing Page refers to the content of the Customer Portal's
+ intial view. The template modifies the content seen above the two links
+ <strong>Open a New Ticket</strong> and <strong>Check Ticket Status</strong>.
name: Landing
-body: |
+body: >
<h1>Welcome to the Support Center</h1>
<p>
In order to streamline support requests and better serve you, we utilize
diff --git a/include/i18n/en_US/templates/page/offline.yaml b/include/i18n/en_US/templates/page/offline.yaml
index f5491e88f5d7819f6ee696e560ad558050017e43..ed634eefaf09bdc658aef80d0ce3e1e54525b3e2 100644
--- a/include/i18n/en_US/templates/page/offline.yaml
+++ b/include/i18n/en_US/templates/page/offline.yaml
@@ -6,8 +6,7 @@
#
---
notes: |
- The offline page is served to the customer portal when the help desk is
- configured offline in the Admin Panel
+ The Offline Page appears in the Customer Portal when the Help Desk is offline.
name: Offline
body: |
diff --git a/include/i18n/en_US/templates/page/pwreset-client.yaml b/include/i18n/en_US/templates/page/pwreset-client.yaml
index d3ea3a3917f4754e3c1e0eab805e8a60bde72bbb..ad839de8e825a98c7602dd982f7ba84788fad465 100644
--- a/include/i18n/en_US/templates/page/pwreset-client.yaml
+++ b/include/i18n/en_US/templates/page/pwreset-client.yaml
@@ -5,8 +5,8 @@
# link on the login page
---
notes: >
- Template of the email sent to clients when using the Forgot My Password
- link on the login page
+ This template defines the email sent to Clients who select the <strong>Forgot My
+ Password</strong> link on the Client Log In page.
name: "%{company.name} Help Desk Access"
body: >
<h3><strong>Hi %{user.name.first},</strong></h3>
diff --git a/include/i18n/en_US/templates/page/pwreset-staff.yaml b/include/i18n/en_US/templates/page/pwreset-staff.yaml
index ff8c8c157fc1143848281f13c2fa4e0630ad7eba..1b39661fd17b574e9721973d4680cacff19e6e66 100644
--- a/include/i18n/en_US/templates/page/pwreset-staff.yaml
+++ b/include/i18n/en_US/templates/page/pwreset-staff.yaml
@@ -5,8 +5,8 @@
# Password link
---
notes: >
- Template of the email sent to staff members when using the Forgot My
- Password link
+ This template defines the email sent to Staff who select the <strong>Forgot My
+ Password</strong> link on the Staff Control Panel Log In page.
name: "osTicket Staff Password Reset"
body: >
<h3><strong>Hi %{staff.name.first},</strong></h3>
diff --git a/include/i18n/en_US/templates/page/registration-client.yaml b/include/i18n/en_US/templates/page/registration-client.yaml
index ea820a31fb9a6a945a2156a570fb369258225699..35f986ca6ad0c9fba1dec545ce15585f35b64014 100644
--- a/include/i18n/en_US/templates/page/registration-client.yaml
+++ b/include/i18n/en_US/templates/page/registration-client.yaml
@@ -7,9 +7,9 @@
#
---
notes: >
- Confirmation email sent to clients when accounts are created for them by
- staff or via the client portal. This email serves as an email address
- verification. Please use %{link} somewhere in the body.
+ This template defines the email sent to Clients when their account has been
+ created in the Client Portal or by an Agent on their behalf. This email serves as
+ an email address verification. Please use %{link} somewhere in the body.
name: "Welcome to %{company.name}"
body: >
<h3><strong>Hi %{recipient.name.first},</strong></h3> We've created an
diff --git a/include/i18n/en_US/templates/page/registration-confirm.yaml b/include/i18n/en_US/templates/page/registration-confirm.yaml
index 00aa6880940fd5a32fda2362fee360bde992e126..293f9ba1365ca585e247e422b83c3da2dfdd188a 100644
--- a/include/i18n/en_US/templates/page/registration-confirm.yaml
+++ b/include/i18n/en_US/templates/page/registration-confirm.yaml
@@ -8,14 +8,14 @@
#
---
notes: >
- Template of the page shown to the user after registering for an account.
- The system will send the user an email with a link they should follow to
- confirm the account. This page should inform them of the next step in
- the process.
+ This templates defines the page shown to Clients after completing the registration
+ form. The template should mention that the system is sending
+ them an email confirmation link and what is the next step in the registration
+ process.
name: "Account registration"
body: >
- <strong>Thanks for registering for an account.</strong>
- <p>
+ <p><strong>Thanks for registering for an account.</strong></p>
+ <br /><p>
We've just sent you an email to the address you entered. Please follow
the link in the email to confirm your account and gain access to your
tickets.
diff --git a/include/i18n/en_US/templates/page/registration-staff.yaml b/include/i18n/en_US/templates/page/registration-staff.yaml
index dcf6056fdd6a4cd163b20c92f94448ff7e9312cc..4b323970852d8dd7b2abab8af57654f8c6b6e93c 100644
--- a/include/i18n/en_US/templates/page/registration-staff.yaml
+++ b/include/i18n/en_US/templates/page/registration-staff.yaml
@@ -6,8 +6,8 @@
#
---
notes: >
- Initial (optional) email sent to staff members when accounts are created
- for them in the staff control panel
+ This template defines the initial email (optional) sent to Agents when an account
+ is created on their behalf.
name: "Welcome to osTicket"
body: >
<h3><strong>Hi %{recipient.name.first},</strong></h3>
diff --git a/include/i18n/en_US/templates/page/registration-thanks.yaml b/include/i18n/en_US/templates/page/registration-thanks.yaml
index adfb922a76d2d0eb5d90121e38103e4b3961a381..0cb5e16a9f7ff74a211e711548ffba6b04dbaf7e 100644
--- a/include/i18n/en_US/templates/page/registration-thanks.yaml
+++ b/include/i18n/en_US/templates/page/registration-thanks.yaml
@@ -7,16 +7,16 @@
#
---
notes: >
- Page shown to the user after successfully registring and confirming their
- account. This page should inform the user that the process is complete and
- that the user can now submit a ticket or access existing tickets
+ This template defines the content displayed after Clients successfully
+ register by confirming their account. This page should inform the user
+ that registration is complete and that the Client can now submit a ticket
+ or access existing tickets.
name: "Account Confirmed!"
body: >
<strong>Thanks for registering for an account.</strong><br />
<br />
You've confirmed your email address and successfully activated your
- account. You may proceed to check on previously opened tickets or open a
- new ticket.<br />
+ account. You may proceed to open a new ticket or manage existing tickets.<br />
<br />
<em>Your friendly support center</em><br />
%{company.name}
diff --git a/include/i18n/en_US/templates/page/thank-you.yaml b/include/i18n/en_US/templates/page/thank-you.yaml
index aef423945287b7e38bb82b7745538794602ada32..96979ef56c9dd1ebfcf9b48a6155cf982540862d 100644
--- a/include/i18n/en_US/templates/page/thank-you.yaml
+++ b/include/i18n/en_US/templates/page/thank-you.yaml
@@ -6,8 +6,8 @@
#
---
notes: |
- The thank-you page is served to the customer portal when a user submites
- a new ticket via the customer portal.
+ This template defines the content displayed on the Thank-You page after a
+ Client submits a new ticket in the Client Portal.
name: Thank You
body: |