adding links for deployment page

mattmakai · mattmakai · commit 976266b55480 · 2014-04-28T16:30:55.000-04:00
diff --git a/bottle.html b/bottle.html
@@ -44,7 +44,7 @@
 </div>
         <div class="row">
     <div class="col-md-8">
-      <h2>Bottle</h2>
+      <h1>Bottle</h1>
 <p><a href="http://bottlepy.org/docs/dev/index.html">Bottle</a> is a WSGI-compliant
 <a href="https://github.com/defnull/bottle/blob/master/bottle.py">single source file</a>
 web framework with no external dependencies except for the standard library
diff --git a/deployment.html b/deployment.html
@@ -55,16 +55,16 @@ <h2>Deployment hosting options</h2>
 <p>There are four options for deploying and hosting a web application:</p>
 <ol>
 <li>
-<p>"Bare metal" servers</p>
+<p><a href="/servers.html">"Bare metal" servers</a></p>
 </li>
 <li>
-<p>Virtualized servers</p>
+<p><a href="/servers.html">Virtualized servers</a></p>
 </li>
 <li>
-<p>Infrastructure-as-a-service</p>
+<p><a href="/servers.html">Infrastructure-as-a-service</a></p>
 </li>
 <li>
-<p>Platform-as-a-service</p>
+<p><a href="/platform-as-a-service.html">Platform-as-a-service</a></p>
 </li>
 </ol>
 <h2>Deployment resources</h2>
diff --git a/django.html b/django.html
@@ -55,7 +55,7 @@ <h1>Django</h1>
 <a href="https://docs.djangoproject.com/en/dev/topics/db/">object-relational mapper</a>,
 and <a href="https://docs.djangoproject.com/en/dev/topics/migrations/">database schema migrations</a>
 (as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/1.6.2">Django framework</a>.</p>
-<h2>Why is Django a good web framework to use?</h2>
+<h2>Why is Django a good web framework choice?</h2>
 <p>The Django project's stability, performance and community have grown 
 tremendously over the past decade since the framework's creation. Detailed
 tutorials and best practices are readily available on the web and in books.
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:24:00Z</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-28T16:30:37Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0203-django.markdown b/source/content/pages/02-web-frameworks/0203-django.markdown
@@ -28,7 +28,7 @@ library. For example,
 and [database schema migrations](https://docs.djangoproject.com/en/dev/topics/migrations/)
 (as of version 1.7) are all included with the [Django framework](https://pypi.python.org/pypi/Django/1.6.2).
 
-## Why is Django a good web framework to use?
+## Why is Django a good web framework choice?
 The Django project's stability, performance and community have grown 
 tremendously over the past decade since the framework's creation. Detailed
 tutorials and best practices are readily available on the web and in books.
diff --git a/source/content/pages/02-web-frameworks/0207-bottle.markdown b/source/content/pages/02-web-frameworks/0207-bottle.markdown
@@ -16,7 +16,7 @@ choice4icon:
 choice4text:
 
 
-## Bottle
+# Bottle
 [Bottle](http://bottlepy.org/docs/dev/index.html) is a WSGI-compliant
 [single source file](https://github.com/defnull/bottle/blob/master/bottle.py)
 web framework with no external dependencies except for the standard library
diff --git a/source/content/pages/03-deployment/0301-deployment.markdown b/source/content/pages/03-deployment/0301-deployment.markdown
@@ -30,13 +30,13 @@ application and its associated data.
 ## Deployment hosting options
 There are four options for deploying and hosting a web application:
 
-1. "Bare metal" servers
+1. ["Bare metal" servers](/servers.html)
 
-2. Virtualized servers
+2. [Virtualized servers](/servers.html)
 
-3. Infrastructure-as-a-service
+3. [Infrastructure-as-a-service](/servers.html)
 
-4. Platform-as-a-service
+4. [Platform-as-a-service](/platform-as-a-service.html)
 
 
 ## Deployment resources
@@ -48,4 +48,5 @@ There are four options for deploying and hosting a web application:
   defines delivery versus deployment and walks through a continuous deployment
   workflow.
 
+
 ### How would you like to deploy your web app?
diff --git a/source/theme/static/css/fsp.css b/source/theme/static/css/fsp.css
@@ -431,8 +431,8 @@ h6 .small,
 h1,
 h2,
 h3 {
-  margin-top: 21px;
-  margin-bottom: 10.5px;
+  margin-top: 32px;
+  margin-bottom: 6px;
 }
 
 h1 small,
@@ -467,7 +467,7 @@ h1,
 
 h2,
 .h2 {
-  font-size: 32px;
+  font-size: 28px;
 }
 
 h3,
diff --git a/theme/css/fsp.css b/theme/css/fsp.css
@@ -431,8 +431,8 @@ h6 .small,
 h1,
 h2,
 h3 {
-  margin-top: 21px;
-  margin-bottom: 10.5px;
+  margin-top: 32px;
+  margin-bottom: 6px;
 }
 
 h1 small,
@@ -467,7 +467,7 @@ h1,
 
 h2,
 .h2 {
-  font-size: 32px;
+  font-size: 28px;
 }
 
 h3,

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:24:00Z</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-28T16:30:37Z</updated></feed>`