diff --git a/docs/docs/photos/migration/from-google-photos/index.md b/docs/docs/photos/migration/from-google-photos/index.md index e334ca5f88..0623f157d2 100644 --- a/docs/docs/photos/migration/from-google-photos/index.md +++ b/docs/docs/photos/migration/from-google-photos/index.md @@ -39,10 +39,21 @@ it with Ente. 8. Wait for Google to send you your data. 9. Open [our desktop app](https://ente.io/download/desktop), click on "Upload", - select "Google takeout" and pick the ZIP file you just downloaded. + select "Google takeout" and pick the ZIP file you just downloaded. If you + were provided with multiple ZIP files, please extract **all** the ZIP files + into one folder and select that folder instead. -> If you were provided with multiple ZIP files, please extract **all** the files -> into one folder and select that folder instead. +> While the app supports uploading multiple ZIPs too, we recommend unzipping +> them all into a single folder and uploading that folder instead so that your +> photo dates are imported properly +> ([details](/photos/faq/photo-dates#importing-from-google-takeout)). +> +>
+> +> Note that you can still preserve your albums even when uploading a single +> folder - select the create new album option and the app will ask you if you +> want to put each leaf folder into a separate album +> ([details](/photos/features/albums#uploading-a-nested-folder)). ![Importing Google Takeout into Ente](google-takeout.png){width=400px} diff --git a/docs/docs/self-hosting/faq/backup.md b/docs/docs/self-hosting/faq/backup.md index 08e140604e..455468bbf5 100644 --- a/docs/docs/self-hosting/faq/backup.md +++ b/docs/docs/self-hosting/faq/backup.md @@ -8,7 +8,7 @@ description: General introduction to backing up your self hosted Ente instance > [!WARNING] > > This is not meant to be a comprehensive and bullet proof guide. There are many -> moving parts, and if small mistakes might make your backups unusable. +> moving parts, and small mistakes might make your backups unusable. > > Please treat this only as a general introduction. And remember to test your > restores. @@ -42,7 +42,7 @@ database contains information like a file specific encryption key. Viewed differently, to decrypt your data you need three pieces of information: -1. The encrypted file data (which comes from the object storage backup). +1. The encrypted file data itself (which comes from the object storage backup). 2. The ([encrypted](https://ente.io/architecture/)) file and collection specific encryption keys (which come from the database backup).