Updating server and operating system sections.

mattmakai · mattmakai · commit b4eb30bebbd5 · 2012-12-25T15:00:17.000-05:00
diff --git a/archives.html b/archives.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
diff --git a/categories.html b/categories.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
diff --git a/css/c.css b/css/c.css
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>2012-12-25T14:43:41Z</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>2012-12-25T14:59:01Z</updated></feed>
diff --git a/index.html b/index.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
@@ -147,7 +147,14 @@ <h2>Infrastructure-as-a-service</h2>
 </div>
 <div class="section" id="platform-as-a-service">
 <h2>Platform-as-a-service</h2>
-<p>Platform-as-a-service (PaaS)</p>
+<p>Platform-as-a-service (PaaS) refers to a class of services that will host
+an application with a layer between the server and the application. The
+layer defines how the application accesses resources such as computing
+time, files, and external services. The tradeoff to PaaS is usually
+ease of deployment to a specific architecture as long as you do things
+&quot;their way.&quot;</p>
+<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.</p>
 </div>
 <div class="section" id="server-monitoring">
 <h2>Server Monitoring</h2>
@@ -164,17 +171,17 @@ <h2>Server Monitoring</h2>
 </div>
 <div class="section" id="further-server-resources">
 <h2>Further Server Resources</h2>
-<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
 <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://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a>
+(Joe's Blog)</p>
 </div>
 
                 </section>
                             <section id="operating-system" class="tech-section">
                     <h1>Operating System</h1>
-                    <p>Vice fingerstache pickled pour-over high life nihil, cliche enim placeat aliquip laborum artisan pitchfork lomo. Do dreamcatcher nihil gastropub non, 90's fashion axe small batch sed echo park selfies art party single-origin coffee esse. Adipisicing mlkshk craft beer laboris, mumblecore cosby sweater elit mixtape street art DIY art party pickled put a bird on it. Flexitarian fixie pug, sartorial culpa sustainable nisi hoodie. Blue bottle put a bird on it meh terry richardson cardigan. American apparel exercitation velit echo park beard aute you probably haven't heard of them letterpress, esse excepteur williamsburg nesciunt food truck in lo-fi. Dolore ullamco meh high life, raw denim flexitarian Austin consectetur non sed irure banksy salvia.</p>
-<p>Occaecat before they sold out squid ut disrupt. Et elit exercitation small batch quis, letterpress dolor chillwave flannel jean shorts swag. Consectetur chambray ex magna, eu bicycle rights next level proident placeat. Cliche marfa fugiat, fixie bespoke echo park odd future thundercats chambray intelligentsia officia cillum exercitation. Enim YOLO pug swag. Cardigan id ullamco, fingerstache do nihil culpa narwhal intelligentsia leggings. Skateboard cillum DIY tousled velit fap.</p>
-<p>Hashtag dolor fashion axe ea mustache jean shorts. Banksy ennui tumblr wolf trust fund four loko, sunt 3 wolf moon fixie fugiat cardigan. Fap single-origin coffee plaid, blue bottle cillum commodo scenester semiotics assumenda quinoa. Craft beer gastropub truffaut, quis vegan gentrify quinoa lomo enim sartorial salvia messenger bag incididunt odio sunt. Magna letterpress officia, retro trust fund narwhal sint put a bird on it mixtape occupy minim you probably haven't heard of them american apparel next level. Williamsburg wayfarers quinoa keytar commodo fingerstache 8-bit street art. Do art party four loko raw denim, food truck vice fanny pack excepteur occaecat enim tumblr leggings plaid.</p>
+                    <p>The operating system sits directly on top of the server or virtual server
+and provides access to computing resources.</p>
 
                 </section>
                             <section id="web-server" class="tech-section">
diff --git a/pages/introduction.html b/pages/introduction.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
diff --git a/pages/operating-system.html b/pages/operating-system.html
@@ -38,16 +38,15 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
             <h1>Operating System</h1>
         
 
-    <p>Vice fingerstache pickled pour-over high life nihil, cliche enim placeat aliquip laborum artisan pitchfork lomo. Do dreamcatcher nihil gastropub non, 90's fashion axe small batch sed echo park selfies art party single-origin coffee esse. Adipisicing mlkshk craft beer laboris, mumblecore cosby sweater elit mixtape street art DIY art party pickled put a bird on it. Flexitarian fixie pug, sartorial culpa sustainable nisi hoodie. Blue bottle put a bird on it meh terry richardson cardigan. American apparel exercitation velit echo park beard aute you probably haven't heard of them letterpress, esse excepteur williamsburg nesciunt food truck in lo-fi. Dolore ullamco meh high life, raw denim flexitarian Austin consectetur non sed irure banksy salvia.</p>
-<p>Occaecat before they sold out squid ut disrupt. Et elit exercitation small batch quis, letterpress dolor chillwave flannel jean shorts swag. Consectetur chambray ex magna, eu bicycle rights next level proident placeat. Cliche marfa fugiat, fixie bespoke echo park odd future thundercats chambray intelligentsia officia cillum exercitation. Enim YOLO pug swag. Cardigan id ullamco, fingerstache do nihil culpa narwhal intelligentsia leggings. Skateboard cillum DIY tousled velit fap.</p>
-<p>Hashtag dolor fashion axe ea mustache jean shorts. Banksy ennui tumblr wolf trust fund four loko, sunt 3 wolf moon fixie fugiat cardigan. Fap single-origin coffee plaid, blue bottle cillum commodo scenester semiotics assumenda quinoa. Craft beer gastropub truffaut, quis vegan gentrify quinoa lomo enim sartorial salvia messenger bag incididunt odio sunt. Magna letterpress officia, retro trust fund narwhal sint put a bird on it mixtape occupy minim you probably haven't heard of them american apparel next level. Williamsburg wayfarers quinoa keytar commodo fingerstache 8-bit street art. Do art party four loko raw denim, food truck vice fanny pack excepteur occaecat enim tumblr leggings plaid.</p>
+    <p>The operating system sits directly on top of the server or virtual server
+and provides access to computing resources.</p>
 
         <hr/>
         <div class="footer pull-right">
diff --git a/pages/servers.html b/pages/servers.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
@@ -100,7 +100,14 @@ <h2>Infrastructure-as-a-service</h2>
 </div>
 <div class="section" id="platform-as-a-service">
 <h2>Platform-as-a-service</h2>
-<p>Platform-as-a-service (PaaS)</p>
+<p>Platform-as-a-service (PaaS) refers to a class of services that will host
+an application with a layer between the server and the application. The
+layer defines how the application accesses resources such as computing
+time, files, and external services. The tradeoff to PaaS is usually
+ease of deployment to a specific architecture as long as you do things
+&quot;their way.&quot;</p>
+<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.</p>
 </div>
 <div class="section" id="server-monitoring">
 <h2>Server Monitoring</h2>
@@ -117,9 +124,10 @@ <h2>Server Monitoring</h2>
 </div>
 <div class="section" id="further-server-resources">
 <h2>Further Server Resources</h2>
-<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
 <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://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a>
+(Joe's Blog)</p>
 </div>
 
         <hr/>
diff --git a/pages/web-server.html b/pages/web-server.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
diff --git a/pages/wsgi-server.html b/pages/wsgi-server.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
diff --git a/source/content/pages/operating-system.rst b/source/content/pages/operating-system.rst
@@ -5,9 +5,5 @@ Operating System
 :slug: operating-system
 :sort-order: 3
 
-
-Vice fingerstache pickled pour-over high life nihil, cliche enim placeat aliquip laborum artisan pitchfork lomo. Do dreamcatcher nihil gastropub non, 90's fashion axe small batch sed echo park selfies art party single-origin coffee esse. Adipisicing mlkshk craft beer laboris, mumblecore cosby sweater elit mixtape street art DIY art party pickled put a bird on it. Flexitarian fixie pug, sartorial culpa sustainable nisi hoodie. Blue bottle put a bird on it meh terry richardson cardigan. American apparel exercitation velit echo park beard aute you probably haven't heard of them letterpress, esse excepteur williamsburg nesciunt food truck in lo-fi. Dolore ullamco meh high life, raw denim flexitarian Austin consectetur non sed irure banksy salvia.
-
-Occaecat before they sold out squid ut disrupt. Et elit exercitation small batch quis, letterpress dolor chillwave flannel jean shorts swag. Consectetur chambray ex magna, eu bicycle rights next level proident placeat. Cliche marfa fugiat, fixie bespoke echo park odd future thundercats chambray intelligentsia officia cillum exercitation. Enim YOLO pug swag. Cardigan id ullamco, fingerstache do nihil culpa narwhal intelligentsia leggings. Skateboard cillum DIY tousled velit fap.
-
-Hashtag dolor fashion axe ea mustache jean shorts. Banksy ennui tumblr wolf trust fund four loko, sunt 3 wolf moon fixie fugiat cardigan. Fap single-origin coffee plaid, blue bottle cillum commodo scenester semiotics assumenda quinoa. Craft beer gastropub truffaut, quis vegan gentrify quinoa lomo enim sartorial salvia messenger bag incididunt odio sunt. Magna letterpress officia, retro trust fund narwhal sint put a bird on it mixtape occupy minim you probably haven't heard of them american apparel next level. Williamsburg wayfarers quinoa keytar commodo fingerstache 8-bit street art. Do art party four loko raw denim, food truck vice fanny pack excepteur occaecat enim tumblr leggings plaid.
+The operating system sits directly on top of the server or virtual server
+and provides access to computing resources.
diff --git a/source/content/pages/servers.rst b/source/content/pages/servers.rst
@@ -69,7 +69,15 @@ the expense of greater complexity in the dynamically scaled infrastructure.
 
 Platform-as-a-service
 ---------------------
-Platform-as-a-service (PaaS) 
+Platform-as-a-service (PaaS) refers to a class of services that will host
+an application with a layer between the server and the application. The
+layer defines how the application accesses resources such as computing
+time, files, and external services. The tradeoff to PaaS is usually
+ease of deployment to a specific architecture as long as you do things
+"their way."  
+
+If you go the PaaS route, you can skip over the operating system and web
+server sections because they are baked into PaaS offerings.
 
 
 Server Monitoring
@@ -86,9 +94,10 @@ section) but they are listed here:
 
 Further Server Resources
 ------------------------
-`Choosing a low cost VPS <http://blog.redfern.me/choosing-a-low-cost-vps/>`_
-
 `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 a low cost VPS <http://blog.redfern.me/choosing-a-low-cost-vps/>`_ 
+(Joe's Blog)
+
diff --git a/source/theme/less/custom.less b/source/theme/less/custom.less
@@ -7,6 +7,8 @@ h1, h2, h3, h4, h5, h6 {color: #222;}
 .logo-header-section {margin: 35px 0 30px 0;}
 .logo-title {font-size: 4em; color: #222; font-family: @sansFontFamily;
              font-weight: bold; line-height: 30px; margin-left: 5px;}
+.logo-title a, .logo-title a:hover {color: #222; text-decoration: none;}
+.logo-title a:hover {color: gray;}
 .logo-image {vertical-align: top;}
 h2 {font-size: 1.8em; margin: 10px 0 5px 0;}
 h3 {font-size: 1.25em; margin: 5px 0 0 0;}
diff --git a/source/theme/static/css/c.css b/source/theme/static/css/c.css
diff --git a/source/theme/templates/base.html b/source/theme/templates/base.html
@@ -38,7 +38,7 @@
             <div class="span12">
                 <div class="logo-header-section">
                     <img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
-                    <span class="logo-title">Full Stack Python</span>
+                    <span class="logo-title"><a href="/">Full Stack Python</a></span>
                 </div>
             </div>
         </div>
diff --git a/theme/css/c.css b/theme/css/c.css

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>2012-12-25T14:43:41Z</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>2012-12-25T14:59:01Z</updated></feed>`