diff --git a/docs/Using-Mastodon/User-guide.md b/docs/Using-Mastodon/User-guide.md index d76c4e5a51b..f78921c6f5a 100644 --- a/docs/Using-Mastodon/User-guide.md +++ b/docs/Using-Mastodon/User-guide.md @@ -14,7 +14,8 @@ Mastodon User's Guide * [Following Other Users](User-guide.md#following-other-users) * [Notifications](User-guide.md#notifications) * [Mobile Apps](User-guide.md#mobile-apps) - * [The Public Timeline](User-guide.md#the-public-timeline) + * [The Federated Timeline](User-guide.md#the-federated-timeline) + * [The Local Timeline](User-guide.md#the-local-timeline) * [Searching](User-guide.md#searching) * [Privacy, Safety and Security](User-guide.md#privacy-safety-and-security) * [Two-Factor Authentication](User-guide.md#two-factor-authentication) @@ -91,7 +92,7 @@ You can also attach video files or GIF animations to Toots. However, there is a #### Following Other Users -Following another user will make all of their toots as well as other users' toots which they [boost](User-guide.md#boosts-and-favourites) in your Home column. This gives you a separate timeline from the [public timeline](User-guide.md#the-public-timeline) in which you can read what particular people are up to without the noise of general conversation. +Following another user will make all of their toots as well as other users' toots which they [boost](User-guide.md#boosts-and-favourites) in your Home column. This gives you a separate timeline from the [federated timeline](User-guide.md#the-federated-timeline) in which you can read what particular people are up to without the noise of general conversation. ![Follow icon](screenshots/follow.png) In order to follow a user, click their name or avatar to open their profile, then click the Follow icon in the top left of their profile view. @@ -117,11 +118,15 @@ When someone follows your account or requests to follow you, mentions your user There are no official mobile Mastodon apps for iOS or Android at this point. However, there are several third-party apps in development; you can find a list of these [here](Apps.md). -#### The Public Timeline +#### The Federated Timeline -Mastodon has a "Public" timeline, which is a collection of all public toots made by all local users as well as posts from remote users that are federated (because someone on your instance follows the remote user making the post). This is a good way to meet new people to follow or interact with, but can be overwhelming especially if there's a lot of activity. +Mastodon has a "Federated" timeline, which is a collection of all public toots made by all local users as well as posts from remote users that are federated (because someone on your instance follows the remote user making the post). This is a good way to meet new people to follow or interact with, but can be overwhelming especially if there's a lot of activity. -![Public Timeline icon](screenshots/public-timeline.png) To view the public timeline, click the "Public Timeline" icon in your Compose column or the respective button on the Getting Started panel. To hide the public timeline again, simply click the "Back" link at the top of the public column while you're viewing it. +![Federated Timeline icon](screenshots/federated-timeline.png) To view the federated timeline, click the "Federated Timeline" icon in your Compose column or the respective button on the Getting Started panel. To hide the federated timeline again, simply click the "Back" link at the top of the column while you're viewing it. + +#### The Local Timeline + +In addition to the Federated Timeline, there's also a "Local" timeline, which only shows public toots made by users on your home instance. This is quieter than the Federated timeline, and useful if you want to stick close to your instance's community without having too much noise from outside. To view the Local Timeline, click the ![Menu icon](screenshots/compose-menu.png) Menu icon on the Compose pane and then select "Local Timeline" on the rightmost column. #### Searching diff --git a/docs/Using-Mastodon/screenshots/compose-cw.png b/docs/Using-Mastodon/screenshots/compose-cw.png index f5d4490c2bb..584080a5325 100644 Binary files a/docs/Using-Mastodon/screenshots/compose-cw.png and b/docs/Using-Mastodon/screenshots/compose-cw.png differ diff --git a/docs/Using-Mastodon/screenshots/compose-media.png b/docs/Using-Mastodon/screenshots/compose-media.png index 10d8fc7faba..7a63c196c96 100644 Binary files a/docs/Using-Mastodon/screenshots/compose-media.png and b/docs/Using-Mastodon/screenshots/compose-media.png differ diff --git a/docs/Using-Mastodon/screenshots/compose-nsfw.png b/docs/Using-Mastodon/screenshots/compose-nsfw.png index 5c88dd3400b..a4ff5ed7b8e 100644 Binary files a/docs/Using-Mastodon/screenshots/compose-nsfw.png and b/docs/Using-Mastodon/screenshots/compose-nsfw.png differ diff --git a/docs/Using-Mastodon/screenshots/compose-privacy.png b/docs/Using-Mastodon/screenshots/compose-privacy.png index 95e9b399f3e..b18ed2043c4 100644 Binary files a/docs/Using-Mastodon/screenshots/compose-privacy.png and b/docs/Using-Mastodon/screenshots/compose-privacy.png differ diff --git a/docs/Using-Mastodon/screenshots/cw-toot.gif b/docs/Using-Mastodon/screenshots/cw-toot.gif index 055af1fac68..5329933a645 100644 Binary files a/docs/Using-Mastodon/screenshots/cw-toot.gif and b/docs/Using-Mastodon/screenshots/cw-toot.gif differ diff --git a/docs/Using-Mastodon/screenshots/public-timeline.png b/docs/Using-Mastodon/screenshots/federated-timeline.png similarity index 83% rename from docs/Using-Mastodon/screenshots/public-timeline.png rename to docs/Using-Mastodon/screenshots/federated-timeline.png index 25efed619b6..d74b089fddf 100644 Binary files a/docs/Using-Mastodon/screenshots/public-timeline.png and b/docs/Using-Mastodon/screenshots/federated-timeline.png differ diff --git a/docs/Using-Mastodon/screenshots/follow-icon.png b/docs/Using-Mastodon/screenshots/follow-icon.png index 4fe3dea0cc5..ee516c2f5a8 100644 Binary files a/docs/Using-Mastodon/screenshots/follow-icon.png and b/docs/Using-Mastodon/screenshots/follow-icon.png differ diff --git a/docs/Using-Mastodon/screenshots/following-icon.png b/docs/Using-Mastodon/screenshots/following-icon.png index 6a611f30ce2..bccdc110e13 100644 Binary files a/docs/Using-Mastodon/screenshots/following-icon.png and b/docs/Using-Mastodon/screenshots/following-icon.png differ diff --git a/docs/Using-Mastodon/screenshots/locked-icon.png b/docs/Using-Mastodon/screenshots/locked-icon.png index c0d8a3e2a4a..d199f1f12d8 100644 Binary files a/docs/Using-Mastodon/screenshots/locked-icon.png and b/docs/Using-Mastodon/screenshots/locked-icon.png differ diff --git a/docs/Using-Mastodon/screenshots/notifications-clear.png b/docs/Using-Mastodon/screenshots/notifications-clear.png index 1dd6c555cdf..7d0922ccb0d 100644 Binary files a/docs/Using-Mastodon/screenshots/notifications-clear.png and b/docs/Using-Mastodon/screenshots/notifications-clear.png differ diff --git a/docs/Using-Mastodon/screenshots/notifications-settings.png b/docs/Using-Mastodon/screenshots/notifications-settings.png index 74a424f6740..3a3417e7d82 100644 Binary files a/docs/Using-Mastodon/screenshots/notifications-settings.png and b/docs/Using-Mastodon/screenshots/notifications-settings.png differ diff --git a/docs/Using-Mastodon/screenshots/pending-icon.png b/docs/Using-Mastodon/screenshots/pending-icon.png index 62cd04c582e..777b3c391ea 100644 Binary files a/docs/Using-Mastodon/screenshots/pending-icon.png and b/docs/Using-Mastodon/screenshots/pending-icon.png differ diff --git a/docs/Using-Mastodon/screenshots/preferences.png b/docs/Using-Mastodon/screenshots/preferences.png index 6cb707580de..943413feb02 100644 Binary files a/docs/Using-Mastodon/screenshots/preferences.png and b/docs/Using-Mastodon/screenshots/preferences.png differ