Skip to content

Commit 7b38a3e

Browse files
committed
rewriting the intro
1 parent 4aa24f3 commit 7b38a3e

File tree

4 files changed

+83
-95
lines changed

4 files changed

+83
-95
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>2014-02-05T16:31:06Z</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-05T21:00:21Z</updated></feed>

index.html

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -76,36 +76,33 @@
7676
<h1>Introduction</h1>
7777
<p>You're knee deep in learning the <a class="reference external" href="http://www.python.org/">Python</a>
7878
programming language. The syntax is beginning to make sense. The first
79-
few &quot;AHA!&quot; moments are hitting you. Now you are excited for continued
80-
direction to accelerate your learning.</p>
81-
<p>This guide explains each piece of a Python web stack. If you want to deploy
82-
a web application built with Django, Flask, Pyramid, or another
83-
Python-based web framework, you've come to the right place.</p>
84-
<p>There are a few other fantastic Python guides that you may want to read if
85-
you're not yet ready to deploy your application.</p>
86-
<p>For general Python learning, read Kenneth Reitz's
87-
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>.</p>
88-
<p>To get an introduction to both Python and Django at the same time, purchase
89-
<a class="reference external" href="http://www.realpython.com/">Real Python</a> by Fletcher, Michael, and Jeremy.</p>
90-
<p>To deploy a Python web application to the Heroku platform-as-a-service
79+
few &quot;AHA!&quot; moments are hitting you. You've picked up the basic concepts of
80+
a Python web framework.</p>
81+
<p>Now you want to know how to take your web application code and put it
82+
live on the Web. That's where this guide comes in. If you want to gain
83+
an understanding of everything you need to deploy and run a production Python
84+
web application, you've come to the right place.</p>
85+
<p>If you're not yet ready to deploy your application there are a few other
86+
fantastic Python guides that you can read first:</p>
87+
<ul class="simple">
88+
<li>For general Python learning, read Kenneth Reitz's
89+
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>.</li>
90+
<li>To get an introduction to both Python and Django at the same time, read
91+
<a class="reference external" href="http://www.realpython.com/">Real Python</a> by Fletcher, Michael, and Jeremy.</li>
92+
<li>To deploy a Python web application to the Heroku platform-as-a-service
9193
(described below in this guide), check out
92-
<a class="reference external" href="http://www.deploydjango.com/">Deploying Django</a> by Randall Degges.</p>
93-
<p>If you're not coming in with any software development background,
94-
you may also find my post on
94+
<a class="reference external" href="http://www.deploydjango.com/">Deploying Django</a> by Randall Degges.</li>
95+
<li>If you're not coming in with any software development background,
96+
you may find my post on
9597
<a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a>
96-
useful.</p>
97-
<p>This guide has a different focus from the above resources. Here I
98-
focus on explaining the way a Python <em>web application</em> stack works from
99-
server infrastructure to the JavaScript that executes on a user's browser.</p>
100-
<p>People learning Python generally have at least one of the three following
101-
goals:</p>
102-
<ol class="arabic simple">
103-
<li>Build web applications</li>
104-
<li>Process, analyze, and visualize data</li>
105-
<li>Script server administration</li>
106-
</ol>
107-
<p>This guide will be most useful to people building web applications and
108-
scripting server administration.</p>
98+
useful.</li>
99+
</ul>
100+
<p>This guide has a different focus from the above resources. Here you will
101+
learn what server options exist, which operating system to use, what the
102+
Web Server Gateway Interface (WSGI) standard is, and so on up through the
103+
action that takes place in the user's browser.</p>
104+
<p>Read on once you have a basic understanding of Python plus a web framework
105+
and are ready to learn more about the full Python web stack.</p>
109106

110107
<br/>
111108
Next read about

introduction.html

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -76,36 +76,33 @@
7676
<h1>Introduction</h1>
7777
<p>You're knee deep in learning the <a class="reference external" href="http://www.python.org/">Python</a>
7878
programming language. The syntax is beginning to make sense. The first
79-
few &quot;AHA!&quot; moments are hitting you. Now you are excited for continued
80-
direction to accelerate your learning.</p>
81-
<p>This guide explains each piece of a Python web stack. If you want to deploy
82-
a web application built with Django, Flask, Pyramid, or another
83-
Python-based web framework, you've come to the right place.</p>
84-
<p>There are a few other fantastic Python guides that you may want to read if
85-
you're not yet ready to deploy your application.</p>
86-
<p>For general Python learning, read Kenneth Reitz's
87-
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>.</p>
88-
<p>To get an introduction to both Python and Django at the same time, purchase
89-
<a class="reference external" href="http://www.realpython.com/">Real Python</a> by Fletcher, Michael, and Jeremy.</p>
90-
<p>To deploy a Python web application to the Heroku platform-as-a-service
79+
few &quot;AHA!&quot; moments are hitting you. You've picked up the basic concepts of
80+
a Python web framework.</p>
81+
<p>Now you want to know how to take your web application code and put it
82+
live on the Web. That's where this guide comes in. If you want to gain
83+
an understanding of everything you need to deploy and run a production Python
84+
web application, you've come to the right place.</p>
85+
<p>If you're not yet ready to deploy your application there are a few other
86+
fantastic Python guides that you can read first:</p>
87+
<ul class="simple">
88+
<li>For general Python learning, read Kenneth Reitz's
89+
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>.</li>
90+
<li>To get an introduction to both Python and Django at the same time, read
91+
<a class="reference external" href="http://www.realpython.com/">Real Python</a> by Fletcher, Michael, and Jeremy.</li>
92+
<li>To deploy a Python web application to the Heroku platform-as-a-service
9193
(described below in this guide), check out
92-
<a class="reference external" href="http://www.deploydjango.com/">Deploying Django</a> by Randall Degges.</p>
93-
<p>If you're not coming in with any software development background,
94-
you may also find my post on
94+
<a class="reference external" href="http://www.deploydjango.com/">Deploying Django</a> by Randall Degges.</li>
95+
<li>If you're not coming in with any software development background,
96+
you may find my post on
9597
<a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a>
96-
useful.</p>
97-
<p>This guide has a different focus from the above resources. Here I
98-
focus on explaining the way a Python <em>web application</em> stack works from
99-
server infrastructure to the JavaScript that executes on a user's browser.</p>
100-
<p>People learning Python generally have at least one of the three following
101-
goals:</p>
102-
<ol class="arabic simple">
103-
<li>Build web applications</li>
104-
<li>Process, analyze, and visualize data</li>
105-
<li>Script server administration</li>
106-
</ol>
107-
<p>This guide will be most useful to people building web applications and
108-
scripting server administration.</p>
98+
useful.</li>
99+
</ul>
100+
<p>This guide has a different focus from the above resources. Here you will
101+
learn what server options exist, which operating system to use, what the
102+
Web Server Gateway Interface (WSGI) standard is, and so on up through the
103+
action that takes place in the user's browser.</p>
104+
<p>Read on once you have a basic understanding of Python plus a web framework
105+
and are ready to learn more about the full Python web stack.</p>
109106

110107
<br/>
111108
Next read the

source/content/pages/introduction.rst

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,35 @@ Introduction
77

88
You're knee deep in learning the `Python <http://www.python.org/>`_
99
programming language. The syntax is beginning to make sense. The first
10-
few "AHA!" moments are hitting you. Now you are excited for continued
11-
direction to accelerate your learning.
12-
13-
This guide explains each piece of a Python web stack. If you want to deploy
14-
a web application built with Django, Flask, Pyramid, or another
15-
Python-based web framework, you've come to the right place.
16-
17-
There are a few other fantastic Python guides that you may want to read if
18-
you're not yet ready to deploy your application.
19-
20-
For general Python learning, read Kenneth Reitz's
21-
`The Hitchhiker’s Guide to Python <http://docs.python-guide.org/en/latest/>`_.
22-
23-
To get an introduction to both Python and Django at the same time, purchase
24-
`Real Python <http://www.realpython.com/>`_ by Fletcher, Michael, and Jeremy.
25-
26-
To deploy a Python web application to the Heroku platform-as-a-service
27-
(described below in this guide), check out
28-
`Deploying Django <http://www.deploydjango.com/>`_ by Randall Degges.
29-
30-
If you're not coming in with any software development background,
31-
you may also find my post on
32-
`Learning Python <http://www.mattmakai.com/learning-python-for-non-developers.html>`_
33-
useful.
34-
35-
This guide has a different focus from the above resources. Here I
36-
focus on explaining the way a Python *web application* stack works from
37-
server infrastructure to the JavaScript that executes on a user's browser.
38-
39-
People learning Python generally have at least one of the three following
40-
goals:
41-
42-
1. Build web applications
43-
2. Process, analyze, and visualize data
44-
3. Script server administration
45-
46-
This guide will be most useful to people building web applications and
47-
scripting server administration.
10+
few "AHA!" moments are hitting you. You've picked up the basic concepts of
11+
a Python web framework.
12+
13+
Now you want to know how to take your web application code and put it
14+
live on the Web. That's where this guide comes in. If you want to gain
15+
an understanding of everything you need to deploy and run a production Python
16+
web application, you've come to the right place.
17+
18+
If you're not yet ready to deploy your application there are a few other
19+
fantastic Python guides that you can read first:
20+
21+
* For general Python learning, read Kenneth Reitz's
22+
`The Hitchhiker’s Guide to Python <http://docs.python-guide.org/en/latest/>`_.
23+
* To get an introduction to both Python and Django at the same time, read
24+
`Real Python <http://www.realpython.com/>`_ by Fletcher, Michael, and Jeremy.
25+
26+
* To deploy a Python web application to the Heroku platform-as-a-service
27+
(described below in this guide), check out
28+
`Deploying Django <http://www.deploydjango.com/>`_ by Randall Degges.
29+
30+
* If you're not coming in with any software development background,
31+
you may find my post on
32+
`Learning Python <http://www.mattmakai.com/learning-python-for-non-developers.html>`_
33+
useful.
34+
35+
This guide has a different focus from the above resources. Here you will
36+
learn what server options exist, which operating system to use, what the
37+
Web Server Gateway Interface (WSGI) standard is, and so on up through the
38+
action that takes place in the user's browser.
39+
40+
Read on once you have a basic understanding of Python plus a web framework
41+
and are ready to learn more about the full Python web stack.

0 commit comments

Comments
 (0)