Merge pull request #4045 from luixxiul/fix

Update docs/faq.md and docs for importing data: adopt the common introduction

docs/faq.md

@@ -415,7 +415,7 @@ See our [documentation page about upgrading services](maintenance-upgrading-serv
 
 ### How do I move my existing installation to another (VM) server?
 
-If you have an existing installation done using this Ansible playbook, you can easily migrate that to another server using [our dedicated server migration guide](maintenance-migrating.md).
+If you have an existing installation done using this Ansible playbook, you can easily migrate that to another server following [our dedicated server migration guide](maintenance-migrating.md).
 
 If your previous installation is done in some other way (not using this Ansible playbook), see [I installed Synapse some other way. Can I migrate such a setup to the playbook?](#i-installed-synapse-some-other-way-can-i-migrate-such-a-setup-to-the-playbook).
 

docs/importing-postgres.md

@@ -1,7 +1,10 @@
 # Importing an existing Postgres database from another installation (optional)
 
-Run this if you'd like to import your database from a previous installation.
-(don't forget to import your Synapse `media_store` files as well — see [the importing-synape-media-store guide](importing-synapse-media-store.md)).
+You can manually import your database from a previous default installation of Synapse.
+
+**Notes**:
+- Don't forget to import your Synapse `media_store` files as well — see [the importing-synapse-media-store guide](importing-synapse-media-store.md) for more details.
+- If you have an existing installation done using this Ansible playbook, you can easily migrate that to another server following [our dedicated server migration guide](maintenance-migrating.md).
 
 ## Prerequisites
 

docs/importing-synapse-media-store.md

@@ -1,6 +1,6 @@
 # Importing `media_store` data files from an existing Synapse installation (optional)
 
-Run this if you'd like to import your `media_store` files from a previous installation of Synapse.
+You can manually import your `media_store` files from a previous installation of Synapse.
 
 ## Prerequisites
 

docs/importing-synapse-sqlite.md

@@ -1,11 +1,13 @@
 # Importing an existing SQLite database from another Synapse installation (optional)
 
-Run this if you'd like to import your database from a previous default installation of Synapse (don't forget to import your `media_store` files as well — see [the importing-synapse-media-store guide](importing-synapse-media-store.md)).
+You can manually import your database from a previous default installation of Synapse.
 
 While this playbook only supports running Synapse in combination with PostgreSQL, a Synapse instance installed manually usually defaults to using an SQLite database.
 
 If you have such a Synapse setup and wish to migrate it to one managed by the playbook (and over to PostgreSQL), this documentation page is for you.
 
+**Note**: don't forget to import your Synapse `media_store` files as well — see [the importing-synapse-media-store guide](importing-synapse-media-store.md) for more details.
+
 ## Prerequisites
 
 Before doing the actual import: