updating web frameworks page for consistency

mattmakai · mattmakai · commit 1b9f06ed1e54 · 2014-02-21T13:12:52.000-05: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-02-21T09:40:44Z</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-21T13:12:40Z</updated></feed>
diff --git a/source/content/pages/web-frameworks.rst b/source/content/pages/web-frameworks.rst
@@ -199,11 +199,10 @@ mail plugin to send emails when exceptions occur.
 
 Web Framework Resources
 =======================
-`Bottle <http://bottlepy.org/docs/dev/>`_,
 `Pyramid <http://www.pylonsproject.org/>`_, 
 `Falcon <http://falconframework.org/>`_,
 `web.py <http://webpy.org/>`_ are the most common Python web frameworks other
-than Django and Flask.
+than Django, Flask and Bottle.
 
 This `roundup of 14 minimal Python frameworks <http://codecondo.com/14-minimal-web-frameworks-for-python/>`_
 contains both familiar and less known Python libraries.
diff --git a/web-frameworks.html b/web-frameworks.html
@@ -224,14 +224,10 @@ <h2>Web Framework Logging</h2>
 mail plugin to send emails when exceptions occur.</p>
 <div class="section" id="web-framework-resources">
 <h3>Web Framework Resources</h3>
-<div class="system-message">
-<p class="system-message-title">System Message: WARNING/2 (<tt class="docutils">/Users/mattmakai/devel/fsp/source/content/pages/web-frameworks.rst</tt>, line 3); <em><a href="#id7">backlink</a></em></p>
-Duplicate explicit target name: &quot;bottle&quot;.</div>
-<p><a class="reference external" href="http://bottlepy.org/docs/dev/">Bottle</a>,
-<a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a>,
+<p><a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a>,
 <a class="reference external" href="http://falconframework.org/">Falcon</a>,
 <a class="reference external" href="http://webpy.org/">web.py</a> are the most common Python web frameworks other
-than Django and Flask.</p>
+than Django, Flask and Bottle.</p>
 <p>This <a class="reference external" href="http://codecondo.com/14-minimal-web-frameworks-for-python/">roundup of 14 minimal Python frameworks</a>
 contains both familiar and less known Python libraries.</p>
 </div>

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-21T09:40:44Z</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-21T13:12:40Z</updated></feed>`