adding web2py as another web framework

mattmakai · mattmakai · commit 086e2dde6691 · 2014-04-29T07:27:17.000-04: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-04-28T16:52:10Z</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-04-29T07:27:01Z</updated></feed>
diff --git a/other-web-frameworks.html b/other-web-frameworks.html
@@ -60,6 +60,9 @@ <h2>Morepath</h2>
 <h2>web.py</h2>
 <p><a href="http://webpy.org/">web.py</a> is a Python web framework designed for simplicity
 in building web applications.</p>
+<h2>web2py</h2>
+<p><a href="http://www.web2py.com/">Web2py</a> is a batteries-included philosophy framework
+with project structure based on model-view-controller patterns.</p>
 <h2>Other web framework resources</h2>
 <ul>
 <li>
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
@@ -41,6 +41,11 @@ framework that routes URLs directly to model code.
 in building web applications.
 
 
+## web2py
+[Web2py](http://www.web2py.com/) is a batteries-included philosophy framework
+with project structure based on model-view-controller patterns.
+
+
 ## Other web framework resources
 * This [roundup of 14 minimal Python frameworks](http://codecondo.com/14-minimal-web-frameworks-for-python/)
   contains both familiar and less known Python libraries.

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-04-28T16:52:10Z</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-04-29T07:27:01Z</updated></feed>`