adding resources found in pull request mattmakai#18

mattmakai · mattmakai · commit 55ee925386da · 2014-04-03T16:12:20.000-04:00
diff --git a/best-python-resources.html b/best-python-resources.html
@@ -123,8 +123,7 @@ <h2>Experienced developers new to Python</h2>
 <li>
 <p>Kenneth Reitz's 
   <a href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>
-  contains a wealth of information both on the Python programming as well
-  as the community.</p>
+  contains a wealth of information both on the Python programming and the community.</p>
 </li>
 <li>
 <p><a href="https://developers.google.com/edu/python/">Google's Python Class</a> contains
diff --git a/caching.html b/caching.html
@@ -74,12 +74,12 @@
         <div class="row">
     <div class="col-md-8">
       <h1>Caching</h1>
-<p>Caching can reduce load on servers by storing the results of common 
+<p>Caching can reduce the load on servers by storing the results of common 
 operations and serving the precomputed answers to clients. </p>
 <p>For example, instead of retrieving data from database tables that rarely 
 change, you can store the values in-memory. Retrieving values from an 
 in-memory location is far faster than retrieving them from a database (which
-stores them on a persistent disk like a hard drive). When the cached values 
+stores them on a persistent disk like a hard drive.) When the cached values 
 change the system can invalidate the cache and re-retrieve the updated values
 for future requests.</p>
 <p>A cache can be created for multiple layers of the stack. </p>
diff --git a/cascading-style-sheets.html b/cascading-style-sheets.html
@@ -74,7 +74,7 @@
         <div class="row">
     <div class="col-md-8">
       <h1>Cascading Style Sheets (CSS)</h1>
-<p>A Cascading Style Sheet (CSS) files contain rules for how to display and 
+<p>Cascading Style Sheet (CSS) files contain rules for how to display and 
 lay out the HTML content when it is rendered by a web browser.</p>
 <h2>Why is CSS necessary?</h2>
 <p>CSS separates content contained in the HTML file from how the content 
@@ -124,7 +124,7 @@ <h2>CSS frameworks</h2>
 <p><a href="http://gumbyframework.com/">Gumby</a></p>
 </li>
 <li>
-<p><a href="http://compass-style.org/">Compass</a>)</p>
+<p><a href="http://compass-style.org/">Compass</a></p>
 </li>
 <li>
 <p><a href="http://www.profoundgrid.com/">Profound Grid</a></p>
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-31T18:29:17Z</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-04-03T16:11:48Z</updated></feed>
diff --git a/logging.html b/logging.html
@@ -100,7 +100,7 @@ <h2>Logging Aggregators</h2>
 <p>When you are running your application on several servers, it is helpful
 to have a monitoring tool called a "logging aggregator". You can configure your
 application to forward your system and application logs to one location that 
-provides tools such as to viewing searching, and monitoring logging events across your cluster. </p>
+provides tools for viewing, searching, and monitoring logging events across your cluster. </p>
 <p>Another advantage of log aggregatortion tools is they allow you to set up custom alerts
 and alarms so you can get notified when error rates breach a certain threshold.</p>
 <h3>Log Aggregator Third Party Services</h3>
@@ -120,7 +120,7 @@ <h3>Open Source Log Aggregators</h3>
 Saves data in elasicache.</li>
 <li><a href="http://logstash.net/">Logstash</a> Similar to Graylog2, logstash offers features to programatically
 configure log data workflows.</li>
-<li><a href="https://github.com/facebook/scribe">Scribe</a> A project written by facebook to aggregate logs. It's designed
+<li><a href="https://github.com/facebook/scribe">Scribe</a> A project written by Facebook to aggregate logs. It's designed
 to run on multiple servers and scale with the rest of your cluster. Uses the Thrift messagaing format so it can
 be used with any language. </li>
 </ul>
diff --git a/no-sql-datastore.html b/no-sql-datastore.html
@@ -92,7 +92,7 @@ <h2>Key-Value Pair</h2>
 <p>Key-value pair data stores are based
 on <a href="http://en.wikipedia.org/wiki/Hash_table">hash map</a> data structures.</p>
 <h2>Graph</h2>
-<p>A graph database represent and store data in three aspects: nodes, edges,
+<p>A graph database represents and stores data in three aspects: nodes, edges,
 and properties. </p>
 <p>A <em>node</em> is an entity, such as a person or business. </p>
 <p>An <em>edge</em> is the relationship between two entities. For example, an 
diff --git a/source-control.html b/source-control.html
@@ -82,7 +82,7 @@ <h2>Why is source control necessary?</h2>
 about permanently screwing something up. Unwanted changes can be easily rolled
 back. Developers can merge changes with other developer's code through 
 <a href="http://en.wikipedia.org/wiki/Diff">diff</a> views. </p>
-<p>These benefits exist on all software projects therefore version control is 
+<p>These benefits exist on all software projects. Therefore version control is 
 a necessity regardless of time size or the programming ecosystem used. Every
 project should immediately begin by using a version control system such
 as Git or Mercurial.</p>
diff --git a/source/content/pages/08-web-frameworks/0801-web-frameworks.markdown b/source/content/pages/08-web-frameworks/0801-web-frameworks.markdown
@@ -154,14 +154,19 @@ included with Python.
 
 
 ### Bottle resources
+* The [official Bottle tutorial](http://bottlepy.org/docs/dev/tutorial.html) 
+  provides a thorough view of basic concepts and features for the framework.
+
 * Digital Ocean provides an extensive [introductory post on Bottle](https://www.digitalocean.com/community/articles/how-to-use-the-bottle-micro-framework-to-develop-python-web-apps).
 
 * This tutorial provides a walkthrough for
 [getting started with Bottle](http://www.giantflyingsaucer.com/blog/?p=3598).
 
 * Here's a short code snippet for 
-  [creating a REST API with Bottle and MongoDB](http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/).
+  [creating a RESTful API with Bottle and MongoDB](http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/).
 
+* This [tutorial](http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/) 
+  is another Bottle walkthrough for creating a RESTful web API.
 
 ## Web Framework Resources
 * "[What is a web framework?](http://www.jeffknupp.com/blog/2014/03/03/what-is-a-web-framework/)"
@@ -177,3 +182,6 @@ included with Python.
 * This [roundup of 14 minimal Python frameworks](http://codecondo.com/14-minimal-web-frameworks-for-python/)
   contains both familiar and less known Python libraries.
 
+* The [web micro-framework battle](http://www.slideshare.net/r1chardj0n3s/web-microframework-battle/)
+  presentation goes over Bottle, Flask, and many other lesser known Python
+  web frameworks.
diff --git a/source/content/pages/22-web-analytics/2201-web-analytics.markdown b/source/content/pages/22-web-analytics/2201-web-analytics.markdown
@@ -32,24 +32,25 @@ application before taking some action, such as purchasing your service.
 
 
 ## Web Analytics Third Party Services
-[Google Analytics](http://www.google.com/analytics/) is a widely used
-free analytics tool for website traffic.
+* [Google Analytics](http://www.google.com/analytics/) is a widely used
+  free analytics tool for website traffic.
 
-[MixPanel](https://mixpanel.com/)'s analytics platform focuses on mobile
-and sales funnel metrics. A developer builds what data points need to be
-collected into the server side or client side code. MixPanel captures that
-data and provides metrics and visualizations based on the data.
+* [MixPanel](https://mixpanel.com/)'s analytics platform focuses on mobile
+  and sales funnel metrics. A developer builds what data points need to be
+  collected into the server side or client side code. MixPanel captures that
+  data and provides metrics and visualizations based on the data.
 
-[KISSmetrics](https://www.kissmetrics.com/)' analytics provides context
-for who is visiting a website and what actions they are taking while on
-the site.
+* [KISSmetrics](https://www.kissmetrics.com/)' analytics provides context
+  for who is visiting a website and what actions they are taking while on
+  the site.
 
-[Heap](https://heapanalytics.com/) is a recently founded analytics service
-with a free introductory tier to get started.
+* [Heap](https://heapanalytics.com/) is a recently founded analytics service
+  with a free introductory tier to get started.
+
+* [CrazyEgg](http://www.crazyegg.com/) is tool for understanding a
+  user's focus while using a website based on heatmaps generated from mouse 
+  movements. 
 
-[CrazyEgg](http://www.crazyegg.com/) is tool for understanding a
-user's focus while using a website based on heatmaps generated from mouse 
-movements. 
 
 ## Web Analytics Resources
 * [Google Analytics for Developers](http://blog.arkency.com/2012/12/google-analytics-for-developers/)  
@@ -69,3 +70,6 @@ movements.
   to get a better understanding of what's going on behind the scenes from
   a technical perspective.
 
+* [Heap vs MixPanel](http://substantial.com/blog/2014/04/03/heap-analytics-vs-mixpanel/)
+  compares the two analytics services.
+  
diff --git a/task-queues.html b/task-queues.html
@@ -105,7 +105,7 @@ <h2>Task queue projects</h2>
 <li>
 <p>The <a href="http://python-rq.org/">RQ (Redis Queue)</a> is a simple Python
   library for queueing jobs and processing them in the background with workers.
-  RQ is backed by Redis and it is designed to have a low barrier to entry.
+  RQ is backed by Redis and is designed to have a low barrier to entry.
   The <a href="http://nvie.com/posts/introducing-rq/">intro post</a> contains information
   on design decisions and how to use RQ.</p>
 </li>
@@ -132,7 +132,7 @@ <h2>Task queue resources</h2>
 </li>
 <li>
 <p><a href="https://www.digitalocean.com/community/articles/how-to-use-celery-with-rabbitmq-to-queue-tasks-on-an-ubuntu-vps">How to use Celery with RabbitMQ</a>
-  is a detail walkthrough for using these tools on an Ubuntu VPS.</p>
+  is a detailed walkthrough for using these tools on an Ubuntu VPS.</p>
 </li>
 <li>
 <p>Heroku has a clear walkthrough for using 
diff --git a/web-analytics.html b/web-analytics.html
@@ -83,7 +83,7 @@ <h1>Web analytics</h1>
 <p>It's easy to get overwhelmed at both the number of analytics services and
 the numerous types of data points collected. Focus on just a handful of
 metrics when you're just starting out. As your application scales and you 
-understand more about your users then add additional analytics services 
+understand more about your users add additional analytics services 
 to gain further insight into their behavior with advanced visualizations such
 as heatmaps and action funnels. The
 <a href="http://spenczar.com/posts/2013/Sep/07/seven-stages-analytics-grief/">seven stages of startup analytics grief</a> 
@@ -97,20 +97,32 @@ <h2>User funnels</h2>
 a funnel you can visualize drop-off points where visitors leave your 
 application before taking some action, such as purchasing your service.</p>
 <h2>Web Analytics Third Party Services</h2>
+<ul>
+<li>
 <p><a href="http://www.google.com/analytics/">Google Analytics</a> is a widely used
-free analytics tool for website traffic.</p>
+  free analytics tool for website traffic.</p>
+</li>
+<li>
 <p><a href="https://mixpanel.com/">MixPanel</a>'s analytics platform focuses on mobile
-and sales funnel metrics. A developer builds what data points need to be
-collected into the server side or client side code. MixPanel captures that
-data and provides metrics and visualizations based on the data.</p>
+  and sales funnel metrics. A developer builds what data points need to be
+  collected into the server side or client side code. MixPanel captures that
+  data and provides metrics and visualizations based on the data.</p>
+</li>
+<li>
 <p><a href="https://www.kissmetrics.com/">KISSmetrics</a>' analytics provides context
-for who is visiting a website and what actions they are taking while on
-the site.</p>
+  for who is visiting a website and what actions they are taking while on
+  the site.</p>
+</li>
+<li>
 <p><a href="https://heapanalytics.com/">Heap</a> is a recently founded analytics service
-with a free introductory tier to get started.</p>
+  with a free introductory tier to get started.</p>
+</li>
+<li>
 <p><a href="http://www.crazyegg.com/">CrazyEgg</a> is tool for understanding a
-user's focus while using a website based on heatmaps generated from mouse 
-movements. </p>
+  user's focus while using a website based on heatmaps generated from mouse 
+  movements. </p>
+</li>
+</ul>
 <h2>Web Analytics Resources</h2>
 <ul>
 <li>
@@ -135,6 +147,10 @@ <h2>Web Analytics Resources</h2>
   to get a better understanding of what's going on behind the scenes from
   a technical perspective.</p>
 </li>
+<li>
+<p><a href="http://substantial.com/blog/2014/04/03/heap-analytics-vs-mixpanel/">Heap vs MixPanel</a>
+  compares the two analytics services.</p>
+</li>
 </ul>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             <br/>
             Next read the 
diff --git a/web-application-security.html b/web-application-security.html
@@ -75,8 +75,8 @@
     <div class="col-md-8">
       <h1>Web Application Security</h1>
 <p>Website security must be thought about while building every level of the web 
-stack. However, this section is included for topics that deserve particular
-treatment, such as Cross-site scripting (XSS), SQL injection, Cross-site 
+stack. However, this section includes topics that deserve particular
+treatment, such as cross-site scripting (XSS), SQL injection, cross-site 
 request forgery and usage of public-private keypairs.</p>
 <h2>Security Resources</h2>
 <ul>
diff --git a/web-frameworks.html b/web-frameworks.html
@@ -224,6 +224,10 @@ <h2>Bottle</h2>
 <h3>Bottle resources</h3>
 <ul>
 <li>
+<p>The <a href="http://bottlepy.org/docs/dev/tutorial.html">official Bottle tutorial</a> 
+  provides a thorough view of basic concepts and features for the framework.</p>
+</li>
+<li>
 <p>Digital Ocean provides an extensive <a href="https://www.digitalocean.com/community/articles/how-to-use-the-bottle-micro-framework-to-develop-python-web-apps">introductory post on Bottle</a>.</p>
 </li>
 <li>
@@ -232,7 +236,11 @@ <h3>Bottle resources</h3>
 </li>
 <li>
 <p>Here's a short code snippet for 
-  <a href="http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/">creating a REST API with Bottle and MongoDB</a>.</p>
+  <a href="http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/">creating a RESTful API with Bottle and MongoDB</a>.</p>
+</li>
+<li>
+<p>This <a href="http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/">tutorial</a> 
+  is another Bottle walkthrough for creating a RESTful web API.</p>
 </li>
 </ul>
 <h2>Web Framework Resources</h2>
@@ -253,6 +261,11 @@ <h2>Web Framework Resources</h2>
 <p>This <a href="http://codecondo.com/14-minimal-web-frameworks-for-python/">roundup of 14 minimal Python frameworks</a>
   contains both familiar and less known Python libraries.</p>
 </li>
+<li>
+<p>The <a href="http://www.slideshare.net/r1chardj0n3s/web-microframework-battle/">web micro-framework battle</a>
+  presentation goes over Bottle, Flask, and many other lesser known Python
+  web frameworks.</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-31T18:29:17Z</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-04-03T16:11:48Z</updated></feed>`