Skip to content

Commit 7d90c8d

Browse files
mattmakaimattmakai
committed
Switching around sections.
1 parent ea4d1bf commit 7d90c8d

File tree

8 files changed

+129
-60
lines changed

8 files changed

+129
-60
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>2013-06-23T11:04:51Z</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>2013-06-23T11:07:11Z</updated></feed>

‎index.html‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<li><a href="#website-security">Website Security</a></li>
6060
<li><a href="#web-analytics">Web Analytics</a></li>
6161
<li><a href="#caching">Caching</a></li>
62+
<li><a href="#about-author">About</a></li>
6263
<li><a href="#change-log">Change Log</a></li>
6364
</ul>
6465
</div>
@@ -78,24 +79,6 @@ <h1>Introduction</h1>
7879
focus on explaining several ways of setting up a Python <em>web application</em>
7980
stack from server infrastructure through JavaScript execution on a user's
8081
browser.</p>
81-
<div class="section" id="about-the-author">
82-
<h2>About the Author</h2>
83-
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I solve problems by
84-
developing software. I often use Python and occasionally work with
85-
languages in the Java Virtual Machine (JVM) stack.</p>
86-
<p>In 2013 I will be traveling to 30 cities in the United States to visit with
87-
tech companies, attend and speak at tech meetups, and blog from an experienced
88-
software developer's perspective about the current state of technology in the
89-
United States. If you're reading this guide then you're likely someone I'm
90-
interested in meeting during my trip. Send me an email at
91-
<a class="reference external" href="mailto:matthew.makai&#64;gmail.com">matthew.makai&#64;gmail.com</a> or
92-
<a class="reference external" href="https://twitter.com/makaimc">message me on Twitter</a>. Read more about
93-
my upcoming trip that will take place between March 9 and August 15, 2013 at
94-
<a class="reference external" href="http://www.codingacrossamerica.com/about.html">Coding Across America</a>.</p>
95-
<p>If there are typos, inaccurate statements, or general areas for improvement
96-
that you see in this guide, please issue a
97-
<a class="reference external" href="https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages">pull request on this website's Github repository</a>. Thank you!</p>
98-
</div>
9982

10083
</section>
10184
<section id="servers" class="tech-section">
@@ -458,10 +441,30 @@ <h2>Caching Resources</h2>
458441
</ul>
459442
</div>
460443

444+
</section>
445+
<section id="about-author" class="tech-section">
446+
<h1>About</h1>
447+
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I solve problems by
448+
developing software. I often use Python and occasionally work with
449+
languages in the Java Virtual Machine (JVM) stack.</p>
450+
<p>In 2013 I will be traveling to 30 cities in the United States to visit with
451+
tech companies, attend and speak at tech meetups, and blog from an experienced
452+
software developer's perspective about the current state of technology in the
453+
United States. If you're reading this guide then you're likely someone I'm
454+
interested in meeting during my trip. Send me an email at
455+
<a class="reference external" href="mailto:matthew.makai&#64;gmail.com">matthew.makai&#64;gmail.com</a> or
456+
<a class="reference external" href="https://twitter.com/makaimc">message me on Twitter</a>. Read more about
457+
my upcoming trip that will take place between March 9 and August 15, 2013 at
458+
<a class="reference external" href="http://www.codingacrossamerica.com/about.html">Coding Across America</a>.</p>
459+
<p>If there are typos, inaccurate statements, or general areas for improvement
460+
that you see in this guide, please issue a
461+
<a class="reference external" href="https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages">pull request on this website's Github repository</a>. Thank you!</p>
462+
461463
</section>
462464
<section id="change-log" class="tech-section">
463465
<h1>Change Log</h1>
464-
<p>2013.01.11: Fleshing out server section, particularly IaaS and PaaS.</p>
466+
<p>2013.06.23: Updating styling, adding new content, switching around sections.</p>
467+
<p>2013.01.11: Fleshing out server section, particularly IaaS and PaaS.</p>
465468
<p>2013.01.04: Added initial trial of a WSGI server -&gt; web server -&gt; browser diagram. Updated web server and OS sections.</p>
466469
<p>2013.01.02: Minor updates to OS section.</p>
467470
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.</p>

‎pages/about-author.html‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
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+
<a href="https://github.com/makaimc/fullstackpython.github.com" class="github">
37+
<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
38+
</a>
39+
<div class="container">
40+
<div class="row">
41+
<div class="span12">
42+
<div class="logo-header-section">
43+
<a href="/"><img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" /></a>
44+
<span class="logo-title"><a href="/">Full Stack Python</a></span>
45+
</div>
46+
</div>
47+
</div>
48+
<h1>About</h1>
49+
50+
51+
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I solve problems by
52+
developing software. I often use Python and occasionally work with
53+
languages in the Java Virtual Machine (JVM) stack.</p>
54+
<p>In 2013 I will be traveling to 30 cities in the United States to visit with
55+
tech companies, attend and speak at tech meetups, and blog from an experienced
56+
software developer's perspective about the current state of technology in the
57+
United States. If you're reading this guide then you're likely someone I'm
58+
interested in meeting during my trip. Send me an email at
59+
<a class="reference external" href="mailto:matthew.makai&#64;gmail.com">matthew.makai&#64;gmail.com</a> or
60+
<a class="reference external" href="https://twitter.com/makaimc">message me on Twitter</a>. Read more about
61+
my upcoming trip that will take place between March 9 and August 15, 2013 at
62+
<a class="reference external" href="http://www.codingacrossamerica.com/about.html">Coding Across America</a>.</p>
63+
<p>If there are typos, inaccurate statements, or general areas for improvement
64+
that you see in this guide, please issue a
65+
<a class="reference external" href="https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages">pull request on this website's Github repository</a>. Thank you!</p>
66+
67+
<hr/>
68+
<div class="footer pull-right">
69+
<a href="http://www.mattmakai.com/" class="underline">Matt Makai</a> 2013
70+
</div>
71+
</div>
72+
73+
<script src="http://code.jquery.com/jquery-latest.js"></script>
74+
<script src="/js/bootstrap.min.js"></script>
75+
</body>
76+
</html>

‎pages/change-log.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
<h1>Change Log</h1>
4949

5050

51-
<p>2013.01.11: Fleshing out server section, particularly IaaS and PaaS.</p>
51+
<p>2013.06.23: Updating styling, adding new content, switching around sections.</p>
52+
<p>2013.01.11: Fleshing out server section, particularly IaaS and PaaS.</p>
5253
<p>2013.01.04: Added initial trial of a WSGI server -&gt; web server -&gt; browser diagram. Updated web server and OS sections.</p>
5354
<p>2013.01.02: Minor updates to OS section.</p>
5455
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.</p>

‎pages/introduction.html‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,24 +61,6 @@ <h1>Introduction</h1>
6161
focus on explaining several ways of setting up a Python <em>web application</em>
6262
stack from server infrastructure through JavaScript execution on a user's
6363
browser.</p>
64-
<div class="section" id="about-the-author">
65-
<h2>About the Author</h2>
66-
<p>I'm <a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a> and I solve problems by
67-
developing software. I often use Python and occasionally work with
68-
languages in the Java Virtual Machine (JVM) stack.</p>
69-
<p>In 2013 I will be traveling to 30 cities in the United States to visit with
70-
tech companies, attend and speak at tech meetups, and blog from an experienced
71-
software developer's perspective about the current state of technology in the
72-
United States. If you're reading this guide then you're likely someone I'm
73-
interested in meeting during my trip. Send me an email at
74-
<a class="reference external" href="mailto:matthew.makai&#64;gmail.com">matthew.makai&#64;gmail.com</a> or
75-
<a class="reference external" href="https://twitter.com/makaimc">message me on Twitter</a>. Read more about
76-
my upcoming trip that will take place between March 9 and August 15, 2013 at
77-
<a class="reference external" href="http://www.codingacrossamerica.com/about.html">Coding Across America</a>.</p>
78-
<p>If there are typos, inaccurate statements, or general areas for improvement
79-
that you see in this guide, please issue a
80-
<a class="reference external" href="https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages">pull request on this website's Github repository</a>. Thank you!</p>
81-
</div>
8264

8365
<hr/>
8466
<div class="footer pull-right">

‎source/content/pages/about-author.rst‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
About
2+
=====
3+
4+
:category: page
5+
:slug: about-author
6+
:sort-order: 12
7+
8+
I'm `Matt Makai <http://www.mattmakai.com/>`_ and I solve problems by
9+
developing software. I often use Python and occasionally work with
10+
languages in the Java Virtual Machine (JVM) stack.
11+
12+
In 2013 I will be traveling to 30 cities in the United States to visit with
13+
tech companies, attend and speak at tech meetups, and blog from an experienced
14+
software developer's perspective about the current state of technology in the
15+
United States. If you're reading this guide then you're likely someone I'm
16+
interested in meeting during my trip. Send me an email at
17+
matthew.makai@gmail.com or
18+
`message me on Twitter <https://twitter.com/makaimc>`_. Read more about
19+
my upcoming trip that will take place between March 9 and August 15, 2013 at
20+
`Coding Across America <http://www.codingacrossamerica.com/about.html>`_.
21+
22+
If there are typos, inaccurate statements, or general areas for improvement
23+
that you see in this guide, please issue a
24+
`pull request on this website's Github repository <https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages>`_. Thank you!
25+

‎source/content/pages/change-log.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Change Log
33

44
:category: page
55
:slug: change-log
6-
:sort-order: 12
6+
:sort-order: 13
7+
8+
2013.06.23: Updating styling, adding new content, switching around sections.
79

810
2013.01.11: Fleshing out server section, particularly IaaS and PaaS.
911

‎source/content/pages/introduction.rst‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,3 @@ focus on explaining several ways of setting up a Python *web application*
2121
stack from server infrastructure through JavaScript execution on a user's
2222
browser.
2323

24-
About the Author
25-
----------------
26-
I'm `Matt Makai <http://www.mattmakai.com/>`_ and I solve problems by
27-
developing software. I often use Python and occasionally work with
28-
languages in the Java Virtual Machine (JVM) stack.
29-
30-
In 2013 I will be traveling to 30 cities in the United States to visit with
31-
tech companies, attend and speak at tech meetups, and blog from an experienced
32-
software developer's perspective about the current state of technology in the
33-
United States. If you're reading this guide then you're likely someone I'm
34-
interested in meeting during my trip. Send me an email at
35-
matthew.makai@gmail.com or
36-
`message me on Twitter <https://twitter.com/makaimc>`_. Read more about
37-
my upcoming trip that will take place between March 9 and August 15, 2013 at
38-
`Coding Across America <http://www.codingacrossamerica.com/about.html>`_.
39-
40-
If there are typos, inaccurate statements, or general areas for improvement
41-
that you see in this guide, please issue a
42-
`pull request on this website's Github repository <https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages>`_. Thank you!
43-

0 commit comments

Comments
 (0)