merging and regenerating with PR mattmakai#46

mattmakai · mattmakai · commit 3ec65bba6283 · 2014-11-18T18:58:59.000-05:00
diff --git a/all.html b/all.html
@@ -451,7 +451,7 @@ <h2>Flask resources</h2>
 the series. However, each post is focused on a single topic to contain 
 the complexity while the reader is learning the framework. The whole 
 series is well worth an in-depth read-through. The 
-<a href="https://twitter.com/miguelgrinberg">author</a> is also wrote the new
+<a href="https://twitter.com/miguelgrinberg">author</a> also wrote the new
 <a href="http://shop.oreilly.com/product/0636920031116.do">O'Reilly Flask Web Development</a>
 book which is an excellent learning resource.</p>
 <ul>
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-11-18T09:00:16Z</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-11-18T18:58:43Z</updated></feed>
diff --git a/flask.html b/flask.html
@@ -72,7 +72,7 @@ <h2>Flask resources</h2>
 the series. However, each post is focused on a single topic to contain 
 the complexity while the reader is learning the framework. The whole 
 series is well worth an in-depth read-through. The 
-<a href="https://twitter.com/miguelgrinberg">author</a> is also wrote the new
+<a href="https://twitter.com/miguelgrinberg">author</a> also wrote the new
 <a href="http://shop.oreilly.com/product/0636920031116.do">O'Reilly Flask Web Development</a>
 book which is an excellent learning resource.</p>
 <ul>

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-11-18T09:00:16Z</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-11-18T18:58:43Z</updated></feed>`