From 1cd4f705fd0e5444c33f26ba0b83ebda574bc389 Mon Sep 17 00:00:00 2001 From: foss- Date: Wed, 18 Oct 2023 10:54:01 +0200 Subject: [PATCH 1/3] Update README.md: rewrote intro text removed twitter, mentioning other fediverse platforms sorted by popularity, reduced number of paragraphs and simplified text overall. --- README.md | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e66f3969e6..47d30d519e 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,15 @@ -Friendica Social Communications Server -====================================== +Friendica - your open and free social network +============================================= -Welcome to the free social web. +Welcome to the free social web. Friendica is a platform for decentralised social communication linking to other independent social and corporate services. -Friendica is a decentralised communications platform that integrates social communication. Our platform links to independent social projects and corporate services. +Being part of the Fediverse allows you to be free from data-harvesting corporations. Enjoy open social communication, independent of any specific provider. -Our mission is to free friends, family and colleagues from data-harvesting corporations; we aim for social communication to be free and open, while flowing between any provider as easily as email does. +Friendica connects you to a federated communications network of thousands of servers. Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more. Receiving content from Tumblr, Wordpress and RSS is also possible. Friendica allows to integrate web based content via add-ons such as ITTT, Buffer. You can customize and control how publicly or privatly you want to share your content. -Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org/), [Diaspora](https://diasporafoundation.org/), [GnuSocial](https://gnu.io/social/), [Pleroma](https://pleroma.social/), or [Hubzilla](https://hubzilla.org/), regardless where each user profile is hosted. +[Join Friendica]((https://dir.friendica.social/servers)) today or setup [your own Friendica instance](doc/Install.md). -With Friendica, you can also fully interact with anyone on Twitter and receive any content from Tumblr, Wordpress or RSS. Friendica allows you to integrate most things on the web via a range of addons such as ITTT, Buffer; you will be able to easily control your own data as you decide. - -Join today and [get your Friendica profile!](https://dir.friendica.social/servers 'Join Friendica today!') - -Have a look at the [installation documentation](doc/Install.md) for further information about installing and using Friendica. - -### Friendica Screenshots +### Screenshots | ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-1.png?raw=true "Frio theme in mobile browser") ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-2.png?raw=true "Frio theme in mobile browser") | |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| From a20cdbd5c71a543054ef7a2e19b44166f33f5ab5 Mon Sep 17 00:00:00 2001 From: foss- Date: Wed, 18 Oct 2023 17:37:50 +0200 Subject: [PATCH 2/3] Update README.md typos and minor tweaks Co-authored-by: Hypolite Petovan --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47d30d519e..c002d095e5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Welcome to the free social web. Friendica is a platform for decentralised social Being part of the Fediverse allows you to be free from data-harvesting corporations. Enjoy open social communication, independent of any specific provider. -Friendica connects you to a federated communications network of thousands of servers. Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more. Receiving content from Tumblr, Wordpress and RSS is also possible. Friendica allows to integrate web based content via add-ons such as ITTT, Buffer. You can customize and control how publicly or privatly you want to share your content. +Friendica connects you to a federated communications network of thousands of servers called the Fediverse. Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more. Receiving content from Tumblr, Wordpress and RSS is also possible. Friendica allows to import and mirror your content via add-ons such as ITTT and Buffer. You can customize and control how publicly or privately you want to share your content. [Join Friendica]((https://dir.friendica.social/servers)) today or setup [your own Friendica instance](doc/Install.md). From 03839fc0fecfbf9183a7419e4f003effb6aa156b Mon Sep 17 00:00:00 2001 From: foss- Date: Wed, 18 Oct 2023 17:50:19 +0200 Subject: [PATCH 3/3] Update README.md moved "Being part of..." further down --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c002d095e5..a0a8b562b0 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ Friendica - your open and free social network Welcome to the free social web. Friendica is a platform for decentralised social communication linking to other independent social and corporate services. -Being part of the Fediverse allows you to be free from data-harvesting corporations. Enjoy open social communication, independent of any specific provider. - Friendica connects you to a federated communications network of thousands of servers called the Fediverse. Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more. Receiving content from Tumblr, Wordpress and RSS is also possible. Friendica allows to import and mirror your content via add-ons such as ITTT and Buffer. You can customize and control how publicly or privately you want to share your content. +Being part of the Fediverse allows you to be free from data-harvesting corporations. Enjoy open social communication, independent of any specific provider. + [Join Friendica]((https://dir.friendica.social/servers)) today or setup [your own Friendica instance](doc/Install.md). ### Screenshots