Skip to content

Commit

Permalink
Fix a few docstrings and one invalid docs link.
Browse files Browse the repository at this point in the history
  • Loading branch information
maiksprenger committed Jun 13, 2013
1 parent 513d49d commit a335fd6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/source/releases/v0.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ It's features include:

Further reading:

* :doc:`The demo site <internals/sandbox>`.
* :doc:`The demo site </internals/sandbox>`.

Accounts
~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion oscar/apps/customer/abstract_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class AbstractCommunicationEventType(models.Model):
# eg. PASSWORD_RESET
code = models.SlugField(_('Code'), max_length=128)

# Name is the friendly description of an event for use in the admin
#: Name is the friendly description of an event for use in the admin
name = models.CharField(
_('Name'), max_length=255,
help_text=_("This is just used for organisational purposes"))
Expand Down
4 changes: 2 additions & 2 deletions oscar/apps/offer/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ def get_applicable_lines(self, basket, range=None):
:basket: The basket
:range: The range of products to use for filtering. The fixed-price
benefit ignores its range and uses the condition range
benefit ignores its range and uses the condition range
"""
if range is None:
range = self.range
Expand Down Expand Up @@ -874,7 +874,7 @@ def consume_items(self, basket, affected_lines):
:basket: The basket
:affected_lines: The lines that have been affected by the discount.
This should be list of tuples (line, discount, qty)
This should be list of tuples (line, discount, qty)
"""
# We need to count how many items have already been consumed as part of
# applying the benefit, so we don't consume too many items.
Expand Down

0 comments on commit a335fd6

Please sign in to comment.