diff options
| author | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
| commit | e1a1c8e7de5e10fa64d168dc5d35a80b96767395 (patch) | |
| tree | c0057448e323c730bea2c76cecf9efb85ef14181 /docs/administration | |
| parent | 4a6389316dac53c1ca2ec36d160690476d881185 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.tar.gz | |
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
Diffstat (limited to 'docs/administration')
| -rw-r--r-- | docs/administration/CLI_tasks/user.md | 4 | ||||
| -rw-r--r-- | docs/administration/updating.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/administration/CLI_tasks/user.md b/docs/administration/CLI_tasks/user.md index 1e6f4a8b4..3b4c421a7 100644 --- a/docs/administration/CLI_tasks/user.md +++ b/docs/administration/CLI_tasks/user.md @@ -57,11 +57,11 @@ mix pleroma.user invites ## Revoke invite ```sh tab="OTP" - ./bin/pleroma_ctl user revoke_invite <token_or_id> + ./bin/pleroma_ctl user revoke_invite <token> ``` ```sh tab="From Source" -mix pleroma.user revoke_invite <token_or_id> +mix pleroma.user revoke_invite <token> ``` diff --git a/docs/administration/updating.md b/docs/administration/updating.md index 2a08dac1f..c994f3f16 100644 --- a/docs/administration/updating.md +++ b/docs/administration/updating.md @@ -1,6 +1,6 @@ # Updating your instance -You should **always check the release notes/changelog** in case there are config deprecations, special update special update steps, etc. +You should **always check the [release notes/changelog](https://git.pleroma.social/pleroma/pleroma/-/releases)** in case there are config deprecations, special update steps, etc. Besides that, doing the following is generally enough: |