Merge branch 'patch-3' into 'develop'

Move all upload contents despite upload folder itself.

See merge request pleroma/pleroma!1352

diff --git a/docs/installation/migrating_from_source_otp_en.md b/docs/installation/migrating_from_source_otp_en.md
index 5264790f3e7c071f231dd1bc682d18797c2ba321..d07a0f622bf9920890dd7b55dae32f200c12488a 100644 (file)
--- a/docs/installation/migrating_from_source_otp_en.md
+++ b/docs/installation/migrating_from_source_otp_en.md
@@ -128,7 +128,7 @@ Debian/Ubuntu:
 cp ~pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
 
 # Reload service files
-systemctl reload-daemon
+systemctl daemon-reload
 
 # Reenable pleroma to start on boot
 systemctl reenable pleroma