From edb285b105d1d03c376df457990f42d644e2ebe7 Mon Sep 17 00:00:00 2001
From: AdamChrimes <iChrimes@live.co.uk>
Date: Mon, 12 Aug 2019 09:49:25 +0100
Subject: [PATCH 01/16] Revert "hide the search functionality until it is fully
 tested"

This reverts commit 8e5975cfe2f868f2f6ad9d77492858e03c6399df.
---
 app.js                        | 2 --
 app/views/includes/header.njk | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 1cfdf0f35..9cd8e89c5 100755
--- a/app.js
+++ b/app.js
@@ -75,7 +75,6 @@ app.get('/service-manual/design-example/:example', (req, res) => {
   res.render('includes/design-example-wrapper.njk', { body: exampleHtml });
 });
 
-/*
 app.get('/service-manual/search', (req, res) => {
   var query = req.query['search-field'] || '';
   res.render('includes/search.njk', { results: pageIndex.search(query), query: query });
@@ -85,7 +84,6 @@ app.get('/service-manual/suggestions', (req, res) => {
   res.set({ 'Content-Type': 'application/json' });
   res.send(JSON.stringify(pageIndex.search(req.query.search)));
 });
-*/
 
 app.get('/', (req, res) => {
   res.redirect('/service-manual');
diff --git a/app/views/includes/header.njk b/app/views/includes/header.njk
index 0af0c8d7e..fba9c522e 100755
--- a/app/views/includes/header.njk
+++ b/app/views/includes/header.njk
@@ -22,7 +22,7 @@
       "longName": "true"
     },
     "showNav": "false",
-    "showSearch": "false",
+    "showSearch": "true",
     "searchAction": "/service-manual/search/"
     })
   }}

From e62fb4c902a8abfc605ab3f9bd4c0d7339d2b5c1 Mon Sep 17 00:00:00 2001
From: AdamChrimes <iChrimes@live.co.uk>
Date: Mon, 12 Aug 2019 09:50:30 +0100
Subject: [PATCH 02/16] Revert "Revert "Update care cards info for content
 designers""

This reverts commit 9882c6d8af67a73e622754a675b438ac6fe466e7.
---
 .../styles-components-patterns/care-cards.njk | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/views/styles-components-patterns/care-cards.njk b/app/views/styles-components-patterns/care-cards.njk
index e24150561..f33af199d 100644
--- a/app/views/styles-components-patterns/care-cards.njk
+++ b/app/views/styles-components-patterns/care-cards.njk
@@ -84,10 +84,10 @@
     <h3>When to use care cards</h3>
     <p>Use care cards to tell users to take action to get medical advice or help.</p>
     <h3>When not to use care cards</h3>
-    <p>Don't use care cards:</p>
+    <p>Do not use care cards:</p>
     <ul>
       <li>in forms or transactions</li>
-      <li>for actions which don't help users get one of the 3 levels of care</li>
+      <li>for actions which do not help users get 1 of the 3 levels of care</li>
     </ul>
     <p>If you want:</p>
     <ul>
@@ -102,10 +102,30 @@
     <p>If you use more than 1 care card - or a care card and a warning callout close to each other, be aware that users often overlook text between them.</p>
 
     <h2>Care card content</h2>
-    <p>Give the card a short heading. It should be 1 clear call to action, for example "Speak to a GP".</p>
-    <p>If the card includes more than one condition, use the format: "Call 111 if:" or "Speak to a GP if:" followed by a bulleted list.</p>
-    <p>Make sure the care card is concise, specific and self-contained. Don't say: "Contact your GP if this happens." Explain in the care card in what circumstances users should contact their GP.</p>
+    <h3>Give the card a short heading using "if"</h3>
+    <p>The heading should be 1 clear call to action. Use the format: "Call 111 if:" or "Speak to a GP if:" followed by a bulleted list in the body of the card.</p>
+    <h3>Put the detail in the body of the card</h3>
+    <p>Do not overload the header. Use the space in the body of the card but keep it concise.</p>
+    <p>It's OK to use a single bullet point after the "if" in the header. It's clearer than including a stand-alone sentence in the card.</p>
+    <p>It's also OK to have 2 colons (1 in the header and 1 in the body of the card), for example:</p>
+    <div class="nhsuk-care-card nhsuk-care-card--urgent">
+      <div class="nhsuk-care-card__heading-container">
+      <h3 class="nhsuk-care-card__heading"><span role="text"><span class="nhsuk-u-visually-hidden">Urgent advice: </span>Get advice from 111 now if:</span></h3>
+      <span class="nhsuk-care-card__arrow" aria-hidden="true"></span>
+      </div>
+      <div class="nhsuk-care-card__content">
+      <p>you take too much furosemide and you:
+      <ul>
+        <li>are over 65 (even if you feel well)</li>
+        <li>have kidney, heart or liver failure (even if you feel well)</li>
+      </ul>
+      </div>
+    </div>
 
+    <h3>Make the care card self-contained</h3>
+    <p>Care cards should be specific and include the information the user needs. Do not say: "Contact your GP if this happens." Explain in the care card in what circumstances users should contact their GP.</p>
+    <h3>Keep signposting simple</h3>
+    <p>Ideally you should signpost to just 1 service in the header but you can signpost to 2 (the top 2 services). If you need to, add more services at the end of the body of the care card.<p>
     <h2 id="accessibility">Accessibility</h2>
     <p>People with visual disabilities may not be able to recognise care cards by their colour. Use clearly worded headings to help them.</p>
     <p>We also add hidden text to the care card header to make the level of urgency clear to people who use screen readers. This also helps people who use headings to navigate the page as the text is part of the heading.</p>
@@ -115,7 +135,7 @@
     <h2>Research</h2>
     <p>The care card design has tested well in long content pages. We've tested it in content in lots of labs and users scanning the page have stopped to read the cards.</p>
     <p>We haven't tested care cards in transactional services and do not recommend using them. If you use a care card in a transactional service, please test it with users and let us know what you find.</p>
-    <p>We've tested care cards with 1 call to action, for example "Speak to a GP". If you use more than 1 action, please test it and share your research findings with us.</p>
+    <p>We've tested care cards with 1 call to action, for example "Speak to a GP if:". If you use more than 1 action, please test it and share your research findings with us.</p>
     <p>We found that users overlook text between care cards, or between care cards and warning callouts, when they are close to each other.</p>
     <p>Accessibility testing showed up some issues around communicating the importance of the cards with hidden text, which we've dealt with. <a href="#accessibility">See the Accessibility section.</a></p>
 
@@ -125,12 +145,12 @@
     <h2>Get in touch</h2>
     <p>If you have a question:</p>
     <ul>
-      <li>join the <a href="https://join.slack.com/t/nhs-service-manual/shared_invite/enQtNTIyOTEyNjU3NDkyLWUwOWM5MWY5MGRhYTYxZmY4ZWI0NDA1N2NhNTRiMGY3MTQxNjk5YTc3ZTAzMTA4YmE3ZDAxYmQ3MTQxNDgzOTQ">NHS.UK service manual Slack workspace</a></li>
+      <li>join the <a href="https://join.slack.com/t/nhs-service-manual/shared_invite/enQtNTIyOTEyNjU3NDkyLWUwOWM5MWY5MGRhYTYxZmY4ZWI0NDA1N2NhNTRiMGY3MTQxNjk5YTc3ZTAzMTA4YmE3ZDAxYmQ3MTQxNDgzOTQ">service manual Slack workspace</a></li>
       <li>email <a href="mailto: service-manual@nhs.net">service-manual@nhs.net</a></li>
     </ul>
 
     <div class="nhsuk-review-date">
-    <p class="nhsuk-body-s">Updated: January 2019</p>
+    <p class="nhsuk-body-s">Updated: August 2019</p>
     </div>
 
     {{ panel({

From 643bde96fe530fb7c47994bb42732b85688ece49 Mon Sep 17 00:00:00 2001
From: AdamChrimes <iChrimes@live.co.uk>
Date: Mon, 12 Aug 2019 09:53:20 +0100
Subject: [PATCH 03/16] populate the change log for release 2.0.0

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a371d3c..cd6dbd9de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # NHS digital service manual Changelog
 
+## 2.0.0 - Unreleased
+
+:new: **New features**
+
+- Add search functionality to the service manual
+
+:new: **New content**
+
+- Add more guidance for content designers to care card page 	
+
 ## 1.8.0 - 09 August 2019
 
 :new: **New content**
diff --git a/package-lock.json b/package-lock.json
index 97fbb5148..ff888c333 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nhsuk-service-manual",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 312a0eeb3..49d5837d8 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nhsuk-service-manual",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "description": "NHS digital service manual",
   "main": "app.js",
   "directories": {

From 6e2a6ab04ca3e1c288eefcc7559cacf5ee5faffb Mon Sep 17 00:00:00 2001
From: AdamChrimes <iChrimes@live.co.uk>
Date: Tue, 13 Aug 2019 16:39:39 +0100
Subject: [PATCH 04/16] hide the search until further development has been
 completed

---
 CHANGELOG.md                  | 6 +-----
 app.js                        | 2 ++
 app/views/includes/header.njk | 2 +-
 package-lock.json             | 2 +-
 package.json                  | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd6dbd9de..971e08245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,6 @@
 # NHS digital service manual Changelog
 
-## 2.0.0 - Unreleased
-
-:new: **New features**
-
-- Add search functionality to the service manual
+## 1.9.0 - Unreleased
 
 :new: **New content**
 
diff --git a/app.js b/app.js
index 9cd8e89c5..1cfdf0f35 100755
--- a/app.js
+++ b/app.js
@@ -75,6 +75,7 @@ app.get('/service-manual/design-example/:example', (req, res) => {
   res.render('includes/design-example-wrapper.njk', { body: exampleHtml });
 });
 
+/*
 app.get('/service-manual/search', (req, res) => {
   var query = req.query['search-field'] || '';
   res.render('includes/search.njk', { results: pageIndex.search(query), query: query });
@@ -84,6 +85,7 @@ app.get('/service-manual/suggestions', (req, res) => {
   res.set({ 'Content-Type': 'application/json' });
   res.send(JSON.stringify(pageIndex.search(req.query.search)));
 });
+*/
 
 app.get('/', (req, res) => {
   res.redirect('/service-manual');
diff --git a/app/views/includes/header.njk b/app/views/includes/header.njk
index fba9c522e..0af0c8d7e 100755
--- a/app/views/includes/header.njk
+++ b/app/views/includes/header.njk
@@ -22,7 +22,7 @@
       "longName": "true"
     },
     "showNav": "false",
-    "showSearch": "true",
+    "showSearch": "false",
     "searchAction": "/service-manual/search/"
     })
   }}
diff --git a/package-lock.json b/package-lock.json
index ff888c333..6c6d11f0c 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nhsuk-service-manual",
-  "version": "2.0.0",
+  "version": "1.9.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 49d5837d8..ff0701b94 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nhsuk-service-manual",
-  "version": "2.0.0",
+  "version": "1.9.0",
   "description": "NHS digital service manual",
   "main": "app.js",
   "directories": {

From 6fadb9d6092b4a57c5de78f9b953df746955c856 Mon Sep 17 00:00:00 2001
From: Chris Midgley <chris.midgley@bjss.com>
Date: Thu, 15 Aug 2019 12:53:58 +0100
Subject: [PATCH 05/16] Update tfbackends resource group to tfbackends-uks.

---
 azure-pipelines.terraform.yml | 2 +-
 deploy/terraform/backend.tf   | 2 +-
 deploy/terraform/init.sh      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.terraform.yml b/azure-pipelines.terraform.yml
index 2bc3637e3..1452a2d69 100644
--- a/azure-pipelines.terraform.yml
+++ b/azure-pipelines.terraform.yml
@@ -46,7 +46,7 @@ steps:
     azureSubscription: 'www.nhs.uk (1e543650-5458-44ea-a3b1-35a6d0d92cc9)'
     scriptLocation: inlineScript
     inlineScript: |
-      access_key=$(az storage account keys list -g tfbackends -n tfbackends --subscription www.nhs.uk | jq -r '.[0].value')
+      access_key=$(az storage account keys list -g tfbackends-uks -n tfbackends --subscription www.nhs.uk | jq -r '.[0].value')
       echo "##vso[task.setvariable variable=STORAGE_ACCOUNT_KEY]$access_key"
 
 - task: AzureCLI@1
diff --git a/deploy/terraform/backend.tf b/deploy/terraform/backend.tf
index e3021e815..70caefa59 100644
--- a/deploy/terraform/backend.tf
+++ b/deploy/terraform/backend.tf
@@ -1,6 +1,6 @@
 terraform {
     backend "azurerm" {
-        resource_group_name  = "tfbackends"
+        resource_group_name  = "tfbackends-uks"
         storage_account_name = "tfbackends"
         container_name       = "tfstate"
     }
diff --git a/deploy/terraform/init.sh b/deploy/terraform/init.sh
index 38caf5be2..aae9bb6ad 100755
--- a/deploy/terraform/init.sh
+++ b/deploy/terraform/init.sh
@@ -5,4 +5,4 @@ else
   ENVIRONMENT=$1
 fi
 
-terraform init -backend-config="key=nhs-service-manual.$ENVIRONMENT.terraform.tfstate" -backend-config="access_key=$(az storage account keys list -g tfbackends -n tfbackends --subscription www.nhs.uk | jq -r '.[0].value')" -reconfigure
+terraform init -backend-config="key=nhs-service-manual.$ENVIRONMENT.terraform.tfstate" -backend-config="access_key=$(az storage account keys list -g tfbackends-uks -n tfbackends --subscription www.nhs.uk | jq -r '.[0].value')" -reconfigure

From 544133ca3652253efd503325a8a4012c9e52754c Mon Sep 17 00:00:00 2001
From: Simon Rose <38424673+SiRose@users.noreply.github.com>
Date: Thu, 15 Aug 2019 14:44:22 +0100
Subject: [PATCH 06/16] Update

Paragraph and h3 added, as per card #140
---
 app/views/content/inclusive-language.njk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/content/inclusive-language.njk b/app/views/content/inclusive-language.njk
index b1922aa11..4aaa859a6 100644
--- a/app/views/content/inclusive-language.njk
+++ b/app/views/content/inclusive-language.njk
@@ -65,6 +65,8 @@
     }) }}
     <h2>Gender and sexuality</h2>
     <p>We make content gender neutral wherever possible.</p>
+    <p>Only mention sex, gender or sexuality if relevant. Avoid gender markers, such as Mr, Miss, Mrs, Ms.</p>
+    <h3>Gender neutral language</h3>
     <p>We do not label people with their gender identity or sexuality. Instead we say:</p>
     <ul>
       <li>trans woman or trans man</li>

From 0314dcda523587ddf71353df9a6f87e626f4ec57 Mon Sep 17 00:00:00 2001
From: laura-hajba <54136845+laura-hajba@users.noreply.github.com>
Date: Thu, 15 Aug 2019 14:45:28 +0100
Subject: [PATCH 07/16] Update the inclusive language page

#139 updated the H2 to now read 'Sex, gender and sexuality' instead of 'Gender and sexuality'
---
 app/views/content/inclusive-language.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/content/inclusive-language.njk b/app/views/content/inclusive-language.njk
index b1922aa11..a7ef2a3e7 100644
--- a/app/views/content/inclusive-language.njk
+++ b/app/views/content/inclusive-language.njk
@@ -63,7 +63,7 @@
     {{ insetText({
       "HTML": "<p>You're more at risk of developing type 2 diabetes if you are over 40 - or 25 for south Asian people.</p>"
     }) }}
-    <h2>Gender and sexuality</h2>
+    <h2>Sex, gender and sexuality</h2>
     <p>We make content gender neutral wherever possible.</p>
     <p>We do not label people with their gender identity or sexuality. Instead we say:</p>
     <ul>

From 7167f5f906018e60eace16f56b7ab8906aeae5d5 Mon Sep 17 00:00:00 2001
From: marklegassick <53823443+marklegassick@users.noreply.github.com>
Date: Thu, 15 Aug 2019 14:46:14 +0100
Subject: [PATCH 08/16] Update measurements and numbers page

Just changed a couple of instances of 'don't' to 'do not', plus changed the sentence about how we use ordinals.
---
 app/views/content/numbers-measurement-dates-time.njk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/content/numbers-measurement-dates-time.njk b/app/views/content/numbers-measurement-dates-time.njk
index dbc1b6606..9f1ffe2ed 100644
--- a/app/views/content/numbers-measurement-dates-time.njk
+++ b/app/views/content/numbers-measurement-dates-time.njk
@@ -73,11 +73,11 @@
       <li>30g of dried fruit</li>
       <li>150ml glass of fruit juice or smoothie"</li>
     </ul>
-    <h4>Examples of where we don't use numerals</h4>
+    <h4>Examples of where we do not use numerals</h4>
     <p>We do not use numerals in some medicines information about <a href="#dosage">dosage</a> because we've found they can be confusing.</p>
   <h3>Ordinal numbers (1st, 2nd, 3rd and so on)</h3>
-  <p>We use ordinal numbers, for example in "your 1st visit".</p>
-  <p>Do not use superscript. It doesn't always read out correctly on screen readers and could confuse people. </p>
+  <p>We use numerals with letter suffixes for ordinal numbers, for example "1st", as in "your 1st visit".</p>
+  <p>Do not use superscript. It does not always read out correctly on screen readers and could confuse people. </p>
 
     <h2 id="measurement">Measurement</h2>
     <h3 id="dosage">Dosage</h3>

From 6a38da1e0d67b25807629c7fbdeedf39bc603664 Mon Sep 17 00:00:00 2001
From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com>
Date: Fri, 16 Aug 2019 11:43:38 +0100
Subject: [PATCH 09/16] Update CHANGELOG.md

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 971e08245..88905ba63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,14 @@
 
 :new: **New content**
 
-- Add more guidance for content designers to care card page 	
+- Add more guidance for content designers to the care card page
+- Add "red book" and inclusive language terms to A to Z of NHS health writing
+
+:wrench: **Fixes**
+
+- Update inclusive language page in content style guide, especially guidance on sex, gender and sexuality
+- Change "measurement" to "measurements" in Numbers, measurements, dates and time - and update links to this page
+- Improve wording about ordinal numbers on Numbers, measurements, dates and time
 
 ## 1.8.0 - 09 August 2019
 

From 3b184c5492407ea070596d2dac57c890cd99ffce Mon Sep 17 00:00:00 2001
From: Sara Wilcox <sara.wilcox1@nhs.net>
Date: Fri, 16 Aug 2019 11:45:45 +0100
Subject: [PATCH 10/16] Update inclusive language page and make other minor
 changes after last Style Council meeting

---
 .../content/a-to-z-of-nhs-health-writing.njk  | 45 +++++++++-----
 app/views/content/inclusive-language.njk      | 59 ++++++++++++++-----
 app/views/content/index.njk                   |  2 +-
 ...jk => numbers-measurements-dates-time.njk} |  6 +-
 app/views/content/partials/related-nav.njk    |  2 +-
 5 files changed, 78 insertions(+), 36 deletions(-)
 rename app/views/content/{numbers-measurement-dates-time.njk => numbers-measurements-dates-time.njk} (97%)

diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk
index 423d1e425..767306cc8 100644
--- a/app/views/content/a-to-z-of-nhs-health-writing.njk
+++ b/app/views/content/a-to-z-of-nhs-health-writing.njk
@@ -136,6 +136,8 @@
         <h3 id="affects">affects</h3>
         <p>It’s alright to use "affects" but in some contexts, for example with medicines, it can be better to say that "something changes the way something else works". </p>
         <p>Check a dictionary if you’re not sure of the difference between "affect" and "effect".</p>
+        <h3 id="age">age</h3>
+        <p>Read about how we talk about age on the <a href="/service-manual/content/inclusive-language#age">Inclusive language</a> page.</p>
         <h3 id="ageing">ageing</h3>
         <p>Not "aging".</p>
         <h3 id="alternative">alternative</h3>
@@ -224,7 +226,7 @@
         <h3 id="condition">condition</h3>
         <p>We use "condition", "problem" or "illness".</p>
         <p>We avoid words like "disease" and "disorder" as they can sound negative. But we do use these words in the names of specific diseases or disorders, like Alzheimer’s disease or obsessive compulsive disorder (OCD) or terms like "tropical diseases".</p>
-        <p>See the section on <a href="/service-manual/content/inclusive-language">conditions in Inclusive language</a>.</p>
+        <p>Read about how we talk about disabilities and conditions on the <a href="/service-manual/content/inclusive-language#disabilities-and-conditions">Inclusive language</a> page.</p>
         <h3 id="continuing-healthcare">continuing healthcare</h3>
         <p>Lower case and "healthcare" is one word.</p>
         <p>We explain <a href="https://www.nhs.uk/conditions/social-care-and-support-guide/money-work-and-benefits/nhs-continuing-healthcare/">NHS continuing healthcare</a> on the NHS website.</p>
@@ -240,16 +242,20 @@
       <div class="nhsuk-a-z-list--results-items">
         <h2 id="D">D</h2>
         <h3 id="dates">dates</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <p>See our guidance on dates on the <a href="/service-manual/content/numbers-measurements-dates-time#dates">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="degrees-(temperature)">degrees (temperature)</h3>
         <p>We use C for centigrade or Celsius – for example, 38C or &minus;4C. Do not include the degree symbol (&deg;).</p>
         <p>We are no longer including references to <a href="#Fahrenheit">Fahrenheit</a>.</p>
         <p>Also see <a href="#fever">fever</a> and <a href="#temperature">temperature</a>.</p>
         <h3 id="diabetic">diabetic</h3>
-        <p>We don’t talk about people as "diabetic". We say they have diabetes. See the section on <a href="/service-manual/content/inclusive-language">conditions in Inclusive language</a>.</p>
+        <p>We don’t talk about people as "diabetic". We say they have diabetes.</p>
         <p>We do use "diabetic" in phrases like "diabetic eye screening".</p>
+        <p>Read more about how we talk about disabilities and conditions on <a href="/service-manual/content/inclusive-language#disabilities-and-conditions">the Inclusive language</a> page.</p>
+
         <h3 id="dietitian">dietitian</h3>
         <p>Not dietician.</p>
+        <h3 id="disabilities">disabilities</h3>
+        <p>We use positive language to talk about disabilities. Read more about how we talk about disabilities and conditions on our <a href="/service-manual/content/inclusive-language#disabilities-and-conditions">Inclusive language</a> page.</p>
         <h3 id="diuretics">diuretics</h3>
         <p>We don’t call them "water tablets". We explain that diuretics are "tablets that make you pee more".</p>
         <h3 id="DNA">DNA</h3>
@@ -258,7 +264,7 @@
         <p>We mostly use "GP". But where someone may see either a GP or another health professional, for example in hospital, we use "doctor".</p>
         <p>Also see "<a href="#specialist">specialist</a>".</p>
         <h3 id="dosage">dosage</h3>
-        <p>See <a href="/service-manual/content/numbers-measurement-dates-time#dosage">dosage</a> in our guidance on numbers, measurement, dates and time.</p>
+        <p>See dosage on our <a href="/service-manual/content/numbers-measurements-dates-time#dosage">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="drugs">drugs</h3>
         <p>We use "medicines".</p>
         <p>We only use "drugs" for illegal drugs.</p>
@@ -276,7 +282,8 @@
         <h3 id="eg">eg</h3>
         <p>eg can sometimes be read aloud as "egg" by screen readers. We prefer "for example" or "such as" or "like" or "including" – whichever works best.</p>
         <h3 id="epileptic">epileptic</h3>
-        <p>We don’t talk about people as "epileptics". We say they have epilepsy. See the section on <a href="/service-manual/content/inclusive-language">conditions in Inclusive language</a>.</p>
+        <p>We don’t talk about people as "epileptics". We say they have epilepsy.</p>
+        <p>Read more about how we talk about conditions on the <a href="/service-manual/content/inclusive-language#disabilities-and-conditions">Inclusive language</a> page.</p>
         <h3 id="equivalent">equivalent</h3>
         <p>We use "equal to".</p>
         <h3 id="etc">etc</h3>
@@ -326,7 +333,7 @@
         <h3 id="foundation-trusts">foundation trust</h3>
         <p>Lower case, unless you are giving the full name of a foundation trust. For example: Anytown NHS Foundation Trust.</p>
         <h3 id="fractions">fractions</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <p>See our guidance on fractions on the <a href="/service-manual/content/numbers-measurements-dates-time#fractions">Numbers, measurements, dates and time</a> page.</p>
         <a class="nhsuk-back-to-top__link" href="#nhsuk-a-z-list">
           <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
             <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
@@ -338,6 +345,8 @@
         <h2 id="G">G</h2>
         <h3 id="gas">gas</h3>
         <p>We don't use "gas". Instead we talk about "<a href="#wind">wind</a>", "<a href="#burp">burping</a>" or "<a href="#fart">farting</a>". </p>
+        <h3 id="gender">gender</h3>
+        <p>Read about how we talk about gender on the <a href="/service-manual/content/inclusive-language#sex-gender-sexuality">Inclusive language</a> page.</p>
         <h3 id="GP">GP</h3>
         <p>Where someone may see either a GP or another health professional, for example in hospital, use "doctor".</p>
         <h3 id="GP-surgery">GP surgery</h3>
@@ -381,7 +390,7 @@
         <p>Only use "immunisation" for the Public Health England (PHE) immunisation programme or Joint Committee on Vaccination and Immunisation (JCVI).</p>
         <p>We use "<a href="#vaccination">vaccination</a>" otherwise.</p>
         <h3 id="imperial-measurements">imperial measurements</h3>
-        <p>See the guidance in <a href="/service-manual/content/numbers-measurement-dates-time#metric-and-imperial">numbers, measurement, dates and time</a>.</p>
+        <p>See the guidance on metric and imperial measurements on the <a href="/service-manual/content/numbers-measurements-dates-time#metric-and-imperial">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="incurable">incurable</h3>
         <p>We avoid "incurable". Instead we say "cannot be cured".</p>
         <h3 id="injection">injection</h3>
@@ -427,14 +436,14 @@
         <h2 id="M">M</h2>
         <h3 id="mad-cow-disease">mad cow disease</h3>
         <p>We use "<a href="#CJD">CJD</a>".</p>
-        <h3 id="measurement">measurement</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <h3 id="measurements">measurements</h3>
+        <p>See the section on measurements on the <a href="/service-manual/content/numbers-measurements-dates-time#measurements">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="medical-record">medical record</h3>
         <p>We prefer "<a href="#health-record">health record</a>".</p>
         <h3 id="medication">medication</h3>
         <p>We use "medicine".</p>
         <h3 id="metric-measurements">metric measurements</h3>
-        <p>See the guidance in <a href="/service-manual/content/numbers-measurement-dates-time#metric-and-imperial">numbers, measurement, dates and time</a>.</p>
+        <p>See the guidance on metric and imperial measurements on the <a href="/service-manual/content/numbers-measurements-dates-time#metric-and-imperial">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="microgram">microgram</h3>
         <p>Write "microgram" in full. Do not shorten it to "mcg".</p>
         <p>It helps to explain that a microgram is 1,000 times smaller than a milligram (mg).</p>
@@ -482,7 +491,7 @@
         <p>We use "usually".</p>
         <p>"Normally" in a health context can make people feel they aren’t "normal".</p>
         <h3 id="numbers">numbers</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <p>See our guidance on <a href="/service-manual/content/numbers-measurements-dates-time">numbers, measurements, dates and time</a>.</p>
         <a class="nhsuk-back-to-top__link" href="#nhsuk-a-z-list">
           <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
             <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
@@ -535,7 +544,7 @@
         <p>We prefer "people" for content aimed at the general public but we sometimes use "patients" if the word "people" might be confusing, for example, where we need to distinguish patients from the general public.</p>
         <p>"Patients" may also be more suitable in content for health professionals.</p>
         <h3 id="percentages">percentages</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <p>See our guidance on fractions and percentages on the <a href="/service-manual/content/numbers-measurements-dates-time#fractions-and-percentages">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="persist">persist</h3>
         <p>We use "carry on" or "keep going".</p>
         <h3 id="personal-child-health-record-(red-book)">personal child health record (red book)</h3>
@@ -567,11 +576,15 @@
       </div>
       <div class="nhsuk-a-z-list--results-items">
         <h2 id="R">R</h2>
+        <h3 id="race">race</h3>
+        <p>Read about how we talk about race, ethnicity, religion and nationality on the <a href="/service-manual/content/inclusive-language#race-ethnicity-religion-nationality">Inclusive language</a> page.</p>
         <h3 id="radiographer-or-radiologist">radiographer or radiologist</h3>
         <p>Radiographers take X-rays. Radiologists read them.</p>
         <h3 id="rectum">rectum</h3>
         <p>We prefer "<a href="#bottom">bottom</a>" or "<a href="#anus">anus</a>". Only use "rectum" when the other alternatives aren't clear enough, for example when talking about surgery to remove part of the rectum.</p>
         <p>We found that people don't search for "rectum" in Google as much as other terms.</p>
+        <h3 id="red-book">red book</h3>
+        <p>See <a href="#personal-child-health-record-(red-book)">personal child health record (red book)</a>.</p>
         <h3 id="reduce-pain">reduce pain</h3>
         <p>We say "help with pain" or "ease the pain".</p>
         <h3 id="reduced-kidney-function">reduced kidney function</h3>
@@ -602,6 +615,8 @@
         <h3 id="setting">setting</h3>
         <p>We avoid the term "hospital setting". We just say "in hospital".</p>
         <p>Instead of "community setting", we mention the place, for example, "in school", "in a clinic" or "at home".</p>
+        <h3 id="sex-and-sexuality">sex and sexuality</h3>
+        <p>Read about how we talk about sex, gender and sexuality on the <a href="/service-manual/content/inclusive-language#sex-gender-sexuality">Inclusive language</a> page.</p>
         <h3 id="sexual-health-clinic">sexual health clinic</h3>
         <p>We use "sexual health clinic", not "STI clinic".</p>
         <p>Sexual health clinics can offer different services. So, when we mention them for the first time and are talking about STIs, we sometimes add that they may also be called "GUM clinics". When we are talking about contraception, we sometimes add that they may also be called "family planning or contraception clinics".</p>
@@ -621,7 +636,7 @@
         <p>We generally use the word "specialist" for consultants and other specialist medical professions. For example, we use "a heart specialist" instead of "a cardiologist".</p>
         <p>Also see "<a href="#doctor">doctor</a>".</p>
         <h3 id="statistics">statistics</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <p>See our guidance on statistics on the <a href="/service-manual/content/numbers-measurements-dates-time#statistics">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="STI">STI</h3>
         <p>You might want to spell out "sexually transmitted infection" the first time you mention it. Otherwise it’s fine to use the abbreviation STI.</p>
         <p>We talk about "a" sexually transmitted infection but "an" STI.</p>
@@ -635,7 +650,7 @@
         <p>See <a href="#poo">poo</a>.</p>
         <h3 id="suffering-from">suffering from</h3>
         <p>We don’t use "suffering from". We talk about people having or living with a disability or condition.</p>
-        <p>See the section on <a href="/service-manual/content/inclusive-language">disabilities and conditions in Inclusive language.</a></p>
+        <p>Read more about how we talk about disabilities and conditions on the <a href="/service-manual/content/inclusive-language#disabilities-and-conditions">Inclusive language</a> page.</p>
         <h3 id="summary-care-record">summary care record</h3>
         <p>Lower case. Also see <a href="#health-record">health record</a>.</p>
         <h3 id="surgery">surgery</h3>
@@ -666,7 +681,7 @@
         <h3 id="terminal">terminal</h3>
         <p>We use "terminal" when a condition or illness is likely to lead to death. We find that people with cancer, for example, often use this word.</p>
         <h3 id="time">time</h3>
-        <p>See our guidance on <a href="/service-manual/content/numbers-measurement-dates-time">numbers, measurement, dates and time</a>.</p>
+        <p>See our guidance on time on the <a href="/service-manual/content/numbers-measurements-dates-time#time">Numbers, measurements, dates and time</a> page.</p>
         <h3 id="tranquillise-and-tranquilliser">tranquillise and tranquilliser</h3>
         <p>Note the double "ll". We use the British spelling with "s", not "z".</p>
         <h3 id="try-to">try to</h3>
diff --git a/app/views/content/inclusive-language.njk b/app/views/content/inclusive-language.njk
index 5d5f073e1..232ad3765 100644
--- a/app/views/content/inclusive-language.njk
+++ b/app/views/content/inclusive-language.njk
@@ -31,7 +31,7 @@
 </div>
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-two-thirds">
-    <h2>Disabilities and conditions</h2>
+    <h2 id="disabilities-and-conditions">Disabilities and conditions</h2>
     <p>We use positive language and don't label people when talking about disabilities and conditions.</p>
     <p>We do say things like:</p>
     <ul>
@@ -49,54 +49,81 @@
       <li>diabetic person</li>
       <li>sick or diseased person</li>
     </ul>
-    <p>NHS digital services should be accessible to everyone who needs them. Read more about <a href="/service-manual/accessibility/content">writing for accessibility</a> in the digital service manual.</p>
-    <h2>Mental health</h2>
+    <p>NHS digital services should be accessible to everyone who needs them. Read <a href="/service-manual/accessibility/content">our guidance on accessibility for content designers, writers and editors</a> in the digital service manual.</p>
+    <h2 id="mental-health">Mental health</h2>
     <p>We do not describe people as mentally ill.</p>
     <p>We do say:</p>
     <ul>
       <li>mental health condition</li>
       <li>mental health problems</li>
     </ul>
-    <h2>Race, ethnicity, religion and nationality</h2>
+    <h2 id="race-ethnicity-religion-nationality">Race, ethnicity, religion and nationality</h2>
     <p>We only refer to people's heritage or religion if it's relevant to the content.</p>
     <p>For example:</p>
     {{ insetText({
       "HTML": "<p>You're more at risk of developing type 2 diabetes if you are over 40 - or 25 for south Asian people.</p>"
     }) }}
-    <h2>Sex, gender and sexuality</h2>
+    <h2 id="sex-gender-sexuality">Sex, gender and sexuality</h2>
     <p>We make content gender neutral wherever possible.</p>
-    <p>Only mention sex, gender or sexuality if relevant. Avoid gender markers, such as Mr, Miss, Mrs, Ms.</p>
+    <p>Only mention sex, gender or sexuality if relevant. Avoid gender markers, such as Mr, Miss, Mrs, or Ms.</p>
     <h3>Gender neutral language</h3>
     <p>We do not label people with their gender identity or sexuality. Instead we say:</p>
     <ul>
-      <li>trans woman or trans man</li>
-      <li>trans and non-binary people</li>
+      <li>trans woman</li>
+      <li>trans man</li>
+      <li>trans people</li>
       <li>lesbian woman</li>
       <li>gay man</li>
       <li>men who have sex with men</li>
     </ul>
+    <p>We use "trans woman" for someone who was assigned male at birth and "trans man" for someone who was assigned female at birth. We use "trans woman" or "trans man" in content about the particular health needs of trans people - for example, screening or treatments that trans people need to be aware of, like advising a trans man about cervical and breast screening.</p>
+    <p>Otherwise we use "trans" as an umbrella term to cover the diverse range of identities outside the traditional male/female definitions. These include transgender, gender fluid and non-binary.</p>
+    <h3>They</h3>
     <p>It's alright to use "they" to avoid "he or she" or where you need a gender-neutral pronoun.</p>
     <p>For example:</p>
     {{ insetText({
       "HTML": "<p>You should see your GP if you have persistent symptoms of osteoarthritis so they can confirm the diagnosis and prescribe any necessary treatment.</p>"
     }) }}
-    <h2>Age</h2>
-    <p>We do not say old age pensioner, pensioner or OAP.</p>
+    <h3>When to use "sex" and when to use "gender"</h3>
+    <p>Sex is biological – male, female or intersex.</p>
+    <p>We use "sex" or, better still, the body part associated with biological sex when we're writing about things like screening that is sex specific, for example, breast and cervical screening.</p>
+    <p>Gender is more complex. It's about social and legal status and social expectations. It's also about how people feel and think about themselves.</p>
+    <p>Someone may see themselves as a man, a woman or neither (non-binary). They may identify with a gender opposite to the sex they were assigned at birth or neither.</p>
+    <p>We use "gender" when we're:</p>
+    <ul>
+      <li>discussing the social idea or identity as opposed to the biological sex, for example, if we're writing about gender dysphoria or transgender</li>
+      <li>writing about a survey or report based on gender, such as gender and professions</li>
+    </ul>
+    <h2 id="age">Age</h2>
+    <p>Only include age if relevant, for example, with vaccination, screening or testing programmes where age determines eligibility. An example of this is chlamydia testing as tests are free for under-25s.</p>
+    <p>Here are some of the terms we use for different stages of life with some guidance about the ages they relate to.</p>
+    <p>When you need to be more specific, for example if you're writing about medicines dosage, give the actual age. For example, "teenagers aged 16 and over".</p>
     <p>We use:</p>
     <ul>
       <li>fertilised egg: from conception to 14 days</li>
       <li>embryo: from 2 to 9 weeks</li>
       <li>unborn baby: from week 10 to birth</li>
       <li>baby: 0 to 12 months</li>
-      <li>infant: under 2 years</li>
       <li>toddler: 1 to 3 years</li>
-      <li>child: 1 to 12 years</li>
-      <li>teenager, or young person: 13 to 19 years (we do not say pubescent or adolescent)</li>
-      <li>older person: 60 to 70 years</li>
-      <li>elderly person: over 70 years</li>
+      <li>child: 4 to 12 years</li>
+      <li>teenager: 13 to 19 years</li>
+      <li>young people: 16 to 24 years</li>
+      <li>adult: generally from age 18 but this may vary. Be specific, for example: "adults aged 19 to 64"
+      <li>older person: 65 years and over</li>
     </ul>
+    <p>With babies and toddlers, we count their age in weeks up until 6 months, then months up until 2 years.</p>
+    <p>We do not use the words:</p>
+    <ul>
+      <li>elderly</li>
+      <li>middle aged</li>
+      <li>OAP</li>
+      <li>old age pensioner</li>
+      <li>pensioner</li>
+      <li>senior</li>
+    </ul>
+
     <div class="nhsuk-review-date">
-     <p class="nhsuk-body-s">Updated: August 2018</p>
+     <p class="nhsuk-body-s">Updated: August 2019</p>
     </div>
   </div>
   <aside class="nhsuk-grid-column-one-third">
diff --git a/app/views/content/index.njk b/app/views/content/index.njk
index e7f60492e..9e360e4c0 100644
--- a/app/views/content/index.njk
+++ b/app/views/content/index.njk
@@ -36,7 +36,7 @@
     <p>Why it's important and what to do about it.</p>
   </div>
   <div class="nhsuk-grid-column-one-third">
-    <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3"><a href="/service-manual/content/numbers-measurement-dates-time">Numbers, measurement, dates and time</a></h2>
+    <h2 class="nhsuk-heading-s nhsuk-u-margin-bottom-3"><a href="/service-manual/content/numbers-measurements-dates-time">Numbers, measurements, dates and time</a></h2>
     <p>With dosage, temperature, and statistics.</p>
   </div>
 </div>
diff --git a/app/views/content/numbers-measurement-dates-time.njk b/app/views/content/numbers-measurements-dates-time.njk
similarity index 97%
rename from app/views/content/numbers-measurement-dates-time.njk
rename to app/views/content/numbers-measurements-dates-time.njk
index 9f1ffe2ed..01f9ba3f7 100644
--- a/app/views/content/numbers-measurement-dates-time.njk
+++ b/app/views/content/numbers-measurements-dates-time.njk
@@ -1,4 +1,4 @@
-{% set pageTitle = 'Numbers, measurement, dates and time' %}
+{% set pageTitle = 'Numbers, measurements, dates and time' %}
 {% set pageSection = 'Content style guide' %}
 {% set pageDescription = 'Content styles, including numerals, ordinals, dosage, temperature, fractions and percentages' %}
 
@@ -33,7 +33,7 @@
       <h2 class="app-page-contents__heading">On this page</h2>
       <ul class="app-page-contents__list">
         <li class="app-page-contents__item">Numbers</li>
-        <li class="app-page-contents__item">Measurement</li>
+        <li class="app-page-contents__item">Measurements</li>
         <li class="app-page-contents__item">Dates</li>
         <li class="app-page-contents__item">Time</li>
         <li class="app-page-contents__item">Ranges of numbers, dates and time</li>
@@ -79,7 +79,7 @@
   <p>We use numerals with letter suffixes for ordinal numbers, for example "1st", as in "your 1st visit".</p>
   <p>Do not use superscript. It does not always read out correctly on screen readers and could confuse people. </p>
 
-    <h2 id="measurement">Measurement</h2>
+    <h2 id="measurements">Measurements</h2>
     <h3 id="dosage">Dosage</h3>
     <p>We do not use a space between amount and measurement.</p>
     <p>Example: The usual dose is 250mg to 500mg.</p>
diff --git a/app/views/content/partials/related-nav.njk b/app/views/content/partials/related-nav.njk
index 4bc0edd19..277548f40 100644
--- a/app/views/content/partials/related-nav.njk
+++ b/app/views/content/partials/related-nav.njk
@@ -29,7 +29,7 @@
       {% endif %}
       {% if pageTitle != 'Numbers, measurement, dates and time' %}
       <li class="nhsuk-related-nav__item">
-        <a href="/service-manual/content/numbers-measurement-dates-time">Numbers, measurement, dates and time</a>
+        <a href="/service-manual/content/numbers-measurements-dates-time">Numbers, measurements, dates and time</a>
       </li>
       {% endif %}
       {% if pageTitle != 'Formatting and punctuation' %}

From c2f9315d01d587c76fdf233b031c9e36df5ff933 Mon Sep 17 00:00:00 2001
From: Chris Midgley <chris.midgley@bjss.com>
Date: Fri, 16 Aug 2019 12:05:07 +0100
Subject: [PATCH 11/16] Convert to Terraform 0.12.

---
 deploy/terraform/backend.tf  | 11 ++++++-----
 deploy/terraform/versions.tf |  4 ++++
 deploy/terraform/web-app.tf  | 35 ++++++++++++++++++-----------------
 3 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 deploy/terraform/versions.tf

diff --git a/deploy/terraform/backend.tf b/deploy/terraform/backend.tf
index 70caefa59..62654e9de 100644
--- a/deploy/terraform/backend.tf
+++ b/deploy/terraform/backend.tf
@@ -1,7 +1,8 @@
 terraform {
-    backend "azurerm" {
-        resource_group_name  = "tfbackends-uks"
-        storage_account_name = "tfbackends"
-        container_name       = "tfstate"
-    }
+  backend "azurerm" {
+    resource_group_name  = "tfbackends-uks"
+    storage_account_name = "tfbackends"
+    container_name       = "tfstate"
+  }
 }
+
diff --git a/deploy/terraform/versions.tf b/deploy/terraform/versions.tf
new file mode 100644
index 000000000..ac97c6ac8
--- /dev/null
+++ b/deploy/terraform/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
diff --git a/deploy/terraform/web-app.tf b/deploy/terraform/web-app.tf
index 8c2fbed3d..b28796b89 100644
--- a/deploy/terraform/web-app.tf
+++ b/deploy/terraform/web-app.tf
@@ -1,31 +1,31 @@
 provider "azurerm" {
-  version = "=1.21.0"
+  version = "=1.32.1"
 }
 
 variable "environment" {
-  type = "string"
+  type = string
 }
 
 variable "app_service_names" {
   default = {
     production = "nhsuk-service-manual"
-    staging = "nhsuk-service-manual-staging"
+    staging    = "nhsuk-service-manual-staging"
   }
 }
 
 variable "app_service_node_env" {
   default = {
     production = "production"
-    staging = "staging"
+    staging    = "staging"
   }
 }
 
 variable "manual_username" {
-  type = "string"
+  type = string
 }
 
 variable "manual_password" {
-  type = "string"
+  type = string
 }
 
 resource "azurerm_resource_group" "nhsuk-service-manual" {
@@ -35,8 +35,8 @@ resource "azurerm_resource_group" "nhsuk-service-manual" {
 
 resource "azurerm_app_service_plan" "nhsuk-service-manual" {
   name                = "nhsuk-service-manual"
-  location            = "${azurerm_resource_group.nhsuk-service-manual.location}"
-  resource_group_name = "${azurerm_resource_group.nhsuk-service-manual.name}"
+  location            = azurerm_resource_group.nhsuk-service-manual.location
+  resource_group_name = azurerm_resource_group.nhsuk-service-manual.name
   kind                = "Linux"
   reserved            = true
 
@@ -47,10 +47,10 @@ resource "azurerm_app_service_plan" "nhsuk-service-manual" {
 }
 
 resource "azurerm_app_service" "nhsuk-service-manual" {
-  name                = "${var.app_service_names[var.environment]}"
-  location            = "${azurerm_resource_group.nhsuk-service-manual.location}"
-  resource_group_name = "${azurerm_resource_group.nhsuk-service-manual.name}"
-  app_service_plan_id = "${azurerm_app_service_plan.nhsuk-service-manual.id}"
+  name                = var.app_service_names[var.environment]
+  location            = azurerm_resource_group.nhsuk-service-manual.location
+  resource_group_name = azurerm_resource_group.nhsuk-service-manual.name
+  app_service_plan_id = azurerm_app_service_plan.nhsuk-service-manual.id
   https_only          = true
 
   site_config {
@@ -58,9 +58,10 @@ resource "azurerm_app_service" "nhsuk-service-manual" {
     linux_fx_version = "NODE|lts"
   }
 
-  app_settings {
-    "NODE_ENV" = "${var.app_service_node_env[var.environment]}"
-    "MANUAL_USERNAME" = "${var.manual_username}"
-    "MANUAL_PASSWORD" = "${var.manual_password}"
+  app_settings = {
+    "NODE_ENV"        = var.app_service_node_env[var.environment]
+    "MANUAL_USERNAME" = var.manual_username
+    "MANUAL_PASSWORD" = var.manual_password
   }
-}
\ No newline at end of file
+}
+

From 5e7d39c5374370b8c856728b743db6f22379e020 Mon Sep 17 00:00:00 2001
From: Chris Midgley <chris.midgley@bjss.com>
Date: Fri, 16 Aug 2019 13:03:14 +0100
Subject: [PATCH 12/16] Assume resource group and app service plan are already
 in place.

Allow creating non-prod or staging environments.
---
 deploy/terraform/web-app.tf | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/deploy/terraform/web-app.tf b/deploy/terraform/web-app.tf
index b28796b89..58a1ff144 100644
--- a/deploy/terraform/web-app.tf
+++ b/deploy/terraform/web-app.tf
@@ -28,29 +28,20 @@ variable "manual_password" {
   type = string
 }
 
-resource "azurerm_resource_group" "nhsuk-service-manual" {
+data "azurerm_resource_group" "nhsuk-service-manual" {
   name     = "nhsuk-service-manual"
-  location = "West Europe"
 }
 
-resource "azurerm_app_service_plan" "nhsuk-service-manual" {
+data "azurerm_app_service_plan" "nhsuk-service-manual" {
   name                = "nhsuk-service-manual"
-  location            = azurerm_resource_group.nhsuk-service-manual.location
-  resource_group_name = azurerm_resource_group.nhsuk-service-manual.name
-  kind                = "Linux"
-  reserved            = true
-
-  sku {
-    tier = "Basic"
-    size = "B1"
-  }
+  resource_group_name = data.azurerm_resource_group.nhsuk-service-manual.name
 }
 
 resource "azurerm_app_service" "nhsuk-service-manual" {
-  name                = var.app_service_names[var.environment]
-  location            = azurerm_resource_group.nhsuk-service-manual.location
-  resource_group_name = azurerm_resource_group.nhsuk-service-manual.name
-  app_service_plan_id = azurerm_app_service_plan.nhsuk-service-manual.id
+  name                = lookup(var.app_service_names, var.environment, "nhsuk-service-manual-${var.environment}")
+  location            = data.azurerm_resource_group.nhsuk-service-manual.location
+  resource_group_name = data.azurerm_resource_group.nhsuk-service-manual.name
+  app_service_plan_id = data.azurerm_app_service_plan.nhsuk-service-manual.id
   https_only          = true
 
   site_config {
@@ -59,7 +50,7 @@ resource "azurerm_app_service" "nhsuk-service-manual" {
   }
 
   app_settings = {
-    "NODE_ENV"        = var.app_service_node_env[var.environment]
+    "NODE_ENV"        = lookup(var.app_service_node_env, var.environment, "staging")
     "MANUAL_USERNAME" = var.manual_username
     "MANUAL_PASSWORD" = var.manual_password
   }

From b8d50d94eebe2fcf76f4c444b7a90c2b5bc6c606 Mon Sep 17 00:00:00 2001
From: Sara Wilcox <sara.wilcox1@nhs.net>
Date: Fri, 16 Aug 2019 13:35:11 +0100
Subject: [PATCH 13/16] Make final tweaks to A to Z and Inclusive language
 content

---
 app/views/content/a-to-z-of-nhs-health-writing.njk | 2 +-
 app/views/content/inclusive-language.njk           | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/content/a-to-z-of-nhs-health-writing.njk b/app/views/content/a-to-z-of-nhs-health-writing.njk
index 767306cc8..88329bc4f 100644
--- a/app/views/content/a-to-z-of-nhs-health-writing.njk
+++ b/app/views/content/a-to-z-of-nhs-health-writing.njk
@@ -333,7 +333,7 @@
         <h3 id="foundation-trusts">foundation trust</h3>
         <p>Lower case, unless you are giving the full name of a foundation trust. For example: Anytown NHS Foundation Trust.</p>
         <h3 id="fractions">fractions</h3>
-        <p>See our guidance on fractions on the <a href="/service-manual/content/numbers-measurements-dates-time#fractions">Numbers, measurements, dates and time</a> page.</p>
+        <p>See our guidance on fractions on the <a href="/service-manual/content/numbers-measurements-dates-time#fractions-and-percentages">Numbers, measurements, dates and time</a> page.</p>
         <a class="nhsuk-back-to-top__link" href="#nhsuk-a-z-list">
           <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
             <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
diff --git a/app/views/content/inclusive-language.njk b/app/views/content/inclusive-language.njk
index 232ad3765..554e53a57 100644
--- a/app/views/content/inclusive-language.njk
+++ b/app/views/content/inclusive-language.njk
@@ -64,21 +64,20 @@
       "HTML": "<p>You're more at risk of developing type 2 diabetes if you are over 40 - or 25 for south Asian people.</p>"
     }) }}
     <h2 id="sex-gender-sexuality">Sex, gender and sexuality</h2>
-    <p>We make content gender neutral wherever possible.</p>
-    <p>Only mention sex, gender or sexuality if relevant. Avoid gender markers, such as Mr, Miss, Mrs, or Ms.</p>
+    <p>Only mention sex, gender or sexuality if relevant.</p>
     <h3>Gender neutral language</h3>
+    <p>We make content gender neutral wherever possible. Avoid gender markers, such as Mr, Miss, Mrs, or Ms.</p>
     <p>We do not label people with their gender identity or sexuality. Instead we say:</p>
     <ul>
       <li>trans woman</li>
       <li>trans man</li>
-      <li>trans people</li>
       <li>lesbian woman</li>
       <li>gay man</li>
       <li>men who have sex with men</li>
     </ul>
     <p>We use "trans woman" for someone who was assigned male at birth and "trans man" for someone who was assigned female at birth. We use "trans woman" or "trans man" in content about the particular health needs of trans people - for example, screening or treatments that trans people need to be aware of, like advising a trans man about cervical and breast screening.</p>
     <p>Otherwise we use "trans" as an umbrella term to cover the diverse range of identities outside the traditional male/female definitions. These include transgender, gender fluid and non-binary.</p>
-    <h3>They</h3>
+    <h4>They</h4>
     <p>It's alright to use "they" to avoid "he or she" or where you need a gender-neutral pronoun.</p>
     <p>For example:</p>
     {{ insetText({

From bb46c67eedd620b9015f33f4f403972cbde04dab Mon Sep 17 00:00:00 2001
From: AdamChrimes <iChrimes@live.co.uk>
Date: Sat, 17 Aug 2019 14:59:51 +0100
Subject: [PATCH 14/16] fix broken link to the numbers, measurements page on
 sitemap

---
 app/views/sitemap.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/sitemap.njk b/app/views/sitemap.njk
index a585081c3..02dae145f 100644
--- a/app/views/sitemap.njk
+++ b/app/views/sitemap.njk
@@ -76,7 +76,7 @@
             <li><a href="/service-manual/content/health-literacy/use-a-readability-tool-to-prioritise-content">Use a readability tool to prioritise content</a></li>
           </ul>
         </li>
-        <li><a href="/service-manual/content/numbers-measurement-dates-time">Numbers, measurement, dates and time</li>
+        <li><a href="/service-manual/content/numbers-measurements-dates-time">Numbers, measurements, dates and time</li>
         <li><a href="/service-manual/content/formatting-and-punctuation">Formatting and punctuation</a></li>
         <li><a href="/service-manual/content/links-and-pdfs">Links and PDFs</a></li>
       </ul>

From 441d5891327b5cc6d6941033e0002a6b56a992d6 Mon Sep 17 00:00:00 2001
From: Qais Patankar <qaisjp@gmail.com>
Date: Mon, 19 Aug 2019 19:42:09 +0100
Subject: [PATCH 15/16] Fix "Github" typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ed9d7ad8f..651dbef52 100755
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Run the project in development mode `npm run watch` and visit <a href="http://lo
 
 ## Get in touch
 
-The NHS digital service manual is maintained by NHS Digital. [Email us](mailto:service-manual@nhs.net), open a [Github issue](https://github.com/nhsuk/nhsuk-service-manual/issues/new) or get in touch on the [NHS digital service manual Slack workspace](https://nhs-service-manual.slack.com/join/shared_invite/enQtNTIyOTEyNjU3NDkyLWUwOWM5MWY5MGRhYTYxZmY4ZWI0NDA1N2NhNTRiMGY3MTQxNjk5YTc3ZTAzMTA4YmE3ZDAxYmQ3MTQxNDgzOTQ).
+The NHS digital service manual is maintained by NHS Digital. [Email us](mailto:service-manual@nhs.net), open a [GitHub issue](https://github.com/nhsuk/nhsuk-service-manual/issues/new) or get in touch on the [NHS digital service manual Slack workspace](https://nhs-service-manual.slack.com/join/shared_invite/enQtNTIyOTEyNjU3NDkyLWUwOWM5MWY5MGRhYTYxZmY4ZWI0NDA1N2NhNTRiMGY3MTQxNjk5YTc3ZTAzMTA4YmE3ZDAxYmQ3MTQxNDgzOTQ).
 
 ## Licence
 

From a0466510e65dfce12eb88fdb69e6404d5a8a8732 Mon Sep 17 00:00:00 2001
From: Sara Wilcox <sara.wilcox1@nhs.net>
Date: Wed, 21 Aug 2019 09:06:32 +0100
Subject: [PATCH 16/16] Tweak language on inclusive language page

---
 app/views/content/inclusive-language.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/content/inclusive-language.njk b/app/views/content/inclusive-language.njk
index 554e53a57..eee733d25 100644
--- a/app/views/content/inclusive-language.njk
+++ b/app/views/content/inclusive-language.njk
@@ -58,7 +58,7 @@
       <li>mental health problems</li>
     </ul>
     <h2 id="race-ethnicity-religion-nationality">Race, ethnicity, religion and nationality</h2>
-    <p>We only refer to people's heritage or religion if it's relevant to the content.</p>
+    <p>We only refer to people's ethnic heritage or religion if it's relevant to the content.</p>
     <p>For example:</p>
     {{ insetText({
       "HTML": "<p>You're more at risk of developing type 2 diabetes if you are over 40 - or 25 for south Asian people.</p>"
@@ -81,7 +81,7 @@
     <p>It's alright to use "they" to avoid "he or she" or where you need a gender-neutral pronoun.</p>
     <p>For example:</p>
     {{ insetText({
-      "HTML": "<p>You should see your GP if you have persistent symptoms of osteoarthritis so they can confirm the diagnosis and prescribe any necessary treatment.</p>"
+      "HTML": "<p>You should see the GP if you have persistent symptoms of osteoarthritis so they can confirm the diagnosis and prescribe any necessary treatment.</p>"
     }) }}
     <h3>When to use "sex" and when to use "gender"</h3>
     <p>Sex is biological – male, female or intersex.</p>