summaryrefslogtreecommitdiff
path: root/doc/build/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-11-30 17:31:00 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-11-30 17:31:00 -0500
commitd80ee72aaa4b7f8a23e1bd55515b8446a951a5f0 (patch)
tree3ec274acb8bc8826864da2c5cd3d381bdb7ce2e0 /doc/build/orm
parent31886aff29b1da8639bcf4ae8b9edc81c4713654 (diff)
downloadsqlalchemy-d80ee72aaa4b7f8a23e1bd55515b8446a951a5f0.tar.gz
- the pronoun removal commit. there was only one instance of a
standalone gendered pronoun with a gender-neutral subject, but also have replaced all occurences of "his/her", "his or her", etc. The docs have always strived to account for both genders in any non-specific singular pronoun, however recent controversy in the community suggests that a zero-gendered-pronoun policy is probably best going forward.
Diffstat (limited to 'doc/build/orm')
-rw-r--r--doc/build/orm/session.rst2
-rw-r--r--doc/build/orm/tutorial.rst27
2 files changed, 16 insertions, 13 deletions
diff --git a/doc/build/orm/session.rst b/doc/build/orm/session.rst
index 5bd5d664d..b3a6e4384 100644
--- a/doc/build/orm/session.rst
+++ b/doc/build/orm/session.rst
@@ -252,7 +252,7 @@ one at a time. We refer to these two concepts as **transaction scope**
and **session scope**.
The implication here is that the SQLAlchemy ORM is encouraging the
-developer to establish these two scopes in his or her application,
+developer to establish these two scopes in their application,
including not only when the scopes begin and end, but also the
expanse of those scopes, for example should a single
:class:`.Session` instance be local to the execution flow within a
diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 32d75194a..aa9a51178 100644
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -406,7 +406,7 @@ We can add more ``User`` objects at once using
... User(name='mary', fullname='Mary Contrary', password='xxg527'),
... User(name='fred', fullname='Fred Flinstone', password='blah')])
-Also, Ed has already decided his password isn't too secure, so lets change it:
+Also, we've decided the password for Ed isn't too secure, so lets change it:
.. sourcecode:: python+sql
@@ -1263,9 +1263,10 @@ using any SQL:
>>> jack.addresses[1].user
<User(name='jack', fullname='Jack Bean', password='gjffdd')>
-Let's add and commit ``Jack Bean`` to the database. ``jack`` as well as the
-two ``Address`` members in his ``addresses`` collection are both added to the
-session at once, using a process known as **cascading**:
+Let's add and commit ``Jack Bean`` to the database. ``jack`` as well
+as the two ``Address`` members in the corresponding ``addresses``
+collection are both added to the session at once, using a process
+known as **cascading**:
.. sourcecode:: python+sql
@@ -1865,8 +1866,8 @@ including the cascade configuration (we'll leave the constructor out too)::
... return "<User(name='%s', fullname='%s', password'%s')>" % (
... self.name, self.fullname, self.password)
-Then we recreate ``Address``, noting that in this case we've created the ``Address.user`` relationship
-via the ``User`` class already::
+Then we recreate ``Address``, noting that in this case we've created
+the ``Address.user`` relationship via the ``User`` class already::
>>> class Address(Base):
... __tablename__ = 'addresses'
@@ -1877,9 +1878,10 @@ via the ``User`` class already::
... def __repr__(self):
... return "<Address(email_address='%s')>" % self.email_address
-Now when we load Jack (below using :meth:`~.Query.get`, which loads by primary key),
-removing an address from his ``addresses`` collection will result in that
-``Address`` being deleted:
+Now when we load the user ``jack`` (below using :meth:`~.Query.get`,
+which loads by primary key), removing an address from the
+corresponding ``addresses`` collection will result in that ``Address``
+being deleted:
.. sourcecode:: python+sql
@@ -1920,7 +1922,8 @@ removing an address from his ``addresses`` collection will result in that
('jack@google.com', 'j25@yahoo.com')
{stop}1
-Deleting Jack will delete both Jack and his remaining ``Address``:
+Deleting Jack will delete both Jack and the remaining ``Address`` associated
+with the user:
.. sourcecode:: python+sql
@@ -2144,8 +2147,8 @@ keyword string 'firstpost'":
('firstpost',)
{stop}[BlogPost("Wendy's Blog Post", 'This is a test', <User(name='wendy', fullname='Wendy Williams', password='foobar')>)]
-If we want to look up just Wendy's posts, we can tell the query to narrow down
-to her as a parent:
+If we want to look up posts owned by the user ``wendy``, we can tell
+the query to narrow down to that ``User`` object as a parent:
.. sourcecode:: python+sql