Skip to content

Commit f53665b

Browse files
committed
Slight modification to introduction.
1 parent 575f3c5 commit f53665b

File tree

10 files changed

+258
-13
lines changed

10 files changed

+258
-13
lines changed

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-27T10:47:59Z</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-27T11:04:55Z</updated></feed>

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ <h1>Introduction</h1>
6565
more.</p>
6666
<p>So now what? Definitely read Kenneth Reitz's
6767
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>
68-
if you have not already. If you're not coming from a non-development
68+
if you have not already. If you're not coming from a non development
6969
background, I wrote a
7070
<a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a>
7171
blog post you may find useful.</p>
@@ -76,9 +76,9 @@ <h1>Introduction</h1>
7676
through the JavaScript running on users' browsers on your website.</p>
7777
<div class="section" id="about-the-author">
7878
<h2>About the Author</h2>
79-
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I develop software in
80-
Washington, DC. I currently work most often in Python and occasionally in
81-
the Java Virtual Machine (JVM) stack.</p>
79+
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I solve problems by
80+
developing software. I most often use Python and occasionally work with
81+
languages in the Java Virtual Machine (JVM) stack.</p>
8282
<p>In 2013 I will be traveling to 30 cities in the United States to visit with
8383
tech companies, speak at tech meetups, and blog from an experienced
8484
software developer's perspective about the current state of technology in the

pages/change-log.html

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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+
<a href="/"><img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" /></a>
41+
<span class="logo-title"><a href="/">Full Stack Python</a></span>
42+
</div>
43+
</div>
44+
</div>
45+
<h1>Change Log</h1>
46+
47+
48+
<p>2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.</p>
49+
<p>2012.12.25: Initial incomplete release on fullstackpython.com.</p>
50+
51+
<hr/>
52+
<div class="footer pull-right">
53+
<a href="http://www.mattmakai.com/" class="underline">Matt Makai</a> 2013
54+
</div>
55+
</div>
56+
57+
<script src="http://code.jquery.com/jquery-latest.js"></script>
58+
<script src="/js/bootstrap.min.js"></script>
59+
</body>
60+
</html>
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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+
<a href="/"><img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" /></a>
41+
<span class="logo-title"><a href="/">Full Stack Python</a></span>
42+
</div>
43+
</div>
44+
</div>
45+
<h1>Content Delivery Network</h1>
46+
47+
48+
<p>CDN lorem ipsum.</p>
49+
50+
<hr/>
51+
<div class="footer pull-right">
52+
<a href="http://www.mattmakai.com/" class="underline">Matt Makai</a> 2013
53+
</div>
54+
</div>
55+
56+
<script src="http://code.jquery.com/jquery-latest.js"></script>
57+
<script src="/js/bootstrap.min.js"></script>
58+
</body>
59+
</html>

pages/introduction.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ <h1>Introduction</h1>
5151
more.</p>
5252
<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. If you're not coming from a non-development
54+
if you have not already. If you're not coming from a non development
5555
background, I wrote a
5656
<a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a>
5757
blog post you may find useful.</p>
@@ -62,9 +62,9 @@ <h1>Introduction</h1>
6262
through the JavaScript running on users' browsers on your website.</p>
6363
<div class="section" id="about-the-author">
6464
<h2>About the Author</h2>
65-
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I develop software in
66-
Washington, DC. I currently work most often in Python and occasionally in
67-
the Java Virtual Machine (JVM) stack.</p>
65+
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I solve problems by
66+
developing software. I most often use Python and occasionally work with
67+
languages in the Java Virtual Machine (JVM) stack.</p>
6868
<p>In 2013 I will be traveling to 30 cities in the United States to visit with
6969
tech companies, speak at tech meetups, and blog from an experienced
7070
software developer's perspective about the current state of technology in the

pages/web-framework.html

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
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+
<a href="/"><img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" /></a>
41+
<span class="logo-title"><a href="/">Full Stack Python</a></span>
42+
</div>
43+
</div>
44+
</div>
45+
<h1>Web Framework</h1>
46+
47+
48+
<p>A web application framework is a collection of libraries that
49+
provide functionality to accomplish common operations for the web. These
50+
common operations include:</p>
51+
<ol class="arabic simple">
52+
<li>URL routing</li>
53+
<li>HTML, XML, JSON, and other output templating</li>
54+
<li>Database manipulation</li>
55+
<li>Cross-site request forgery (CSRF) and Cross-site scripting (XSS) protection</li>
56+
</ol>
57+
<p>Not all web frameworks include functionality for all of the above
58+
functionality. Frameworks must balance between &quot;being all things to all
59+
people but very complicated&quot; or doing only certain things well without
60+
prescription for how to do other functions.</p>
61+
<p>For example, the Django web application framework includes an
62+
Object-Relational Mapping (ORM) layer that abstracts relational database
63+
read, write, query, and delete operations. However, the ORM layer in Django
64+
does not work (without modification) on non-relational databases such
65+
<a class="reference external" href="http://www.mongodb.org/">MongoDB</a> and <a class="reference external" href="http://docs.basho.com/">Riak</a>.
66+
Other web frameworks such as Flask and Pyramid are generally easier to
67+
use with non-relational databases by incorporating external Python libraries.</p>
68+
69+
<hr/>
70+
<div class="footer pull-right">
71+
<a href="http://www.mattmakai.com/" class="underline">Matt Makai</a> 2013
72+
</div>
73+
</div>
74+
75+
<script src="http://code.jquery.com/jquery-latest.js"></script>
76+
<script src="/js/bootstrap.min.js"></script>
77+
</body>
78+
</html>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Change Log
2+
==========
3+
4+
:category: page
5+
:slug: change-log
6+
:sort-order: 9
7+
8+
2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.
9+
10+
2012.12.25: Initial incomplete release on fullstackpython.com.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Content Delivery Network
2+
========================
3+
4+
:category: page
5+
:slug: content-delivery-network
6+
:sort-order: 8
7+
8+
CDN lorem ipsum.

source/content/pages/introduction.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ more.
1212

1313
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. If you're not coming from a non-development
15+
if you have not already. If you're not coming from a non development
1616
background, I wrote a
1717
`Learning Python <http://www.mattmakai.com/learning-python-for-non-developers.html>`_
1818
blog post you may find useful.
@@ -25,9 +25,9 @@ through the JavaScript running on users' browsers on your website.
2525

2626
About the Author
2727
----------------
28-
I'm `Matt Makai <http://www.mattmakai.com/>`_ and I develop software in
29-
Washington, DC. I currently work most often in Python and occasionally in
30-
the Java Virtual Machine (JVM) stack.
28+
I'm `Matt Makai <http://www.mattmakai.com/>`_ and I solve problems by
29+
developing software. I most often use Python and occasionally work with
30+
languages in the Java Virtual Machine (JVM) stack.
3131

3232
In 2013 I will be traveling to 30 cities in the United States to visit with
3333
tech companies, speak at tech meetups, and blog from an experienced
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Web Framework
2+
=============
3+
4+
:category: page
5+
:slug: web-framework
6+
:sort-order: 7
7+
8+
A web application framework is a collection of libraries that
9+
provide functionality to accomplish common operations for the web. These
10+
common operations include:
11+
12+
1. URL routing
13+
2. HTML, XML, JSON, and other output templating
14+
3. Database manipulation
15+
4. Cross-site request forgery (CSRF) and Cross-site scripting (XSS) protection
16+
17+
Not all web frameworks include functionality for all of the above
18+
functionality. Frameworks must balance between "being all things to all
19+
people but very complicated" or doing only certain things well without
20+
prescription for how to do other functions.
21+
22+
For example, the Django web application framework includes an
23+
Object-Relational Mapping (ORM) layer that abstracts relational database
24+
read, write, query, and delete operations. However, the ORM layer in Django
25+
does not work (without modification) on non-relational databases such
26+
`MongoDB <http://www.mongodb.org/>`_ and `Riak <http://docs.basho.com/>`_.
27+
Other web frameworks such as Flask and Pyramid are generally easier to
28+
use with non-relational databases by incorporating external Python libraries.
29+
30+

0 commit comments

Comments
 (0)