adding eve framework and talk from europython

mattmakai · mattmakai · commit 7e997f7ca049 · 2014-07-26T10:55:00.000+02:00
diff --git a/api-creation.html b/api-creation.html
@@ -69,6 +69,13 @@ <h2>API creation frameworks</h2>
   you can use the same API code for Django, Flask, Bottle, Pyramid or any
   other WSGI framework with minimal porting effort.</p>
 </li>
+<li>
+<p><a href="http://python-eve.org/">Eve</a> is a Python REST framework built with Flask,
+  MongoDB and Redis. The framework's primary author 
+  <a href="https://twitter.com/nicolaiarocci">Nicola Iarocci</a> gave a great talk at 
+  <a href="https://www.youtube.com/watch?v=9sUsLvG72_o">EuroPython 2014</a> that 
+  introduced the main features of the framework.</p>
+</li>
 </ul>
 <h2>API testing projects</h2>
 <p>Building, running and maintaining APIs requires as much effort as building,
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-25T08:40:12Z</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-26T10:54:46Z</updated></feed>
diff --git a/other-web-frameworks.html b/other-web-frameworks.html
@@ -53,8 +53,7 @@ <h2>Morepath</h2>
 framework that routes URLs directly to model code.</p>
 <ul>
 <li>Morepath's creator gave a 
-  <a href="https://www.youtube.com/watch?v=gyDKMAWPyuY">great talk on the motivation and structure for
-  the new framework</a> 
+  <a href="https://www.youtube.com/watch?v=gyDKMAWPyuY">great talk on the motivation and structure for the new framework</a> 
   at EuroPython 2014.</li>
 </ul>
 <h2>web.py</h2>
diff --git a/source/content/pages/02-web-frameworks/0209-other-web-frameworks.markdown b/source/content/pages/02-web-frameworks/0209-other-web-frameworks.markdown
@@ -37,8 +37,7 @@ with web application speed as a top priority.
 framework that routes URLs directly to model code.
 
 * Morepath's creator gave a 
-  [great talk on the motivation and structure for
-  the new framework](https://www.youtube.com/watch?v=gyDKMAWPyuY) 
+  [great talk on the motivation and structure for the new framework](https://www.youtube.com/watch?v=gyDKMAWPyuY) 
   at EuroPython 2014.
 
 
diff --git a/source/content/pages/06-apis/0605-api-creation.markdown b/source/content/pages/06-apis/0605-api-creation.markdown
@@ -43,6 +43,12 @@ applications through machine-to-machine communication.
   you can use the same API code for Django, Flask, Bottle, Pyramid or any
   other WSGI framework with minimal porting effort.
 
+* [Eve](http://python-eve.org/) is a Python REST framework built with Flask,
+  MongoDB and Redis. The framework's primary author 
+  [Nicola Iarocci](https://twitter.com/nicolaiarocci) gave a great talk at 
+  [EuroPython 2014](https://www.youtube.com/watch?v=9sUsLvG72_o) that 
+  introduced the main features of the framework.
+
 
 ## API testing projects
 Building, running and maintaining APIs requires as much effort as building,

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-25T08:40:12Z</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-26T10:54:46Z</updated></feed>`