summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-28 19:40:45 -0500
committerChris McDonough <chrism@plope.com>2010-12-28 19:40:45 -0500
commit02c43fe07f1ffe0cc27e539618ed8d96014cddee (patch)
treeddce198c3c2a8ec4da9a77d329327877cfade855 /docs
parentde487c1729a41d236b107b3ad728edd7df71ec1e (diff)
parent5e2c481dda9c69477749693c3563255b94f25990 (diff)
downloadpyramid-02c43fe07f1ffe0cc27e539618ed8d96014cddee.tar.gz
pyramid-02c43fe07f1ffe0cc27e539618ed8d96014cddee.tar.bz2
pyramid-02c43fe07f1ffe0cc27e539618ed8d96014cddee.zip
Merge branch 'mgedmin-master'
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/resources.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst
index ac88afdfd..8cf2cead2 100644
--- a/docs/narr/resources.rst
+++ b/docs/narr/resources.rst
@@ -404,7 +404,7 @@ Obtaining the Lineage of a Resource
-----------------------------------
:func:`pyramid.location.lineage` returns a generator representing the
-:term:`lineage` of the :term:`location` aware:term:`resource` object.
+:term:`lineage` of the :term:`location` aware :term:`resource` object.
The :func:`~pyramid.location.lineage` function returns the resource it is
passed, then each parent of the resource, in order. For example, if the
@@ -533,7 +533,7 @@ declares that the blog entry implements an :term:`interface`.
implements(IBlogEntry)
def __init__(self, title, body, author):
self.title = title
- self.body = body
+ self.body = body
self.author = author
self.created = datetime.datetime.now()
@@ -568,7 +568,7 @@ To do so, use the :func:`zope.interface.directlyProvides` function:
class BlogEntry(object):
def __init__(self, title, body, author):
self.title = title
- self.body = body
+ self.body = body
self.author = author
self.created = datetime.datetime.now()
@@ -596,7 +596,7 @@ the :func:`zope.interface.alsoProvides` function:
class BlogEntry(object):
def __init__(self, title, body, author):
self.title = title
- self.body = body
+ self.body = body
self.author = author
self.created = datetime.datetime.now()