incorporating pull request and adding conf mgmt section

mattmakai · mattmakai · commit efe3e5aab970 · 2014-01-14T15:51:07.000-08: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-01-14T15:48:05Z</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-01-14T15:50:48Z</updated></feed>
diff --git a/pages/web-server.html b/pages/web-server.html
@@ -58,7 +58,7 @@ <h1>Web Server</h1>
 <p>In a simple case, the client will request a static asset such as a picture
 or JavaScript file. The file sits on the file system in a location the
 web server is authorized to access and the web server sends the file
-to the clinet with a 200 status code. If the client already requested the
+to the client with a 200 status code. If the client already requested the
 file and the file has not changed, the web server will pass back a 304
 &quot;Not modified&quot; response indicating the client already has the latest version
 of that file.</p>
diff --git a/source/content/pages/web-server.rst b/source/content/pages/web-server.rst
@@ -16,7 +16,7 @@ status code a content response as well.
 In a simple case, the client will request a static asset such as a picture
 or JavaScript file. The file sits on the file system in a location the
 web server is authorized to access and the web server sends the file
-to the clinet with a 200 status code. If the client already requested the
+to the client with a 200 status code. If the client already requested the
 file and the file has not changed, the web server will pass back a 304 
 "Not modified" response indicating the client already has the latest version
 of that file.

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-01-14T15:48:05Z</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-01-14T15:50:48Z</updated></feed>`