Merge pull request #293 from clairbarrass/main

Update connecting-totp.md

docs/user-guide/connecting-totp.md

@@ -72,23 +72,12 @@ by following the instructions at:
 Once you have done this, your SSH key will be added to your Cirrus
 account.
 
-Remember, you will need to use both an SSH key and Time-based one-time password to log into Cirrus so you will
-also need to set up your TBOT before you can log into Cirrus. We cover this next.
-
-### Time-based one-time password
+### MFA Time-based one-time password
 
+Remember, you will need to use both an SSH key and Time-based one-time password to log into Cirrus so you will
+also need to [set up your TOTP](https://epcced.github.io/safe-docs/safe-for-users/#how-to-turn-on-mfa-on-your-machine-account) before you can log into Cirrus. 
 
-[Login to SAFE](https://safe.epcc.ed.ac.uk/). Then:
-
-1. Go to the Menu 'Login accounts' and select your Cirrus account.  Set MFA-token. A scanable QR code will be displayed.
-2. Install a suitable smart-phone app such as google-authenticator ([android](https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2), [ios](http://appstore.com/googleauthenticator)) on your phone or mobile device, or use a cross-platform app such as [Authy](https://authy.com/) which works on Windows, MacOS, Linux, Android and ios.
-3. Follow the app instructions to add a new account and scan the displayed QR code (or type in the dispayed 26 character key).
-4. Type the verification code generated by the app into the Verification code box.
-5. Click Set
-
-TOTP 2-Factor Authentication is now enabled on your Cirrus account.
 
-Each time you log in to Cirrus, in additon to requesting your ssh key passphrase, you will also be asked for the current 6-digit authentication code from the app.
 
 
 
@@ -403,19 +392,10 @@ on the private key file `id_rsa_cirrus` one would use the command
     For example the pattern `-rw-r--r--` indicates that the owning user can read and write the file, members of the owning group can read it, and anyone else can also read it. The `chmod` codes are constructed by treating the user, group, and owner permission strings as binary numbers, then converting them to decimal. For example the permission string `-rwx------` becomes `111 000 000` -\> `700`.
 
 
+### MFA
 
-### Password
-
-If you are having trouble entering your password consider using a
-password manager, from which you can copy and paste it. This will also
-help you generate a secure password. If you need to reset your password,
-instructions for doing so can be found
-[here](https://epcced.github.io/safe-docs/safe-for-users/#reset_machine).
+If your TOTP passcode is being consistently rejected, you can [remove MFA from your account](https://epcced.github.io/safe-docs/safe-for-users/#mfa_off) and then [re-enable it](https://epcced.github.io/safe-docs/safe-for-users/#mfa).
 
-Windows users please note that `Ctrl+V` does not work to paste in to
-PuTTY, MobaXterm, or PowerShell. Instead use `Shift+Ins` to paste.
-Alternatively, right-click and select 'Paste' in PuTTY and MobaXterm, or
-simply right-click to paste in PowerShell.
 
 ### SSH verbose output