Skip to content

Commit 402dd4b

Browse files
mattmakaimattmakai
committed
working on static content page
1 parent c21741b commit 402dd4b

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
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-03-28T13:25:20Z</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-03-28T17:20:47Z</updated></feed>

‎source/content/pages/12-static-content/1201-static-content.markdown‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ up either directly through the web server or a content delivery network (CDN).
99
Examples include JavaScript, image, and CSS files.
1010

1111

12+
## Types of static content
13+
Static content can be either assets created as part of your development
14+
process such as images on your landing page or user-generated content. The
15+
Django framework calls these two categories *assets* and *media*.
16+
17+
1218
## Content delivery networks
1319
A content delivery network (CDN) is a third party that stores and serves
1420
static files. [Amazon CloudFront](http://aws.amazon.com/cloudfront/),
@@ -23,8 +29,7 @@ constraints under heavy traffic. A CDN can remove the need to serve static
2329
assets from that nginx server so it can purely act as a pass through for
2430
requests to the Green Unicorn WSGI server.
2531

26-
CDNs distribute request load globally by using data centers in different
27-
locations.
32+
CDNs send content responses from data centers with the closest proximity to the requester.
2833

2934

3035
## Static Content Resources

‎static-content.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ <h1>Static content</h1>
7777
<p>Some content on a website does not change and therefore should be served
7878
up either directly through the web server or a content delivery network (CDN).
7979
Examples include JavaScript, image, and CSS files.</p>
80+
<h2>Types of static content</h2>
81+
<p>Static content can be either assets created as part of your development
82+
process such as images on your landing page or user-generated content. The
83+
Django framework calls these two categories <em>assets</em> and <em>media</em>.</p>
8084
<h2>Content delivery networks</h2>
8185
<p>A content delivery network (CDN) is a third party that stores and serves
8286
static files. <a href="http://aws.amazon.com/cloudfront/">Amazon CloudFront</a>,
@@ -90,8 +94,7 @@ <h2>Content delivery networks</h2>
9094
constraints under heavy traffic. A CDN can remove the need to serve static
9195
assets from that nginx server so it can purely act as a pass through for
9296
requests to the Green Unicorn WSGI server.</p>
93-
<p>CDNs distribute request load globally by using data centers in different
94-
locations.</p>
97+
<p>CDNs send content responses from data centers with the closest proximity to the requester.</p>
9598
<h2>Static Content Resources</h2>
9699
<p><a href="http://blog.doismellburning.co.uk/2012/07/14/using-amazon-s3-to-host-your-django-static-files/">Using Amazon S3 to host your Django static files</a></p>
97100
<p><a href="http://www.hanselman.com/blog/CDNsFailButYourScriptsDontHaveToFallbackFromCDNToLocalJQuery.aspx">CDNs fail, but your scripts don't have to</a></p>

0 commit comments

Comments
 (0)