tweaking wording on orms page

mattmakai · mattmakai · commit 2d7595e30d6d · 2015-06-16T09:22:19.000-07:00
diff --git a/all.html b/all.html
@@ -3371,9 +3371,9 @@ <h3>Potential for reduced performance</h3>
 <h3>Shifting complexity from the database into the app code</h3>
 <p>The code for working with an application's data has to live somewhere. Before
 ORMs were common, database stored procedures were used to encapsulate the
-database logic. With an ORM, the data manipulation code instead lives in the 
-application's codebase. The addition of data handling code in the codebase
-generally isn't an issue with a sound application design, but it does 
+database logic. With an ORM, the data manipulation code instead lives within 
+the application's Python codebase. The addition of data handling logic in the 
+codebase generally isn't an issue with a sound application design, but it does 
 increase the total amount of Python code instead of splitting code between 
 the application and the database stored procedures.</p>
 <h2>Python ORM Implementations</h2>
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T09:21:39Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T09:22:16Z</updated></feed>
diff --git a/object-relational-mappers-orms.html b/object-relational-mappers-orms.html
@@ -131,9 +131,9 @@ <h3>Potential for reduced performance</h3>
 <h3>Shifting complexity from the database into the app code</h3>
 <p>The code for working with an application's data has to live somewhere. Before
 ORMs were common, database stored procedures were used to encapsulate the
-database logic. With an ORM, the data manipulation code instead lives in the 
-application's codebase. The addition of data handling code in the codebase
-generally isn't an issue with a sound application design, but it does 
+database logic. With an ORM, the data manipulation code instead lives within 
+the application's Python codebase. The addition of data handling logic in the 
+codebase generally isn't an issue with a sound application design, but it does 
 increase the total amount of Python code instead of splitting code between 
 the application and the database stored procedures.</p>
 <h2>Python ORM Implementations</h2>
diff --git a/source/content/pages/05-data/04-object-relational-mappers.markdown b/source/content/pages/05-data/04-object-relational-mappers.markdown
@@ -121,9 +121,9 @@ SQL code.
 ### Shifting complexity from the database into the app code
 The code for working with an application's data has to live somewhere. Before
 ORMs were common, database stored procedures were used to encapsulate the
-database logic. With an ORM, the data manipulation code instead lives in the 
-application's codebase. The addition of data handling code in the codebase
-generally isn't an issue with a sound application design, but it does 
+database logic. With an ORM, the data manipulation code instead lives within 
+the application's Python codebase. The addition of data handling logic in the 
+codebase generally isn't an issue with a sound application design, but it does 
 increase the total amount of Python code instead of splitting code between 
 the application and the database stored procedures.
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T09:21:39Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T09:22:16Z</updated></feed>`