Merge branch 'dev' into 'main'

Update content/faq/_index.en.md, content/faq/_index.md

See merge request matrix.tu-dresden.de/dokumentation!36

content/faq/_index.en.md

@@ -69,18 +69,13 @@ To do this, please check whether this has been set up at all. See [Secure backup
 ***
 #### How do I reset the secure backup if I have lost my security phrase AND my (saved and printed) security key? {#reset-securityphrase}
 Please execute the following:
-  * export the room keys for all matrix sessions except for one, which is still accessible, `Settings` -> `Security & Privacy` -> `Encryption`/`Cryptography`, here it is best to provide the matrix login password. Finally, log out by clicking on the user name in the upper left corner and log out. If you are asked whether you want the encrypted messages, click on 'I don't want my encrypted messages', because these keys have already been exported.
-  * [Delete]({{< relref "settings/#security--privacy" >}}) all sessions that are no longer accessible. the top one in bold is the current session, do not tick this one
-  * Log off the last session
-  * Write a message to the ServiceDesk with a request to delete the security keys from the database.
-  * Wait for the answer
-  * Log in again at Matrix and skip verification at windows and messages
-  * Log out from Matrix
-  * Log in again at Matrix and skip verification at windows and messages again
-  * Under `Settings`-> `Security & Privacy` -> `Secure Backup` look if there is a green button `Setup` and no red buttons. If there are still red buttons, press first `Delete Backup`, afterwards the button `Reset` and may a clearing of the cache under `Settings`-> `Help & About` is necessary, as well a logging off and logging on again. Also it may be necessary to press the red button `Reset` under `Settings`-> `Security & Privacy` -> `Cross-Signing`. The action was successful, if for 'Secure Backup' and 'Cross-Signing' only the green 'Setup' button is displayed.
-  * If all this does not work reply to the ticket with a request for a jitsi meeting
-  * For all previously exported key backups, perform the manual import path
-  * Set up a new security backup. See [Secure backup]({{< relref "settings/#secure-backup" >}})
+  1. Export E2EE room keys manually in on Matrix session (=client/device/browser), where you can still read former encrypted conversation. Therefore, click on "Export E2EE room keys" under unter `Settings`-> `Security & Privacy` -> `Cryptography`. If you do not have any access to any Matrix session where you can read the former enrypted conversation, you have to skip this step.
+  2. In the one Matrix session, where you manually exported your E2EE room keys, sign off all further devices in the following way: Tick all checkboxes for other sessions/devices/clients in `Settings`-> `Security & Privacy` -> `Where you're signed in` and afterwards click on the red "Sign out x selected devices" below the list. The entry at the top of the list under the subheadline "This device" should not be deleted.
+  3. Maybe log out and log in again by ignoring all messages regarding the secure backup. Unfortuenately, you seem to not have the security key any more.
+  4. Have a look in the `Settings`-> `Security & Privacy` -> `Secure Backup` if there is any green button `Set up Secure Backup`. If there are red buttons, start with clicking on `Delete backup`, continue with clicking on `Reset`. Maybe you should "Clear the cache and reload" under `Settings`-> `Help & About` and sign off and on again.
+  5. Continue with clicking in `Settings`-> `Security & Privacy` -> `Cross-signing` on the red button `Reset`. This step was successful, if under the subheadlines `Secure Backup` and `Cross-signing` you only find green buttons for setting up. But do not click them right now in this step.
+  6. Import your saved E2EE room keys from step 1 manually by using the button "Import E2EE room keys" in `Settings`-> `Security & Privacy` -> `Cryptography`.
+  7. Now set up your new [Secure Backup]({{< relref "en/settings/#secure-backup" >}}) and the Cross-Signing with the two green buttons. Print the Security Key several times and deposit it securely (At only one place you have the risk of loss e.g. via a fire).
 
 ***
 #### Why is there no room "TU Dresden"? Who is allowed to create it? {#no-tud-room}

content/faq/_index.md

@@ -74,7 +74,7 @@ Bitte folgendes ausführen:
   4. Unter `Einstellungen`-> `Sicherheit` -> `Sicheres Backup` schauen ob dort ein grüner Knopf `Einrichten` und keine roten Knöpfe da sind. Oder wenn noch rote Knöpfe da sind, erst den Knopf `Sicherung löschen`, dann den Knopf `Zurücksetzen` klicken. Möglicherweise ist ein löschen des Zwischenspeichers (roter Knopf unter `Einstellungen`-> `Hilfe & Über`) nötig, möglicherweise auch ein Abmelden und erneutes aAnmelden. 
   5. Anschließend unter `Einstellungen`-> `Sicherheit` -> `Quersignierung` auf den roten Knopf `Zurücksetzen` drücken. Die Aktion war erfolgreich, wenn für `Sicheres Backup` und `Quersignierung` nur noch der grüne Einrichten Knopf angezeigt wird.
   6. Jetzt die zuvor exportieren Schlüsselsicherungen manuell importieren. Dazu unter `Einstellungen`-> `Sicherheit` -> `Verschlüsselung` auf E2E-Raumschlüssel importieren klicken.
-  7. Neue Schlüsselsicherung einrichten. Siehe [Schlüsselsicherung]({{< relref "settings/#schlüsselsicherung" >}}). Den Sicherheitsschlüssel mehrfach ausdrucken und an verschiedenen Orten sicher aufbewahren (Verlustgefahr bspw. durch Brand, wenn nur an einem Ort).
+  7. Neue Schlüsselsicherung und Quersignierung einrichten mit den zwei grünen Knöpfen. Siehe [Schlüsselsicherung]({{< relref "settings/#schlüsselsicherung" >}}). Den Sicherheitsschlüssel mehrfach ausdrucken und an verschiedenen Orten sicher aufbewahren (Verlustgefahr bspw. durch Brand, wenn nur an einem Ort).
 
 ***
 #### Warum gibt es keinen Raum „TU Dresden“? Wer dürfte ihn erstellen? {#no-tud-room}