From 97f8c13aed1f18caf37d7b4f87ad42aadebe982e Mon Sep 17 00:00:00 2001 From: Rachel Fae Fox Date: Wed, 1 May 2019 18:02:18 +0000 Subject: [PATCH 1/2] README.md edited online with Bitbucket --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4f22445d..6e7f1288 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # Pleroma +## About This Repo + +This repo is the version of pleroma that is running on [Otherkin.Club](https://otherkin.club/). If you are looking to run your own instance, please go to [https://git.pleroma.social/pleroma/pleroma](https://git.pleroma.social/pleroma/pleroma) instead. + ## About Pleroma Pleroma is a microblogging server software that can federate (= exchange messages with) other servers that support the same federation standards (OStatus and ActivityPub). What that means is that you can host a server for yourself or your friends and stay in control of your online identity, but still exchange messages with people on larger servers. Pleroma will federate with all servers that implement either OStatus or ActivityPub, like Friendica, GNU Social, Hubzilla, Mastodon, Misskey, Peertube, and Pixelfed. @@ -16,12 +20,12 @@ No release has been made yet, but several servers have been online for months al ### Docker -While we don’t provide docker files, other people have written very good ones. Take a look at or . +While we don’t provide docker files, other people have written very good ones. Take a look at or . ### Dependencies * Postgresql version 9.6 or newer -* Elixir version 1.7 or newer. If your distribution only has an old version available, check [Elixir’s install page](https://elixir-lang.org/install.html) or use a tool like [asdf](https://github.com/asdf-vm/asdf). +* Elixir version 1.7 or newer. If your distribution only has an old version available, check [Elixir’s install page](https://elixir-lang.org/install.html) or use a tool like [asdf](https://github.com/asdf-vm/asdf). * Build-essential tools ### Configuration @@ -51,7 +55,7 @@ Copy `installation/init.d/pleroma` to `/etc/init.d/pleroma`. You can add it to t ### Standalone/run by other means -Run `mix phx.server` in repository’s root, it will output log into stdout/stderr. +Run `mix phx.server` in repository’s root, it will output log into stdout/stderr. ### Using an upstream proxy for federation From b5e079ed25279da197fa955f344d50cecc8d1de4 Mon Sep 17 00:00:00 2001 From: Rachel Fae Fox Date: Wed, 1 May 2019 18:03:25 +0000 Subject: [PATCH 2/2] README.md edited --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6e7f1288..990d4d0f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## About This Repo -This repo is the version of pleroma that is running on [Otherkin.Club](https://otherkin.club/). If you are looking to run your own instance, please go to [https://git.pleroma.social/pleroma/pleroma](https://git.pleroma.social/pleroma/pleroma) instead. +This repo is the version of pleroma that is running on [otherkin.Club](https://otherkin.club/). If you are looking to run your own instance, please go to [https://git.pleroma.social/pleroma/pleroma](https://git.pleroma.social/pleroma/pleroma) instead. ## About Pleroma @@ -20,12 +20,12 @@ No release has been made yet, but several servers have been online for months al ### Docker -While we don’t provide docker files, other people have written very good ones. Take a look at or . +While we don�t provide docker files, other people have written very good ones. Take a look at or . ### Dependencies * Postgresql version 9.6 or newer -* Elixir version 1.7 or newer. If your distribution only has an old version available, check [Elixir’s install page](https://elixir-lang.org/install.html) or use a tool like [asdf](https://github.com/asdf-vm/asdf). +* Elixir version 1.7 or newer. If your distribution only has an old version available, check [Elixir�s install page](https://elixir-lang.org/install.html) or use a tool like [asdf](https://github.com/asdf-vm/asdf). * Build-essential tools ### Configuration @@ -55,7 +55,7 @@ Copy `installation/init.d/pleroma` to `/etc/init.d/pleroma`. You can add it to t ### Standalone/run by other means -Run `mix phx.server` in repository’s root, it will output log into stdout/stderr. +Run `mix phx.server` in repository�s root, it will output log into stdout/stderr. ### Using an upstream proxy for federation