adding caddy and nginx links to web servers page

mattmakai · mattmakai · commit 6c5664cb963a · 2016-03-13T17:38:20.000-07:00
diff --git a/all.html b/all.html
@@ -5814,13 +5814,16 @@ <h2>Web server implementations</h2>
 and configurations.</p>
 <ul>
 <li>
-<p><a href="https://httpd.apache.org/">Apache HTTP Server</a></p>
+<p>The <a href="/apache-http-server.html">Apache HTTP Server</a> has been the most 
+  commonly deployed web server on the Internet for 20+ years.</p>
 </li>
 <li>
-<p><a href="http://nginx.org/en/">Nginx</a></p>
+<p><a href="/nginx.html">Nginx</a> is the second most commonly used server for the
+  top 100,000 websites and often serves as a reverse proxy for 
+  <a href="/wsgi-servers.html">Python WSGI servers</a>.</p>
 </li>
 <li>
-<p><a href="https://caddyserver.com/">Caddy</a> is a newcomer to the web server scene
+<p><a href="/caddy.html">Caddy</a> is a newcomer to the web server scene
   and is focused on serving the HTTP/2 protocol with HTTPS. </p>
 </li>
 </ul>
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>2016-03-13T09:25:23Z</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>2016-03-13T17:37:40Z</updated></feed>
diff --git a/source/content/pages/07-web-app-deployment/06-web-servers.markdown b/source/content/pages/07-web-app-deployment/06-web-servers.markdown
@@ -34,13 +34,17 @@ The conceptual web server idea can be implemented in various ways. The
 following web server implementations each have varying features, extensions
 and configurations.
 
-* [Apache HTTP Server](https://httpd.apache.org/)
+* The [Apache HTTP Server](/apache-http-server.html) has been the most 
+  commonly deployed web server on the Internet for 20+ years.
 
-* [Nginx](http://nginx.org/en/)
+* [Nginx](/nginx.html) is the second most commonly used server for the
+  top 100,000 websites and often serves as a reverse proxy for 
+  [Python WSGI servers](/wsgi-servers.html).
 
-* [Caddy](https://caddyserver.com/) is a newcomer to the web server scene
+* [Caddy](/caddy.html) is a newcomer to the web server scene
   and is focused on serving the HTTP/2 protocol with HTTPS. 
 
+
 ## Client requests
 A client that sends a request to a web server is usually a browser such 
 as Internet Explorer, Firefox, or Chrome, but it can also be a
diff --git a/web-servers.html b/web-servers.html
@@ -54,13 +54,16 @@ <h2>Web server implementations</h2>
 and configurations.</p>
 <ul>
 <li>
-<p><a href="https://httpd.apache.org/">Apache HTTP Server</a></p>
+<p>The <a href="/apache-http-server.html">Apache HTTP Server</a> has been the most 
+  commonly deployed web server on the Internet for 20+ years.</p>
 </li>
 <li>
-<p><a href="http://nginx.org/en/">Nginx</a></p>
+<p><a href="/nginx.html">Nginx</a> is the second most commonly used server for the
+  top 100,000 websites and often serves as a reverse proxy for 
+  <a href="/wsgi-servers.html">Python WSGI servers</a>.</p>
 </li>
 <li>
-<p><a href="https://caddyserver.com/">Caddy</a> is a newcomer to the web server scene
+<p><a href="/caddy.html">Caddy</a> is a newcomer to the web server scene
   and is focused on serving the HTTP/2 protocol with HTTPS. </p>
 </li>
 </ul>

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>2016-03-13T09:25:23Z</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>2016-03-13T17:37:40Z</updated></feed>`