Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

3 files changed, 21 insertions, 8 deletions

diff --git a/docs/pro-manual/admin-tasks.md b/docs/pro-manual/admin-tasks.md
index d4f48a5eb..7beefab31 100644
--- a/docs/pro-manual/admin-tasks.md
+++ b/docs/pro-manual/admin-tasks.md
@@ -22,7 +22,5 @@ via a role) for you to be able to perform this task.
 
 - If you’re a member of council staff using FixMyStreet Pro, questions should be addressed
 to your Administrator.
-- For technical problems and queries, Administrators may contact the FixMyStreet team on
-[bettercities@mysociety.org](mailto:bettercities@mysociety.org).
-- Is something not quite right, or missing from this documentation? Let us know on
-[bettercities@mysociety.org](mailto:bettercities@mysociety.org).
+- For any technical problems and queries, Administrators may contact the
+  FixMyStreet team by raising a ticket through their helpdesk system.
diff --git a/docs/pro-manual/citizens-experience.md b/docs/pro-manual/citizens-experience.md
index f47c2a124..5e7bfd0f7 100644
--- a/docs/pro-manual/citizens-experience.md
+++ b/docs/pro-manual/citizens-experience.md
@@ -22,13 +22,17 @@ When a citizen sees a problem and wishes to report it, they can do so in one of
 <img alt="Make a report on a council website, fixmystreet.com, or via the FixMyStreet app" src="/assets/img/pro-user-guide/all-the-sites.png" />
 
 - Through the council website, on the council’s branded FixMyStreet instance
-- On FixMyStreet.com, the UK-wide site
-- Via the FixMystreet app
-
+- On [FixMyStreet.com](https://www.fixmystreet.com), the UK-wide site
+- Via the FixMyStreet app
 
 No matter which of these channels they use, the report will be visible in all three places. All
 FixMyStreet instances draw from the same database of reports.
 
+The FixMyStreet website, and the council’s branded version, can also be
+installed as a ‘web app’ – providing a logo on their homescreen that users can
+treat like a native app without the hassle of app stores. If that’s something
+that would be of interest for your installation, please get in touch.
+
 <div class="boxout" markdown="1">
 
 <h4 class="boxout__title">What if a user makes a report on the council site, but it’s the responsibility of a different authority?</h4>
@@ -101,4 +105,4 @@ and you’ll be offered a range of options: you can subscribe to every report ma
 council area; every report made within a particular ward; or within an area roughly covering a
 population of 200,000 people (the size of this area varies with population density).
 Staff need not normally do this, as they will be working in the reports interface daily, and will be
-aware of issues as they arise.
\ No newline at end of file
+aware of issues as they arise.
diff --git a/docs/pro-manual/staff-user-accounts.md b/docs/pro-manual/staff-user-accounts.md
index 37997ada2..3efa4f41f 100644
--- a/docs/pro-manual/staff-user-accounts.md
+++ b/docs/pro-manual/staff-user-accounts.md
@@ -35,6 +35,17 @@ Your password must contain 6 or more characters, and must not be one of the most
 used combinations (such as ‘Password’ or ‘123456’). Your council may also have password policies
 which you are expected to abide by.
 
+### Two-factor authentication
+
+Any staff user can choose to set up two-factor authentication on their account.
+To do this, they will need an app on their phone that can generate time-based
+authentication keys, such as Google Authenticator or a password manager. Then.
+they can visit their account page on the site and select ‘Activate two-factor
+authentication’ to receive a QR code to scan with the app.
+
+If you wish your organisation to have mandated two-factor authentication,
+please get in touch.
+
 ### How to log out
 
 Click on ‘Your account’ in the top menu, then click ‘Sign out’.