[Python-modules-commits] [python-social-auth] 20/71: Merge branch 'master' of https://github.com/PixelPin/python-social-auth into PixelPin-master

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag v0.2.14
in repository python-social-auth.

commit ecaa306ccb7fb854004c7a446959e203de1108fb
Merge: 7f74771 737b32f
Author: Matías Aguirre <matiasaguirre at gmail.com>
Date:   Mon Oct 5 10:46:26 2015 -0300

    Merge branch 'master' of https://github.com/PixelPin/python-social-auth into PixelPin-master

 docs/backends/pixelpin.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --cc docs/backends/pixelpin.rst
index 8479a93,5a3c131..8f1ebaf
--- a/docs/backends/pixelpin.rst
+++ b/docs/backends/pixelpin.rst
@@@ -1,34 -1,30 +1,33 @@@
 -PixelPin
 -========
 -
 -PixelPin only supports OAuth2.
 -
 -PixelPin OAuth2
 ----------------
 -
 -Developer documentation for PixelPin can be found at http://developer.pixelpin.co.uk/
 -To setup OAuth2 do the following:
 -
 -- Register a new developer account at `PixelPin Developers`_.
 -
 -    You require a PixelPin account to create developer accounts. Sign up at `PixelPin Account Page`_
 -	For the value of redirect uri, use whatever path you need to return to on your web application. The
 -	example code provided with the plugin uses http://<yoursite>/complete/pixelpin-oauth2/
 -	
 -	Once verified by email, record the values of client id and secret for the next step
 -
 -- Fill **Consumer Key** and **Consumer Secret** values in your settings.py file::
 -
 -      SOCIAL_AUTH_PIXELPIN_OAUTH2_KEY = ''
 -      SOCIAL_AUTH_PIXELPIN_OAUTH2_SECRET = ''
 -
 -- Add ``'social.backends.pixelpin.PixelPinOAuth2'`` into your
 -  ``SOCIAL_AUTH_AUTHENTICATION_BACKENDS``.
 -
 -.. _PixelPin homepage: http://pixelpin.co.uk/
 -.. _PixelPin Account Page: https://login.pixelpin.co.uk/
 -.. _PixelPin Developers: http://developer.pixelpin.co.uk/
 +PixelPin
 +========
 +
- PixelPin itself supports OAuth 1 and 2 but this provider only supports OAuth2.
++PixelPin only supports OAuth2.
 +
 +PixelPin OAuth2
 +---------------
 +
 +Developer documentation for PixelPin can be found at
- https://login.pixelpin.co.uk/Developer/Index.aspx To setup OAuth2 do the
- following:
++http://developer.pixelpin.co.uk/. To setup OAuth2 do the following:
 +
 +- Register a new developer account at `PixelPin Developers`_.
 +
 +  You require a PixelPin account to create developer accounts. Sign up at
 +  `PixelPin Account Page`_ For the value of redirect uri, use whatever path you
 +  need to return to on your web application. The example code provided with the
 +  plugin uses ``http://<yoursite>/complete/pixelpin-oauth2/``.
 +
 +  Once verified by email, record the values of client id and secret for the
 +  next step.
 +
 +- Fill **Consumer Key** and **Consumer Secret** values in your settings.py
 +  file::
 +
 +      SOCIAL_AUTH_PIXELPIN_OAUTH2_KEY = ''
 +      SOCIAL_AUTH_PIXELPIN_OAUTH2_SECRET = ''
 +
 +- Add ``'social.backends.pixelpin.PixelPinOAuth2'`` into your
 +  ``SOCIAL_AUTH_AUTHENTICATION_BACKENDS``.
 +
 +.. _PixelPin homepage: http://pixelpin.co.uk/
 +.. _PixelPin Account Page: https://login.pixelpin.co.uk/
- .. _PixelPin Developers: https://login.pixelpin.co.uk/Developers/Index.aspx
++.. _PixelPin Developers: http://developer.pixelpin.co.uk/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git