summaryrefslogtreecommitdiff
path: root/docs/administration
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2024-05-20 12:30:15 +0400
committerLain Soykaf <lain@lain.com>2024-05-20 12:30:15 +0400
commitad26b6d593d83ddb539a5c61ee9f639f7b40531e (patch)
tree7df211d68414fea73074731b31be9f700cff8883 /docs/administration
parentddb9e90c405369496fdf9e6dfed593eff8d5dc5c (diff)
parente8cd6662eb2a534e3be16b522bf81b25b194edab (diff)
downloadpleroma-ad26b6d593d83ddb539a5c61ee9f639f7b40531e.tar.gz
pleroma-ad26b6d593d83ddb539a5c61ee9f639f7b40531e.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bump-elixir
Diffstat (limited to 'docs/administration')
-rw-r--r--docs/administration/CLI_tasks/config.md4
-rw-r--r--docs/administration/backup.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/administration/CLI_tasks/config.md b/docs/administration/CLI_tasks/config.md
index fc9f3cbd5..7c167ec5d 100644
--- a/docs/administration/CLI_tasks/config.md
+++ b/docs/administration/CLI_tasks/config.md
@@ -1,4 +1,4 @@
-# Transfering the config to/from the database
+# Transferring the config to/from the database
{! backend/administration/CLI_tasks/general_cli_task_info.include !}
@@ -34,7 +34,7 @@
Options:
-- `<path>` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non standart folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/pleroma`. For installation from source - `config` directory in the pleroma folder.
+- `<path>` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non-standard folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/pleroma`. For installation from source - `config` directory in the pleroma folder.
- `<env>` - environment, for which is migrated config. By default is `prod`.
- To delete transferred settings from database optional flag `-d` can be used
diff --git a/docs/administration/backup.md b/docs/administration/backup.md
index 5f279ab97..93325e702 100644
--- a/docs/administration/backup.md
+++ b/docs/administration/backup.md
@@ -31,7 +31,7 @@
1. Optionally you can remove the users of your instance. This will trigger delete requests for their accounts and posts. Note that this is 'best effort' and doesn't mean that all traces of your instance will be gone from the fediverse.
* You can do this from the admin-FE where you can select all local users and delete the accounts using the *Moderate multiple users* dropdown.
- * You can also list local users and delete them individualy using the CLI tasks for [Managing users](./CLI_tasks/user.md).
+ * You can also list local users and delete them individually using the CLI tasks for [Managing users](./CLI_tasks/user.md).
2. Stop the Pleroma service `systemctl stop pleroma`
3. Disable pleroma from systemd `systemctl disable pleroma`
4. Remove the files and folders you created during installation (see installation guide). This includes the pleroma, nginx and systemd files and folders.