diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f7ce89f5..beaac790 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,9 @@ Changelog ========= +* 2.2.1 (Not released) + * Added AVATAR_GRAVATAR_FIELD setting to define the user field to get the gravatar email. + * 2.2.0 (December 2, 2015) * Added Python 3.5 support * Added Django 1.9 support diff --git a/docs/index.txt b/docs/index.txt index 43e2a4ad..021a387b 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -128,9 +128,9 @@ AVATAR_DEFAULT_URL and there is no ``Avatar`` instance found in the system for the given user. AVATAR_GRAVATAR_FIELD - The name of the user's field containing the gravatar email. Defaults to - ``email``. If you put, for example, ``gravatar``, django-avatar will get the - user's gravatar in ``user.gravatar``. + The name of the user's field containing the gravatar email. For example, if you set + this to ``gravatar`` then django-avatar will get the user's gravatar in ``user.gravatar``. + Defaults to ``email``. AVATAR_MAX_SIZE File size limit for avatar upload. Default is ``1024 * 1024`` (1mb).