From e43190b936fc329c4658fb9d7dce0ebef5893862 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 2 Dec 2019 14:40:46 +0000
Subject: [PATCH 001/117] Create page and add content

---
 app/templates/views/guidance | 183 +++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 app/templates/views/guidance

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
new file mode 100644
index 000000000..0ff87462e
--- /dev/null
+++ b/app/templates/views/guidance
@@ -0,0 +1,183 @@
+{% extends "content_template.html" %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/sub-navigation.html" import sub_navigation %}
+
+{% block per_page_title %}
+  Get started
+{% endblock %}
+
+{% block content_column_content %}
+
+  <h1 class="heading-large">Get started</h1>
+
+  <p>This guidance is for teams using GOV.UK Notify to send emails, text messages and letters.</p>
+
+  <p>It includes information about how to:</p>
+
+  <ul class="list list-bullet">
+    <li>create and send messages</li>
+    <li>edit and format messages</li>
+    <li>send files by email</li>
+    <li>upload your own letters</li>
+    <li>add branding and customisation</li>
+  </ul>
+  
+  <h2 class="heading-medium">Create and send messages</h2>
+  
+  <p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
+  
+  <h2 class="heading-medium">Edit and format messages</h2>
+  
+  <h3 class="heading-small">Formatting</h3>
+
+  <p>You can see a list of formatting instructions on the edit template page:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page.</li>
+    <li>Add a new template or choose an existing template and select Edit.</li>
+  </ol>
+
+  <p>Email templates can include:</p>
+  <ul class="list list-bullet">
+    <li>headings</li>
+    <li>bullets</li>
+    <li>call-outs</li>
+    <li>horizontal rules</li>
+  </ul>
+
+  <p>Letter templates can include headings and bullets.</p>
+
+  <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you've written.</p>
+
+  <h3 class="heading-small">Links</h3>
+  
+  <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
+
+  <p>You cannot convert text into a link. Research shows that recipients like to read the URL to check a link looks genuine before they click it. This is hard to do if the URL is hidden behind clickable link text.</p>
+
+  <p>If your links are very long, we do not recommend using a third-party link shortening service because:</p>
+  
+  <ul class="list list-bullet">
+    <li>your users cannot see where the link will take them</li>
+    <li>your link might stop working if there's a service outage</li>
+    <li>you can no longer control where the redirect goes</li>
+  </ul>
+
+  <h3 class="heading-small">Personalised content</h3>
+
+  <p>To personalise the content of your messages, add a placeholder to the template.</p>
+
+  <p>Placeholders are filled in with details, like a name or reference number, each time you send a message.</p>
+
+  <p>To add a placeholder to the template:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page.</li>
+    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Add a placeholder using double brackets. For example: Hello ((first name)), your reference is ((ref number)).</li>
+    <li>Select Save.</li>
+  </ol>
+
+  <p>When you send a message you can either:</p>
+
+  <ul class="list list-bullet">
+    <li>manually fill in the placeholders yourself</li>
+    <li>upload a list of personal details and let Notify do it for you</li>
+  </ul>
+
+  <p>If you upload a list, the column names need to match the placeholders in your template.</p>
+  
+  <h3 class="heading-small">Optional content</h3>
+  
+  <p>To add optional content to your emails and text messages:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page.</li>
+    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
+    <li>Select Save.</li>
+  </ol>
+
+  <p>For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:</p>
+
+  <ul class="list list-bullet">
+    <li>do this yourself</li>
+    <li>upload a list of personal details and let Notify do it for you</li>
+  </ul>
+
+  <p>If you upload a list, the column names need to match the optional content in your template.</p>
+
+  <p>You cannot add optional content to a letter.</p>
+  
+  <h2 class="heading-medium">Send files by email</h2>
+  
+  <p><a href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
+
+  <p>Follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
+  
+  <h2 class="heading-small">Upload your own letters</h2>
+
+  <p>You can upload and send your own letters instead of creating a reusable letter template.</p>
+  
+  <p>To upload and send your own letter from a PDF file:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Uploads page.</li>
+    <li>Select Upload a letter.</li>
+    <li>Select Choose file.</li>
+  </ol>
+
+  <p>Your file must meet our letter specification.</p>
+  
+  <h2 class="heading-medium">Branding and customisation</h2>
+  
+  <h3 class="heading-small">Change email branding</h3>
+
+  <p>To change your email branding:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Email settings section, select Change on the Email branding row.</li>
+  </ol>
+
+  <h3 class="heading-small">Add a reply-to email address</h3>
+  
+  <p>Notify lets you choose the email address that users reply to. You must add at least one reply-to address before your service can go live.</p>
+
+  <p>To add a reply-to email address:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Email settings section, select Manage on the Reply-to email addresses row.</li>
+    <li>Select Add reply-to address.</li>
+    <!--<li>Enter the email address you want to use, and select Add.</li>-->
+  </ol>
+  
+  <h3 class="heading-small">Change the text message sender</h3>
+  
+  <p>The text message sender name tells your users who the message is from.</p>
+
+  <p>To change the text message sender from the default of ‘GOVUK’:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Text message settings section, select Manage on the Text message senders row.</li>
+  
+  <h3 class="heading-small">Change letter branding</h3>
+  
+  <p>To change your letter branding:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Letter settings section, select Change on the Letter branding row.</li>
+  </ol>
+
+{% endblock %}

From 917687f567af3e631ba9e9be5eeae1d466abc3fc Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 2 Dec 2019 15:30:01 +0000
Subject: [PATCH 002/117] Update title and h1

---
 app/templates/views/guidance | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
index 0ff87462e..a6c891b33 100644
--- a/app/templates/views/guidance
+++ b/app/templates/views/guidance
@@ -3,12 +3,12 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Get started
+  Guidance
 {% endblock %}
 
 {% block content_column_content %}
 
-  <h1 class="heading-large">Get started</h1>
+  <h1 class="heading-large">Guidance</h1>
 
   <p>This guidance is for teams using GOV.UK Notify to send emails, text messages and letters.</p>
 

From 07306e948d54c1f2c5ebb28dab975bd22a8435ad Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 2 Dec 2019 15:34:07 +0000
Subject: [PATCH 003/117] Add heading IDs

---
 app/templates/views/guidance | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
index a6c891b33..50157108a 100644
--- a/app/templates/views/guidance
+++ b/app/templates/views/guidance
@@ -22,13 +22,13 @@
     <li>add branding and customisation</li>
   </ul>
   
-  <h2 class="heading-medium">Create and send messages</h2>
+  <h2 class="heading-medium" id="create-and-send-messages">Create and send messages</h2>
   
   <p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
   
-  <h2 class="heading-medium">Edit and format messages</h2>
+  <h2 class="heading-medium id="edit-and-format-messages"">Edit and format messages</h2>
   
-  <h3 class="heading-small">Formatting</h3>
+  <h3 class="heading-small" id="formatting">Formatting</h3>
 
   <p>You can see a list of formatting instructions on the edit template page:</p>
 
@@ -50,7 +50,7 @@
 
   <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you've written.</p>
 
-  <h3 class="heading-small">Links</h3>
+  <h3 class="heading-small" id="links">Links</h3>
   
   <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
 
@@ -64,7 +64,7 @@
     <li>you can no longer control where the redirect goes</li>
   </ul>
 
-  <h3 class="heading-small">Personalised content</h3>
+  <h3 class="heading-small" id="personalised-content">Personalised content</h3>
 
   <p>To personalise the content of your messages, add a placeholder to the template.</p>
 
@@ -89,7 +89,7 @@
 
   <p>If you upload a list, the column names need to match the placeholders in your template.</p>
   
-  <h3 class="heading-small">Optional content</h3>
+  <h3 class="heading-small" id="optional-content">Optional content</h3>
   
   <p>To add optional content to your emails and text messages:</p>
   
@@ -112,13 +112,13 @@
 
   <p>You cannot add optional content to a letter.</p>
   
-  <h2 class="heading-medium">Send files by email</h2>
+  <h2 class="heading-medium" id="send-files-by-email">Send files by email</h2>
   
   <p><a href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
 
   <p>Follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
   
-  <h2 class="heading-small">Upload your own letters</h2>
+  <h2 class="heading-medium" id="upload-letters">Upload your own letters</h2>
 
   <p>You can upload and send your own letters instead of creating a reusable letter template.</p>
   
@@ -133,9 +133,9 @@
 
   <p>Your file must meet our letter specification.</p>
   
-  <h2 class="heading-medium">Branding and customisation</h2>
+  <h2 class="heading-medium" id="branding">Branding and customisation</h2>
   
-  <h3 class="heading-small">Change email branding</h3>
+  <h3 class="heading-small" id="email-branding">Change email branding</h3>
 
   <p>To change your email branding:</p>
 
@@ -145,7 +145,7 @@
     <li>In the Email settings section, select Change on the Email branding row.</li>
   </ol>
 
-  <h3 class="heading-small">Add a reply-to email address</h3>
+  <h3 class="heading-small" id="reply-to-address">Add a reply-to email address</h3>
   
   <p>Notify lets you choose the email address that users reply to. You must add at least one reply-to address before your service can go live.</p>
 
@@ -159,7 +159,7 @@
     <!--<li>Enter the email address you want to use, and select Add.</li>-->
   </ol>
   
-  <h3 class="heading-small">Change the text message sender</h3>
+  <h3 class="heading-small" id="test-message-sender">Change the text message sender</h3>
   
   <p>The text message sender name tells your users who the message is from.</p>
 
@@ -170,7 +170,7 @@
     <li>Go to the Settings page.</li>
     <li>In the Text message settings section, select Manage on the Text message senders row.</li>
   
-  <h3 class="heading-small">Change letter branding</h3>
+  <h3 class="heading-small" id="letter-branding">Change letter branding</h3>
   
   <p>To change your letter branding:</p>
   

From bcf12a20b461b24a37d65ab54b76af8fa888980e Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 11:44:04 +0000
Subject: [PATCH 004/117] Update personalisation content

---
 app/templates/views/features.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 1ff8bf309..6b2572bb2 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>If you want to include personalised content in your message, you can add a placeholder. Placeholders are filled in with details, like a name or reference number, each time you send a message. You can do this manually or upload a list of personal details and let Notify do it for you.</p>
+<p>Read <a href="{{ url_for('.guidance') }}">how to personalise the content of your messages</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>

From 7068271f396c35d82ddb89f494b20a169cbaa3c9 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 11:56:42 +0000
Subject: [PATCH 005/117] Update page title and content

---
 app/templates/views/message-status.html | 40 ++++++++++++++-----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index a04171210..6a1ebd56b 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -2,29 +2,21 @@
 {% from "components/table.html" import mapping_table, row, text_field %}
 
 {% block per_page_title %}
-  Message status
+  Delivery status
 {% endblock %}
 
 {% block content_column_content %}
 
-  <h1 class="heading-large">Message status</h1>
+  <h1 class="heading-large">Delivery status</h1>
 
-  <p>When you send a message using GOV.UK Notify, it moves through different states.</p>
-  <p>Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered. You can also use our API to check the status of your messages.</p>
+  <p>Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.</p>
   <p>For <a href="{{ url_for("main.security") }}">security</a>, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p>
+  
+  <p>This page describes the types of message status you’ll see when you’re signed in to Notify.<p>
+    
+  <p>If you’re using our API, some of the statuses you’ll see will be different. Read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.</p>
 
-  <img
-      src="{{ asset_url('images/message-sending-flow.svg') }}"
-      alt="A picture of the sending flow of messages in Notify, showing the three states of Sending, Delivered and Failed. Also shows the next
-           steps when messages fail, deleting data and trying a new channel for permanent failures, and trying again or trying a new channel for
-           temporary failures"
-      style="width: 100%;"
-  >
-  <h2 id="messagestatus" class="heading-medium">Types of message status</h2>
-  <p>These are the types of message status you’ll see when you’re signed in to Notify.</p>
-  <p>If you’re using our API, some of the statuses you’ll see will be different. Read our <a href="{{ url_for('.documentation') }}">documentation</a> for a detailed list of API message statuses.</p>
-
-  <h3 id="email-statuses" class="heading-small">Emails</h3>
+  <h2 id="email-statuses" class="heading-medium">Emails</h2>
   <div class="bottom-gutter-3-2">
     {% call mapping_table(
       caption='Message statuses – emails',
@@ -46,8 +38,14 @@
       {% endfor %}
     {% endcall %}
   </div>
+  
+  <h3 id="spam" class="heading-small">Spam</h3>
+  <p>If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>
 
-  <h3 id="sms-statuses" class="heading-small">Text messages</h3>
+  <h3 id="open-rates" class="heading-small">Open rates and click-throughs</h3>
+  <p>Notify does not track open rates and click-throughs because there are privacy issues. Tracking emails without asking users for their consent risks breaching General Data Protection Regulations (GDPR).</p>
+
+  <h2 id="sms-statuses" class="heading-medium">Text messages</h3>
   <div class="bottom-gutter-3-2">
     {% call mapping_table(
       caption='Message statuses – text messages',
@@ -71,7 +69,7 @@
     {% endcall %}
   </div>
 
-  <h3 class="heading-small">Letters</h3>
+  <h2 id="letter-statuses" class="heading-medium">Letters</h2>
   <div class="bottom-gutter-3-2">
     {% call mapping_table(
       caption='Message statuses – letters',
@@ -93,4 +91,10 @@
     {% endcall %}
   </div>
 
+  <h3 id="returned-mail" class="heading-small">Undelivered letters and returned mail</h3>
+
+  <p>Every letter we send includes our printer’s address on the back of the envelope. It’s not possible to customise the return address.</p>
+  <p>Returned mail is securely destroyed by our printer.</p>
+  <p>Each letter has a unique ID. Our printer sends us the ID of every letter they destroy. We contact you if the IDs match any of your letters. This is a partly manual process, so it can take a few weeks.</p>
+
 {% endblock %}

From c7c9d6c3deeb897515f7956b6066436b170173e3 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 12:04:22 +0000
Subject: [PATCH 006/117] Update reply-to address content

---
 app/templates/views/features/emails.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 62a9317a5..77e6bd43c 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>You can add reply-to addresses in your service settings.</p>
+  <p>Read <a href="{{ url_for('.guidance') }}">how to add reply-to addresses</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>

From 747d60175e25488fb5ca1ef46d725edc30345a0b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 12:08:54 +0000
Subject: [PATCH 007/117] Update branding content

---
 app/templates/views/features/emails.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 77e6bd43c..9bc725fb4 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>You can change your branding in your service settings.</p>
+  <p>Read <a href="{{ url_for('.guidance') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>

From ebd91fabd2396278c571c517e878f6da3087d223 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 12:13:54 +0000
Subject: [PATCH 008/117] Update sms sender content

---
 app/templates/views/features/text-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 530e95305..8b8d41ba7 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -28,7 +28,7 @@
 
   <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
   <p>When you send a text message with Notify, the sender name tells people who it's from.</p>
-  <p>You can change the text message sender name from the default of ‘GOVUK’ in your service settings.</p>
+  <p>Read <a href="{{ url_for('.guidance') }}">how to change the text message sender name</a>.</p>
 
   <h2 class="heading heading-medium">Pricing<h2>
     <p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>

From 3bdcc0ec3264a7f03baf3de3145a1e73f492ed7f Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 12:19:10 +0000
Subject: [PATCH 009/117] Update upload letters content

---
 app/templates/views/features/letters.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 1b498a05b..295fdd095 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -29,12 +29,13 @@
 
   <h3 class="heading-small" id="branding">Branding</h3>
   <p>Add your organisation’s logo to your letter templates.</p>
-  <p>You can change your branding in your service settings.</p>
+  <p>Read <a href="{{ url_for('.guidance') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter, save it as a PDF, then upload it to Notify.<p>
-  <p>Read our <a href="{{ url_for('.documentation') }}">API documentation</a> for more information.</p>
+  <p>Read <a href="{{ url_for('.guidance') }}">how to upload your own letters</a>.</p>
+  <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for more information.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It costs between 30p and 76p (plus VAT) to send a letter. Prices include:</p>

From 7057f79532235d6fd623f2548c30988e0d7dea45 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 3 Dec 2019 12:19:57 +0000
Subject: [PATCH 010/117] Update upload letters content

---
 app/templates/views/features/letters.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 295fdd095..f6350ee27 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -35,7 +35,7 @@
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter, save it as a PDF, then upload it to Notify.<p>
   <p>Read <a href="{{ url_for('.guidance') }}">how to upload your own letters</a>.</p>
-  <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for more information.</p>
+  <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It costs between 30p and 76p (plus VAT) to send a letter. Prices include:</p>

From 7b49a566c5e8bcc51367bf06f5160da99253b06b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 08:36:36 +0000
Subject: [PATCH 011/117] Update content

---
 app/templates/views/message-status.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index 6a1ebd56b..eea85876b 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -12,9 +12,11 @@
   <p>Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.</p>
   <p>For <a href="{{ url_for("main.security") }}">security</a>, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p>
   
-  <p>This page describes the types of message status you’ll see when you’re signed in to Notify.<p>
-    
-  <p>If you’re using our API, some of the statuses you’ll see will be different. Read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.</p>
+  <p>This page describes the types of message status you’ll see when you’re signed in to Notify.</p>
+  <p>If you're using the Notify API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.<p>
+<p>ALTERNATIVE</p>  
+  <p>This page describes the types of message status you’ll see when you’re signed in to Notify.</p>
+  <p>Read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.<p>
 
   <h2 id="email-statuses" class="heading-medium">Emails</h2>
   <div class="bottom-gutter-3-2">

From 4b598d463ca4a513ef0bd94d28d256ecfb861198 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:42:59 +0000
Subject: [PATCH 012/117] Add list of links

---
 app/templates/views/guidance | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
index 50157108a..95333c5bb 100644
--- a/app/templates/views/guidance
+++ b/app/templates/views/guidance
@@ -28,6 +28,13 @@
   
   <h2 class="heading-medium id="edit-and-format-messages"">Edit and format messages</h2>
   
+  <p>This section explains how to add:</p>
+  <ul class="list list-bullet">
+    <li><a href="#formatting">formatting</a></li>
+    <li><a href="#links">links</a></li>
+    <li><a href="#personalised-content">personalised content</a></li>
+    <li><a href="#optional-content">optional content</a></li>
+  
   <h3 class="heading-small" id="formatting">Formatting</h3>
 
   <p>You can see a list of formatting instructions on the edit template page:</p>

From c1f3f5c99e227cf787a0e4ff30e32f7e28dcbe9c Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:46:26 +0000
Subject: [PATCH 013/117] Update links

---
 app/templates/views/features.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 6b2572bb2..0cc604318 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>Read <a href="{{ url_for('.guidance') }}">how to personalise the content of your messages</a>.</p>
+<p>Read <a href="{{ url_for('.guidance', _anchor='personalised-content') }}">how to personalise the content of your messages</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>
@@ -38,7 +38,7 @@
 
 <h2 class="heading-medium" id="reporting">Reporting</h2>
 <p>Notify’s real-time dashboard lets you see the number of messages sent. You can also check the current status of any message to see when it was delivered.</p>
-<p>Read more about how <a href="{{ url_for('main.message_status') }}">message status</a> works.</p>
+<p>Read more about how <a href="{{ url_for('main.message_status') }}">delivery status</a> works.</p>
 
 <h2 class="heading-medium" id="permissions">Permissions</h2>
 <p>Control which members of your team can see, create, edit and send messages.</p>

From edc7a28a70ff5b18b69716fa13a18c09f03d2bff Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:47:41 +0000
Subject: [PATCH 014/117] Add anchor links

---
 app/templates/views/features/emails.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 9bc725fb4..48719d957 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>Read <a href="{{ url_for('.guidance') }}">how to change your branding</a>.</p>
+  <p>Read <a href="{{ url_for('.guidance', _anchor='email-branding') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>Read <a href="{{ url_for('.guidance') }}">how to add reply-to addresses</a>.</p>
+  <p>Read <a href="{{ url_for('.guidance'), _anchor='reply-to-addresses' }}">how to add reply-to addresses</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>

From cb8166efa0034ea5b7348834783de66a0a4b70fc Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:49:06 +0000
Subject: [PATCH 015/117] Correct anchor link

---
 app/templates/views/features/emails.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 48719d957..41e7fceb9 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>Read <a href="{{ url_for('.guidance'), _anchor='reply-to-addresses' }}">how to add reply-to addresses</a>.</p>
+  <p>Read <a href="{{ url_for('.guidance'), _anchor='reply-to-address' }}">how to add reply-to addresses</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>

From b9ec7df023b2cb0a2bfd8a995308f27c468f49e1 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:49:36 +0000
Subject: [PATCH 016/117] Add anchor link

---
 app/templates/views/features/letters.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index f6350ee27..eb5542bfd 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -29,7 +29,7 @@
 
   <h3 class="heading-small" id="branding">Branding</h3>
   <p>Add your organisation’s logo to your letter templates.</p>
-  <p>Read <a href="{{ url_for('.guidance') }}">how to change your branding</a>.</p>
+  <p>Read <a href="{{ url_for('.guidance', _anchor='letter-branding') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>

From d7711421d9fa811aa341f0b50c1cf5a1e179aacf Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:50:32 +0000
Subject: [PATCH 017/117] Add anchor link

---
 app/templates/views/features/letters.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index eb5542bfd..1d2ab555e 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -34,7 +34,7 @@
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter, save it as a PDF, then upload it to Notify.<p>
-  <p>Read <a href="{{ url_for('.guidance') }}">how to upload your own letters</a>.</p>
+  <p>Read <a href="{{ url_for('.guidance', _anchor='upload-letters') }}">how to upload your own letters</a>.</p>
   <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>

From b4479c783b99a2ef09617da2d8ec2b5680dc1131 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:51:12 +0000
Subject: [PATCH 018/117] Fix anchor link

---
 app/templates/views/guidance | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
index 95333c5bb..973e9d290 100644
--- a/app/templates/views/guidance
+++ b/app/templates/views/guidance
@@ -166,7 +166,7 @@
     <!--<li>Enter the email address you want to use, and select Add.</li>-->
   </ol>
   
-  <h3 class="heading-small" id="test-message-sender">Change the text message sender</h3>
+  <h3 class="heading-small" id="text-message-sender">Change the text message sender</h3>
   
   <p>The text message sender name tells your users who the message is from.</p>
 

From 55e4393a818d2d10755547ee005076b2facdfbaa Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 11:51:41 +0000
Subject: [PATCH 019/117] Add anchor link

---
 app/templates/views/features/text-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 8b8d41ba7..7b40a89ea 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -28,7 +28,7 @@
 
   <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
   <p>When you send a text message with Notify, the sender name tells people who it's from.</p>
-  <p>Read <a href="{{ url_for('.guidance') }}">how to change the text message sender name</a>.</p>
+  <p>Read <a href="{{ url_for('.guidance', _anchor='text-message-sender') }}">how to change the text message sender name</a>.</p>
 
   <h2 class="heading heading-medium">Pricing<h2>
     <p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>

From cf0d9c582105f103941707842aaaf33164a6765a Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 14:07:53 +0000
Subject: [PATCH 020/117] Add bulk sending content

---
 app/templates/views/guidance | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
index 973e9d290..8bac1ac77 100644
--- a/app/templates/views/guidance
+++ b/app/templates/views/guidance
@@ -26,6 +26,15 @@
   
   <p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
   
+  <h3 class="heading-small" id="bulk-sending">Bulk sending</h3>
+
+  <p>To send a batch of messages at once:</p>
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page and choose an existing template.</li>
+    <li>Select Send.</li>
+    <li>If you’re sending emails, select Upload a list of email addresses. If you’re sending text messages, select Upload a list of phone numbers. If you’re sending letters, select Upload a list of addresses.</li>
+  
   <h2 class="heading-medium id="edit-and-format-messages"">Edit and format messages</h2>
   
   <p>This section explains how to add:</p>

From 6741b5d55e188683f25ff87e3785a2c8c5fc0171 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 4 Dec 2019 15:51:13 +0000
Subject: [PATCH 021/117] Add links to list

---
 app/templates/views/guidance | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance
index 8bac1ac77..bdb6661a1 100644
--- a/app/templates/views/guidance
+++ b/app/templates/views/guidance
@@ -15,11 +15,11 @@
   <p>It includes information about how to:</p>
 
   <ul class="list list-bullet">
-    <li>create and send messages</li>
-    <li>edit and format messages</li>
-    <li>send files by email</li>
-    <li>upload your own letters</li>
-    <li>add branding and customisation</li>
+    <li><a href="#create-and-send-messages">create and send messages</a></li>
+    <li><a href="#edit-and-format-messages">edit and format messages</a></li>
+    <li><a href="#send-files-by-email">send files by email</a></li>
+    <li><a href="#upload-letters">upload your own letters</a></li>
+    <li>add <a href="#branding">branding and customisation</a></li>
   </ul>
   
   <h2 class="heading-medium" id="create-and-send-messages">Create and send messages</h2>

From 95a92060c020ec12155f863e21ffbfde6973bf69 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 9 Dec 2019 11:04:42 +0000
Subject: [PATCH 022/117] Remove alternative content

---
 app/templates/views/message-status.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index eea85876b..c181ec36d 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -14,9 +14,6 @@
   
   <p>This page describes the types of message status you’ll see when you’re signed in to Notify.</p>
   <p>If you're using the Notify API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.<p>
-<p>ALTERNATIVE</p>  
-  <p>This page describes the types of message status you’ll see when you’re signed in to Notify.</p>
-  <p>Read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.<p>
 
   <h2 id="email-statuses" class="heading-medium">Emails</h2>
   <div class="bottom-gutter-3-2">

From bad465021be325799d83eaaa14c111371c270f29 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 9 Dec 2019 11:07:21 +0000
Subject: [PATCH 023/117] Fix heading and content

---
 app/templates/views/message-status.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index c181ec36d..745d0cde9 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -39,12 +39,12 @@
   </div>
   
   <h3 id="spam" class="heading-small">Spam</h3>
-  <p>If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>
+  <p>If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>
 
   <h3 id="open-rates" class="heading-small">Open rates and click-throughs</h3>
   <p>Notify does not track open rates and click-throughs because there are privacy issues. Tracking emails without asking users for their consent risks breaching General Data Protection Regulations (GDPR).</p>
 
-  <h2 id="sms-statuses" class="heading-medium">Text messages</h3>
+  <h2 id="sms-statuses" class="heading-medium">Text messages</h2>
   <div class="bottom-gutter-3-2">
     {% call mapping_table(
       caption='Message statuses – text messages',
@@ -94,6 +94,6 @@
 
   <p>Every letter we send includes our printer’s address on the back of the envelope. It’s not possible to customise the return address.</p>
   <p>Returned mail is securely destroyed by our printer.</p>
-  <p>Each letter has a unique ID. Our printer sends us the ID of every letter they destroy. We contact you if the IDs match any of your letters. This is a partly manual process, so it can take a few weeks.</p>
+  <p>Each letter has a unique ID. Our printer sends us the ID of every letter they destroy. We’ll contact you if the IDs match any of your letters. This is a partly manual process, so it can take a few weeks.</p>
 
 {% endblock %}

From 327673abfa2809ae9b7cbca0c44efd7f6ab9769d Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 20 Jan 2020 16:39:45 +0000
Subject: [PATCH 024/117] Update file name

---
 app/templates/views/{guidance => guidance.html} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/templates/views/{guidance => guidance.html} (100%)

diff --git a/app/templates/views/guidance b/app/templates/views/guidance.html
similarity index 100%
rename from app/templates/views/guidance
rename to app/templates/views/guidance.html

From fef1a92ccefaa9b67f5f96f7fdc8b3a8ed950e5e Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 20 Jan 2020 16:40:30 +0000
Subject: [PATCH 025/117] Create upload-a-letter.html

---
 app/templates/views/guidance/upload-a-letter.html | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 app/templates/views/guidance/upload-a-letter.html

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
new file mode 100644
index 000000000..261bd0372
--- /dev/null
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -0,0 +1 @@
+Upload your own letters

From 830b1f527459f413a50f88f89b05cb5e4059235c Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 20 Jan 2020 16:42:32 +0000
Subject: [PATCH 026/117] Update content

---
 .../views/guidance/upload-a-letter.html       | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index 261bd0372..a5bb82745 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -1 +1,26 @@
-Upload your own letters
+{% extends "content_template.html" %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/sub-navigation.html" import sub_navigation %}
+
+{% block per_page_title %}
+  Guidance
+{% endblock %}
+
+{% block content_column_content %}
+
+  <h1 class="heading-large">Upload a letter</h1>
+  
+  <p>You can upload and send your own letters instead of creating a reusable letter template.</p>
+  
+  <p>To upload and send your own letter from a PDF file:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Uploads page.</li>
+    <li>Select Upload a letter.</li>
+    <li>Select Choose file.</li>
+  </ol>
+
+  <p>Your file must meet our letter specification.</p>
+
+{% endblock %}

From b239b8cb13eccd43f46f85c088755ed53a1741f8 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 20 Jan 2020 16:43:01 +0000
Subject: [PATCH 027/117] Update path

---
 app/templates/views/{ => guidance}/guidance.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/templates/views/{ => guidance}/guidance.html (100%)

diff --git a/app/templates/views/guidance.html b/app/templates/views/guidance/guidance.html
similarity index 100%
rename from app/templates/views/guidance.html
rename to app/templates/views/guidance/guidance.html

From 9a61f3c56d44f13cba85729d8d604c4eb8d576b5 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 09:21:36 +0000
Subject: [PATCH 028/117] Update filename

---
 app/templates/views/guidance/{guidance.html => index.html} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/templates/views/guidance/{guidance.html => index.html} (100%)

diff --git a/app/templates/views/guidance/guidance.html b/app/templates/views/guidance/index.html
similarity index 100%
rename from app/templates/views/guidance/guidance.html
rename to app/templates/views/guidance/index.html

From d6a8954304a6ff8261bd6577a361115005dbac4d Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 09:23:18 +0000
Subject: [PATCH 029/117] Create edit-and-format-messages.html

---
 .../guidance/edit-and-format-messages.html    | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 app/templates/views/guidance/edit-and-format-messages.html

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
new file mode 100644
index 000000000..c719d1d4f
--- /dev/null
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -0,0 +1,103 @@
+{% extends "content_template.html" %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/sub-navigation.html" import sub_navigation %}
+
+{% block per_page_title %}
+  Guidance
+{% endblock %}
+
+{% block content_column_content %}
+
+  <h1 class="heading-large">Edit and format messages</h1>
+  
+  <p>This section explains how to add:</p>
+  <ul class="list list-bullet">
+    <li><a href="#formatting">formatting</a></li>
+    <li><a href="#links">links</a></li>
+    <li><a href="#personalised-content">personalised content</a></li>
+    <li><a href="#optional-content">optional content</a></li>
+  
+  <h3 class="heading-small" id="formatting">Formatting</h3>
+
+  <p>You can see a list of formatting instructions on the edit template page:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page.</li>
+    <li>Add a new template or choose an existing template and select Edit.</li>
+  </ol>
+
+  <p>Email templates can include:</p>
+  <ul class="list list-bullet">
+    <li>headings</li>
+    <li>bullets</li>
+    <li>call-outs</li>
+    <li>horizontal rules</li>
+  </ul>
+
+  <p>Letter templates can include headings and bullets.</p>
+
+  <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you've written.</p>
+
+  <h3 class="heading-small" id="links">Links</h3>
+  
+  <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
+
+  <p>You cannot convert text into a link. Research shows that recipients like to read the URL to check a link looks genuine before they click it. This is hard to do if the URL is hidden behind clickable link text.</p>
+
+  <p>If your links are very long, we do not recommend using a third-party link shortening service because:</p>
+  
+  <ul class="list list-bullet">
+    <li>your users cannot see where the link will take them</li>
+    <li>your link might stop working if there's a service outage</li>
+    <li>you can no longer control where the redirect goes</li>
+  </ul>
+
+  <h3 class="heading-small" id="personalised-content">Personalised content</h3>
+
+  <p>To personalise the content of your messages, add a placeholder to the template.</p>
+
+  <p>Placeholders are filled in with details, like a name or reference number, each time you send a message.</p>
+
+  <p>To add a placeholder to the template:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page.</li>
+    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Add a placeholder using double brackets. For example: Hello ((first name)), your reference is ((ref number)).</li>
+    <li>Select Save.</li>
+  </ol>
+
+  <p>When you send a message you can either:</p>
+
+  <ul class="list list-bullet">
+    <li>manually fill in the placeholders yourself</li>
+    <li>upload a list of personal details and let Notify do it for you</li>
+  </ul>
+
+  <p>If you upload a list, the column names need to match the placeholders in your template.</p>
+  
+  <h3 class="heading-small" id="optional-content">Optional content</h3>
+  
+  <p>To add optional content to your emails and text messages:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page.</li>
+    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
+    <li>Select Save.</li>
+  </ol>
+
+  <p>For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:</p>
+
+  <ul class="list list-bullet">
+    <li>do this yourself</li>
+    <li>upload a list of personal details and let Notify do it for you</li>
+  </ul>
+
+  <p>If you upload a list, the column names need to match the optional content in your template.</p>
+
+  <p>You cannot add optional content to a letter.</p>
+  

From 5418958c1605ecad3b9267cbc17f88ce2a8b7682 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 09:25:14 +0000
Subject: [PATCH 030/117] Create create-and-send-messages.html

---
 .../guidance/create-and-send-messages.html    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app/templates/views/guidance/create-and-send-messages.html

diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
new file mode 100644
index 000000000..4466ea93c
--- /dev/null
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -0,0 +1,24 @@
+{% extends "content_template.html" %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/sub-navigation.html" import sub_navigation %}
+
+{% block per_page_title %}
+  Guidance
+{% endblock %}
+
+{% block content_column_content %}
+
+  <h1 class="heading-large">Create and send messages</h1>
+  
+  <p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
+  
+  <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
+
+  <p>To send a batch of messages at once:</p>
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Templates page and choose an existing template.</li>
+    <li>Select Send.</li>
+    <li>If you’re sending emails, select Upload a list of email addresses. If you’re sending text messages, select Upload a list of phone numbers. If you’re sending letters, select Upload a list of addresses.</li>
+  
+  {% endblock %}

From 6f1f57cc221be40dee499acc620ae9a61549b9b4 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 09:25:42 +0000
Subject: [PATCH 031/117] Add {% endblock %}

---
 app/templates/views/guidance/edit-and-format-messages.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index c719d1d4f..eca220468 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -101,3 +101,4 @@
 
   <p>You cannot add optional content to a letter.</p>
   
+{% endblock %}

From 7da98c37457806c39d0f871db666fc77d2d27161 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 09:28:59 +0000
Subject: [PATCH 032/117] Create send-a-file-by-email.html

---
 .../views/guidance/send-a-file-by-email.html   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/templates/views/guidance/send-a-file-by-email.html

diff --git a/app/templates/views/guidance/send-a-file-by-email.html b/app/templates/views/guidance/send-a-file-by-email.html
new file mode 100644
index 000000000..9c1e2c86a
--- /dev/null
+++ b/app/templates/views/guidance/send-a-file-by-email.html
@@ -0,0 +1,18 @@
+{% extends "content_template.html" %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/sub-navigation.html" import sub_navigation %}
+
+{% block per_page_title %}
+  Guidance
+{% endblock %}
+
+{% block content_column_content %}
+
+  <h1 class="heading-large">Send files by email</h1>
+  
+  <p><a href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
+
+  <p>Follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
+  
+{% endblock %}
+  

From dabc2b91f6bb7dbd29ea17c5149bd9d3e838de7b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 09:37:06 +0000
Subject: [PATCH 033/117] Create branding-and-customisation.html

---
 .../guidance/branding-and-customisation.html  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 app/templates/views/guidance/branding-and-customisation.html

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
new file mode 100644
index 000000000..19d71e8c4
--- /dev/null
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -0,0 +1,67 @@
+{% extends "content_template.html" %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
+{% from "components/sub-navigation.html" import sub_navigation %}
+
+{% block per_page_title %}
+  Guidance
+{% endblock %}
+
+{% block content_column_content %}
+
+  <h1 class="heading-large">Branding and customisation</h1>
+  
+  <p>This page explains how to:</p>
+  
+  <ul class="list list-bullet">
+    <li><a href="#email-branding">change email branding</a></li>
+    <li><a href="#reply-to-address">add a reply-to email address</a></li>
+    <li><a href="#text-message-sender">change the text message sender</a></li>
+    <li><a href="#letter-branding">change letter branding</a></li>
+  </ul>
+  
+  <h2 class="heading-medium" id="email-branding">Change email branding</h2>
+
+  <p>To change your email branding:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Email settings section, select Change on the Email branding row.</li>
+  </ol>
+
+  <h2 class="heading-medium" id="reply-to-address">Add a reply-to email address</h2>
+  
+  <p>Notify lets you choose the email address that users reply to. You must add at least one reply-to address before your service can go live.</p>
+
+  <p>To add a reply-to email address:</p>
+
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Email settings section, select Manage on the Reply-to email addresses row.</li>
+    <li>Select Add reply-to address.</li>
+    <!--<li>Enter the email address you want to use, and select Add.</li>-->
+  </ol>
+  
+  <h2 class="heading-medium" id="text-message-sender">Change the text message sender</h2>
+  
+  <p>The text message sender name tells your users who the message is from.</p>
+
+  <p>To change the text message sender from the default of ‘GOVUK’:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Text message settings section, select Manage on the Text message senders row.</li>
+  
+  <h2 class="heading-medium" id="letter-branding">Change letter branding</h2>
+  
+  <p>To change your letter branding:</p>
+  
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li>Go to the Settings page.</li>
+    <li>In the Letter settings section, select Change on the Letter branding row.</li>
+  </ol>
+
+{% endblock %}

From f8fbf0dad54a2884ff7009acbbbedd2b52e98f18 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 10:02:21 +0000
Subject: [PATCH 034/117] Remove content

---
 app/templates/views/guidance/index.html | 174 ------------------------
 1 file changed, 174 deletions(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index bdb6661a1..0535b7c1c 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -22,178 +22,4 @@
     <li>add <a href="#branding">branding and customisation</a></li>
   </ul>
   
-  <h2 class="heading-medium" id="create-and-send-messages">Create and send messages</h2>
-  
-  <p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
-  
-  <h3 class="heading-small" id="bulk-sending">Bulk sending</h3>
-
-  <p>To send a batch of messages at once:</p>
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page and choose an existing template.</li>
-    <li>Select Send.</li>
-    <li>If you’re sending emails, select Upload a list of email addresses. If you’re sending text messages, select Upload a list of phone numbers. If you’re sending letters, select Upload a list of addresses.</li>
-  
-  <h2 class="heading-medium id="edit-and-format-messages"">Edit and format messages</h2>
-  
-  <p>This section explains how to add:</p>
-  <ul class="list list-bullet">
-    <li><a href="#formatting">formatting</a></li>
-    <li><a href="#links">links</a></li>
-    <li><a href="#personalised-content">personalised content</a></li>
-    <li><a href="#optional-content">optional content</a></li>
-  
-  <h3 class="heading-small" id="formatting">Formatting</h3>
-
-  <p>You can see a list of formatting instructions on the edit template page:</p>
-
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
-  </ol>
-
-  <p>Email templates can include:</p>
-  <ul class="list list-bullet">
-    <li>headings</li>
-    <li>bullets</li>
-    <li>call-outs</li>
-    <li>horizontal rules</li>
-  </ul>
-
-  <p>Letter templates can include headings and bullets.</p>
-
-  <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you've written.</p>
-
-  <h3 class="heading-small" id="links">Links</h3>
-  
-  <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
-
-  <p>You cannot convert text into a link. Research shows that recipients like to read the URL to check a link looks genuine before they click it. This is hard to do if the URL is hidden behind clickable link text.</p>
-
-  <p>If your links are very long, we do not recommend using a third-party link shortening service because:</p>
-  
-  <ul class="list list-bullet">
-    <li>your users cannot see where the link will take them</li>
-    <li>your link might stop working if there's a service outage</li>
-    <li>you can no longer control where the redirect goes</li>
-  </ul>
-
-  <h3 class="heading-small" id="personalised-content">Personalised content</h3>
-
-  <p>To personalise the content of your messages, add a placeholder to the template.</p>
-
-  <p>Placeholders are filled in with details, like a name or reference number, each time you send a message.</p>
-
-  <p>To add a placeholder to the template:</p>
-
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
-    <li>Add a placeholder using double brackets. For example: Hello ((first name)), your reference is ((ref number)).</li>
-    <li>Select Save.</li>
-  </ol>
-
-  <p>When you send a message you can either:</p>
-
-  <ul class="list list-bullet">
-    <li>manually fill in the placeholders yourself</li>
-    <li>upload a list of personal details and let Notify do it for you</li>
-  </ul>
-
-  <p>If you upload a list, the column names need to match the placeholders in your template.</p>
-  
-  <h3 class="heading-small" id="optional-content">Optional content</h3>
-  
-  <p>To add optional content to your emails and text messages:</p>
-  
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
-    <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
-    <li>Select Save.</li>
-  </ol>
-
-  <p>For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:</p>
-
-  <ul class="list list-bullet">
-    <li>do this yourself</li>
-    <li>upload a list of personal details and let Notify do it for you</li>
-  </ul>
-
-  <p>If you upload a list, the column names need to match the optional content in your template.</p>
-
-  <p>You cannot add optional content to a letter.</p>
-  
-  <h2 class="heading-medium" id="send-files-by-email">Send files by email</h2>
-  
-  <p><a href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
-
-  <p>Follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
-  
-  <h2 class="heading-medium" id="upload-letters">Upload your own letters</h2>
-
-  <p>You can upload and send your own letters instead of creating a reusable letter template.</p>
-  
-  <p>To upload and send your own letter from a PDF file:</p>
-  
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Uploads page.</li>
-    <li>Select Upload a letter.</li>
-    <li>Select Choose file.</li>
-  </ol>
-
-  <p>Your file must meet our letter specification.</p>
-  
-  <h2 class="heading-medium" id="branding">Branding and customisation</h2>
-  
-  <h3 class="heading-small" id="email-branding">Change email branding</h3>
-
-  <p>To change your email branding:</p>
-
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Email settings section, select Change on the Email branding row.</li>
-  </ol>
-
-  <h3 class="heading-small" id="reply-to-address">Add a reply-to email address</h3>
-  
-  <p>Notify lets you choose the email address that users reply to. You must add at least one reply-to address before your service can go live.</p>
-
-  <p>To add a reply-to email address:</p>
-
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Email settings section, select Manage on the Reply-to email addresses row.</li>
-    <li>Select Add reply-to address.</li>
-    <!--<li>Enter the email address you want to use, and select Add.</li>-->
-  </ol>
-  
-  <h3 class="heading-small" id="text-message-sender">Change the text message sender</h3>
-  
-  <p>The text message sender name tells your users who the message is from.</p>
-
-  <p>To change the text message sender from the default of ‘GOVUK’:</p>
-  
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Text message settings section, select Manage on the Text message senders row.</li>
-  
-  <h3 class="heading-small" id="letter-branding">Change letter branding</h3>
-  
-  <p>To change your letter branding:</p>
-  
-  <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Letter settings section, select Change on the Letter branding row.</li>
-  </ol>
-
 {% endblock %}

From 583965d1fbfb7bd72d84fa021954459ed48ae458 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 10:13:25 +0000
Subject: [PATCH 035/117] Update and rename send-a-file-by-email.html to
 send-files-by-email.html

---
 .../{send-a-file-by-email.html => send-files-by-email.html}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/templates/views/guidance/{send-a-file-by-email.html => send-files-by-email.html} (77%)

diff --git a/app/templates/views/guidance/send-a-file-by-email.html b/app/templates/views/guidance/send-files-by-email.html
similarity index 77%
rename from app/templates/views/guidance/send-a-file-by-email.html
rename to app/templates/views/guidance/send-files-by-email.html
index 9c1e2c86a..5d486f42d 100644
--- a/app/templates/views/guidance/send-a-file-by-email.html
+++ b/app/templates/views/guidance/send-files-by-email.html
@@ -12,7 +12,7 @@
   
   <p><a href="{{ url_for('.support') }}">Contact us</a> if you want to send files by email.</p>
 
-  <p>Follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
+  <p>Then follow the instructions to send a file by email in our <a href="{{ url_for('.documentation') }}">API documentation</a>.</p>
   
 {% endblock %}
   

From 0cb7d76eeacd23ced3977e259b3bcfac8f107711 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 14:30:32 +0000
Subject: [PATCH 036/117] Update content

---
 .../{branding-and-customisation.html => branding.html}   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
 rename app/templates/views/guidance/{branding-and-customisation.html => branding.html} (85%)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding.html
similarity index 85%
rename from app/templates/views/guidance/branding-and-customisation.html
rename to app/templates/views/guidance/branding.html
index 19d71e8c4..38dfd85ee 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding.html
@@ -21,6 +21,8 @@
   
   <h2 class="heading-medium" id="email-branding">Change email branding</h2>
 
+  <p>The default branding for email templates is the GOV.UK logo.</p>
+  
   <p>To change your email branding:</p>
 
   <ol class="list list-number">
@@ -31,7 +33,7 @@
 
   <h2 class="heading-medium" id="reply-to-address">Add a reply-to email address</h2>
   
-  <p>Notify lets you choose the email address that users reply to. You must add at least one reply-to address before your service can go live.</p>
+  <p>You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can <a href="{{ url_for('main.trial_mode_new') }}">request to go live</a>.</p>
 
   <p>To add a reply-to email address:</p>
 
@@ -40,7 +42,6 @@
     <li>Go to the Settings page.</li>
     <li>In the Email settings section, select Manage on the Reply-to email addresses row.</li>
     <li>Select Add reply-to address.</li>
-    <!--<li>Enter the email address you want to use, and select Add.</li>-->
   </ol>
   
   <h2 class="heading-medium" id="text-message-sender">Change the text message sender</h2>
@@ -56,7 +57,9 @@
   
   <h2 class="heading-medium" id="letter-branding">Change letter branding</h2>
   
-  <p>To change your letter branding:</p>
+  <p>Letter templates do not have default branding.</p>
+    
+  <p>To add a logo to your letters:</p>
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>

From e2608c4ec36fea31c2323eb056889ddb403f7eb2 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:03:59 +0000
Subject: [PATCH 037/117] Update content and formatting

---
 .../guidance/edit-and-format-messages.html    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index eca220468..5284c3725 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -10,14 +10,14 @@
 
   <h1 class="heading-large">Edit and format messages</h1>
   
-  <p>This section explains how to add:</p>
+  <p>This section explains how to:</p>
   <ul class="list list-bullet">
-    <li><a href="#formatting">formatting</a></li>
-    <li><a href="#links">links</a></li>
-    <li><a href="#personalised-content">personalised content</a></li>
-    <li><a href="#optional-content">optional content</a></li>
+    <li><a href="#formatting">format your text</a></li>
+    <li><a href="#links">add links</a></li>
+    <li><a href="#personalised-content">personalise your content</a></li>
+    <li>add <a href="#optional-content">optional content</a></li>
   
-  <h3 class="heading-small" id="formatting">Formatting</h3>
+  <h2 class="heading-medium" id="formatting">Format your text</h2>
 
   <p>You can see a list of formatting instructions on the edit template page:</p>
 
@@ -37,9 +37,9 @@
 
   <p>Letter templates can include headings and bullets.</p>
 
-  <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you've written.</p>
+  <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you’ve written.</p>
 
-  <h3 class="heading-small" id="links">Links</h3>
+  <h2 class="heading-medium" id="links">Add links</h2>
   
   <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
 
@@ -49,11 +49,11 @@
   
   <ul class="list list-bullet">
     <li>your users cannot see where the link will take them</li>
-    <li>your link might stop working if there's a service outage</li>
+    <li>your link might stop working if there’s a service outage</li>
     <li>you can no longer control where the redirect goes</li>
   </ul>
 
-  <h3 class="heading-small" id="personalised-content">Personalised content</h3>
+  <h2 class="heading-medium" id="personalised-content">Personalise your content</h2>
 
   <p>To personalise the content of your messages, add a placeholder to the template.</p>
 
@@ -78,7 +78,7 @@
 
   <p>If you upload a list, the column names need to match the placeholders in your template.</p>
   
-  <h3 class="heading-small" id="optional-content">Optional content</h3>
+  <h2 class="heading-medium" id="optional-content">Add optional content</h2>
   
   <p>To add optional content to your emails and text messages:</p>
   

From 3ab38a86545bef77e3beb3497d588cae7c28b1b1 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:09:15 +0000
Subject: [PATCH 038/117] Update links

---
 app/templates/views/guidance/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 0535b7c1c..a289c585d 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -12,14 +12,14 @@
 
   <p>This guidance is for teams using GOV.UK Notify to send emails, text messages and letters.</p>
 
-  <p>It includes information about how to:</p>
+  <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <li><a href="#create-and-send-messages">create and send messages</a></li>
-    <li><a href="#edit-and-format-messages">edit and format messages</a></li>
-    <li><a href="#send-files-by-email">send files by email</a></li>
-    <li><a href="#upload-letters">upload your own letters</a></li>
-    <li>add <a href="#branding">branding and customisation</a></li>
+    <li><a href="{{ url_for('.create-and-send-messages') }}">create and send messages</a></li>
+    <li><a href="{{ url_for('.edit-and-format-messages') }}">edit and format messages</a></li>
+    <li><a href="{{ url_for('.send-files-by-email') }}">send files by email</a></li>
+    <li><a href="{{ url_for('.upload-your-own-letters') }}">upload your own letters</a></li>
+    <li>add <a href="{{ url_for('.branding-and-customisation') }}">branding and customisation</a></li>
   </ul>
   
 {% endblock %}

From b8fe221c3418d647444aa4cd4d1398cc447923ef Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:09:52 +0000
Subject: [PATCH 039/117] Update filename

---
 .../guidance/{branding.html => branding-and-customisation.html}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/templates/views/guidance/{branding.html => branding-and-customisation.html} (100%)

diff --git a/app/templates/views/guidance/branding.html b/app/templates/views/guidance/branding-and-customisation.html
similarity index 100%
rename from app/templates/views/guidance/branding.html
rename to app/templates/views/guidance/branding-and-customisation.html

From 184e174ec423f04db42f4a31ec91bf42765a1f61 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:10:27 +0000
Subject: [PATCH 040/117] Update link

---
 app/templates/views/guidance/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index a289c585d..b51209388 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -18,7 +18,7 @@
     <li><a href="{{ url_for('.create-and-send-messages') }}">create and send messages</a></li>
     <li><a href="{{ url_for('.edit-and-format-messages') }}">edit and format messages</a></li>
     <li><a href="{{ url_for('.send-files-by-email') }}">send files by email</a></li>
-    <li><a href="{{ url_for('.upload-your-own-letters') }}">upload your own letters</a></li>
+    <li><a href="{{ url_for('.upload-a-letter') }}">upload your own letters</a></li>
     <li>add <a href="{{ url_for('.branding-and-customisation') }}">branding and customisation</a></li>
   </ul>
   

From 6ad2a826149338fcd8e819bba13fa06c01630296 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:17:30 +0000
Subject: [PATCH 041/117] Add links to spec and template

---
 app/templates/views/guidance/upload-a-letter.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index a5bb82745..42440427a 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -21,6 +21,8 @@
     <li>Select Choose file.</li>
   </ol>
 
-  <p>Your file must meet our letter specification.</p>
+  <p>Your file must meet our <a href="https://www.notifications.service.gov.uk/docs/notify-pdf-letter-spec-latest.pdf">letter specification</a>.</p>
+
+  <p>To help you create your letter, you can download a <a href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">Word document template</a>.</p>
 
 {% endblock %}

From 69b9966870c4250c6a0ad967d325a06070b5f85c Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:20:52 +0000
Subject: [PATCH 042/117] Update link

---
 app/templates/views/features.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 0cc604318..e10ab29cd 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>Read <a href="{{ url_for('.guidance', _anchor='personalised-content') }}">how to personalise the content of your messages</a>.</p>
+<p>Read <a href="{{ url_for('.edit-and-format-messages', _anchor='personalised-content') }}">how to personalise the content of your messages</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>

From 87eafd7e0cd30e26c48131152c8038fb52c689b7 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:22:16 +0000
Subject: [PATCH 043/117] Update links

---
 app/templates/views/features/emails.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 41e7fceb9..033b8935b 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>Read <a href="{{ url_for('.guidance', _anchor='email-branding') }}">how to change your branding</a>.</p>
+  <p>Read <a href="{{ url_for('.branding-and-customisation', _anchor='email-branding') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>Read <a href="{{ url_for('.guidance'), _anchor='reply-to-address' }}">how to add reply-to addresses</a>.</p>
+  <p>Read <a href="{{ url_for('.branding-and-customisation'), _anchor='reply-to-address' }}">how to add reply-to addresses</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>

From 07bb29fbc0f2c774ee56c02e1d57fb295a5f8eba Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:24:42 +0000
Subject: [PATCH 044/117] Update links

---
 app/templates/views/features/letters.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 1d2ab555e..c85111429 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -29,12 +29,12 @@
 
   <h3 class="heading-small" id="branding">Branding</h3>
   <p>Add your organisation’s logo to your letter templates.</p>
-  <p>Read <a href="{{ url_for('.guidance', _anchor='letter-branding') }}">how to change your branding</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='letter-branding') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter, save it as a PDF, then upload it to Notify.<p>
-  <p>Read <a href="{{ url_for('.guidance', _anchor='upload-letters') }}">how to upload your own letters</a>.</p>
+  <p>See <a href="{{ url_for('.upload-a-letter') }}">how to upload your own letters</a>.</p>
   <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>

From 11723d50fb784a0d9e1f42bffa4f99685abe032b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:25:42 +0000
Subject: [PATCH 045/117] Update link text

---
 app/templates/views/features.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index e10ab29cd..4f38e726b 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>Read <a href="{{ url_for('.edit-and-format-messages', _anchor='personalised-content') }}">how to personalise the content of your messages</a>.</p>
+<p>See <a href="{{ url_for('.edit-and-format-messages', _anchor='personalised-content') }}">how to personalise the content of your messages</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>

From 7d6b3c6ca8143c85721d677c7688710b9fdba278 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:26:47 +0000
Subject: [PATCH 046/117] Update link text

---
 app/templates/views/features/emails.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 033b8935b..50f1124f3 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>Read <a href="{{ url_for('.branding-and-customisation', _anchor='email-branding') }}">how to change your branding</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='email-branding') }}">how to change your branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>Read <a href="{{ url_for('.branding-and-customisation'), _anchor='reply-to-address' }}">how to add reply-to addresses</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation'), _anchor='reply-to-address' }}">how to add reply-to addresses</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>

From 112c6400352a11dc8e972895144efe2b8cccb503 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:27:34 +0000
Subject: [PATCH 047/117] Update link text

---
 app/templates/views/features/text-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 7b40a89ea..6b83b6309 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -28,7 +28,7 @@
 
   <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
   <p>When you send a text message with Notify, the sender name tells people who it's from.</p>
-  <p>Read <a href="{{ url_for('.guidance', _anchor='text-message-sender') }}">how to change the text message sender name</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='text-message-sender') }}">how to change the text message sender name</a>.</p>
 
   <h2 class="heading heading-medium">Pricing<h2>
     <p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>

From b4b09bd00fe3c11b2088d09bba1401e976dccf9c Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:36:05 +0000
Subject: [PATCH 048/117] Update lead-in line

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 5284c3725..cf5b869bc 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -45,7 +45,7 @@
 
   <p>You cannot convert text into a link. Research shows that recipients like to read the URL to check a link looks genuine before they click it. This is hard to do if the URL is hidden behind clickable link text.</p>
 
-  <p>If your links are very long, we do not recommend using a third-party link shortening service because:</p>
+  <p>We do not recommend using a third-party link shortening service because:</p>
   
   <ul class="list list-bullet">
     <li>your users cannot see where the link will take them</li>

From 1abc06b6e5c9f841d1ad493eebdd5759e4d71420 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:39:17 +0000
Subject: [PATCH 049/117] Update content for clarity

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index cf5b869bc..87ad9f342 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -37,7 +37,7 @@
 
   <p>Letter templates can include headings and bullets.</p>
 
-  <p>Notify does not allow bold, italics, subheadings, underlined text, HTML formatting or different fonts. This is because they can make it harder for users to read what you’ve written.</p>
+  <p>Notify does not allow bold, italics, subheadings, underlined text or different fonts. This is because they can make it harder for users to read what you’ve written.</p>
 
   <h2 class="heading-medium" id="links">Add links</h2>
   

From d50995b65d28f9ed0c0372e4dc8cdf70e7dbabd2 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:42:17 +0000
Subject: [PATCH 050/117] Update headings and links

---
 app/templates/views/guidance/edit-and-format-messages.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 87ad9f342..510cdeb1b 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -12,12 +12,12 @@
   
   <p>This section explains how to:</p>
   <ul class="list list-bullet">
-    <li><a href="#formatting">format your text</a></li>
+    <li><a href="#formatting">format text</a></li>
     <li><a href="#links">add links</a></li>
     <li><a href="#personalised-content">personalise your content</a></li>
     <li>add <a href="#optional-content">optional content</a></li>
   
-  <h2 class="heading-medium" id="formatting">Format your text</h2>
+  <h2 class="heading-medium" id="formatting">How to format text</h2>
 
   <p>You can see a list of formatting instructions on the edit template page:</p>
 
@@ -78,7 +78,7 @@
 
   <p>If you upload a list, the column names need to match the placeholders in your template.</p>
   
-  <h2 class="heading-medium" id="optional-content">Add optional content</h2>
+  <h2 class="heading-medium" id="optional-content">Optional content</h2>
   
   <p>To add optional content to your emails and text messages:</p>
   

From adfc9a72af2beae167e63c8afa77e0526fae2a1b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:45:59 +0000
Subject: [PATCH 051/117] Update links and headings

---
 .../views/guidance/edit-and-format-messages.html          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 510cdeb1b..14ee53755 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -12,12 +12,12 @@
   
   <p>This section explains how to:</p>
   <ul class="list list-bullet">
-    <li><a href="#formatting">format text</a></li>
+    <li><a href="#formatting">format your content</a></li>
     <li><a href="#links">add links</a></li>
     <li><a href="#personalised-content">personalise your content</a></li>
-    <li>add <a href="#optional-content">optional content</a></li>
+    <li><a href="#optional-content">add optional content</a></li>
   
-  <h2 class="heading-medium" id="formatting">How to format text</h2>
+  <h2 class="heading-medium" id="formatting">Format your content</h2>
 
   <p>You can see a list of formatting instructions on the edit template page:</p>
 
@@ -78,7 +78,7 @@
 
   <p>If you upload a list, the column names need to match the placeholders in your template.</p>
   
-  <h2 class="heading-medium" id="optional-content">Optional content</h2>
+  <h2 class="heading-medium" id="optional-content">Add optional content</h2>
   
   <p>To add optional content to your emails and text messages:</p>
   

From f66111b6252ed2ec77aa2cb81d276d5a841fe0dc Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:51:19 +0000
Subject: [PATCH 052/117] Replace 'section' with 'page'

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 14ee53755..f19af9dfe 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -10,7 +10,7 @@
 
   <h1 class="heading-large">Edit and format messages</h1>
   
-  <p>This section explains how to:</p>
+  <p>This page explains how to:</p>
   <ul class="list list-bullet">
     <li><a href="#formatting">format your content</a></li>
     <li><a href="#links">add links</a></li>

From 73b4058c3899d998fedc00e3515a23cf6743eaa7 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 15:58:02 +0000
Subject: [PATCH 053/117] Update personalised content

---
 app/templates/views/features.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 4f38e726b..b2769abca 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>See <a href="{{ url_for('.edit-and-format-messages', _anchor='personalised-content') }}">how to personalise the content of your messages</a>.</p>
+<p>See <a href="{{ url_for('.edit-and-format-messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>
@@ -38,7 +38,7 @@
 
 <h2 class="heading-medium" id="reporting">Reporting</h2>
 <p>Notify’s real-time dashboard lets you see the number of messages sent. You can also check the current status of any message to see when it was delivered.</p>
-<p>Read more about how <a href="{{ url_for('main.message_status') }}">delivery status</a> works.</p>
+<p>Read more about the <a href="{{ url_for('main.message_status') }}">delivery status</a> of your messages.</p>
 
 <h2 class="heading-medium" id="permissions">Permissions</h2>
 <p>Control which members of your team can see, create, edit and send messages.</p>

From 8b4d6eb039e6b7c0972245f9f3e3a324268041b6 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 16:01:30 +0000
Subject: [PATCH 054/117] Update link text

---
 app/templates/views/features/emails.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 50f1124f3..0d5489272 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='email-branding') }}">how to change your branding</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation'), _anchor='reply-to-address' }}">how to add reply-to addresses</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation'), _anchor='reply-to-address' }}">how to add a reply-to address</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>

From bf7086415e401bca92a75d54f2a173c8658615bd Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 16:04:13 +0000
Subject: [PATCH 055/117] Update link text and remove link to spec

---
 app/templates/views/features/letters.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index c85111429..fb5da5ef7 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -29,12 +29,11 @@
 
   <h3 class="heading-small" id="branding">Branding</h3>
   <p>Add your organisation’s logo to your letter templates.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='letter-branding') }}">how to change your branding</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
-  <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter, save it as a PDF, then upload it to Notify.<p>
-  <p>See <a href="{{ url_for('.upload-a-letter') }}">how to upload your own letters</a>.</p>
+  <p>See <a href="{{ url_for('.upload-a-letter') }}">how to upload a letter</a>.</p>
   <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>

From 9a39f32bb9510fe41ed233f6a5b021ba6e86ef4b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 16:06:22 +0000
Subject: [PATCH 056/117] Update link text

---
 app/templates/views/features/text-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 6b83b6309..5d79f6613 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -28,7 +28,7 @@
 
   <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
   <p>When you send a text message with Notify, the sender name tells people who it's from.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='text-message-sender') }}">how to change the text message sender name</a>.</p>
+  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
 
   <h2 class="heading heading-medium">Pricing<h2>
     <p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>

From 0fed42e23335d819f4920b8542a57cc71786b96f Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 16:07:02 +0000
Subject: [PATCH 057/117] Update headings

---
 app/templates/views/guidance/branding-and-customisation.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 38dfd85ee..139b6c698 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -19,7 +19,7 @@
     <li><a href="#letter-branding">change letter branding</a></li>
   </ul>
   
-  <h2 class="heading-medium" id="email-branding">Change email branding</h2>
+  <h2 class="heading-medium" id="email-branding">Change your email branding</h2>
 
   <p>The default branding for email templates is the GOV.UK logo.</p>
   
@@ -55,7 +55,7 @@
     <li>Go to the Settings page.</li>
     <li>In the Text message settings section, select Manage on the Text message senders row.</li>
   
-  <h2 class="heading-medium" id="letter-branding">Change letter branding</h2>
+  <h2 class="heading-medium" id="letter-branding">Change your letter branding</h2>
   
   <p>Letter templates do not have default branding.</p>
     

From 030aa0b52de5fc20add565367aa958e0b6425ec1 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 16:10:09 +0000
Subject: [PATCH 058/117] Update GDPR content

---
 app/templates/views/message-status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index 745d0cde9..6e2e94220 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -42,7 +42,7 @@
   <p>If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>
 
   <h3 id="open-rates" class="heading-small">Open rates and click-throughs</h3>
-  <p>Notify does not track open rates and click-throughs because there are privacy issues. Tracking emails without asking users for their consent risks breaching General Data Protection Regulations (GDPR).</p>
+  <p>Notify does not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p>
 
   <h2 id="sms-statuses" class="heading-medium">Text messages</h2>
   <div class="bottom-gutter-3-2">

From b979e87c040145b725becf142e88e229b203f78e Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 21 Jan 2020 16:18:34 +0000
Subject: [PATCH 059/117] Update content

---
 app/templates/views/message-status.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index 6e2e94220..0c3585310 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -12,8 +12,8 @@
   <p>Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.</p>
   <p>For <a href="{{ url_for("main.security") }}">security</a>, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p>
   
-  <p>This page describes the types of message status you’ll see when you’re signed in to Notify.</p>
-  <p>If you're using the Notify API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API message statuses.<p>
+  <p>This page describes the statuses you’ll see when you’re signed in to Notify.</p>
+  <p>If you're using the Notify API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API statuses.<p>
 
   <h2 id="email-statuses" class="heading-medium">Emails</h2>
   <div class="bottom-gutter-3-2">
@@ -93,7 +93,7 @@
   <h3 id="returned-mail" class="heading-small">Undelivered letters and returned mail</h3>
 
   <p>Every letter we send includes our printer’s address on the back of the envelope. It’s not possible to customise the return address.</p>
-  <p>Returned mail is securely destroyed by our printer.</p>
+  <p>Returned mail is destroyed by our printer.</p>
   <p>Each letter has a unique ID. Our printer sends us the ID of every letter they destroy. We’ll contact you if the IDs match any of your letters. This is a partly manual process, so it can take a few weeks.</p>
 
 {% endblock %}

From ff5d3cca97deb80960aada53e8f5a0934898d1a4 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 10:58:58 +0000
Subject: [PATCH 060/117] Fix page title

---
 app/templates/views/guidance/branding-and-customisation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 139b6c698..d32a5dab3 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -3,7 +3,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Guidance
+  Branding and customisation
 {% endblock %}
 
 {% block content_column_content %}

From 81f959cff2d832d073e701a7cd86d0efae8b30c5 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 10:59:21 +0000
Subject: [PATCH 061/117] Fix page title

---
 app/templates/views/guidance/create-and-send-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
index 4466ea93c..30a575056 100644
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -3,7 +3,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Guidance
+  Create and send messages
 {% endblock %}
 
 {% block content_column_content %}

From 911462bcf18a05e481a5747cbd4f03041cbc972f Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 10:59:45 +0000
Subject: [PATCH 062/117] Fix page title

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index f19af9dfe..9de13112d 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -3,7 +3,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Guidance
+  Edit and format messages
 {% endblock %}
 
 {% block content_column_content %}

From 2304738514708a6b6eed869bbe5efdb99adf241a Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 11:00:21 +0000
Subject: [PATCH 063/117] Fix page title

---
 app/templates/views/guidance/send-files-by-email.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/send-files-by-email.html b/app/templates/views/guidance/send-files-by-email.html
index 5d486f42d..329eb24b9 100644
--- a/app/templates/views/guidance/send-files-by-email.html
+++ b/app/templates/views/guidance/send-files-by-email.html
@@ -3,7 +3,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Guidance
+  Send files by email
 {% endblock %}
 
 {% block content_column_content %}

From 00a6bdcd90df30a32bf86b54f20e8c54f8e28d14 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 11:01:37 +0000
Subject: [PATCH 064/117] Fix page title

---
 app/templates/views/guidance/upload-a-letter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index 42440427a..8adb411e4 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -3,7 +3,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Guidance
+  Upload a letter
 {% endblock %}
 
 {% block content_column_content %}

From cd8b41d8d398e8c081f0eed25d0abc26aaf2a216 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 12:02:30 +0000
Subject: [PATCH 065/117] Add inset text link

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 9de13112d..855872720 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -31,7 +31,7 @@
   <ul class="list list-bullet">
     <li>headings</li>
     <li>bullets</li>
-    <li>call-outs</li>
+    <li>call-outs (<a href="https://design-system.service.gov.uk/components/inset-text/">inset text</a>)</li>
     <li>horizontal rules</li>
   </ul>
 

From 8e5d11c70e4f5af6fbbbac5af6c5ba239cc68ca5 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 22 Jan 2020 13:47:23 +0000
Subject: [PATCH 066/117] Add a route to serve guidance pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rather than hard coding the page titles, let’s just accept anythin
 that’s a real template in the guidance folder – will make it easier for
 Karl to edit and create pages.
---
 app/main/views/index.py            | 12 ++++++++++++
 tests/app/main/views/test_index.py | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index a910963e6..1ee5db928 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -7,6 +7,7 @@ from flask import (
     url_for,
 )
 from flask_login import current_user
+from jinja2.exceptions import TemplateNotFound
 from notifications_utils.international_billing_rates import (
     INTERNATIONAL_BILLING_RATES,
 )
@@ -325,6 +326,17 @@ def trial_mode_new():
     )
 
 
+@main.route('/guidance')
+@main.route('/guidance/<slug>')
+def guidance(slug='index'):
+    try:
+        return render_template(
+            'views/guidance/{}.html'.format(slug)
+        )
+    except TemplateNotFound:
+        abort(404)
+
+
 # --- Redirects --- #
 
 @main.route('/roadmap', endpoint='old_roadmap')
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index 38c12b34d..41b917113 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -277,3 +277,23 @@ def test_letter_spec_redirect_with_non_logged_in_user(client_request):
             '/documentation/images/notify-pdf-letter-spec-v2.4.pdf'
         ),
     )
+
+
+def test_guidance_index(client_request):
+    client_request.get('main.guidance')
+
+
+@pytest.mark.parametrize('slug', (
+    'branding-and-customisation',
+    'create-and-send-messages',
+    'edit-and-format-messages',
+    'index',
+    'send-files-by-email',
+    'upload-a-letter',
+))
+def test_guidance_pages(client_request, slug):
+    client_request.get('main.guidance', slug=slug)
+
+
+def test_guidance_404s_for_page_that_doesnt_exist(client_request):
+    client_request.get('main.guidance', slug='foo', _expected_status=404)

From 80fe15f5178a19441381cb6c753081da5c291332 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 22 Jan 2020 14:24:58 +0000
Subject: [PATCH 067/117] Fix links

---
 app/templates/views/features.html               |  2 +-
 app/templates/views/features/emails.html        |  4 ++--
 app/templates/views/features/letters.html       |  4 ++--
 app/templates/views/features/text-messages.html |  2 +-
 app/templates/views/guidance/index.html         | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index b2769abca..27126bb14 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>See <a href="{{ url_for('.edit-and-format-messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
+<p>See <a href="{{ url_for('.guidance', slug='edit-and-format-messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>
diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 0d5489272..40c02d8d9 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
+  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation'), _anchor='reply-to-address' }}">how to add a reply-to address</a>.</p>
+  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='reply-to-address') }}">how to add a reply-to address</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>
diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index fb5da5ef7..3d0f60dc7 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -29,11 +29,11 @@
 
   <h3 class="heading-small" id="branding">Branding</h3>
   <p>Add your organisation’s logo to your letter templates.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
+  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
-  <p>See <a href="{{ url_for('.upload-a-letter') }}">how to upload a letter</a>.</p>
+  <p>See <a href="{{ url_for('.guidance', slug='upload-a-letter') }}">how to upload a letter</a>.</p>
   <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 5d79f6613..21ba3e0c9 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -28,7 +28,7 @@
 
   <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
   <p>When you send a text message with Notify, the sender name tells people who it's from.</p>
-  <p>See <a href="{{ url_for('.branding-and-customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
+  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
 
   <h2 class="heading heading-medium">Pricing<h2>
     <p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index b51209388..847e23483 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -15,11 +15,11 @@
   <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <li><a href="{{ url_for('.create-and-send-messages') }}">create and send messages</a></li>
-    <li><a href="{{ url_for('.edit-and-format-messages') }}">edit and format messages</a></li>
-    <li><a href="{{ url_for('.send-files-by-email') }}">send files by email</a></li>
-    <li><a href="{{ url_for('.upload-a-letter') }}">upload your own letters</a></li>
-    <li>add <a href="{{ url_for('.branding-and-customisation') }}">branding and customisation</a></li>
+    <li><a href="{{ url_for('.guidance', slug='create-and-send-messages') }}">create and send messages</a></li>
+    <li><a href="{{ url_for('.guidance', slug='edit-and-format-messages') }}">edit and format messages</a></li>
+    <li><a href="{{ url_for('.guidance', slug='send-files-by-email') }}">send files by email</a></li>
+    <li><a href="{{ url_for('.guidance', slug='upload-a-letter') }}">upload your own letters</a></li>
+    <li>add <a href="{{ url_for('.guidance', slug='branding-and-customisation') }}">branding and customisation</a></li>
   </ul>
-  
+
 {% endblock %}

From f843862f51a87324e5e12bf6cbcba9f22831d80e Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 15:14:43 +0000
Subject: [PATCH 068/117] Update links to letter spec

---
 app/templates/views/guidance/upload-a-letter.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index 8adb411e4..eaac965d9 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -21,8 +21,10 @@
     <li>Select Choose file.</li>
   </ol>
 
-  <p>Your file must meet our <a href="https://www.notifications.service.gov.uk/docs/notify-pdf-letter-spec-latest.pdf">letter specification</a>.</p>
+  <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter.<p>
 
-  <p>To help you create your letter, you can download a <a href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">Word document template</a>.</p>
+  <!--<p>Your file must meet our <a href="{{ url_for('.letter_spec') }}">letter specification</a>.</p>-->
+
+  <!--<p>To help you create your letter, you can download a <a href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">Word document template</a>.</p>-->
 
 {% endblock %}

From b951b6a076b9fb97d21255fe16aad7d5b97fe920 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 22 Jan 2020 15:19:34 +0000
Subject: [PATCH 069/117] Fix apostrophe

---
 app/templates/views/get-started.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index 415fdb700..e44486062 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -75,7 +75,7 @@
     {% else %}
     <p>You should <a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
     {% endif %}
-    <p>Check <a href="{{ url_for('main.how_to_pay') }}">how to pay</a> if you're planning to send letters or exceed the <a href="{{ url_for('.pricing') }}">free text message allowance</a>.</p>
+    <p>Check <a href="{{ url_for('main.how_to_pay') }}">how to pay</a> if you’re planning to send letters or exceed the <a href="{{ url_for('.pricing') }}">free text message allowance</a>.</p>
   </li>
 
 </ol>

From 365fcb0ff81f07ea54c942f422b800ba49a93e95 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 23 Jan 2020 16:03:27 +0000
Subject: [PATCH 070/117] Add guidance pages to navigation classes

---
 app/navigation.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/navigation.py b/app/navigation.py
index 8cbd0ecab..baf6b1aae 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -197,6 +197,7 @@ class HeaderNavigation(Navigation):
         'get_notifications_as_json',
         'get_started',
         'go_to_dashboard_after_tour',
+        'guidance',
         'history',
         'inbound_sms_admin',
         'inbox',
@@ -520,6 +521,7 @@ class MainNavigation(Navigation):
         'get_notifications_as_json',
         'get_started',
         'go_to_dashboard_after_tour',
+        'guidance',
         'history',
         'how_to_pay',
         'inbound_sms_admin',
@@ -751,6 +753,7 @@ class CaseworkNavigation(Navigation):
         'get_notifications_as_json',
         'get_started',
         'go_to_dashboard_after_tour',
+        'guidance',
         'history',
         'how_to_pay',
         'inbound_sms_admin',
@@ -1039,6 +1042,7 @@ class OrgNavigation(Navigation):
         'get_notifications_as_json',
         'get_started',
         'go_to_dashboard_after_tour',
+        'guidance',
         'history',
         'how_to_pay',
         'inbound_sms_admin',

From a2a4ceb8d6b777255180084e8b56952d8d55e527 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 10:20:42 +0000
Subject: [PATCH 071/117] Add bold

---
 .../guidance/branding-and-customisation.html   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index d32a5dab3..69415d25d 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -27,8 +27,8 @@
 
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Email settings section, select Change on the Email branding row.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
+    <li>In the <b class="govuk-!-font-weight-bold">Email settings</b> section, select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Email branding</b> row.</li>
   </ol>
 
   <h2 class="heading-medium" id="reply-to-address">Add a reply-to email address</h2>
@@ -39,9 +39,9 @@
 
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Email settings section, select Manage on the Reply-to email addresses row.</li>
-    <li>Select Add reply-to address.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
+    <li>In the <b class="govuk-!-font-weight-bold">Email settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Reply-to email addresses</b> row.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Add reply-to address</b>.</li>
   </ol>
   
   <h2 class="heading-medium" id="text-message-sender">Change the text message sender</h2>
@@ -52,8 +52,8 @@
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Text message settings section, select Manage on the Text message senders row.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
+    <li>In the <b class="govuk-!-font-weight-bold">Text message settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
   
   <h2 class="heading-medium" id="letter-branding">Change your letter branding</h2>
   
@@ -63,8 +63,8 @@
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Settings page.</li>
-    <li>In the Letter settings section, select Change on the Letter branding row.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b< page.</li>
+    <li>In the <b class="govuk-!-font-weight-bold">Letter settings</b> section, select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Letter branding</b> row.</li>
   </ol>
 
 {% endblock %}

From 87a1df58efd7a03e5d07e08747d53fda99b680f5 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 10:22:33 +0000
Subject: [PATCH 072/117] Add bold

---
 app/templates/views/guidance/create-and-send-messages.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
index 30a575056..4aa85a9a2 100644
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -17,8 +17,8 @@
   <p>To send a batch of messages at once:</p>
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page and choose an existing template.</li>
-    <li>Select Send.</li>
-    <li>If you’re sending emails, select Upload a list of email addresses. If you’re sending text messages, select Upload a list of phone numbers. If you’re sending letters, select Upload a list of addresses.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page and choose an existing template.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Send</b>.</li>
+    <li>If you’re sending emails, select <b class="govuk-!-font-weight-bold">Upload a list of email addresses</b>. If you’re sending text messages, select <b class="govuk-!-font-weight-bold">Upload a list of phone numbers</b>. If you’re sending letters, select <b class="govuk-!-font-weight-bold">Upload a list of addresses</b>.</li>
   
   {% endblock %}

From 153e0300ec2e436beeb79077746215b6894b4c46 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 10:28:38 +0000
Subject: [PATCH 073/117] Add bold

---
 .../views/guidance/edit-and-format-messages.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 855872720..eb011cf8f 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -23,8 +23,8 @@
 
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
+    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
   </ol>
 
   <p>Email templates can include:</p>
@@ -63,10 +63,10 @@
 
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
+    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
     <li>Add a placeholder using double brackets. For example: Hello ((first name)), your reference is ((ref number)).</li>
-    <li>Select Save.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
   </ol>
 
   <p>When you send a message you can either:</p>
@@ -84,10 +84,10 @@
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Templates page.</li>
-    <li>Add a new template or choose an existing template and select Edit.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
+    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
     <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
-    <li>Select Save.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
   </ol>
 
   <p>For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:</p>

From d36555aed0940f5bbfc6baabce77f6114f968db6 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 10:29:35 +0000
Subject: [PATCH 074/117] Add bold

---
 app/templates/views/guidance/upload-a-letter.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index eaac965d9..89249e9e3 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -16,9 +16,9 @@
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
-    <li>Go to the Uploads page.</li>
-    <li>Select Upload a letter.</li>
-    <li>Select Choose file.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Uploads</b> page.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Upload a letter</b>.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Choose file</b>.</li>
   </ol>
 
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter.<p>

From fff50b97b64adb5f91331a934e134ccbb6610cd0 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 11:39:50 +0000
Subject: [PATCH 075/117] Add more information links

---
 app/templates/views/guidance/index.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 847e23483..eba9c07e9 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -17,9 +17,20 @@
   <ul class="list list-bullet">
     <li><a href="{{ url_for('.guidance', slug='create-and-send-messages') }}">create and send messages</a></li>
     <li><a href="{{ url_for('.guidance', slug='edit-and-format-messages') }}">edit and format messages</a></li>
+    <li>add <a href="{{ url_for('.guidance', slug='branding-and-customisation') }}">branding and customisation</a></li>
     <li><a href="{{ url_for('.guidance', slug='send-files-by-email') }}">send files by email</a></li>
     <li><a href="{{ url_for('.guidance', slug='upload-a-letter') }}">upload your own letters</a></li>
-    <li>add <a href="{{ url_for('.guidance', slug='branding-and-customisation') }}">branding and customisation</a></li>
+  </ul>
+
+  <h2 class="heading-medium">More information</h2>
+
+  <p>The GOV.UK Service Manual has advice on:</p>
+  
+  <ul class="list list-bullet">
+    <li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li>
+    <li><a href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
+    <li><a href="https://www.gov.uk/service-manual/technology/how-to-email-your-users">sending emails from your service domain</a></li>
+    <li><a href="https://www.gov.uk/service-manual/technology/sending-text-messages-securely">sending text messages securely</a></li>
   </ul>
 
 {% endblock %}

From 487327cc38cdc492753864d41608e2e893c3a64f Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 12:01:00 +0000
Subject: [PATCH 076/117] Add guidance to footer

Add guidance to footer, rename 'Delivery status'
---
 app/templates/admin_template.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index d0837ea51..dde9ea393 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -223,7 +223,11 @@
           },
           {
             "href": url_for("main.message_status"),
-            "text": "Message status"
+            "text": "Delivery status"
+          },
+          {
+            "href": url_for("main.guidance"),
+            "text": "Guidance"
           },
           {
             "href": url_for("main.documentation"),

From 4d6ab92d41ab02affdff653347e720dc8dc9142b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Fri, 24 Jan 2020 12:15:27 +0000
Subject: [PATCH 077/117] Add Using Notify navigation

---
 app/main/views/sub_navigation_dictionaries.py | 55 ++++++++++++++++---
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index f9683e22b..06c319b07 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -22,14 +22,6 @@ def features_nav():
             "name": "Roadmap",
             "link": "main.roadmap",
         },
-        {
-            "name": "Trial mode",
-            "link": "main.trial_mode_new",
-        },
-        {
-            "name": "Message status",
-            "link": "main.message_status",
-        },
         {
             "name": "Security",
             "link": "main.security",
@@ -52,3 +44,50 @@ def pricing_nav():
             "link": "main.how_to_pay",
         },
     ]
+
+
+def using_notify_nav():
+    return [
+        {
+            "name": "Get started",
+            "link": "main.get_started",
+        },
+        {
+            "name": "Trial mode",
+            "link": "main.trial_mode_new",
+        },
+        {
+            "name": "Delivery status",
+            "link": "main.message_status",
+        },
+        {
+            "name": "Guidance",
+            "link": "main.guidance",
+            "sub_navigation_items": [
+                {
+                    "name": "Create and send messages",
+                    "link": "main.features_email",
+                },
+                {
+                    "name": "Edit and format messages",
+                    "link": "main.features_sms",
+                },
+                {
+                    "name": "Branding and customisation",
+                    "link": "main.features_letters",
+                },
+                {
+                    "name": "Send files by email",
+                    "link": "main.features_letters",
+                },
+                {
+                    "name": "Upload your own letters",
+                    "link": "main.features_letters",
+                },
+            ]
+        },
+        {
+            "name": "API documentation",
+            "link": "main.documentation",
+        },
+    ]

From d29f23bfc840eaaed24feefe126b9caf38fde3d3 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 24 Jan 2020 15:57:29 +0000
Subject: [PATCH 078/117] Add left hand navigation

Due to the way the navigation dictionaries are built this mean being
less smart about the view method for the guidance pages.
---
 app/main/views/index.py                       | 85 +++++++++++++++----
 app/main/views/sub_navigation_dictionaries.py | 12 +--
 app/navigation.py                             | 32 ++++++-
 app/templates/admin_template.html             |  2 +-
 app/templates/views/features.html             |  2 +-
 app/templates/views/features/emails.html      |  4 +-
 app/templates/views/features/letters.html     |  4 +-
 .../views/features/text-messages.html         |  2 +-
 app/templates/views/guidance/index.html       | 12 +--
 tests/app/main/views/test_index.py            | 25 +-----
 10 files changed, 119 insertions(+), 61 deletions(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index 1ee5db928..944650e57 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -7,7 +7,6 @@ from flask import (
     url_for,
 )
 from flask_login import current_user
-from jinja2.exceptions import TemplateNotFound
 from notifications_utils.international_billing_rates import (
     INTERNATIONAL_BILLING_RATES,
 )
@@ -17,7 +16,11 @@ from app import email_branding_client, letter_branding_client, status_api_client
 from app.main import main
 from app.main.forms import FieldWithNoneOption, SearchByNameForm
 from app.main.views.feedback import QUESTION_TICKET_TYPE
-from app.main.views.sub_navigation_dictionaries import features_nav, pricing_nav
+from app.main.views.sub_navigation_dictionaries import (
+    features_nav,
+    pricing_nav,
+    using_notify_nav,
+)
 from app.utils import get_logo_cdn_domain, user_is_logged_in
 
 
@@ -91,6 +94,7 @@ def how_to_pay():
 
 
 @main.route('/delivery-and-failure')
+@main.route('/features/messages-status')
 def delivery_and_failure():
     return redirect(url_for('.message_status'), 301)
 
@@ -219,7 +223,10 @@ def letter_template():
 
 @main.route('/documentation')
 def documentation():
-    return render_template('views/documentation.html')
+    return render_template(
+        'views/documentation.html',
+        navigation_links=using_notify_nav(),
+    )
 
 
 @main.route('/integration-testing')
@@ -298,43 +305,87 @@ def using_notify():
     ), 410
 
 
-@main.route('/features/messages-status')
+@main.route('/using-notify/delivery-status')
 def message_status():
     return render_template(
         'views/message-status.html',
-        navigation_links=features_nav()
+        navigation_links=using_notify_nav(),
     )
 
 
 @main.route('/features/get-started')
+def get_started_old():
+    return redirect(url_for('.get_started'), 301)
+
+
+@main.route('/using-notify/get-started')
 def get_started():
     return render_template(
-        'views/get-started.html'
+        'views/get-started.html',
+        navigation_links=using_notify_nav(),
     )
 
 
 @main.route('/trial-mode')
+@main.route('/features/trial-mode')
 def trial_mode():
     return redirect(url_for('.trial_mode_new'), 301)
 
 
-@main.route('/features/trial-mode')
+@main.route('/using-notify/trial-mode')
 def trial_mode_new():
     return render_template(
         'views/trial-mode.html',
-        navigation_links=features_nav()
+        navigation_links=using_notify_nav(),
     )
 
 
-@main.route('/guidance')
-@main.route('/guidance/<slug>')
-def guidance(slug='index'):
-    try:
-        return render_template(
-            'views/guidance/{}.html'.format(slug)
-        )
-    except TemplateNotFound:
-        abort(404)
+@main.route('/using-notify/guidance')
+def guidance_index():
+    return render_template(
+        'views/guidance/index.html',
+        navigation_links=using_notify_nav(),
+    )
+
+
+@main.route('/using-notify/guidance/branding-and-customisation')
+def branding_and_customisation():
+    return render_template(
+        'views/guidance/branding-and-customisation.html',
+        navigation_links=using_notify_nav(),
+    )
+
+
+@main.route('/using-notify/guidance/create-and-send-messages')
+def create_and_send_messages():
+    return render_template(
+        'views/guidance/create-and-send-messages.html',
+        navigation_links=using_notify_nav(),
+    )
+
+
+@main.route('/using-notify/guidance/edit-and-format-messages')
+def edit_and_format_messages():
+    return render_template(
+        'views/guidance/edit-and-format-messages.html',
+        navigation_links=using_notify_nav(),
+    )
+
+
+@main.route('/using-notify/guidance/send-files-by-email')
+def send_files_by_email():
+    return render_template(
+        'views/guidance/send-files-by-email.html',
+        navigation_links=using_notify_nav(),
+    )
+
+
+@main.route('/using-notify/guidance/upload-a-letter')
+def upload_a_letter():
+    return render_template(
+        'views/guidance/upload-a-letter.html',
+        navigation_links=using_notify_nav(),
+    )
 
 
 # --- Redirects --- #
diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index 06c319b07..b65b72916 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -62,27 +62,27 @@ def using_notify_nav():
         },
         {
             "name": "Guidance",
-            "link": "main.guidance",
+            "link": "main.guidance_index",
             "sub_navigation_items": [
                 {
                     "name": "Create and send messages",
-                    "link": "main.features_email",
+                    "link": "main.create_and_send_messages",
                 },
                 {
                     "name": "Edit and format messages",
-                    "link": "main.features_sms",
+                    "link": "main.edit_and_format_messages",
                 },
                 {
                     "name": "Branding and customisation",
-                    "link": "main.features_letters",
+                    "link": "main.branding_and_customisation",
                 },
                 {
                     "name": "Send files by email",
-                    "link": "main.features_letters",
+                    "link": "main.send_files_by_email",
                 },
                 {
                     "name": "Upload your own letters",
-                    "link": "main.features_letters",
+                    "link": "main.upload_a_letter",
                 },
             ]
         },
diff --git a/app/navigation.py b/app/navigation.py
index baf6b1aae..627445421 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -196,8 +196,14 @@ class HeaderNavigation(Navigation):
         'get_example_csv',
         'get_notifications_as_json',
         'get_started',
+        'get_started_old',
         'go_to_dashboard_after_tour',
-        'guidance',
+        'guidance_index',
+        'branding_and_customisation',
+        'create_and_send_messages',
+        'edit_and_format_messages',
+        'send_files_by_email',
+        'upload_a_letter',
         'history',
         'inbound_sms_admin',
         'inbox',
@@ -520,8 +526,14 @@ class MainNavigation(Navigation):
         'get_example_csv',
         'get_notifications_as_json',
         'get_started',
+        'get_started_old',
         'go_to_dashboard_after_tour',
-        'guidance',
+        'guidance_index',
+        'branding_and_customisation',
+        'create_and_send_messages',
+        'edit_and_format_messages',
+        'send_files_by_email',
+        'upload_a_letter',
         'history',
         'how_to_pay',
         'inbound_sms_admin',
@@ -752,8 +764,14 @@ class CaseworkNavigation(Navigation):
         'get_example_csv',
         'get_notifications_as_json',
         'get_started',
+        'get_started_old',
         'go_to_dashboard_after_tour',
-        'guidance',
+        'guidance_index',
+        'branding_and_customisation',
+        'create_and_send_messages',
+        'edit_and_format_messages',
+        'send_files_by_email',
+        'upload_a_letter',
         'history',
         'how_to_pay',
         'inbound_sms_admin',
@@ -1041,8 +1059,14 @@ class OrgNavigation(Navigation):
         'get_example_csv',
         'get_notifications_as_json',
         'get_started',
+        'get_started_old',
         'go_to_dashboard_after_tour',
-        'guidance',
+        'guidance_index',
+        'branding_and_customisation',
+        'create_and_send_messages',
+        'edit_and_format_messages',
+        'send_files_by_email',
+        'upload_a_letter',
         'history',
         'how_to_pay',
         'inbound_sms_admin',
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index dde9ea393..91eec3123 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -226,7 +226,7 @@
             "text": "Delivery status"
           },
           {
-            "href": url_for("main.guidance"),
+            "href": url_for("main.guidance_index"),
             "text": "Guidance"
           },
           {
diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 27126bb14..a0cdf2be3 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -27,7 +27,7 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalised content</h2>
 <p>Notify makes it easy to send personalised messages from a single template.</p>
-<p>See <a href="{{ url_for('.guidance', slug='edit-and-format-messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
+<p>See <a href="{{ url_for('.edit_and_format_messages', _anchor='personalised-content') }}">how to personalise your content</a>.</p>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p>To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.</p>
diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index 40c02d8d9..f9ddc5693 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -24,7 +24,7 @@
 
   <h3 class="heading heading-small" id="branding">Email branding</h3>
   <p>Add your organisation’s logo and brand colour to email templates.</p>
-  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
+  <p>See <a href="{{ url_for('.branding_and_customisation', _anchor='email-branding') }}">how to change your email branding</a>.</p>
 
   <h3 class="heading heading-small" id="send-files">Send files by email</h3>
   <p>Notify offers a safe and reliable way to send files by email.</p>
@@ -41,7 +41,7 @@
   <h3 class="heading heading-small" id="reply-to">Add a reply-to address</h3>
   <p>Notify lets you choose the email address that users reply to.</p>
   <p>Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.</p>
-  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='reply-to-address') }}">how to add a reply-to address</a>.</p>
+  <p>See <a href="{{ url_for('.branding_and_customisation', _anchor='reply-to-address') }}">how to add a reply-to address</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It’s free to send emails through Notify.</p>
diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 3d0f60dc7..4eea66c9a 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -29,11 +29,11 @@
 
   <h3 class="heading-small" id="branding">Branding</h3>
   <p>Add your organisation’s logo to your letter templates.</p>
-  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
+  <p>See <a href="{{ url_for('.branding_and_customisation', _anchor='letter-branding') }}">how to change your letter branding</a>.</p>
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
-  <p>See <a href="{{ url_for('.guidance', slug='upload-a-letter') }}">how to upload a letter</a>.</p>
+  <p>See <a href="{{ url_for('.upload_a_letter') }}">how to upload a letter</a>.</p>
   <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 21ba3e0c9..270e192f5 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -28,7 +28,7 @@
 
   <h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
   <p>When you send a text message with Notify, the sender name tells people who it's from.</p>
-  <p>See <a href="{{ url_for('.guidance', slug='branding-and-customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
+  <p>See <a href="{{ url_for('.branding_and_customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
 
   <h2 class="heading heading-medium">Pricing<h2>
     <p>Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.</p>
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index eba9c07e9..0f7132f35 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -15,17 +15,17 @@
   <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <li><a href="{{ url_for('.guidance', slug='create-and-send-messages') }}">create and send messages</a></li>
-    <li><a href="{{ url_for('.guidance', slug='edit-and-format-messages') }}">edit and format messages</a></li>
-    <li>add <a href="{{ url_for('.guidance', slug='branding-and-customisation') }}">branding and customisation</a></li>
-    <li><a href="{{ url_for('.guidance', slug='send-files-by-email') }}">send files by email</a></li>
-    <li><a href="{{ url_for('.guidance', slug='upload-a-letter') }}">upload your own letters</a></li>
+    <li><a href="{{ url_for('.create_and_send_messages') }}">create and send messages</a></li>
+    <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
+    <li>add <a href="{{ url_for('.branding_and_customisation') }}">branding and customisation</a></li>
+    <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
+    <li><a href="{{ url_for('.upload_a_letter') }}">upload your own letters</a></li>
   </ul>
 
   <h2 class="heading-medium">More information</h2>
 
   <p>The GOV.UK Service Manual has advice on:</p>
-  
+
   <ul class="list list-bullet">
     <li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li>
     <li><a href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index 41b917113..3b0de3657 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -80,7 +80,10 @@ def test_robots(client):
     'cookies', 'privacy', 'pricing', 'terms', 'roadmap',
     'features', 'documentation', 'security',
     'message_status', 'features_email', 'features_sms',
-    'features_letters', 'how_to_pay', 'get_started'
+    'features_letters', 'how_to_pay', 'get_started',
+    'guidance_index', 'branding_and_customisation',
+    'create_and_send_messages', 'edit_and_format_messages',
+    'send_files_by_email', 'upload_a_letter',
 ])
 def test_static_pages(
     client_request,
@@ -277,23 +280,3 @@ def test_letter_spec_redirect_with_non_logged_in_user(client_request):
             '/documentation/images/notify-pdf-letter-spec-v2.4.pdf'
         ),
     )
-
-
-def test_guidance_index(client_request):
-    client_request.get('main.guidance')
-
-
-@pytest.mark.parametrize('slug', (
-    'branding-and-customisation',
-    'create-and-send-messages',
-    'edit-and-format-messages',
-    'index',
-    'send-files-by-email',
-    'upload-a-letter',
-))
-def test_guidance_pages(client_request, slug):
-    client_request.get('main.guidance', slug=slug)
-
-
-def test_guidance_404s_for_page_that_doesnt_exist(client_request):
-    client_request.get('main.guidance', slug='foo', _expected_status=404)

From 822e29138d68ca598abc014b90bac7cefc5dd06e Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 24 Jan 2020 16:16:41 +0000
Subject: [PATCH 079/117] Fix unclosed list and awkward line breaks

---
 .../guidance/edit-and-format-messages.html    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index eb011cf8f..8ddbbb7a8 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -9,14 +9,15 @@
 {% block content_column_content %}
 
   <h1 class="heading-large">Edit and format messages</h1>
-  
+
   <p>This page explains how to:</p>
   <ul class="list list-bullet">
     <li><a href="#formatting">format your content</a></li>
     <li><a href="#links">add links</a></li>
     <li><a href="#personalised-content">personalise your content</a></li>
     <li><a href="#optional-content">add optional content</a></li>
-  
+  </ul>
+
   <h2 class="heading-medium" id="formatting">Format your content</h2>
 
   <p>You can see a list of formatting instructions on the edit template page:</p>
@@ -40,13 +41,13 @@
   <p>Notify does not allow bold, italics, subheadings, underlined text or different fonts. This is because they can make it harder for users to read what you’ve written.</p>
 
   <h2 class="heading-medium" id="links">Add links</h2>
-  
+
   <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
 
   <p>You cannot convert text into a link. Research shows that recipients like to read the URL to check a link looks genuine before they click it. This is hard to do if the URL is hidden behind clickable link text.</p>
 
   <p>We do not recommend using a third-party link shortening service because:</p>
-  
+
   <ul class="list list-bullet">
     <li>your users cannot see where the link will take them</li>
     <li>your link might stop working if there’s a service outage</li>
@@ -65,7 +66,7 @@
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
     <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
-    <li>Add a placeholder using double brackets. For example: Hello ((first name)), your reference is ((ref number)).</li>
+    <li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is ((ref&nbsp;number)).</li>
     <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
   </ol>
 
@@ -77,11 +78,11 @@
   </ul>
 
   <p>If you upload a list, the column names need to match the placeholders in your template.</p>
-  
+
   <h2 class="heading-medium" id="optional-content">Add optional content</h2>
-  
+
   <p>To add optional content to your emails and text messages:</p>
-  
+
   <ol class="list list-number">
     <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
@@ -100,5 +101,5 @@
   <p>If you upload a list, the column names need to match the optional content in your template.</p>
 
   <p>You cannot add optional content to a letter.</p>
-  
+
 {% endblock %}

From 6d9e19a013d52329c69539f08f641fe3b7c81c0c Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 08:47:47 +0000
Subject: [PATCH 080/117] Update navigation links

---
 app/main/views/sub_navigation_dictionaries.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index b65b72916..8aefcea62 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -65,15 +65,15 @@ def using_notify_nav():
             "link": "main.guidance_index",
             "sub_navigation_items": [
                 {
-                    "name": "Create and send messages",
+                    "name": "Send messages",
                     "link": "main.create_and_send_messages",
                 },
                 {
-                    "name": "Edit and format messages",
+                    "name": "Formatting",
                     "link": "main.edit_and_format_messages",
                 },
                 {
-                    "name": "Branding and customisation",
+                    "name": "Branding",
                     "link": "main.branding_and_customisation",
                 },
                 {
@@ -81,7 +81,7 @@ def using_notify_nav():
                     "link": "main.send_files_by_email",
                 },
                 {
-                    "name": "Upload your own letters",
+                    "name": "Upload a letter",
                     "link": "main.upload_a_letter",
                 },
             ]

From 1af5136f9ccb1b817036f0bb6bad1b9a01e437d2 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 08:51:17 +0000
Subject: [PATCH 081/117] Update title, H1 and filename

---
 .../{create-and-send-messages.html => send-messages.html}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename app/templates/views/guidance/{create-and-send-messages.html => send-messages.html} (93%)

diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/send-messages.html
similarity index 93%
rename from app/templates/views/guidance/create-and-send-messages.html
rename to app/templates/views/guidance/send-messages.html
index 4aa85a9a2..0587c80ac 100644
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/send-messages.html
@@ -3,12 +3,12 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Create and send messages
+  Send messages
 {% endblock %}
 
 {% block content_column_content %}
 
-  <h1 class="heading-large">Create and send messages</h1>
+  <h1 class="heading-large">Send messages</h1>
   
   <p><a href="{{ url_for('main.register') }}">Create an account</a> to see a short tutorial explaining how to create and send messages.</p>
   

From 1e8ba88b4d4aedf68fbe037a73eb369754bd1631 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 08:51:56 +0000
Subject: [PATCH 082/117] Update link text

---
 app/templates/views/guidance/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 0f7132f35..2784112cc 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -15,7 +15,7 @@
   <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <li><a href="{{ url_for('.create_and_send_messages') }}">create and send messages</a></li>
+    <li><a href="{{ url_for('.create_and_send_messages') }}">send messages</a></li>
     <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
     <li>add <a href="{{ url_for('.branding_and_customisation') }}">branding and customisation</a></li>
     <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>

From 133a62022c15b764ef01614e63563fe21e25c635 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 08:53:29 +0000
Subject: [PATCH 083/117] Update link

---
 app/main/views/index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index 944650e57..1688caa14 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -357,9 +357,9 @@ def branding_and_customisation():
 
 
 @main.route('/using-notify/guidance/create-and-send-messages')
-def create_and_send_messages():
+def send_messages():
     return render_template(
-        'views/guidance/create-and-send-messages.html',
+        'views/guidance/send-messages.html',
         navigation_links=using_notify_nav(),
     )
 

From b76066dd766d771c36cb9079dfaad51300fbdd3a Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 08:54:05 +0000
Subject: [PATCH 084/117] Update link

---
 app/main/views/sub_navigation_dictionaries.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index 8aefcea62..bf5394d1d 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -66,7 +66,7 @@ def using_notify_nav():
             "sub_navigation_items": [
                 {
                     "name": "Send messages",
-                    "link": "main.create_and_send_messages",
+                    "link": "main.send_messages",
                 },
                 {
                     "name": "Formatting",

From bc303388d2c82faee344afadfb0b694f39eda59b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 09:04:36 +0000
Subject: [PATCH 085/117] Fix sign in link

---
 .../views/guidance/branding-and-customisation.html        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 69415d25d..865b1cb78 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -26,7 +26,7 @@
   <p>To change your email branding:</p>
 
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Email settings</b> section, select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Email branding</b> row.</li>
   </ol>
@@ -38,7 +38,7 @@
   <p>To add a reply-to email address:</p>
 
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Email settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Reply-to email addresses</b> row.</li>
     <li>Select <b class="govuk-!-font-weight-bold">Add reply-to address</b>.</li>
@@ -51,7 +51,7 @@
   <p>To change the text message sender from the default of ‘GOVUK’:</p>
   
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Text message settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
   
@@ -62,7 +62,7 @@
   <p>To add a logo to your letters:</p>
   
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b< page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Letter settings</b> section, select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Letter branding</b> row.</li>
   </ol>

From 40948af2fde06c7bf0d150e32ad802acb124c6be Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 09:05:28 +0000
Subject: [PATCH 086/117] Fix sign in links

---
 app/templates/views/guidance/edit-and-format-messages.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 8ddbbb7a8..baed59d5d 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -23,7 +23,7 @@
   <p>You can see a list of formatting instructions on the edit template page:</p>
 
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
     <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
   </ol>
@@ -63,7 +63,7 @@
   <p>To add a placeholder to the template:</p>
 
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
     <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
     <li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is ((ref&nbsp;number)).</li>
@@ -84,7 +84,7 @@
   <p>To add optional content to your emails and text messages:</p>
 
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page.</li>
     <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
     <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>

From 96b6d6e6ac418b35b815c5aa4d95f8a65bdc2903 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 09:05:58 +0000
Subject: [PATCH 087/117] Fix sign in link

---
 app/templates/views/guidance/send-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/send-messages.html b/app/templates/views/guidance/send-messages.html
index 0587c80ac..2fc567a6d 100644
--- a/app/templates/views/guidance/send-messages.html
+++ b/app/templates/views/guidance/send-messages.html
@@ -16,7 +16,7 @@
 
   <p>To send a batch of messages at once:</p>
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Templates</b> page and choose an existing template.</li>
     <li>Select <b class="govuk-!-font-weight-bold">Send</b>.</li>
     <li>If you’re sending emails, select <b class="govuk-!-font-weight-bold">Upload a list of email addresses</b>. If you’re sending text messages, select <b class="govuk-!-font-weight-bold">Upload a list of phone numbers</b>. If you’re sending letters, select <b class="govuk-!-font-weight-bold">Upload a list of addresses</b>.</li>

From be09dee10d5685941855a303e5528052d6dd4429 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 09:06:28 +0000
Subject: [PATCH 088/117] Fix sign in link

---
 app/templates/views/guidance/upload-a-letter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index 89249e9e3..e47f84f11 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -15,7 +15,7 @@
   <p>To upload and send your own letter from a PDF file:</p>
   
   <ol class="list list-number">
-    <li><a href="{{ url_for('.register') }}">Sign in to Notify</a>.</li>
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Uploads</b> page.</li>
     <li>Select <b class="govuk-!-font-weight-bold">Upload a letter</b>.</li>
     <li>Select <b class="govuk-!-font-weight-bold">Choose file</b>.</li>

From f771e402a049a87a67097b18437acf2fa3fa79b6 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 09:15:38 +0000
Subject: [PATCH 089/117] Fix <ol> tags

---
 app/templates/views/guidance/branding-and-customisation.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 865b1cb78..8ab18b3cb 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -54,7 +54,8 @@
     <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Text message settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
-  
+  </ol
+
   <h2 class="heading-medium" id="letter-branding">Change your letter branding</h2>
   
   <p>Letter templates do not have default branding.</p>

From 885b78eac512a571c8c8133444dffd8a796ae6b3 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 09:31:45 +0000
Subject: [PATCH 090/117] Update if statement and instructions

Update if statement and instructions to make them consistent with the guidance pages.
---
 app/templates/views/trial-mode.html | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html
index fcd75e453..52166a0fb 100644
--- a/app/templates/views/trial-mode.html
+++ b/app/templates/views/trial-mode.html
@@ -16,15 +16,20 @@
      <li>create letter templates, but not send them</li>
    </ul>
 
-  <p>
-    To remove these restrictions, 
     {% if current_service and current_service.trial_mode %}
-     you can <a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a>.
+  <p>
+    To remove these restrictions, you can <a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a>.</p>
     {% else %}
-     go to the Settings page and request to go live.
-    {% endif %}
+  <p>
+    To remove these restrictions:
   </p>
-
+  <ol class="list list-number">
+    <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Request to go live</b>.</li>
+  </ol>
+    {% endif %}
+ 
   <p>Before you request to go live, you must:</p>
   <ul class="list list-bullet">
     <li>accept our data sharing and financial agreement</li>

From 87e42cc4bb255dcf0c37d5cee5c8008fd1c4cbad Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 11:33:39 +0000
Subject: [PATCH 091/117] Revert filename

Reverts part of commit 1af5136f9ccb1b817036f0bb6bad1b9a01e437d2
---
 .../{send-messages.html => create-and-send-messages.html}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/templates/views/guidance/{send-messages.html => create-and-send-messages.html} (100%)

diff --git a/app/templates/views/guidance/send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
similarity index 100%
rename from app/templates/views/guidance/send-messages.html
rename to app/templates/views/guidance/create-and-send-messages.html

From a4ba99b7489642ae2a7ccdfbaf41c0a00392794d Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Mon, 27 Jan 2020 11:46:09 +0000
Subject: [PATCH 092/117] Redo `send_messages` as `create_and_send_messages`

Reverts changes in the following commits:
- 1e8ba88b4d4aedf68fbe037a73eb369754bd1631
- 133a62022c15b764ef01614e63563fe21e25c635
- b76066dd766d771c36cb9079dfaad51300fbdd3a

These changes `main.create_and_send_messages` to
`main.send_messages` but this name was already
taken.

Further details on Github:

https://github.com/alphagov/notifications-admin/pull/3213#pullrequestreview-348548476
---
 app/main/views/index.py                       | 4 ++--
 app/main/views/sub_navigation_dictionaries.py | 2 +-
 app/templates/views/guidance/index.html       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index 1688caa14..944650e57 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -357,9 +357,9 @@ def branding_and_customisation():
 
 
 @main.route('/using-notify/guidance/create-and-send-messages')
-def send_messages():
+def create_and_send_messages():
     return render_template(
-        'views/guidance/send-messages.html',
+        'views/guidance/create-and-send-messages.html',
         navigation_links=using_notify_nav(),
     )
 
diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index bf5394d1d..8aefcea62 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -66,7 +66,7 @@ def using_notify_nav():
             "sub_navigation_items": [
                 {
                     "name": "Send messages",
-                    "link": "main.send_messages",
+                    "link": "main.create_and_send_messages",
                 },
                 {
                     "name": "Formatting",
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 2784112cc..0f7132f35 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -15,7 +15,7 @@
   <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <li><a href="{{ url_for('.create_and_send_messages') }}">send messages</a></li>
+    <li><a href="{{ url_for('.create_and_send_messages') }}">create and send messages</a></li>
     <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
     <li>add <a href="{{ url_for('.branding_and_customisation') }}">branding and customisation</a></li>
     <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>

From c0bafc26feac6b9c1fb911c1a7f1e9d6858322b9 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 27 Jan 2020 11:58:37 +0000
Subject: [PATCH 093/117] Add link to Guidance and fix formatting

Add link to Guidance and add bold to instructions for consistency
---
 app/templates/views/get-started.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index e44486062..a921f063f 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -43,12 +43,12 @@
 
   <li class="get-started-list__item">
     <h2 class="get-started-list__heading">Write some messages</h2>
-    <p>Add <a href="{{ url_for('main.features', _anchor='templates') }}">message templates</a> with examples of the content you plan to send.<!-- You do not need to add letter templates if you’re planning to <a href="{{ url_for('main.features_letters', _anchor='upload-letters') }}">upload your own letters</a>.--></p>
-    <p>The GOV.UK Service Manual has advice on:</p>
+    <p>Add <a href="{{ url_for('main.features', _anchor='templates') }}">message templates</a> with examples of the content you plan to send. You can use our <a href="{{ url_for('main.guidance') }}">guidance</a> to help you.<!-- You do not need to add letter templates if you’re planning to <a href="{{ url_for('main.features_letters', _anchor='upload-letters') }}">upload your own letters</a>.--></p>
+    <!--<p>The GOV.UK Service Manual has advice on:</p>
     <ul class="list list-bullet">
       <li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages#how-to-write-emails-and-text-messages">how to write emails and text messages</a></li>
       <li><a href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
-    </ul>
+    </ul>-->
   </li>
 
   <li class="get-started-list__item">
@@ -71,7 +71,7 @@
   <li class="get-started-list__item">
     <h2 class="get-started-list__heading">Start sending messages</h2>
     {% if not current_user.is_authenticated or not current_service %}
-    <p>When you’re ready to send messages to people outside your team, go to the Settings page and request to go live. We’ll approve your request within one working day.</p>
+    <p>When you’re ready to send messages to people outside your team, go to the <b class="govuk-!-font-weight-bold">Settings</b> page and select <b class="govuk-!-font-weight-bold">Request to go live</a>. We’ll approve your request within one working day.</p>
     {% else %}
     <p>You should <a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
     {% endif %}

From 8b9c2b7427df9226b46dcde41d6060ae74c21d2c Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 3 Feb 2020 12:47:42 +0000
Subject: [PATCH 094/117] Fix tests

---
 app/templates/views/get-started.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index a921f063f..b3d5c0cbc 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -43,7 +43,7 @@
 
   <li class="get-started-list__item">
     <h2 class="get-started-list__heading">Write some messages</h2>
-    <p>Add <a href="{{ url_for('main.features', _anchor='templates') }}">message templates</a> with examples of the content you plan to send. You can use our <a href="{{ url_for('main.guidance') }}">guidance</a> to help you.<!-- You do not need to add letter templates if you’re planning to <a href="{{ url_for('main.features_letters', _anchor='upload-letters') }}">upload your own letters</a>.--></p>
+    <p>Add <a href="{{ url_for('main.features', _anchor='templates') }}">message templates</a> with examples of the content you plan to send. You can use our <a href="{{ url_for('main.guidance_index') }}">guidance</a> to help you.<!-- You do not need to add letter templates if you’re planning to <a href="{{ url_for('main.features_letters', _anchor='upload-letters') }}">upload your own letters</a>.--></p>
     <!--<p>The GOV.UK Service Manual has advice on:</p>
     <ul class="list list-bullet">
       <li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages#how-to-write-emails-and-text-messages">how to write emails and text messages</a></li>

From 6843930d48d9b1074aadc117d68f749db493c99d Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:02:55 +0000
Subject: [PATCH 095/117] Update link headings

---
 app/templates/views/guidance/branding-and-customisation.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 8ab18b3cb..38007c329 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -13,10 +13,10 @@
   <p>This page explains how to:</p>
   
   <ul class="list list-bullet">
-    <li><a href="#email-branding">change email branding</a></li>
+    <li><a href="#email-branding">change your email branding</a></li>
     <li><a href="#reply-to-address">add a reply-to email address</a></li>
     <li><a href="#text-message-sender">change the text message sender</a></li>
-    <li><a href="#letter-branding">change letter branding</a></li>
+    <li><a href="#letter-branding">change your letter branding</a></li>
   </ul>
   
   <h2 class="heading-medium" id="email-branding">Change your email branding</h2>

From 83bcd78e4472ae0d15635d3f8e803eb4128b7c2c Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:05:37 +0000
Subject: [PATCH 096/117] Delete 'name' from explanation

---
 app/templates/views/guidance/branding-and-customisation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 38007c329..41902f674 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -46,7 +46,7 @@
   
   <h2 class="heading-medium" id="text-message-sender">Change the text message sender</h2>
   
-  <p>The text message sender name tells your users who the message is from.</p>
+  <p>The text message sender tells your users who the message is from.</p>
 
   <p>To change the text message sender from the default of ‘GOVUK’:</p>
   

From d9f9205e788d8523f4d8f1e67d619577c2219fb0 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:09:55 +0000
Subject: [PATCH 097/117] Add instruction

---
 app/templates/views/guidance/branding-and-customisation.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 41902f674..0fda5b39f 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -54,6 +54,7 @@
     <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Text message settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
+    <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
   </ol
 
   <h2 class="heading-medium" id="letter-branding">Change your letter branding</h2>

From 6341c4adb3972b0dffa2150c96b3d5d1838af662 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:11:41 +0000
Subject: [PATCH 098/117] Fix </b> tag

---
 app/templates/views/guidance/branding-and-customisation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 0fda5b39f..9f426c2e0 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -65,7 +65,7 @@
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
-    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b< page.</li>
+    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Letter settings</b> section, select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Letter branding</b> row.</li>
   </ol>
 

From 0d9f5b27cd7bdd9705d74d15a594539ce54db4bd Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:22:38 +0000
Subject: [PATCH 099/117] Update description of clickable link text

Update description of clickable link text to make it clear we're talking about email. This is because we **do** hide URLs behind clickable link text on web pages.
---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index baed59d5d..b3d80227a 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -44,7 +44,7 @@
 
   <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
 
-  <p>You cannot convert text into a link. Research shows that recipients like to read the URL to check a link looks genuine before they click it. This is hard to do if the URL is hidden behind clickable link text.</p>
+  <p>You cannot convert text into a link. Research shows that people like to see the URL before they click a link in an email so they can check it looks genuine. This is hard to do if the URL is hidden behind clickable link text.</p>
 
   <p>We do not recommend using a third-party link shortening service because:</p>
 

From 76f46e47d79b1b2785438ce0722b4d5829c80829 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:26:02 +0000
Subject: [PATCH 100/117] Update description

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index b3d80227a..eea668de1 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -44,7 +44,7 @@
 
   <p>When composing an email or text message, write URLs in full and Notify will convert them into links for you.</p>
 
-  <p>You cannot convert text into a link. Research shows that people like to see the URL before they click a link in an email so they can check it looks genuine. This is hard to do if the URL is hidden behind clickable link text.</p>
+  <p>You cannot convert text into a link. Research shows that people like to check a URL looks genuine before clicking the link in an email. This is hard to do if the URL is hidden behind clickable link text.</p>
 
   <p>We do not recommend using a third-party link shortening service because:</p>
 

From 6d4d176039c261651f7e3a36cf92c56e0b9d278d Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 13:29:58 +0000
Subject: [PATCH 101/117] Edit content

---
 app/templates/views/guidance/upload-a-letter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index e47f84f11..b19f35363 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -12,7 +12,7 @@
   
   <p>You can upload and send your own letters instead of creating a reusable letter template.</p>
   
-  <p>To upload and send your own letter from a PDF file:</p>
+  <p>To upload and send a letter from a PDF file:</p>
   
   <ol class="list list-number">
     <li><a href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>

From b0e539abbad63b1f050e2762b08d428a05453e6a Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 14:25:28 +0000
Subject: [PATCH 102/117] Fix </ol> tag

---
 app/templates/views/guidance/branding-and-customisation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 9f426c2e0..1f22ce366 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -55,7 +55,7 @@
     <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
     <li>In the <b class="govuk-!-font-weight-bold">Text message settings</b> section, select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
     <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
-  </ol
+</ol>
 
   <h2 class="heading-medium" id="letter-branding">Change your letter branding</h2>
   

From fcf1494051b6c709c173766429dc0fc90eb1c16d Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 15:04:48 +0000
Subject: [PATCH 103/117] Update links - comment out Send messages

---
 app/templates/views/guidance/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 0f7132f35..9d11fd605 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -15,9 +15,9 @@
   <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <li><a href="{{ url_for('.create_and_send_messages') }}">create and send messages</a></li>
+    <!--<li><a href="{{ url_for('.create_and_send_messages') }}">create and send messages</a></li>-->
     <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
-    <li>add <a href="{{ url_for('.branding_and_customisation') }}">branding and customisation</a></li>
+    <li><a href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
     <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
     <li><a href="{{ url_for('.upload_a_letter') }}">upload your own letters</a></li>
   </ul>

From b37560ebe84e19bd2ab913d460a4b5c6c480a1ac Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Mon, 3 Feb 2020 16:06:32 +0000
Subject: [PATCH 104/117] Remove Send messages link

---
 app/main/views/sub_navigation_dictionaries.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index 8aefcea62..b3acbb468 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -64,10 +64,6 @@ def using_notify_nav():
             "name": "Guidance",
             "link": "main.guidance_index",
             "sub_navigation_items": [
-                {
-                    "name": "Send messages",
-                    "link": "main.create_and_send_messages",
-                },
                 {
                     "name": "Formatting",
                     "link": "main.edit_and_format_messages",

From 5314ba72cc1cc76239a22d97f82e9b09dfc0e555 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 4 Feb 2020 13:48:45 +0000
Subject: [PATCH 105/117] Remove 'Upload a letter'

Remove 'Upload a letter' from navigation because it's not available to all users yet.
---
 app/main/views/sub_navigation_dictionaries.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index b3acbb468..2316fd083 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -76,10 +76,6 @@ def using_notify_nav():
                     "name": "Send files by email",
                     "link": "main.send_files_by_email",
                 },
-                {
-                    "name": "Upload a letter",
-                    "link": "main.upload_a_letter",
-                },
             ]
         },
         {

From 92ad395fca2d8cdecec6d34f2f523bde69c0822d Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 4 Feb 2020 13:50:29 +0000
Subject: [PATCH 106/117] Comment out and update content

Comment out and update content because Upload a letter is not available to all users yet.
---
 app/templates/views/features/letters.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 4eea66c9a..b7dbf37bc 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -33,8 +33,8 @@
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
-  <p>See <a href="{{ url_for('.upload_a_letter') }}">how to upload a letter</a>.</p>
-  <p>Or, if you’re using our API, read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
+  <!--<p>See <a href="{{ url_for('.upload_a_letter') }}">how to upload a letter</a>.</p>-->
+  <p>Read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
   <p>It costs between 30p and 76p (plus VAT) to send a letter. Prices include:</p>

From ca5a92c6825a920b01432088198b24d8a3ab6413 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Tue, 4 Feb 2020 13:51:43 +0000
Subject: [PATCH 107/117] Comment out 'Upload your own letters'

Comment out 'Upload your own letters'  because this feature is not available to all users yet.
---
 app/templates/views/guidance/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 9d11fd605..12d74f803 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -19,7 +19,7 @@
     <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
     <li><a href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
     <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
-    <li><a href="{{ url_for('.upload_a_letter') }}">upload your own letters</a></li>
+    <!--<li><a href="{{ url_for('.upload_a_letter') }}">upload your own letters</a></li>-->
   </ul>
 
   <h2 class="heading-medium">More information</h2>

From c7983c2396a65efc178faab5c957c5e89439aff7 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 5 Feb 2020 09:24:59 +0000
Subject: [PATCH 108/117] Update app/templates/views/get-started.html

Fix b tag

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
---
 app/templates/views/get-started.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index b3d5c0cbc..5604ff062 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -71,7 +71,7 @@
   <li class="get-started-list__item">
     <h2 class="get-started-list__heading">Start sending messages</h2>
     {% if not current_user.is_authenticated or not current_service %}
-    <p>When you’re ready to send messages to people outside your team, go to the <b class="govuk-!-font-weight-bold">Settings</b> page and select <b class="govuk-!-font-weight-bold">Request to go live</a>. We’ll approve your request within one working day.</p>
+    <p>When you’re ready to send messages to people outside your team, go to the <b class="govuk-!-font-weight-bold">Settings</b> page and select <b class="govuk-!-font-weight-bold">Request to go live</b>. We’ll approve your request within one working day.</p>
     {% else %}
     <p>You should <a href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
     {% endif %}

From 74874ee78d1e2beccea7863696eda8ff4508f11a Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 15:59:07 +0000
Subject: [PATCH 109/117] Remove commented-out content

---
 app/templates/views/features/letters.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index b7dbf37bc..4b092e055 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -33,7 +33,6 @@
 
   <h3 class="heading heading-small" id="upload-letters">Upload your own letters</h3>
   <p>You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
-  <!--<p>See <a href="{{ url_for('.upload_a_letter') }}">how to upload a letter</a>.</p>-->
   <p>Read our <a href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>

From a5c77a6fc32b1755c4eacdfe50e61186a9829bff Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 16:01:23 +0000
Subject: [PATCH 110/117] Remove commented-out content

---
 app/templates/views/get-started.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index 5604ff062..67056a69b 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -43,12 +43,7 @@
 
   <li class="get-started-list__item">
     <h2 class="get-started-list__heading">Write some messages</h2>
-    <p>Add <a href="{{ url_for('main.features', _anchor='templates') }}">message templates</a> with examples of the content you plan to send. You can use our <a href="{{ url_for('main.guidance_index') }}">guidance</a> to help you.<!-- You do not need to add letter templates if you’re planning to <a href="{{ url_for('main.features_letters', _anchor='upload-letters') }}">upload your own letters</a>.--></p>
-    <!--<p>The GOV.UK Service Manual has advice on:</p>
-    <ul class="list list-bullet">
-      <li><a href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages#how-to-write-emails-and-text-messages">how to write emails and text messages</a></li>
-      <li><a href="https://www.gov.uk/service-manual/design/writing-effective-letters">writing effective letters</a></li>
-    </ul>-->
+    <p>Add <a href="{{ url_for('main.features', _anchor='templates') }}">message templates</a> with examples of the content you plan to send. You can use our <a href="{{ url_for('main.guidance_index') }}">guidance</a> to help you.</p>
   </li>
 
   <li class="get-started-list__item">

From ccb783c43b000781dd6e13a828a28d86d69850e9 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 16:02:41 +0000
Subject: [PATCH 111/117] Update app/templates/views/guidance/index.html

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
---
 app/templates/views/guidance/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 12d74f803..d6e005e0a 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -15,7 +15,6 @@
   <p>It explains how to:</p>
 
   <ul class="list list-bullet">
-    <!--<li><a href="{{ url_for('.create_and_send_messages') }}">create and send messages</a></li>-->
     <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
     <li><a href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
     <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>

From d646238a015cc331d0238ff1f547cfda00f1827e Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 16:03:48 +0000
Subject: [PATCH 112/117] Remove commented-out content

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
---
 app/templates/views/guidance/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index d6e005e0a..14ba6abe4 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -18,7 +18,6 @@
     <li><a href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li>
     <li><a href="{{ url_for('.branding_and_customisation') }}">add branding and customisation</a></li>
     <li><a href="{{ url_for('.send_files_by_email') }}">send files by email</a></li>
-    <!--<li><a href="{{ url_for('.upload_a_letter') }}">upload your own letters</a></li>-->
   </ul>
 
   <h2 class="heading-medium">More information</h2>

From 77590bb9d30937473139589d987227cbe1aff8a1 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 16:05:32 +0000
Subject: [PATCH 113/117] Remove commented-out content

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
---
 app/templates/views/guidance/upload-a-letter.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index b19f35363..f33443a70 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -23,7 +23,6 @@
 
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter.<p>
 
-  <!--<p>Your file must meet our <a href="{{ url_for('.letter_spec') }}">letter specification</a>.</p>-->
 
   <!--<p>To help you create your letter, you can download a <a href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">Word document template</a>.</p>-->
 

From f7e1e35dcb56665591acfaa64747a9d633d7bf36 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 16:06:00 +0000
Subject: [PATCH 114/117] Remove commented-out content

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
---
 app/templates/views/guidance/upload-a-letter.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index f33443a70..1e7921fd7 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -24,6 +24,5 @@
   <p>Use the <a href="{{ url_for('.letter_spec') }}">letter specification document</a> to help you set up your letter.<p>
 
 
-  <!--<p>To help you create your letter, you can download a <a href="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-word-template-v1.0.docx">Word document template</a>.</p>-->
 
 {% endblock %}

From 0949fc6480f2aefdca66c7376efb6df30dfa8d50 Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 12 Feb 2020 11:17:26 +0000
Subject: [PATCH 115/117] Update
 app/templates/views/guidance/edit-and-format-messages.html

---
 app/templates/views/guidance/edit-and-format-messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index eea668de1..96e22b191 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -32,7 +32,7 @@
   <ul class="list list-bullet">
     <li>headings</li>
     <li>bullets</li>
-    <li>call-outs (<a href="https://design-system.service.gov.uk/components/inset-text/">inset text</a>)</li>
+    <li><a href="https://design-system.service.gov.uk/components/inset-text/">inset text</a></li>
     <li>horizontal rules</li>
   </ul>
 

From d24d772cfa02b9b0a9bef3488a78710b304b6e2b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 12 Feb 2020 11:25:58 +0000
Subject: [PATCH 116/117] Reorder introduction content

---
 app/templates/views/message-status.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index 0c3585310..f9990aef0 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -9,10 +9,8 @@
 
   <h1 class="heading-large">Delivery status</h1>
 
-  <p>Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.</p>
+  <p>Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered. This page describes the statuses you’ll see when you’re signed in to Notify.</p>
   <p>For <a href="{{ url_for("main.security") }}">security</a>, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p>
-  
-  <p>This page describes the statuses you’ll see when you’re signed in to Notify.</p>
   <p>If you're using the Notify API, read our <a href="{{ url_for('.documentation') }}">documentation</a> for a list of API statuses.<p>
 
   <h2 id="email-statuses" class="heading-medium">Emails</h2>

From 98ccce5d900c79f6aea15ee3b30ef3647748f3fb Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Wed, 12 Feb 2020 11:33:10 +0000
Subject: [PATCH 117/117] Make click-throughs content clearer

---
 app/templates/views/message-status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index f9990aef0..fc322b3fd 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -40,7 +40,7 @@
   <p>If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>
 
   <h3 id="open-rates" class="heading-small">Open rates and click-throughs</h3>
-  <p>Notify does not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p>
+  <p>Notify cannot tell you if your users open an email or click on the links you send them. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p>
 
   <h2 id="sms-statuses" class="heading-medium">Text messages</h2>
   <div class="bottom-gutter-3-2">