diff --git a/docs/Using-Mastodon/User-guide.md b/docs/Using-Mastodon/User-guide.md index d76c4e5a51bde67c0ff2bb69b3a0c3005d32c7e4..f78921c6f5a0c5a7ebb00a4cfcdca3e60d6326b2 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.  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. - 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. + 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 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 f5d4490c2bb018359c2e776b5b3d656f5fcb096f..584080a532565ac068769fd06f520a4bb56a1d9b 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 10d8fc7fabaae73450c8a830b5d189f5a60eb423..7a63c196c96bca6d983ce9d7dbd4cac77e0520da 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 5c88dd3400bde308512234f1306b9d8ff8ddf0ad..a4ff5ed7b8ec7c1a12b3bf987e14ed7e3d897e6a 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 95e9b399f3ec55a36b91b6b3c9a0df81895e18f9..b18ed2043c49fb464a2481f45786a6130cf3c9bf 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 055af1fac68468a5f4f6da02c04ccf2d61678aed..5329933a645b3028012d46d9ba31374ff67fbe1d 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 25efed619b610ac6fa3b7e4f6a65549d892f93f2..d74b089fddf74792556c45fdba7c240e49c80c66 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 4fe3dea0cc56f7dbe0bda12a40f3726a7b9fac40..ee516c2f5a8917c43b6baa4f065e4c041d2cdd9a 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 6a611f30ce25074e07eedea94c47582f5a265b1e..bccdc110e13285383c987f489916f85cd7cc8a13 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 c0d8a3e2a4a826b02edfd15b4f9a03c1b758582d..d199f1f12d8fa5a9b852c8cc44d688a054f9c834 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 1dd6c555cdfb039b2cc4a3a78f1af4dc1c16eebc..7d0922ccb0d3ec7e8e9599f2f78b1899a237cfd8 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 74a424f674058a13d6c1a29343c56239ca81426a..3a3417e7d821fb47a4ff2906977f422736cbefcf 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 62cd04c582e7f0d250905d6fd87c9c7aaa9bcf2b..777b3c391ea303310a9ebe69588e321896120c1f 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 6cb707580deedc7344e937c7ab84964355576efe..943413feb0217079c77dd22fb3e8862b83f4df17 100644 Binary files a/docs/Using-Mastodon/screenshots/preferences.png and b/docs/Using-Mastodon/screenshots/preferences.png differ