Merge branch 'master' into patch-3

Running-Mastodon/Production-guide.md

@@ -109,7 +109,7 @@ server {
 
 ## Running in production without Docker
 
-It is recommended to create a special user for mastodon on the server (you could call the user `mastodon`), though remember to disable outside login for it. You should only be able to get into that user through `sudo su - mastodon`.
+It is recommended to create a special user for mastodon on the server (you could call the user `mastodon`), though remember to disable outside login for it. You should only be able to get into that user through `sudo -u mastodon`.
 
 ## General dependencies
 
@@ -165,8 +165,7 @@ Initial Setup postgres:
 
 Set up a user and database for Mastodon:
 
-    sudo su - postgres
-    psql
+    sudo -u postgres psql
 
 In the prompt:
 
@@ -200,7 +199,11 @@ Then once `rbenv` is ready, run `rbenv install 2.4.1` to install the Ruby versio
 
 ## Git
 
-You need the `git-core` package installed on your system. If it is so, from the `mastodon` user:
+You need the `git-core` package installed on your system. If it is so, run the shell from the `mastodon` user:
+
+    sudo -su mastodon
+
+And enter the following commands:
 
     cd ~
     git clone https://github.com/tootsuite/mastodon.git live

Using-the-API/API.md

@@ -39,29 +39,33 @@ ___
 
 ## Available libraries
 
-| Language             | Library                                                         | Developer(s)                                                                   |
-| -------------------- | --------------------------------------------------------------- | ------------------------------------------------------------------------------ |
-| Apex (Salesforce)    | [apex-mastodon](https://github.com/tzmfreedom/apex-mastodon)    |                                                                                |
-| C# (.NET Standard)   | [Mastodot](https://github.com/yamachu/Mastodot)                 |                                                                                |
-| C# (.NET Standard)   | [Mastonet](https://github.com/glacasa/Mastonet)                 |                                                                                |
-| C# (.NET)            | [mastodon-api-cs](https://github.com/pawotter/mastodon-api-cs)  |                                                                                |
-| C# (.NET)            | [Mastodon.Net](https://github.com/Tlaster/Mastodon.Net)         |                                                                                |
-| Crystal              | [mastodon.cr](https://github.com/decors/mastodon.cr)            |                                                                                |
-| Elixir               | [hunter](https://github.com/milmazz/hunter)                     |                                                                                |
-| Go                   | [go-mastodon](https://github.com/mattn/go-mastodon)             |                                                                                |
-| Go                   | [madon](https://github.com/McKael/madon)                        |                                                                                |
-| Haskell              | [hastodon](https://github.com/syucream/hastodon)                |                                                                                |
-| Java                 | [mastodon4j](https://github.com/sys1yagi/mastodon4j)            |                                                                                |
-| JavaScript           | [libodonjs](https://github.com/Zatnosk/libodonjs)               |                                                                                |
-| Javascript (Browser) | [mastodon.js](https://github.com/Kirschn/mastodon.js)           |                                                                                |
-| JavaScript (Node.js) | [node-mastodon](https://github.com/jessicahayley/node-mastodon) |                                                                                |
-| Perl                 | [Mastodon::Client](https://metacpan.org/pod/Mastodon::Client)   |                                                                                |
-| Python               | [Mastodon.py](https://github.com/halcy/Mastodon.py)             |                                                                                |
-| R                    | [mastodon](https://github.com/ThomasChln/mastodon)              |                                                                                |
-| Ruby                 | [mastodon-api](https://github.com/tootsuite/mastodon-api)       | [@Gargron@mastodon.social](https://mastodon.social/@Gargron)                   |
-| Rust                 | [mammut](https://github.com/Aaronepower/mammut)                 |                                                                                |
-| Scala                | [scaladon](https://github.com/schwitzerm/scaladon)              |                                                                                |
-| Swift                | [MastodonKit](https://github.com/ornithocoder/MastodonKit)      | [@ornithocoder@mastodon.technology](https://mastodon.technology/@ornithocoder) |
+| Language             | Library                                                                        | Developer(s)                                                                   |
+| -------------------- | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ |
+| Apex (Salesforce)    | [apex-mastodon](https://github.com/tzmfreedom/apex-mastodon)                   |                                                                                |
+| C# (.NET Standard)   | [Mastodot](https://github.com/yamachu/Mastodot)                                |                                                                                |
+| C# (.NET Standard)   | [Mastonet](https://github.com/glacasa/Mastonet)                                |                                                                                |
+| C# (.NET)            | [mastodon-api-cs](https://github.com/pawotter/mastodon-api-cs)                 |                                                                                |
+| C# (.NET)            | [Mastodon.Net](https://github.com/Tlaster/Mastodon.Net)                        |                                                                                |
+| Crystal              | [mastodon.cr](https://github.com/decors/mastodon.cr)                           |                                                                                |
+| Elixir               | [hunter](https://github.com/milmazz/hunter)                                    |                                                                                |
+| Go                   | [go-mastodon](https://github.com/mattn/go-mastodon)                            |                                                                                |
+| Go                   | [madon](https://github.com/McKael/madon)                                       |                                                                                |
+| Haskell              | [hastodon](https://github.com/syucream/hastodon)                               |                                                                                |
+| Java                 | [mastodon4j](https://github.com/sys1yagi/mastodon4j)                           |                                                                                |
+| JavaScript           | [libodonjs](https://github.com/Zatnosk/libodonjs)                              |                                                                                |
+| Javascript (Browser) | [mastodon.js](https://github.com/Kirschn/mastodon.js)                          |                                                                                |
+| JavaScript (Node.js) | [node-mastodon](https://github.com/jessicahayley/node-mastodon)                |                                                                                |
+| Perl                 | [Mastodon::Client](https://metacpan.org/pod/Mastodon::Client)                  |                                                                                |
+| PHP                  | [Mastodon-api-php](https://github.com/yks118/Mastodon-api-php)                 |                                                                                |
+| PHP                  | [MastodonOAuthPHP](https://github.com/TheCodingCompany/MastodonOAuthPHP)       |                                                                                |
+| PHP                  | [Phediverse Mastodon REST Client](https://github.com/phediverse/mastodon-rest) |                                                                                |
+| PHP                  | [TootoPHP](https://framagit.org/MaxKoder/TootoPHP)                             |                                                                                |
+| Python               | [Mastodon.py](https://github.com/halcy/Mastodon.py)                            |                                                                                |
+| R                    | [mastodon](https://github.com/ThomasChln/mastodon)                             |                                                                                |
+| Ruby                 | [mastodon-api](https://github.com/tootsuite/mastodon-api)                      | [@Gargron@mastodon.social](https://mastodon.social/@Gargron)                   |
+| Rust                 | [mammut](https://github.com/Aaronepower/mammut)                                |                                                                                |
+| Scala                | [scaladon](https://github.com/schwitzerm/scaladon)                             |                                                                                |
+| Swift                | [MastodonKit](https://github.com/ornithocoder/MastodonKit)                     | [@ornithocoder@mastodon.technology](https://mastodon.technology/@ornithocoder) |
 
 ___