Merge pull request #1943 from tobiasd/20151007-adminname

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

diff --git a/doc/Move-Account.md b/doc/Move-Account.md
index cb20f99b42da5d1305c507c118970d80799f84d5..19e6f11554181ab8ea0e9e559c32a72bdbf85764 100644 (file)
--- a/doc/Move-Account.md
+++ b/doc/Move-Account.md
@@ -1,33 +1,27 @@
-Move Account\r
+How to move your account between servers\r
 ============\r
 \r
 * [Home](help)\r
 \r
 \r
-! **this is an experimental feature**\r
+! **This is an experimental feature**\r
 \r
-** How to move an account between servers **\r
+* Go to "Settings" -> "[Export personal data](uexport)"\r
+* Click on "Export account" to save your account data.\r
+* **Save the file in a secure place!** It contains your details, your contacts, groups, and personal settings. It also contains your secret keys to authenticate yourself to your contacts.\r
+* Go to your new server, and open *http://newserver.com/uimport* (there is not a direct link to this page at the moment).\r
+* Do NOT create a new account prior to importing your old settings - uimport should be used *instead* of register.\r
+* Load your saved account file and click "Import".\r
+* After the move, the account on the old server will not work reliably anymore, and should be not used.\r
 \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
-**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
-Load your saved account file and click "Import".\r
-\r
-Friendica will recreate your account on new server, with your contacts and groups.\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 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
-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 be not used.\r
+Friendica contacts\r
+---\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:\r
+If your contacts are runnning on an updated server, your details on their side will be automatically updated.\r
 \r
+GNU Social/Diaspora contacts\r
+---\r
+Contacts on GNU Social or Diaspora will be archived, as we can't inform them about your move.\r
+You should ask them to remove your contact from their lists and re-add you, and you should do the same with their contact.\r