From 2928a470595636e2f6827e76fa903f5b81968876 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Thu, 27 Aug 2015 07:33:35 +0200
Subject: [PATCH] whitelist.txt deleted and merged in README.md

---
 README.md     | 9 ++++++++-
 manifest.json | 4 ++--
 whitelist.txt | 4 ----
 3 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 whitelist.txt

diff --git a/README.md b/README.md
index 882806f..46f5b7f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Current Movim version : 0.9 git2015-08-27
 
 0.9b 2015-08-27
 - Update to Movim 0.9 git2015-08-27
-- Add whitelist.txt (about public access yes/no consequencies)
+- Add notes in README about public pods & whitelisting
 
 0.8b 2015-08-24
 - Added language selection : ar, de, es, it, ja, nl, ru
@@ -83,6 +83,13 @@ Username and password are definied during installation.
 * URL rewriting is disabled (experimental feature)
 * No SSO auto login
 
+**Public Pod & Whitelisting**
+
+* Public pod = Yes : anyone can connect in your Movim pod using its own JID
+* Public pod = No : Whitelist allows only JID from your Yunohost to login*
+
+If you want to allow more domains, connect to yourserver.yourdomain.org/movim/?q=admin then add domains in the whitelist.
+
 **Help**
 
 support@conference.yunohost.org src386_
diff --git a/manifest.json b/manifest.json
index e15779d..28cee0b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,8 +62,8 @@
             {
                 "name": "public_site",
                 "ask": {
-                    "en": "Public pod ? (see whitelist.txt on github)"
-		    "fr": "Pod public ? (voir whitelist.txt sur github)"
+                    "en": "Public pod ? (see README on github)"
+		    "fr": "Pod public ? (voir README sur github)"
                 },
                 "choices": ["Yes", "No"],
                 "default": "No"
diff --git a/whitelist.txt b/whitelist.txt
deleted file mode 100644
index 6e04e6b..0000000
--- a/whitelist.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-* Public pod = Yes : anyone can connect in your Movim pod using its own JID
-* Public pod = No : Whitelist allows only JID from your Yunohost to login*
-
-If you want to allow more domains, connect to yourserver.yourdomain.org/movim/?q=admin then add domains in the whitelist.