working on static content page

mattmakai · mattmakai · commit c21741b8cc63 · 2014-03-28T13:25:27.000-04:00
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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-27T08:45:11Z</updated></feed>
+<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>
diff --git a/source/content/pages/12-static-content/1201-static-content.markdown b/source/content/pages/12-static-content/1201-static-content.markdown
@@ -8,8 +8,10 @@ Some content on a website does not change and therefore should be served
 up either directly through the web server or a content delivery network (CDN).
 Examples include JavaScript, image, and CSS files.
 
-A CDN is a third party that serves your static files.
-[Amazon CloudFront](http://aws.amazon.com/cloudfront/),
+
+## Content delivery networks
+A content delivery network (CDN) is a third party that stores and serves 
+static files. [Amazon CloudFront](http://aws.amazon.com/cloudfront/),
 [Akamai](http://www.akamai.com/), and 
 [Rackspace Cloud Files](http://www.rackspace.com/cloud/public/files/) 
 are examples of CDNs. The purpose of a CDN is to remove the load of static
diff --git a/source/content/pages/18-web-security/1801-web-security.markdown b/source/content/pages/18-web-security/1801-web-security.markdown
@@ -33,4 +33,6 @@ securing Linux distributions.
   [cheat sheets for security](https://www.owasp.org/index.php/Cheat_Sheets) 
   topics.
 
+* [How HTTPS Secures Connections](http://blog.hartleybrody.com/https-certificates/)
+  is a guide for what HTTPS does and does not secure against.
 
diff --git a/static-content.html b/static-content.html
@@ -77,8 +77,9 @@ <h1>Static content</h1>
 <p>Some content on a website does not change and therefore should be served
 up either directly through the web server or a content delivery network (CDN).
 Examples include JavaScript, image, and CSS files.</p>
-<p>A CDN is a third party that serves your static files.
-<a href="http://aws.amazon.com/cloudfront/">Amazon CloudFront</a>,
+<h2>Content delivery networks</h2>
+<p>A content delivery network (CDN) is a third party that stores and serves 
+static files. <a href="http://aws.amazon.com/cloudfront/">Amazon CloudFront</a>,
 <a href="http://www.akamai.com/">Akamai</a>, and 
 <a href="http://www.rackspace.com/cloud/public/files/">Rackspace Cloud Files</a> 
 are examples of CDNs. The purpose of a CDN is to remove the load of static
diff --git a/web-application-security.html b/web-application-security.html
@@ -110,6 +110,10 @@ <h2>Security Resources</h2>
   <a href="https://www.owasp.org/index.php/Cheat_Sheets">cheat sheets for security</a> 
   topics.</p>
 </li>
+<li>
+<p><a href="http://blog.hartleybrody.com/https-certificates/">How HTTPS Secures Connections</a>
+  is a guide for what HTTPS does and does not secure against.</p>
+</li>
 </ul>
                                                                                                                                                                                                                                                                                                                                                                                                                                     <br/>
             Next read the 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?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-27T08:45:11Z</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-28T13:25:20Z</updated></feed>`