From: Matías Aguirre <matiasaguirre@gmail.com>
Date: Mon, 9 Apr 2012 01:18:25 +0000 (-0300)
Subject: Drop meaningless text
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0b003e5da587df8c93828f6700f3d2083aab176c;p=django-social-auth.git

Drop meaningless text
---

diff --git a/README.rst b/README.rst
index fd361c3..9cbe49c 100644
--- a/README.rst
+++ b/README.rst
@@ -299,8 +299,7 @@ Configuration
       SOCIAL_AUTH_CREATE_USERS = False
 
   It is also possible to associate multiple user accounts with a single email
-  address as long as the rest of the user data is unique. Set value as True
-  to enable, otherwise set as False to disable.
+  address, set value as True to enable, otherwise set as False to disable.
   This behavior is disabled by default (false) unless specifically set::
 
       SOCIAL_AUTH_ASSOCIATE_BY_MAIL = True
@@ -688,6 +687,11 @@ at `Facebook development resources`_:
 
      FACEBOOK_EXTENDED_PERMISSIONS = [...]
 
+  Take into account that Facebook doesn't return user email by default, this
+  setting is needed if email is required::
+
+     FACEBOOK_EXTENDED_PERMISSIONS = ['email']
+
 - Define ``FACEBOOK_PROFILE_EXTRA_PARAMS`` to pass extra parameters to
   https://graph.facebook.com/me when gathering the user profile data, like::
 
diff --git a/doc/backends/facebook.rst b/doc/backends/facebook.rst
index 94de299..63dfefa 100644
--- a/doc/backends/facebook.rst
+++ b/doc/backends/facebook.rst
@@ -16,6 +16,11 @@ at `Facebook development resources`_:
 
      FACEBOOK_EXTENDED_PERMISSIONS = [...]
 
+  Take into account that Facebook doesn't return user email by default, this
+  setting is needed if email is required::
+
+     FACEBOOK_EXTENDED_PERMISSIONS = ['email']
+
 - Define ``FACEBOOK_PROFILE_EXTRA_PARAMS`` to pass extra parameters to
   https://graph.facebook.com/me when gathering the user profile data, like::
 
diff --git a/doc/configuration.rst b/doc/configuration.rst
index 01e9204..31311aa 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -195,9 +195,9 @@ Configuration
 
       SOCIAL_AUTH_CREATE_USERS = False
 
-  Also, it's possible to associate user accounts that share the same email
-  address if the user entry is unique (that means that if the email is not used
-  by more than one account). This behavior is disabled by default unless::
+  It is also possible to associate multiple user accounts with a single email
+  address, set value as True to enable, otherwise set as False to disable.
+  This behavior is disabled by default (false) unless specifically set::
 
       SOCIAL_AUTH_ASSOCIATE_BY_MAIL = True