3 files changed, 30 insertions, 8 deletions

diff --git a/doc/snac.1 b/doc/snac.1
index efba67e..999c594 100644
--- a/doc/snac.1
+++ b/doc/snac.1
@@ -270,7 +270,9 @@ user url that also contains a rel="me" attribute. These links are specially
 marked as verified in the user's public timeline and also via the Mastodon API.
 .It Cm export_csv Ar basedir Ar uid
 Exports some account data as Mastodon-compatible CSV files. After executing
-this command, the following files will be written to the current directory:
+this command, the following files will be written to the
+.Pa export/
+subdirectory inside the user directory:
 .Pa bookmarks.csv ,
 .Pa blocked_accounts.csv ,
 .Pa lists.csv , and
@@ -286,7 +288,9 @@ Starts a migration from this account to the one set as an alias (see
 section 'Migrating from snac to Mastodon').
 .It Cm import_csv Ar basedir Ar uid
 Imports CSV data files from a Mastodon export. This command expects the
-following files to be in the current directory:
+following files to be inside the
+.Pa import/
+subdirectory of a user's directory inside the server base directory:
 .Pa bookmarks.csv ,
 .Pa blocked_accounts.csv ,
 .Pa lists.csv , and
@@ -314,10 +318,15 @@ for a job to be assigned), input or output (processing I/O packets)
 or stopped (not running, only to be seen while starting or stopping
 the server).
 .It Cm import_list Ar basedir Ar uid Ar file
-Imports a Mastodon list in CSV format. This option can be used to
-import "Mastodon Follow Packs".
+Imports a Mastodon list in CSV format. The file must be stored inside the
+.Pa import/
+subdirectory of a user's directory inside the server base directory.
+This option can be used to import "Mastodon Follow Packs".
 .It Cm import_block_list Ar basedir Ar uid Ar file
-Imports a Mastodon list of accounts to be blocked in CSV format.
+Imports a Mastodon list of accounts to be blocked in CSV format. The
+file must be stored inside the
+.Pa import/
+subdirectory of a user's directory inside the server base directory.
 .El
 .Ss Migrating an account to/from Mastodon
 See 
diff --git a/doc/snac.5 b/doc/snac.5
index 0168430..be7bfd7 100644
--- a/doc/snac.5
+++ b/doc/snac.5
@@ -209,6 +209,12 @@ web interface.
 .It Pa history/
 This directory contains generated HTML files. They may be snapshots of the
 local timeline in previous months or other cached data.
+.It Pa export/
+This directory will contain exported data in Mastodon-compatible CSV format
+after executing the 'export_csv' command-line operation.
+.It Pa import/
+Mastodon-compatible CSV files must be copied into this directory to use
+any of the importing functions.
 .It Pa server.pid
 This file stores the server PID in a single text line.
 .El
diff --git a/doc/snac.8 b/doc/snac.8
index f5e4bd5..f94d53f 100644
--- a/doc/snac.8
+++ b/doc/snac.8
@@ -421,7 +421,9 @@ server, first export your data to CSV by running:
 snac export_csv $SNAC_BASEDIR origin
 .Ed
 .Pp
-You'll find the following CSV files in the current directory:
+You'll find the following CSV files in the
+.Pa export/
+subdirectory inside the user directory:
 .Pa bookmarks.csv ,
 .Pa blocked_accounts.csv ,
 .Pa lists.csv , and
@@ -480,6 +482,7 @@ Also, please take note that the
 account you migrated from is not disabled nor changed in any way, so can still
 use it as it no migration was done. This behaviour may or may not match what other
 ActivityPub implementations do.
+.Pp
 .Ss Migrating from Mastodon to snac
 Since version 2.61, you can migrate accounts on other ActivityPub instances to your
 .Nm
@@ -508,7 +511,9 @@ directory:
 .Pa lists.csv , and
 .Pa following_accounts.csv .
 .Pp
-2. From the directory where those files are stored, run
+2. Copy all those files to the
+.Pa import/
+subdirectory of the user's directory inside the server base directory, and run
 .Bd -literal -offset indent
 snac import_csv $SNAC_BASEDIR destination
 .Ed
@@ -518,7 +523,9 @@ of all the ActivityPub servers involved (webfinger, accounts, posts, etc.). Some
 may be transient and retried later. Also, if
 .Nm
 complains that it can't find any of these files, please check that they are really
-stored in the current directory and that their names match exactly. Some of them may be
+stored in the
+.Pa import/
+subdirectory and that their names match exactly. Some of them may be
 empty (for example, if you didn't create any list) and that's fine.
 .Pp
 3. Again on your