merging pull request mattmakai#8, tweaking wording

mattmakai · mattmakai · commit 59cab28c0d3e · 2014-02-10T08:10:09.000-05:00
diff --git a/databases.html b/databases.html
@@ -126,6 +126,19 @@ <h2>Connecting to a database with Python</h2>
 is not necessary. Simply &quot;import sqlite3&quot; to begin interfacing with the
 single file-based database.</p>
 </div>
+<div class="section" id="object-relational-mapping">
+<h2>Object-Relational Mapping</h2>
+<p>Object-relational mappers (ORMs) allow developers to access data from a
+backend by writing with Python code instead of SQL queries. Each web
+application framework handles integrating ORMs differently.</p>
+<p>Django provides an ORM with its core functionality. Flask leaves using an
+ORM up to an extension, such as
+<a class="reference external" href="http://pythonhosted.org/Flask-SQLAlchemy/">Flask-SQLALchemy</a>.</p>
+<p>Developers can also use ORMs without a web framework, such as when
+creating a data analysis tool or a batch script without a user interface. The
+most widely used stand-alone ORM written for Python is currently
+<a class="reference external" href="http://www.sqlalchemy.org/">SQLAlchemy</a>.</p>
+</div>
 <div class="section" id="database-third-party-services">
 <h2>Database third-party services</h2>
 <p>Numerous companies run scalable database servers as a hosted service.
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>2014-02-10T07:58:55Z</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>2014-02-10T08:09:39Z</updated></feed>
diff --git a/source/content/pages/databases.rst b/source/content/pages/databases.rst
@@ -76,6 +76,23 @@ is not necessary. Simply "import sqlite3" to begin interfacing with the
 single file-based database.
 
 
+-------------------------
+Object-Relational Mapping
+-------------------------
+Object-relational mappers (ORMs) allow developers to access data from a 
+backend by writing with Python code instead of SQL queries. Each web 
+application framework handles integrating ORMs differently. 
+
+Django provides an ORM with its core functionality. Flask leaves using an 
+ORM up to an extension, such as 
+`Flask-SQLALchemy <http://pythonhosted.org/Flask-SQLAlchemy/>`_. 
+
+Developers can also use ORMs without a web framework, such as when
+creating a data analysis tool or a batch script without a user interface. The 
+most widely used stand-alone ORM written for Python is currently
+`SQLAlchemy <http://www.sqlalchemy.org/>`_.
+
+
 -----------------------------
 Database third-party services
 -----------------------------
@@ -96,16 +113,6 @@ needs.
 with managed, backed up, replicated, and auto-patched MySQL instances. Cloud
 SQL integrates with Google App Engine but can be used independently as well.
 
-Object-Relational Mapping
---------------------------
-
-Often you might want to simplify accessing your data, and prefer a simple, 
-object oriented way to manipulate your data, instead of raw SQL queries.
-
-This is solved by Object Relational Mapping (ORM) applications. Sometimes these
-are integrated with your framework of choice, but you might use them without
-general frameworks too. Probably, the most widely used stand-alone ORM written
-for Python is `SQLAlchemy <http://www.sqlalchemy.org/>`_.
 
 Database resources
 ==================

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>2014-02-10T07:58:55Z</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>2014-02-10T08:09:39Z</updated></feed>`