3 files changed, 8 insertions, 26 deletions
diff --git a/docker/dev/README.md b/docker/dev/README.md
index a4b6fb9bb..f737a1554 100644
--- a/docker/dev/README.md
+++ b/docker/dev/README.md
@@ -1,28 +1,13 @@
-**Mattermost Alpha**  
-**Team Communication Service**  
-**Development Build**
+Mattermost
+==========
 
-
-About Mattermost
-================
+http:/mattermost.org
 
 Mattermost is an open-source team communication service. It brings team messaging and file sharing into one place, accessible across PCs and phones, with archiving and search.
 
-
-
 Installing Mattermost
 =====================
 
-You're installing "Mattermost Alpha", a pre-released version providing an early look at what we're building. While the core team runs this version internally, it's not recommended for production since we can't guarantee API stability or backwards compatibility.
-
-That said, any issues at all, please let us know on the Mattermost forum.
-
-Notes: 
-- For Alpha, Docker is intentionally setup as a single container, since production deployment is not yet recommended.
-
-Local Machine Setup (Docker)
------------------------------
-
 To run an instance of the latest version of mattermost on your local machine you can run:
 
 `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform`
@@ -35,9 +20,4 @@ To run an instance of the latest code from the master branch on GitHub you can r
 
 `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:dev`
 
-
-License
--------
-
-Mattermost is licensed under an "Apache-wrapped AGPL" model inspired by MongoDB. Similar to MongoDB, you can run and link to the system using Configuration Files and Admin Tools licensed under Apache, version 2.0, as described in the LICENSE file, as an explicit exception to the terms of the GNU Affero General Public License (AGPL) that applies to most of the remaining source files. See individual files for details.
-
+Any questions, please visit http://forum.mattermost.org
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index cbac2ea69..aceeb95b4 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -23,7 +23,8 @@
         "UseLocalStorage": true,
         "StorageDirectory": "/mattermost/data/",
         "AllowedLoginAttempts": 10,
-        "DisableEmailSignUp": false
+        "DisableEmailSignUp": false,
+        "EnableOAuthServiceProvider": false
     },
     "SSOSettings": {
         "gitlab": {
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 794ac95ae..bc42951b8 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -23,7 +23,8 @@
         "UseLocalStorage": true,
         "StorageDirectory": "/mattermost/data/",
         "AllowedLoginAttempts": 10,
-        "DisableEmailSignUp": false
+        "DisableEmailSignUp": false,
+        "EnableOAuthServiceProvider": false
     },
     "SSOSettings": {
         "gitlab": {