From: lambda <lain@soykaf.club>
Date: Mon, 1 Apr 2019 21:20:11 +0000 (+0000)
Subject: Merge branch 'documentation-improvements' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fc2bef5ac33b48bdbe3ab076804e287a42f07874;p=akkoma

Merge branch 'documentation-improvements' into 'develop'

Small documentation improvements

See merge request pleroma/pleroma!1001
---

fc2bef5ac33b48bdbe3ab076804e287a42f07874
diff --cc README.md
index 154abee40,8223afcb3..c45190fc3
--- a/README.md
+++ b/README.md
@@@ -8,9 -6,9 +8,9 @@@ Pleroma is a microblogging server softw
  
  Pleroma is written in Elixir, high-performance and can run on small devices like a Raspberry Pi.
  
- For clients it supports both the [GNU Social API with Qvitter extensions](https://twitter-api.readthedocs.io/en/latest/index.html) and the [Mastodon client API](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md).
+ For clients it supports both the [GNU Social API with Qvitter extensions](https://twitter-api.readthedocs.io/en/latest/index.html) and the [Mastodon client API](https://docs.joinmastodon.org/api/guidelines/).
  
 -- [Client Applications for Pleroma](docs/Clients.md)
 +- [Client Applications for Pleroma](https://docs-develop.pleroma.social/clients.html)
  
  No release has been made yet, but several servers have been online for months already. If you want to run your own server, feel free to contact us at @lain@pleroma.soykaf.com or in our dev chat at #pleroma on freenode or via matrix at <https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org>.