Skip to content

Commit 27b0dc0

Browse files
mattmakaimattmakai
committed
Updating introduction.
1 parent f835d97 commit 27b0dc0

File tree

12 files changed

+124
-26
lines changed

12 files changed

+124
-26
lines changed

‎css/c.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?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-24T18:58:05Z</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-24T19:14:04Z</updated></feed>

‎index.html‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<li><a href="#servers">Servers</a></li>
5050
<li><a href="#operating-system">Operating System</a></li>
5151
<li><a href="#web-server">Web Server</a></li>
52+
<li><a href="#wsgi-server">WSGI Server</a></li>
5253
</ul>
5354
</div>
5455
<div class="span9">
@@ -58,10 +59,11 @@ <h1>Introduction</h1>
5859
programming language. The syntax is beginning to make sense. The first
5960
few &quot;AHA!&quot; moments are hitting you. Now you are excited for direction to learn
6061
more.</p>
61-
<p>Now what? Definitely read Kenneth Reitz's
62+
<p>So now what? Definitely read Kenneth Reitz's
6263
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>
63-
if you have not already.</p>
64-
<p>This guide has a different focus from the Hitchhiker's Guide. This site
64+
if you have not already. If you're not coming from a development background,
65+
I wrote a <a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a> blog post.</p>
66+
<p>This guide has a different focus from the above resources. This site
6567
describes the myriad ways of setting up a Python <em>web application</em>
6668
stack from a &quot;bare metal&quot; server, virtual private server (VPS), Amazon Web
6769
Services (AWS) instance, or Platform-as-a-Service (PaaS) provider up
@@ -122,8 +124,9 @@ <h2>Virtualized servers</h2>
122124
</div>
123125
<div class="section" id="server-monitoring">
124126
<h2>Server Monitoring</h2>
125-
<p>There are several important resources to monitor the server level of a web
126-
stack:</p>
127+
<p>There are several important resources to monitor on the server level of a web
128+
stack. Technically some of these cross into the operating system level (next
129+
section) but they are listed here:</p>
127130
<ol class="arabic simple">
128131
<li>Server uptime</li>
129132
<li>CPU utilization</li>
@@ -132,8 +135,10 @@ <h2>Server Monitoring</h2>
132135
<li>Network bandwidth and latency</li>
133136
</ol>
134137
</div>
135-
<div class="section" id="resources">
136-
<h2>Resources</h2>
138+
<div class="section" id="further-server-resources">
139+
<h2>Further Server Resources</h2>
140+
<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>
141+
<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>
137142
</div>
138143

139144
</section>
@@ -149,6 +154,14 @@ <h1>Web Server</h1>
149154
<p>Web server lorem ipsum.</p>
150155
<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>
151156
<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>
157+
<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>
158+
159+
</section>
160+
<section id="wsgi-server" class="tech-section">
161+
<h1>WSGI Server</h1>
162+
<p>WSGI server lorem ipsum.</p>
163+
<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>
164+
<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>
152165
<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>
153166

154167
</section>

‎pages/introduction.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ <h1>Introduction</h1>
4949
programming language. The syntax is beginning to make sense. The first
5050
few &quot;AHA!&quot; moments are hitting you. Now you are excited for direction to learn
5151
more.</p>
52-
<p>Now what? Definitely read Kenneth Reitz's
52+
<p>So now what? Definitely read Kenneth Reitz's
5353
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>
54-
if you have not already.</p>
55-
<p>This guide has a different focus from the Hitchhiker's Guide. This site
54+
if you have not already. If you're not coming from a development background,
55+
I wrote a <a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a> blog post.</p>
56+
<p>This guide has a different focus from the above resources. This site
5657
describes the myriad ways of setting up a Python <em>web application</em>
5758
stack from a &quot;bare metal&quot; server, virtual private server (VPS), Amazon Web
5859
Services (AWS) instance, or Platform-as-a-Service (PaaS) provider up

‎pages/servers.html‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ <h2>Virtualized servers</h2>
7979
</div>
8080
<div class="section" id="server-monitoring">
8181
<h2>Server Monitoring</h2>
82-
<p>There are several important resources to monitor the server level of a web
83-
stack:</p>
82+
<p>There are several important resources to monitor on the server level of a web
83+
stack. Technically some of these cross into the operating system level (next
84+
section) but they are listed here:</p>
8485
<ol class="arabic simple">
8586
<li>Server uptime</li>
8687
<li>CPU utilization</li>
@@ -89,8 +90,10 @@ <h2>Server Monitoring</h2>
8990
<li>Network bandwidth and latency</li>
9091
</ol>
9192
</div>
92-
<div class="section" id="resources">
93-
<h2>Resources</h2>
93+
<div class="section" id="further-server-resources">
94+
<h2>Further Server Resources</h2>
95+
<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>
96+
<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>
9497
</div>
9598

9699
<hr/>

‎pages/wsgi-server.html‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<!doctype html>
2+
<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
3+
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
4+
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
5+
<!--[if gt IE 8]><!-->
6+
<html class="no-js" lang="en"> <!--<![endif]-->
7+
8+
<head>
9+
<meta charset="utf-8">
10+
<meta name="language" content="English" />
11+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
12+
13+
<title>Full Stack Python</title>
14+
<meta name="description" content="Full stack Python shows how an entire Python web application is built, from the server to the front end JavaScript.">
15+
<meta name="author" content="Matt Makai">
16+
<meta name="viewport" content="width=device-width,initial-scale=1">
17+
<link rel="stylesheet" href="/css/c.css" />
18+
<link rel="stylesheet" href="/css/bootstrap-responsive.min.css" />
19+
<script src="/js/modernizr-2.0.6.min.js"></script>
20+
<script type="text/javascript">
21+
22+
var _gaq = _gaq || [];
23+
_gaq.push(['_setAccount', 'UA-19910497-7']);
24+
_gaq.push(['_trackPageview']);
25+
26+
(function() {
27+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
28+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
29+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
30+
})();
31+
32+
</script>
33+
</head>
34+
35+
<body>
36+
<div class="container">
37+
<div class="row">
38+
<div class="span12">
39+
<div class="logo-header-section">
40+
<img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" />
41+
<span class="logo-title">Full Stack Python</span>
42+
</div>
43+
</div>
44+
</div>
45+
<h1>WSGI Server</h1>
46+
47+
48+
<p>WSGI server lorem ipsum.</p>
49+
<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>
50+
<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>
51+
<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>
52+
53+
<hr/>
54+
<div class="footer pull-right">
55+
<a href="http://www.mattmakai.com/" class="underline">Matt Makai</a> 2013
56+
</div>
57+
</div>
58+
59+
<script src="http://code.jquery.com/jquery-latest.js"></script>
60+
<script src="/js/bootstrap.min.js"></script>
61+
</body>
62+
</html>

‎source/content/pages/introduction.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ programming language. The syntax is beginning to make sense. The first
1010
few "AHA!" moments are hitting you. Now you are excited for direction to learn
1111
more.
1212

13-
Now what? Definitely read Kenneth Reitz's
13+
So now what? Definitely read Kenneth Reitz's
1414
`The Hitchhiker’s Guide to Python <http://docs.python-guide.org/en/latest/>`_
15-
if you have not already.
15+
if you have not already. If you're not coming from a development background,
16+
I wrote a `Learning Python <http://www.mattmakai.com/learning-python-for-non-developers.html>`_ blog post.
1617

17-
This guide has a different focus from the Hitchhiker's Guide. This site
18+
This guide has a different focus from the above resources. This site
1819
describes the myriad ways of setting up a Python *web application*
1920
stack from a "bare metal" server, virtual private server (VPS), Amazon Web
2021
Services (AWS) instance, or Platform-as-a-Service (PaaS) provider up

‎source/content/pages/servers.rst‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,19 @@ the shared server.
4444

4545
Server Monitoring
4646
-----------------
47-
There are several important resources to monitor the server level of a web
48-
stack:
47+
There are several important resources to monitor on the server level of a web
48+
stack. Technically some of these cross into the operating system level (next
49+
section) but they are listed here:
4950

5051
1. Server uptime
5152
2. CPU utilization
5253
3. Memory utilization
5354
4. Persistence storage consumed versus free
5455
5. Network bandwidth and latency
5556

56-
Resources
57-
---------
57+
Further Server Resources
58+
------------------------
59+
`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)
60+
61+
`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)
5862

‎source/content/pages/wsgi-server.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
WSGI Server
2+
===========
3+
4+
:category: page
5+
:slug: wsgi-server
6+
:sort-order: 5
7+
8+
WSGI server lorem ipsum.
9+
10+
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.
11+
12+
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.
13+
14+
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.

‎source/theme/less/custom.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ h1, h2, h3, h4, h5, h6 {color: #222;}
1111
h2 {font-size: 1.8em; margin: 10px 0 5px 0;}
1212
h3 {font-size: 1.25em; margin: 5px 0 0 0;}
1313
.fsp-side-nav-ul li.active {background: @gray;}
14-
.tech-section {margin-bottom: 25px;}
14+
.tech-section {margin-bottom: 30px;}
1515
p {color: #333;}
1616
.footer {margin-bottom: 15px;}

0 commit comments

Comments
 (0)