merge PR mattmakai#32 and regenerate HTML

mattmakai · mattmakai · commit a0eb549cdf72 · 2014-07-24T10:48:46.000+02:00
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-07-24T09:50:38Z</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-07-24T10:48:29Z</updated></feed>
diff --git a/web-frameworks.html b/web-frameworks.html
@@ -65,7 +65,7 @@ <h2>Common web framework functionality</h2>
 <p>For example, the Django web application framework includes an 
 Object-Relational Mapping (ORM) layer that abstracts relational database 
 read, write, query, and delete operations. However, Django's ORM
-cannot work without significant modification on non-relational databases such 
+cannot work without significant modification on non-relational databases such as 
 <a href="http://www.mongodb.org/">MongoDB</a>.
 Some other web frameworks such as Flask and Pyramid are easier to
 use with non-relational databases by incorporating external Python libraries.
@@ -76,7 +76,7 @@ <h2>General web framework resources</h2>
 <li>
 <p>"<a href="http://www.jeffknupp.com/blog/2014/03/03/what-is-a-web-framework/">What is a web framework?</a>"
   by <a href="https://twitter.com/jeffknupp">Jeff Knupp</a>
-  is a in-depth explanation of what a web framework is and their relation
+  is an in-depth explanation of what a web framework is and their relation
   to web servers.</p>
 </li>
 <li>

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-07-24T09:50:38Z</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-07-24T10:48:29Z</updated></feed>`