updating guide with new links

mattmakai · mattmakai · commit 78116a9aa1dd · 2013-12-25T13:31:03.000-06: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>2013-12-23T09:50: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>2013-12-25T13:30:56Z</updated></feed>
diff --git a/index.html b/index.html
@@ -204,7 +204,6 @@ <h2>Platform-as-a-service</h2>
 </div>
 <div class="section" id="server-resources">
 <h2>Server Resources</h2>
-<p><a class="reference external" href="http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/">How to set up a safe and secure Web server</a> (Ars Technica)</p>
 <p><a class="reference external" href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a> (Patrick McKenzie)</p>
 <p><a class="reference external" href="http://rdegges.com/devops-django-part-4-choosing-heroku">Choosing Heroku</a>
 (Randall Degges)</p>
@@ -291,12 +290,14 @@ <h1>Web Server</h1>
 section for a more detailed explanation).</p>
 <div class="section" id="web-server-resources">
 <h2>Web Server Resources</h2>
+<p><a class="reference external" href="http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/">How to set up a safe and secure Web server</a></p>
 <p><a class="reference external" href="http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid">Apache and mod_wsgi on Ubuntu 10.04</a></p>
 <p><a class="reference external" href="http://articles.slicehost.com/nginx">Nginx web server tutorials</a></p>
 <p><a class="reference external" href="http://carrot.is/coding/nginx_introduction">Nginx for Developers: An Introduction</a></p>
 <p><a class="reference external" href="http://tautt.com/best-nginx-configuration-for-security/">Nginx security configuration example</a></p>
 <p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">HTTP Status Codes</a></p>
 <p><a class="reference external" href="http://blog.zachorr.com/nginx-setup/">Battle ready Nginx - an optimization guide</a></p>
+<p><a class="reference external" href="http://arstechnica.com/business/2011/11/a-faster-web-server-ripping-out-apache-for-nginx/">A faster Web server: ripping out Apache for Nginx</a></p>
 </div>
 
                 </section>
diff --git a/pages/servers.html b/pages/servers.html
@@ -149,7 +149,6 @@ <h2>Platform-as-a-service</h2>
 </div>
 <div class="section" id="server-resources">
 <h2>Server Resources</h2>
-<p><a class="reference external" href="http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/">How to set up a safe and secure Web server</a> (Ars Technica)</p>
 <p><a class="reference external" href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a> (Patrick McKenzie)</p>
 <p><a class="reference external" href="http://rdegges.com/devops-django-part-4-choosing-heroku">Choosing Heroku</a>
 (Randall Degges)</p>
diff --git a/pages/web-server.html b/pages/web-server.html
@@ -75,12 +75,14 @@ <h1>Web Server</h1>
 section for a more detailed explanation).</p>
 <div class="section" id="web-server-resources">
 <h2>Web Server Resources</h2>
+<p><a class="reference external" href="http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/">How to set up a safe and secure Web server</a></p>
 <p><a class="reference external" href="http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid">Apache and mod_wsgi on Ubuntu 10.04</a></p>
 <p><a class="reference external" href="http://articles.slicehost.com/nginx">Nginx web server tutorials</a></p>
 <p><a class="reference external" href="http://carrot.is/coding/nginx_introduction">Nginx for Developers: An Introduction</a></p>
 <p><a class="reference external" href="http://tautt.com/best-nginx-configuration-for-security/">Nginx security configuration example</a></p>
 <p><a class="reference external" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">HTTP Status Codes</a></p>
 <p><a class="reference external" href="http://blog.zachorr.com/nginx-setup/">Battle ready Nginx - an optimization guide</a></p>
+<p><a class="reference external" href="http://arstechnica.com/business/2011/11/a-faster-web-server-ripping-out-apache-for-nginx/">A faster Web server: ripping out Apache for Nginx</a></p>
 </div>
 
         <hr/>
diff --git a/source/content/pages/servers.rst b/source/content/pages/servers.rst
@@ -127,8 +127,6 @@ generally start at the WSGI server layer.
 
 Server Resources
 ----------------
-`How to set up a safe and secure Web server <http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/>`_ (Ars Technica)
-
 `Staging Servers, Source Control & Deploy Workflows, And Other Stuff Nobody Teaches You <http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/>`_ (Patrick McKenzie)
 
 `Choosing Heroku <http://rdegges.com/devops-django-part-4-choosing-heroku>`_
diff --git a/source/content/pages/web-server.rst b/source/content/pages/web-server.rst
@@ -41,6 +41,8 @@ section for a more detailed explanation).
 
 Web Server Resources
 --------------------
+`How to set up a safe and secure Web server <http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/>`_ 
+
 `Apache and mod_wsgi on Ubuntu 10.04 <http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid>`_
 
 `Nginx web server tutorials <http://articles.slicehost.com/nginx>`_
@@ -52,3 +54,5 @@ Web Server Resources
 `HTTP Status Codes <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_
 
 `Battle ready Nginx - an optimization guide <http://blog.zachorr.com/nginx-setup/>`_
+
+`A faster Web server: ripping out Apache for Nginx <http://arstechnica.com/business/2011/11/a-faster-web-server-ripping-out-apache-for-nginx/>`_

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>2013-12-23T09:50: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>2013-12-25T13:30:56Z</updated></feed>`