Merge pull request #1376 from annando/1502-central-item-storage

[friendica.git] / doc / Move-Account.md

diff --git a/doc/Move-Account.md b/doc/Move-Account.md
index cb20f99b42da5d1305c507c118970d80799f84d5..35c50259e3fead44915b0a11245239a32b2ebcbc 100644 (file)
--- a/doc/Move-Account.md
+++ b/doc/Move-Account.md
@@ -11,21 +11,23 @@ Move Account
 Go to "Settings" -> "[Export personal data](uexport)"\r
 Click on "Export account" to save your account data.\r
 This file contains your details, your contacts, groups, and personal settings.\r
 Go to "Settings" -> "[Export personal data](uexport)"\r
 Click on "Export account" to save your account data.\r
 This file contains your details, your contacts, groups, and personal settings.\r

-It contains also your secret keys to authenticate yourself to your contacts:\r
+It also contains your secret keys to authenticate yourself to your contacts:\r

 **save this file in a secure place**!\r
 \r
 Go to your new server, and open *http://newserver.com/uimport* (there is not a \r
 direct link to this page at the moment).\r
 \r
 **save this file in a secure place**!\r
 \r
 Go to your new server, and open *http://newserver.com/uimport* (there is not a \r
 direct link to this page at the moment).\r
 \r

+Do NOT create a new account prior to importing your old settings - uimport should be used *instead* of register.\r
+\r

 Load your saved account file and click "Import".\r
 \r
 Load your saved account file and click "Import".\r
 \r

-Friendica will recreate your account on new server, with your contacts and groups.\r
+Friendica will recreate your account on the new server, with your contacts and groups.\r

 A message is sent to Friendica contacts, to inform them about your move: if your\r
 A message is sent to Friendica contacts, to inform them about your move: if your\r

-contacts are runnning on an updated server, automatically your details on their\r
-side will be updated.\r
+contacts are runnning on an updated server, your details on their\r
+side will be automatically updated.\r

 Contacts on Statusnet/Identi.ca or Diaspora will be archived, as we can't inform\r
 them about your move.\r
 Contacts on Statusnet/Identi.ca or Diaspora will be archived, as we can't inform\r
 them about your move.\r

-You should ask them to remove your contact from their lists and readd you, and you\r
+You should ask them to remove your contact from their lists and re-add you, and you\r

 should do the same with their contact.\r
 \r
 After the move, the account on the old server will not work reliably anymore, and\r
 should do the same with their contact.\r
 \r
 After the move, the account on the old server will not work reliably anymore, and\r