Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b2d634e authored by Manoj Nair's avatar Manoj Nair
Browse files

Merge branch '1110-update-murena-vault-guide' into 'master'

Resolve "Update Murena Vault guide"

Closes #1110

See merge request e/documentation/user!1333
parents 27d89146 1db09b39
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ For the very first release of June, 3rd every user gets the same storage size in
## Security
## Security
- **End-to-End Encryption:** Cryptpad is end-to-end encrypted, ensuring that nobody can access your data without your credentials (Murena ID + Vault password).
- **End-to-End Encryption:** Cryptpad is end-to-end encrypted, ensuring that nobody can access your data without your credentials (Murena ID + Vault password).


{% include alerts/warning.html content="The Murena Vault password cannot be reset." %}

## Supported Document Types
## Supported Document Types
Users can work with a variety of document formats, including but not limited to:
Users can work with a variety of document formats, including but not limited to:
- Microsoft Office files: Word (.doc, .docx), Excel (.xls, .xlsx), PowerPoint (.ppt, .pptx)
- Microsoft Office files: Word (.doc, .docx), Excel (.xls, .xlsx), PowerPoint (.ppt, .pptx)
+1 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@
    <li><a href="{% translate_link support-topics/read-the-howtos-in-german %}">Read the [HOWTOs] In German</a></li>
    <li><a href="{% translate_link support-topics/read-the-howtos-in-german %}">Read the [HOWTOs] In German</a></li>
    <li><a href="{% translate_link support-topics/how-to-support-e %}">How to Support /e/OS</a></li>
    <li><a href="{% translate_link support-topics/how-to-support-e %}">How to Support /e/OS</a></li>
    <li><a href="{% translate_link support-topics/android-auto %}">Android Auto</a></li>
    <li><a href="{% translate_link support-topics/android-auto %}">Android Auto</a></li>
    <li><a href="{% translate_link murena-vault %}">Murena Vault</a></li>
    <li><a href="{% translate_link support-topics/parental-control %}">Setup Parental Control on /e/OS</a></li>
    <li><a href="{% translate_link support-topics/parental-control %}">Setup Parental Control on /e/OS</a></li>
</ul>
</ul>
<h2>Device specific guides</h2>
<h2>Device specific guides</h2>