Skip to content

Commit 3fcedbd

Browse files
mattmakaimattmakai
committed
Updating OS section and switching WSGI and database stub ordering.
1 parent 4dfc041 commit 3fcedbd

File tree

6 files changed

+68
-19
lines changed

6 files changed

+68
-19
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-25T15:06:54Z</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-25T17:15:31Z</updated></feed>

‎index.html‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
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>
5352
<li><a href="#database">Database</a></li>
53+
<li><a href="#wsgi-server">WSGI Server</a></li>
5454
</ul>
5555
</div>
5656
<div class="span9 offset1">
@@ -184,9 +184,25 @@ <h1>Operating System</h1>
184184
<p>The operating system sits directly on top of the server or virtual server
185185
and provides access to computing resources. The only operating
186186
system I can recommend for production Python web stack deployments is
187-
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat, and
188-
CentOS are all viable options. (Side note: Mac OS X is fine for development
189-
activities but not for test/production deployments.)</p>
187+
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat
188+
Enterprise Linux, and CentOS are all viable options.</p>
189+
<p><em>Side note</em>: Mac OS X is fine for development activities but not for
190+
test/production deployments.</p>
191+
<div class="section" id="ubuntu">
192+
<h2>Ubuntu</h2>
193+
<p>Ubuntu is a Linux distribution packaged by the
194+
<a class="reference external" href="http://www.canonical.com/">Canonical Ltd</a> company. Ubuntu uses the
195+
Debian distribution as a base for packages, including the <a class="reference external" href="http://wiki.debian.org/Apt">aptitude package
196+
manager</a>. For desktop versions of Ubuntu,
197+
GNOME (until the 11.04 release) or Unity (11.10 through current)
198+
is added to the distribution to provide a user interface.</p>
199+
</div>
200+
<div class="section" id="red-hat-and-centos">
201+
<h2>Red Hat and CentOS</h2>
202+
<p>Red Hat Enterprise Linux (RHEL) and Community enterprise Operating
203+
System (CentOS) are essentially the same distribution. The key
204+
difference is that CentOS is an open source free derivative of RHEL.</p>
205+
</div>
190206

191207
</section>
192208
<section id="web-server" class="tech-section">
@@ -197,17 +213,17 @@ <h1>Web Server</h1>
197213
<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>
198214

199215
</section>
200-
<section id="wsgi-server" class="tech-section">
201-
<h1>WSGI Server</h1>
202-
<p>WSGI server lorem ipsum.</p>
216+
<section id="database" class="tech-section">
217+
<h1>Database</h1>
218+
<p>Database lorem ipsum.</p>
203219
<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>
204220
<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>
205221
<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>
206222

207223
</section>
208-
<section id="database" class="tech-section">
209-
<h1>Database</h1>
210-
<p>Database lorem ipsum.</p>
224+
<section id="wsgi-server" class="tech-section">
225+
<h1>WSGI Server</h1>
226+
<p>WSGI server lorem ipsum.</p>
211227
<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>
212228
<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>
213229
<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>

‎pages/operating-system.html‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,25 @@ <h1>Operating System</h1>
4848
<p>The operating system sits directly on top of the server or virtual server
4949
and provides access to computing resources. The only operating
5050
system I can recommend for production Python web stack deployments is
51-
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat, and
52-
CentOS are all viable options. (Side note: Mac OS X is fine for development
53-
activities but not for test/production deployments.)</p>
51+
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat
52+
Enterprise Linux, and CentOS are all viable options.</p>
53+
<p><em>Side note</em>: Mac OS X is fine for development activities but not for
54+
test/production deployments.</p>
55+
<div class="section" id="ubuntu">
56+
<h2>Ubuntu</h2>
57+
<p>Ubuntu is a Linux distribution packaged by the
58+
<a class="reference external" href="http://www.canonical.com/">Canonical Ltd</a> company. Ubuntu uses the
59+
Debian distribution as a base for packages, including the <a class="reference external" href="http://wiki.debian.org/Apt">aptitude package
60+
manager</a>. For desktop versions of Ubuntu,
61+
GNOME (until the 11.04 release) or Unity (11.10 through current)
62+
is added to the distribution to provide a user interface.</p>
63+
</div>
64+
<div class="section" id="red-hat-and-centos">
65+
<h2>Red Hat and CentOS</h2>
66+
<p>Red Hat Enterprise Linux (RHEL) and Community enterprise Operating
67+
System (CentOS) are essentially the same distribution. The key
68+
difference is that CentOS is an open source free derivative of RHEL.</p>
69+
</div>
5470

5571
<hr/>
5672
<div class="footer pull-right">

‎source/content/pages/database.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Database
33

44
:category: page
55
:slug: database
6-
:sort-order: 6
6+
:sort-order: 5
77

88
Database lorem ipsum.
99

‎source/content/pages/operating-system.rst‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,25 @@ Operating System
88
The operating system sits directly on top of the server or virtual server
99
and provides access to computing resources. The only operating
1010
system I can recommend for production Python web stack deployments is
11-
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat, and
12-
CentOS are all viable options. (Side note: Mac OS X is fine for development
13-
activities but not for test/production deployments.)
11+
a flavor of Linux. Ubuntu Long Term Support (LTS) releases, Red Hat
12+
Enterprise Linux, and CentOS are all viable options.
1413

14+
*Side note*: Mac OS X is fine for development activities but not for
15+
test/production deployments.
16+
17+
Ubuntu
18+
------
19+
Ubuntu is a Linux distribution packaged by the
20+
`Canonical Ltd <http://www.canonical.com/>`_ company. Ubuntu uses the
21+
Debian distribution as a base for packages, including the `aptitude package
22+
manager <http://wiki.debian.org/Apt>`_. For desktop versions of Ubuntu,
23+
GNOME (until the 11.04 release) or Unity (11.10 through current)
24+
is added to the distribution to provide a user interface.
25+
26+
27+
Red Hat and CentOS
28+
------------------
29+
Red Hat Enterprise Linux (RHEL) and Community enterprise Operating
30+
System (CentOS) are essentially the same distribution. The key
31+
difference is that CentOS is an open source free derivative of RHEL.
1532

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ WSGI Server
33

44
:category: page
55
:slug: wsgi-server
6-
:sort-order: 5
6+
:sort-order: 6
77

88
WSGI server lorem ipsum.
99

0 commit comments

Comments
 (0)