Skip to content

Commit

Permalink
Corrected some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Martijn Jacobs committed Jan 14, 2016
1 parent e755808 commit 01718ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/source/usage/communicate_with_the_api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ When you don't support anonymous checkouts you will need to login first. Oscar A
}
response = session.post('http://localhost:8000/api/login/', json=data)
When the authentication was succesful, your will receive a new (authenticated) sessionid, and the anonymous basket will be automatically merged with a (previous stored) basket of this specific user. You can see that the owner is now set in the basket:
When the authentication was succesful, your will receive a new (authenticated) sessionid, and the anonymous basket has been automatically merged with a (previous stored) basket of this specific user. You can see now that the owner is set in the basket:

.. code-block:: python
Expand Down
6 changes: 3 additions & 3 deletions docs/source/usage/permissions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ The following actions will be performed when a user logs in:
Permissions
-----------

The Django REST Framework already supplies it's own permissions to make sure that
you can define which user can do what (PUT or just GET etc.). Oscar API is using
the following permissions, which you can use if you would like in your own views:
The Django REST Framework already supplies it's own defined permissions to make
sure that you can define which user can do what (PUT or just GET etc.). Oscar API
is using the following permissions, which you can use in your own views:

.. automodule:: oscarapi.permissions
:members:

0 comments on commit 01718ab

Please sign in to comment.