Skip to content

Commit 74a801a

Browse files
committed
Updating database and WSGI sections.
1 parent 8379cfb commit 74a801a

File tree

10 files changed

+96
-31
lines changed

10 files changed

+96
-31
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-30T12:50:45Z</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-30T13:38:46Z</updated></feed>

index.html

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,21 @@ <h1>Web Server</h1>
230230
</section>
231231
<section id="database" class="tech-section">
232232
<h1>Database</h1>
233-
<p>Database lorem ipsum.</p>
234-
<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>
235-
<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>
236-
<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>
233+
<p>A database provides an abstraction on top of a file system for creating,
234+
reading, updating, and deleting persistent data. The abstraction most
235+
commonly represented is a set of relational tables, known as a
236+
relational database management system (RDBMS). Alternative abstractions
237+
include graph databases where data is stored in both nodes and edges of a
238+
graph.</p>
239+
<div class="section" id="database-resources">
240+
<h2>Database resources</h2>
241+
<p><a class="reference external" href="http://www.postgresql.org/">PostgreSQL</a> and
242+
<a class="reference external" href="http://www.mysql.com/">MySQL</a> are two of the most common open source
243+
databases.</p>
244+
<p><a class="reference external" href="http://www.sqlite.org/">SQLite</a> is a database that is stored in a single
245+
file on disk. SQLite is built into Python but is only built for access
246+
by a single connection at a time.</p>
247+
</div>
237248

238249
</section>
239250
<section id="web-framework" class="tech-section">
@@ -260,10 +271,11 @@ <h1>Web Framework</h1>
260271
use with non-relational databases by incorporating external Python libraries.</p>
261272
<div class="section" id="web-framework-resources">
262273
<h2>Web Framework Resources</h2>
263-
<p><a class="reference external" href="http://www.djangoproject.com/">Django</a></p>
264-
<p><a class="reference external" href="http://flask.pocoo.org/">Flask</a></p>
265-
<p><a class="reference external" href="http://bottlepy.org/docs/dev/">Bottle</a></p>
266-
<p><a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a></p>
274+
<p><a class="reference external" href="http://www.djangoproject.com/">Django</a>,
275+
<a class="reference external" href="http://flask.pocoo.org/">Flask</a>,
276+
<a class="reference external" href="http://bottlepy.org/docs/dev/">Bottle</a>,
277+
<a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a>, and
278+
<a class="reference external" href="http://webpy.org/">web.py</a> are the most common Python web frameworks.</p>
267279
</div>
268280

269281
</section>
@@ -276,6 +288,17 @@ <h1>WSGI Server</h1>
276288
WSGI v1.0 is superseded by
277289
<a class="reference external" href="http://www.python.org/dev/peps/pep-3333/">PEP 3333</a>, which defines the
278290
v1.0.1 WSGI standard.</p>
291+
<div class="section" id="wsgi-resources">
292+
<h2>WSGI Resources</h2>
293+
<p><a class="reference external" href="http://www.python.org/dev/peps/pep-0333/">PEP 0333 WSGI v1.0</a>
294+
and
295+
<a class="reference external" href="http://www.python.org/dev/peps/pep-3333/">PEP 3333 WSGI v1.0.1</a>
296+
specifications.</p>
297+
<p><a class="reference external" href="http://gunicorn.org/">Green Unicorn</a>,
298+
<a class="reference external" href="http://code.google.com/p/modwsgi/">mod_wsgi</a>,
299+
<a class="reference external" href="https://github.com/unbit/uwsgi-docs">uWSGI</a>, and
300+
<a class="reference external" href="http://www.gevent.org/">gvent</a> are common WSGI server implementations.</p>
301+
</div>
279302

280303
</section>
281304
<section id="content-delivery-network" class="tech-section">
@@ -302,7 +325,7 @@ <h2>CDN Resources</h2>
302325
</section>
303326
<section id="change-log" class="tech-section">
304327
<h1>Change Log</h1>
305-
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section.</p>
328+
<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>
306329
<p>2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.</p>
307330
<p>2012.12.25: Initial incomplete release on fullstackpython.com.</p>
308331

pages/change-log.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<h1>Change Log</h1>
4646

4747

48-
<p>2012.12.30: Updated introduction with improved wording. Working on CDN section.</p>
48+
<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>
4949
<p>2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.</p>
5050
<p>2012.12.25: Initial incomplete release on fullstackpython.com.</p>
5151

pages/database.html

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,21 @@
4545
<h1>Database</h1>
4646

4747

48-
<p>Database 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>
48+
<p>A database provides an abstraction on top of a file system for creating,
49+
reading, updating, and deleting persistent data. The abstraction most
50+
commonly represented is a set of relational tables, known as a
51+
relational database management system (RDBMS). Alternative abstractions
52+
include graph databases where data is stored in both nodes and edges of a
53+
graph.</p>
54+
<div class="section" id="database-resources">
55+
<h2>Database resources</h2>
56+
<p><a class="reference external" href="http://www.postgresql.org/">PostgreSQL</a> and
57+
<a class="reference external" href="http://www.mysql.com/">MySQL</a> are two of the most common open source
58+
databases.</p>
59+
<p><a class="reference external" href="http://www.sqlite.org/">SQLite</a> is a database that is stored in a single
60+
file on disk. SQLite is built into Python but is only built for access
61+
by a single connection at a time.</p>
62+
</div>
5263

5364
<hr/>
5465
<div class="footer pull-right">

pages/web-framework.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ <h1>Web Framework</h1>
6767
use with non-relational databases by incorporating external Python libraries.</p>
6868
<div class="section" id="web-framework-resources">
6969
<h2>Web Framework Resources</h2>
70-
<p><a class="reference external" href="http://www.djangoproject.com/">Django</a></p>
71-
<p><a class="reference external" href="http://flask.pocoo.org/">Flask</a></p>
72-
<p><a class="reference external" href="http://bottlepy.org/docs/dev/">Bottle</a></p>
73-
<p><a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a></p>
70+
<p><a class="reference external" href="http://www.djangoproject.com/">Django</a>,
71+
<a class="reference external" href="http://flask.pocoo.org/">Flask</a>,
72+
<a class="reference external" href="http://bottlepy.org/docs/dev/">Bottle</a>,
73+
<a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a>, and
74+
<a class="reference external" href="http://webpy.org/">web.py</a> are the most common Python web frameworks.</p>
7475
</div>
7576

7677
<hr/>

pages/wsgi-server.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ <h1>WSGI Server</h1>
5252
WSGI v1.0 is superseded by
5353
<a class="reference external" href="http://www.python.org/dev/peps/pep-3333/">PEP 3333</a>, which defines the
5454
v1.0.1 WSGI standard.</p>
55+
<div class="section" id="wsgi-resources">
56+
<h2>WSGI Resources</h2>
57+
<p><a class="reference external" href="http://www.python.org/dev/peps/pep-0333/">PEP 0333 WSGI v1.0</a>
58+
and
59+
<a class="reference external" href="http://www.python.org/dev/peps/pep-3333/">PEP 3333 WSGI v1.0.1</a>
60+
specifications.</p>
61+
<p><a class="reference external" href="http://gunicorn.org/">Green Unicorn</a>,
62+
<a class="reference external" href="http://code.google.com/p/modwsgi/">mod_wsgi</a>,
63+
<a class="reference external" href="https://github.com/unbit/uwsgi-docs">uWSGI</a>, and
64+
<a class="reference external" href="http://www.gevent.org/">gvent</a> are common WSGI server implementations.</p>
65+
</div>
5566

5667
<hr/>
5768
<div class="footer pull-right">

source/content/pages/change-log.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Change Log
55
:slug: change-log
66
:sort-order: 9
77

8-
2012.12.30: Updated introduction with improved wording. Working on CDN section.
8+
2012.12.30: Updated introduction with improved wording. Working on CDN section. Added very basic database content and removed stub from that section.
99

1010
2012.12.27: Added beginning of section on Python web frameworks. Added stub for content delivery network.
1111

source/content/pages/database.rst

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,20 @@ Database
55
:slug: database
66
:sort-order: 6
77

8-
Database lorem ipsum.
8+
A database provides an abstraction on top of a file system for creating,
9+
reading, updating, and deleting persistent data. The abstraction most
10+
commonly represented is a set of relational tables, known as a
11+
relational database management system (RDBMS). Alternative abstractions
12+
include graph databases where data is stored in both nodes and edges of a
13+
graph.
914

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.
15+
Database resources
16+
------------------
17+
`PostgreSQL <http://www.postgresql.org/>`_ and
18+
`MySQL <http://www.mysql.com/>`_ are two of the most common open source
19+
databases.
1120

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.
21+
`SQLite <http://www.sqlite.org/>`_ is a database that is stored in a single
22+
file on disk. SQLite is built into Python but is only built for access
23+
by a single connection at a time.
1324

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/content/pages/web-framework.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ use with non-relational databases by incorporating external Python libraries.
2929

3030
Web Framework Resources
3131
-----------------------
32-
`Django <http://www.djangoproject.com/>`_
33-
34-
`Flask <http://flask.pocoo.org/>`_
35-
36-
`Bottle <http://bottlepy.org/docs/dev/>`_
37-
38-
`Pyramid <http://www.pylonsproject.org/>`_
32+
`Django <http://www.djangoproject.com/>`_,
33+
`Flask <http://flask.pocoo.org/>`_,
34+
`Bottle <http://bottlepy.org/docs/dev/>`_,
35+
`Pyramid <http://www.pylonsproject.org/>`_, and
36+
`web.py <http://webpy.org/>`_ are the most common Python web frameworks.

source/content/pages/wsgi-server.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,14 @@ WSGI v1.0 is superseded by
1313
`PEP 3333 <http://www.python.org/dev/peps/pep-3333/>`_, which defines the
1414
v1.0.1 WSGI standard.
1515

16+
WSGI Resources
17+
--------------
18+
`PEP 0333 WSGI v1.0 <http://www.python.org/dev/peps/pep-0333/>`_
19+
and
20+
`PEP 3333 WSGI v1.0.1 <http://www.python.org/dev/peps/pep-3333/>`_
21+
specifications.
22+
23+
`Green Unicorn <http://gunicorn.org/>`_,
24+
`mod_wsgi <http://code.google.com/p/modwsgi/>`_,
25+
`uWSGI <https://github.com/unbit/uwsgi-docs>`_, and
26+
`gvent <http://www.gevent.org/>`_ are common WSGI server implementations.

0 commit comments

Comments
 (0)