From f085ecedb34c5acaaa5ec2b8e95acd6630d9c766 Mon Sep 17 00:00:00 2001
From: Skid <skid@tuto-craft.com>
Date: Tue, 14 Aug 2018 15:41:55 +0200
Subject: [PATCH 1/2] Update setup.en.md

---
 docs/setup.en.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/setup.en.md b/docs/setup.en.md
index 56632cc36..73ea63639 100644
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -62,6 +62,13 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```
 
+*(optional)* Create a twitter application
+----------------------------------------------------------------
+If you want to enable the twitter integration, you need to create a twitter app at [apps.twitter.com](https://apps.twitter.com/).
+
+In the app you need to set the oauth callback url as : https://misskey-instance/api/tw/cb
+
+
 *5.* Make configuration file
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.

From f04526bacad59b3e6947a93459f1067e94cb9322 Mon Sep 17 00:00:00 2001
From: Skid <skid@tuto-craft.com>
Date: Tue, 14 Aug 2018 15:45:36 +0200
Subject: [PATCH 2/2] Update example.yml

---
 .config/example.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/example.yml b/.config/example.yml
index a4f3c0036..ce092a08f 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -123,6 +123,7 @@ drive:
 # google_maps_api_key: example-google-maps-api-key
 
 # Twitter integration
+# You need to set the oauth callback url as : https://<your-misskey-instance>/api/tw/cb
 # twitter:
 #   consumer_key: example-twitter-consumer-key
 #   consumer_secret: example-twitter-consumer-secret-key