adding new paas resources

mattmakai · mattmakai · commit df3726c658b5 · 2014-02-07T10:05:06.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-07T07:34:37Z</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-07T10:04:52Z</updated></feed>
diff --git a/servers.html b/servers.html
@@ -126,11 +126,11 @@ <h2>Virtualized servers</h2>
 the shared server. Choosing virtualized server hosting should be based on
 your needs for urgency of service ticket requests and the frequency you
 require for ongoing maintenance such as persistent storage backups.</p>
-</div>
 <div class="section" id="virtualized-servers-resources">
-<h2>Virtualized servers resources</h2>
+<h3>Virtualized servers resources</h3>
 <p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
 </div>
+</div>
 <div class="section" id="infrastructure-as-a-service">
 <h2>Infrastructure-as-a-service</h2>
 <p>Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
@@ -156,14 +156,14 @@ <h2>Infrastructure-as-a-service</h2>
 but you will pay correspondingly more for them. EBS throughput is just
 one of many quirks you need to understand before committing to an
 IaaS platform.</p>
-</div>
 <div class="section" id="infrastructure-as-a-service-resources">
-<h2>Infrastructure-as-a-service Resources</h2>
+<h3>Infrastructure-as-a-service Resources</h3>
 <p><a class="reference external" href="http://aws.amazon.com/python/">Amazon Web Services official documentation for Python</a></p>
 <p><a class="reference external" href="https://github.com/boto/boto">boto</a> is an amazing Python library for
 working with Amazon Web Services</p>
 <p><a class="reference external" href="http://docs.rackspace.com/sdks/guide/content/python.html">Rackspace official documentation for Python</a></p>
 </div>
+</div>
 <div class="section" id="platform-as-a-service">
 <h2>Platform-as-a-service</h2>
 <p>A platform-as-a-service (PaaS) provides infrastructure and a software layer
@@ -183,11 +183,17 @@ <h2>Platform-as-a-service</h2>
 <p>If you go the PaaS route, you can skip over the operating system and web
 server sections because they are baked into PaaS offerings. PaaS offerings
 generally start at the WSGI server layer.</p>
-</div>
 <div class="section" id="platform-as-a-service-resources">
-<h2>Platform-as-a-service resources</h2>
-<p><a class="reference external" href="http://rdegges.com/devops-django-part-4-choosing-heroku">Choosing Heroku</a>
-(Randall Degges)</p>
+<h3>Platform-as-a-service resources</h3>
+<p>DevOps Django and Heroku Series by <a class="reference external" href="https://twitter.com/rdegges">Randall Degges</a>:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://www.rdegges.com/devops-django-part-1-goals/">Part One: Goals</a></li>
+<li><a class="reference external" href="http://www.rdegges.com/devops-django-part-2-the-pain-of-deployment/">Part Two: The Pain of Deployment</a></li>
+<li><a class="reference external" href="http://www.rdegges.com/devops-django-part-3-the-heroku-way/">Part Three: The Heroku Way</a></li>
+<li><a class="reference external" href="http://rdegges.com/devops-django-part-4-choosing-heroku">Part Four: Choosing Heroku</a></li>
+</ul>
+<p><a class="reference external" href="http://appsembler.com/blog/paas-bakeoff-comparing-stackato-openshift-dotcloud-and-heroku-for-django-hosting-and-deployment/">PaaS bakeoff: Comparing Stackato, OpenShift, Dotcloud and Heroku for Django hosting and deployment</a> by <a class="reference external" href="https://twitter.com/natea">Nate Aune</a></p>
+</div>
 </div>
 
                                                                                           <br/>
diff --git a/source/content/pages/introduction.rst b/source/content/pages/introduction.rst
@@ -1,3 +1,4 @@
+============
 Introduction
 ============
 
diff --git a/source/content/pages/servers.rst b/source/content/pages/servers.rst
@@ -1,3 +1,4 @@
+=======
 Servers
 =======
 
@@ -16,6 +17,7 @@ web application:
 
 4. Platform-as-a-service
 
+----------
 Bare metal
 ----------
 The term *bare metal* refers to purchasing the actual hardware and hooking 
@@ -44,6 +46,7 @@ smaller case form factors (called "blades") but are correspondingly more
 expensive than putting off-the-shelf components together yourself.
 
 
+-------------------
 Virtualized servers
 -------------------
 Virtual private servers (VPSs) are slices of hardware on top of a larger
@@ -67,11 +70,12 @@ require for ongoing maintenance such as persistent storage backups.
 
 
 Virtualized servers resources
------------------------------
+=============================
 `Choosing a low cost VPS <http://blog.redfern.me/choosing-a-low-cost-vps/>`_ 
 
 
 
+---------------------------
 Infrastructure-as-a-service
 ---------------------------
 Infrastructure-as-a-service (IaaS) overlaps with virtualized servers 
@@ -103,7 +107,7 @@ IaaS platform.
 
 
 Infrastructure-as-a-service Resources
--------------------------------------
+=====================================
 `Amazon Web Services official documentation for Python <http://aws.amazon.com/python/>`_ 
 
 `boto <https://github.com/boto/boto>`_ is an amazing Python library for
@@ -112,6 +116,7 @@ working with Amazon Web Services
 `Rackspace official documentation for Python <http://docs.rackspace.com/sdks/guide/content/python.html>`_
 
 
+---------------------
 Platform-as-a-service
 ---------------------
 A platform-as-a-service (PaaS) provides infrastructure and a software layer
@@ -141,8 +146,16 @@ server sections because they are baked into PaaS offerings. PaaS offerings
 generally start at the WSGI server layer.
 
 Platform-as-a-service resources
--------------------------------
-`Choosing Heroku <http://rdegges.com/devops-django-part-4-choosing-heroku>`_
-(Randall Degges)
+===============================
+DevOps Django and Heroku Series by `Randall Degges <https://twitter.com/rdegges>`_:
+
+* `Part One: Goals <http://www.rdegges.com/devops-django-part-1-goals/>`_
+
+* `Part Two: The Pain of Deployment <http://www.rdegges.com/devops-django-part-2-the-pain-of-deployment/>`_
+
+* `Part Three: The Heroku Way <http://www.rdegges.com/devops-django-part-3-the-heroku-way/>`_
+
+* `Part Four: Choosing Heroku <http://rdegges.com/devops-django-part-4-choosing-heroku>`_
 
+`PaaS bakeoff: Comparing Stackato, OpenShift, Dotcloud and Heroku for Django hosting and deployment <http://appsembler.com/blog/paas-bakeoff-comparing-stackato-openshift-dotcloud-and-heroku-for-django-hosting-and-deployment/>`_ by `Nate Aune <https://twitter.com/natea>`_
 

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-07T07:34:37Z</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-07T10:04:52Z</updated></feed>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+============`
`1`	`2`	`Introduction`
`2`	`3`	`============`
`3`	`4`