Merge pull request #2922 from alphagov/features-footer-second-pass

Features and footer updates

app/templates/views/features.html

@@ -40,7 +40,7 @@
 
     <h2 class="heading-medium">API integration</h2>
     <p>You can integrate the Notify API with your web application or back-office system to send messages automatically.</p>
-    <p><a href="{{ url_for('.documentation') }}">Read our API documentation</a> for more information.</p>
+    <p>Read our <a href="{{ url_for('.documentation') }}">API documentation</a> for more information.</p>
 
     <h2 class="heading-medium">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>

app/templates/views/features/emails.html

@@ -43,7 +43,7 @@
       <li>email attachments are often marked as spam</li>
     </ul>
     <p><a href="{{ url_for('.feedback', ticket_type='ask-question-give-feedback') }}">Contact the team</a> and ask us to turn this feature on for your service.</p>
-    <p><a href="{{ url_for('.documentation') }}">Read the API documentation</a> for more information.</p>
+    <p>Read our <a href="{{ url_for('.documentation') }}">API documentation</a> for more information.</p>
 
     <h3 class="heading heading-small">Add a reply-to address</h3>
     <p>Notify lets you choose the email address that users reply to.</p>

app/templates/views/features/letters.html

@@ -25,18 +25,19 @@
     <ul class="list list-bullet">
       <li>create reusable letter templates</li>
       <li>personalise the content of your letter</li>
-      <li>send bulk messages</li>
+      <li>send bulk mail</li>
     </ul>
     <p>You can also <a href="{{ url_for('.documentation') }}">integrate with our API</a> to send letters automatically.</p>
 
     <h3 class="heading-small">Choose your postage</h3>
-    <p>You can send letters by first or second class post.</p>
+    <p>Notify can send letters by first or second class post.</p>
     <p>First class letters are delivered one day after they’re dispatched. Second class letters are delivered 2 days after they’re dispatched.</p>
     <p>Letters sent before 5:30pm are dispatched the next working day (Monday to Friday). Royal Mail delivers from Monday to Saturday, excluding bank holidays.</p>
 
     <h3 class="heading heading-small">Upload your own letters</h3>
-    <p>You can create reusable letter templates in Notify, or upload and send your own letters.</p>
+    <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="https://docs.notifications.service.gov.uk/documentation/images/notify-pdf-letter-spec-v2.3.pdf">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>
 
     <h2 class="heading heading-medium">Pricing</h2>
     <p>It costs between 30p and 76p (plus VAT) to send a letter. Prices include:</p>

app/templates/views/features/text-messages.html

@@ -15,7 +15,7 @@
   <div class="column-two-thirds">
 
     <h1 class="heading heading-large">Text messages</h1>
-    <p>With GOV.UK Notify you can send thousands of free text messages to UK and international numbers.</p>
+    <p>Send thousands of free text messages to UK and international numbers with GOV.UK Notify.</p>
     {% if not current_user.is_authenticated %}
     <p><a href="{{ url_for('main.register') }}">Create an account</a> and try Notify for yourself.</p>
     {% endif %}

app/templates/views/message-status.html

@@ -18,7 +18,7 @@
 
     <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>For security, 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>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>
 
     <img
         src="{{ asset_url('images/message-sending-flow.svg') }}"
@@ -29,7 +29,7 @@
     >
     <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. <a href="{{ url_for('.documentation') }}">Read our documentation</a> for a detailed list of API message statuses.</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 class="heading-small">Emails</h3>
     <div class="bottom-gutter-3-2">

tests/app/main/views/test_index.py

@@ -78,7 +78,9 @@ def test_robots(client):
 
 @pytest.mark.parametrize('view', [
     'cookies', 'privacy', 'pricing', 'terms', 'roadmap',
-    'features', 'callbacks', 'documentation', 'security'
+    'features', 'callbacks', 'documentation', 'security',
+    'message_status', 'features_email', 'features_sms',
+    'features_letters',
 ])
 def test_static_pages(
     client_request,