aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-02-24 07:28:35 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-02-24 07:28:35 +0000
commit1e1156b64572e764b7faec13d731c2da647f0de7 (patch)
tree4370ed1120cf0c1fecd1c7e4ed3a56769845a18b /docs
parent1961a680ec8fb333fa34a7b102820388c9cf5aa6 (diff)
parent8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160 (diff)
downloadpleroma-1e1156b64572e764b7faec13d731c2da647f0de7.tar.gz
Merge branch '1505-threads-federation' into 'develop'
[#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129
Diffstat (limited to 'docs')
-rw-r--r--docs/introduction.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/introduction.md b/docs/introduction.md
index 823e14f53..a915c143c 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -41,7 +41,7 @@ On the top right you will also see a wrench icon. This opens your personal setti
This is where the interesting stuff happens!
Depending on the timeline you will see different statuses, but each status has a standard structure:
-- Profile pic, name and link to profile. An optional left-arrow if it's a reply to another status (hovering will reveal the replied-to status). Clicking on the profile pic will uncollapse the user's profile.
+- Profile pic, name and link to profile. An optional left-arrow if it's a reply to another status (hovering will reveal the reply-to status). Clicking on the profile pic will uncollapse the user's profile.
- A `+` button on the right allows you to Expand/Collapse an entire discussion thread. It also updates in realtime!
- An arrow icon allows you to open the status on the instance where it's originating from.
- The text of the status, including mentions and attachements. If you click on a mention, it will automatically open the profile page of that person.