summaryrefslogtreecommitdiff
path: root/src/docs/en-US
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-12 12:48:58 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-08-12 12:48:58 +0900
commit9fd0e9085004fe01529ef9d3853a3c12c5d1bd8d (patch)
tree2b59b7768791b093319696e88f47fbbb3797a107 /src/docs/en-US
parentMerge branch 'develop' (diff)
parent12.87.0 (diff)
downloadmisskey-9fd0e9085004fe01529ef9d3853a3c12c5d1bd8d.tar.gz
misskey-9fd0e9085004fe01529ef9d3853a3c12c5d1bd8d.tar.bz2
misskey-9fd0e9085004fe01529ef9d3853a3c12c5d1bd8d.zip
Merge branch 'develop'
Diffstat (limited to 'src/docs/en-US')
-rw-r--r--src/docs/en-US/features/note.md2
-rw-r--r--src/docs/en-US/general/links.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/docs/en-US/features/note.md b/src/docs/en-US/features/note.md
index fbc47f1ac3..a835cf09a4 100644
--- a/src/docs/en-US/features/note.md
+++ b/src/docs/en-US/features/note.md
@@ -51,4 +51,4 @@ If you enable this option, your note won't be federated to remote instances.
By pinning a note to your profile it will be constantly displayed on your profile page. To pin a note, open the note menu and press "Pin to profile". It's also possible to pin multiple notes to your profile.
## Watch
-ノートをウォッチすると、自分以外のノートへのリアクションや返信などの通知を受け取ることができます。 ノートのメニューを開き、「ウォッチ」を選択してウォッチできます。
+You can get notifications for replies, reactions etc. for a note that is not yours by watching it. To watch a note, select "Watch" from the respective note's menu.
diff --git a/src/docs/en-US/general/links.md b/src/docs/en-US/general/links.md
index 932db975b3..1952160359 100644
--- a/src/docs/en-US/general/links.md
+++ b/src/docs/en-US/general/links.md
@@ -1,8 +1,8 @@
# A collection of links
## Websites
+- [Official Discord](https://discord.gg/Wp8gVStHW3) - The official Discord server for Misskey
- [Misskey Forum](https://forum.misskey.io/) - A forum used for questions surrounding Misskey
-- [Misskey Forum](https://forum.misskey.io/) - Misskeyに関する話題を扱うフォーラム
## Accounts
- [@repo@misskey.io](https://misskey.io/@repo) - A bot that publishes posts about updates to the Misskey repository