commit 14fe8fa

Updated documentation.

 1@@ -461,33 +461,78 @@ Also, please take note that the
 2 .Nm
 3 account you migrated from is not disabled nor changed in any way, so can still
 4 use it as it no migration was done. This behaviour may or may not match what other
 5-ActivityPub do.
 6+ActivityPub implementations do.
 7 .Ss Migrating from Mastodon to snac
 8-User migration from different Fediverse instances is a pain in the ass
 9-that has been implemented everywhere as a kludgy afterthought. There is
10-not much that can be done, other than importing the list of people you
11-follow to your new
12+Since version 2.61, you can migrate accounts on other ActivityPub instances to your
13 .Nm
14-account.
15+one. What is described here is the process to do it from
16+Mastodon; on other software implementations, it will surely be somewhat different. All
17+the steps regarding your
18+.Nm
19+account must be done from the command line. For the sake of the example, let's
20+say that you want to migrate from an account named @origin@mastodon.example.com to
21+another one named @destination@snac.example.org and that both of them
22+already exist. I've used this very informative page as a guideline:
23+.Pp
24+.Lk https://fedi.tips/transferring-your-mastodon-account-to-another-server/
25+.Pp
26+
27+1. On the web interface of your origin Mastodon account, click on
28+.Vt Preferences
29+>
30+.Vt Import and Export
31+>
32+.Vt Export
33+and download the CSV files under the "Follows", "Lists", "You Block" and "Bookmarks"
34+labels. After being downloaded, you should find the following files on your download
35+directory:
36+.Pa bookmarks.csv ,
37+.Pa blocked_accounts.csv ,
38+.Pa lists.csv , and
39+.Pa following_accounts.csv .
40+.Pp
41+2. From the directory where those files are stored, run
42+.Bd -literal -offset indent
43+snac import_csv $SNAC_BASEDIR destination
44+.Ed
45 .Pp
46-To do this, download the user's list of accounts being followed (in CSV
47-format) from the Mastodon web interface and execute this:
48+This process may take some time because it depends on the availability / responsiveness
49+of all the ActivityPub servers involved (webfinger, accounts, posts, etc.). Also, if
50+.Nm
51+complains that it can't find any of these files, please check that they really are
52+in the current directory and that their names match exactly. Some of them may be empty
53+(for example, if you didn't create any list) and that's fine.
54+.Pp
55+3. Again on your
56+.Nm
57+server, run
58 .Bd -literal -offset indent
59-awk -F, 'NR > 1 { print $1 }' /path/to/following_accounts.csv | \\
60-xargs -n 1 snac follow $SNAC_BASEDIR $SNAC_USER
61+snac alias $SNAC_BASEDIR destination "@origin@mastodon.example.com"
62 .Ed
63+.Pp
64+Check that no errors were shown. If they do, the origin Mastodon server may be
65+busy or down. Try again later.
66+.Pp
67+4. Move back to the web interface of the origin Mastodon account, go to
68+.Vt Preferences
69+>
70+.Vt Account
71+>
72+.Vt Move To A Different Account ,
73+and follow the instructions there. Set the handle of the new account to your
74+.Nm
75+one; as of our example, @destination@snac.example.org. This will start the migration
76+process: it's the duty of your old Mastodon instance to send an automatic
77+.Vt Move
78+message to all your followers in their respective instances. According to the great
79+document I linked above, this process may or may not start immediately, and its
80+success may depend heavily on how all the servers involved behave. Just cross your
81+fingers and hope for the best.
82+.Pp
83 .Ss Instance blocking
84 Full instances can be blocked. This operation must be done from
85 the command-line tool. See
86 .Xr snac 1 .
87-.Ss Other Considerations
88-.Nm
89-stores all the messages it receives as JSON files, which are usually
90-bloated and filled with redundant information. Using a filesystem with
91-file compression enabled (like btrfs or zfs) will probably be a good
92-choice to store the
93-.Nm
94-data storage into.
95 .Sh ENVIRONMENT
96 .Bl -tag -width Ds
97 .It Ev DEBUG

1@@ -4,7 +4,7 @@
2 
3 - A snac account in your server (from now, the *origin* account).
4 - A Mastodon account, already created on any public server (from now, the *destination* account).
5-- 3 other Fediverse accounts, already created on public servers (from now, the *followers* accounts). These accounts must be from Mastodon instances (or, optionally, from other implementations where the `Move` activity is known to be supported).
6+- 3 other Fediverse accounts, already created on public servers (from now, the *follower* accounts). These accounts must be from Mastodon instances (or, optionally, from other implementations where the `Move` activity is known to be supported).
7 
8 ## Steps
9 

1@@ -4,7 +4,7 @@
2 
3 - A Mastodon account, already created on any public server (from now, the *origin* account).
4 - A snac account in your server (from now, the *destination* account).
5-- 3 other Fediverse accounts, already created on public servers (from now, the *followers* accounts). These accounts must be from Mastodon instances (or, optionally, from other implementations where the `Move` activity is known to be supported).
6+- 3 other Fediverse accounts, already created on public servers (from now, the *follower* accounts). These accounts must be from Mastodon instances (or, optionally, from other implementations where the `Move` activity is known to be supported).
7 
8 ## Steps
9