diff --git a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md index 09d5651f77..6a9d117d6f 100644 --- a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md +++ b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md @@ -491,7 +491,7 @@ For configuring the public stream. some kind of automated poster, testing bots, etc. * `exclude_sources` (array, default []): Sources of notices that should be kept off of - the public timeline (because they're from automatic posters, for instance). + the public feed (because they're from automatic posters, for instance). throttle diff --git a/bin/configure b/bin/configure index 5d36c6d6b1..8dfe527ec6 100755 --- a/bin/configure +++ b/bin/configure @@ -226,7 +226,7 @@ PROFILE=$(${WHIPTAIL} --title 'GNU social site profile' --clear --backtitle 'GNU public 'Make this node publicly accessible, with open registration' \ community 'Make this node publicly accessible, but with invite-only registration' \ isolated 'Make this node publicly accessible, with open registration but do not federate' \ - private 'Make this node publicly accessible, but with invite-only registration, only registered users can see timelines' \ + private 'Make this node publicly accessible, but with invite-only registration, only registered users can see feeds' \ single_user 'Like public, but only allows registering one user' \ 3>&1 1>&2 2>&3) validate_exit $? diff --git a/components/Left/templates/left/view.html.twig b/components/Left/templates/left/view.html.twig index afca56c7e9..adf479b5c7 100644 --- a/components/Left/templates/left/view.html.twig +++ b/components/Left/templates/left/view.html.twig @@ -16,7 +16,7 @@ {% endif %} - {{ block("timeline", "cards/navigation/view.html.twig") }} + {{ block("feeds", "cards/navigation/view.html.twig") }} {{ block("footer", "cards/navigation/view.html.twig") }} diff --git a/docs/administrator/src/install/no_docker_shell.md b/docs/administrator/src/install/no_docker_shell.md index 2ca9eb0e73..1117a2f21a 100644 --- a/docs/administrator/src/install/no_docker_shell.md +++ b/docs/administrator/src/install/no_docker_shell.md @@ -156,7 +156,7 @@ especially if you've previously installed PHP packages. {{#include bin-configure.md}} 7. You should now be able to navigate to your social site's main directory - and see the "Public Timeline", which will probably be empty. You can + and see the "Public Feed", which will probably be empty. You can now register new user, post some notices, edit your profile, etc. ### Fancy URLs diff --git a/docs/user/src/SUMMARY.md b/docs/user/src/SUMMARY.md index af27f68c30..a69c9b3100 100644 --- a/docs/user/src/SUMMARY.md +++ b/docs/user/src/SUMMARY.md @@ -2,7 +2,7 @@ - [What is GNU social](./what_is.md) - [The IndieWeb](./indieweb.md) -- [Timelines](./timelines.md) +- [Feeds](./feeds.md) - [Getting Started]() - [Choosing an instance](./getting_started/choosing_an_instance.md) - [Registering an account](./getting_started/register.md) diff --git a/docs/user/src/timelines.md b/docs/user/src/feeds.md similarity index 98% rename from docs/user/src/timelines.md rename to docs/user/src/feeds.md index 11798441b3..d3cc89b99a 100644 --- a/docs/user/src/timelines.md +++ b/docs/user/src/feeds.md @@ -1,4 +1,4 @@ -# Timelines +# Feeds Communication became cheap. Everyone wants to share information. However, people aren't interested in consuming everyone's information. diff --git a/docs/user/src/what_is.md b/docs/user/src/what_is.md index dadec02e74..26d561541a 100644 --- a/docs/user/src/what_is.md +++ b/docs/user/src/what_is.md @@ -2,7 +2,7 @@ GNU social is a social network platform for communities. It enables you to publish short notes including URLs and pictures. If you're interested in what someone has -to say you can subscribe them. When you log in to your account you see a timeline +to say you can subscribe them. When you log in to your account you see a feed containing all the notes from people, groups and tags you subscribed. You can have a conversation with another person by replying to each other's notes. diff --git a/plugins/Directory/css/directory/actors.css b/plugins/Directory/css/directory/actors.css index 09ab42f46b..10ab1d7eff 100644 --- a/plugins/Directory/css/directory/actors.css +++ b/plugins/Directory/css/directory/actors.css @@ -4,13 +4,13 @@ flex-wrap: wrap; } -.nav-content .timeline .actors > div { +.nav-content .feed .actors > div { margin: var(--unit-size) var(--unit-size) 0 var(--unit-size); border-radius: var(--unit-size); width: 100%; } -.nav-content .timeline .actors > div:last-child { +.nav-content .feed .actors > div:last-child { margin: var(--unit-size) var(--unit-size) var(--unit-size) var(--unit-size); } @@ -48,4 +48,4 @@ display: flex; flex-wrap: wrap; justify-content: right; -} \ No newline at end of file +} diff --git a/plugins/Directory/css/directory/groups.css b/plugins/Directory/css/directory/groups.css index bdc1fa6a50..be613f7fce 100644 --- a/plugins/Directory/css/directory/groups.css +++ b/plugins/Directory/css/directory/groups.css @@ -8,13 +8,13 @@ padding: var(--unit-size); } -.nav-content .timeline .groups > div { +.nav-content .feed .groups > div { margin: var(--unit-size) var(--unit-size) 0 var(--unit-size); border-radius: var(--unit-size); width: 100%; } -.nav-content .timeline .groups > div:last-child { +.nav-content .feed .groups > div:last-child { margin: var(--unit-size) var(--unit-size) var(--unit-size) var(--unit-size); } @@ -52,4 +52,4 @@ display: flex; flex-wrap: wrap; justify-content: right; -} \ No newline at end of file +} diff --git a/plugins/Directory/templates/directory/groups.html.twig b/plugins/Directory/templates/directory/groups.html.twig index 75a02dc595..646d092b6f 100644 --- a/plugins/Directory/templates/directory/groups.html.twig +++ b/plugins/Directory/templates/directory/groups.html.twig @@ -3,7 +3,7 @@ {% block title %}Groups{% endblock %} {% block body %} -