summaryrefslogtreecommitdiff
path: root/docs/administration
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-07-16 14:51:36 -0500
committerAlex Gleason <alex@alexgleason.me>2020-07-16 14:51:36 -0500
commit38425ebdbf157377ccb0402f78dc3d02f81c55f5 (patch)
tree740f32837d28e918f097c948d89827d99434d5b2 /docs/administration
parent8daacc911498d827fd68ea3d34eb1be9ae4a1ffe (diff)
parent3a2b2cb6f2d6ce39ae0d246649189c021c535992 (diff)
downloadpleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.tar.gz
pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.zip
Merge remote-tracking branch 'upstream/develop' into linkify
Diffstat (limited to 'docs/administration')
-rw-r--r--docs/administration/CLI_tasks/user.md4
-rw-r--r--docs/administration/updating.md2
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: