cleaning up servers learning checklist

mattmakai · mattmakai · commit 596084312389 · 2014-05-30T09:30:40.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-05-30T09:20:58Z</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-05-30T09:30:32Z</updated></feed>
diff --git a/servers.html b/servers.html
@@ -50,20 +50,6 @@ <h2>Why are servers necessary?</h2>
 actual users (as opposed to test users) are known as <em>production</em> servers.
 Production servers hold real data (again as opposed to test data) and must be 
 secure against unauthorized access.</p>
-<h2>Servers learning checklist</h2>
-<p><i class="fa fa-check-square-o"></i>
-Understand the difference between bare metal servers, virtual private servers
-(VPS) and infrastructure-as-a-service. </p>
-<p><i class="fa fa-check-square-o"></i>
-Sign up for a hosting provider. I recommend getting a 
-<a href="https://www.linode.com/?r=bfeecaf55a83cd3dd224a5f2a3a001fdf95d4c3d">Linode VPS</a> 
-to set up your initial infrastructure and deploy your web application there.
-<a href="https://www.digitalocean.com/">Digital Ocean</a> and 
-<a href="http://prgmr.com/xen/">prgrmr</a> are other VPS options. You can change
-hosting providers later after learning how to deploy web apps.</p>
-<p><i class="fa fa-check-square-o"></i>
-Provision your first server and move on to the 
-<a href="/operating-systems.html">operating systems section</a>.</p>
 <h2>"Bare metal" servers</h2>
 <p>The term <em>bare metal</em> refers to purchasing the actual hardware and hooking 
 it up to the Internet either through a business-class internet service 
@@ -167,12 +153,14 @@ <h3>Infrastructure-as-a-service resources</h3>
 </ul>
 <h2>Servers learning checklist</h2>
 <p><i class="fa fa-check-square-o"></i>
-Sign up for a 
-<a href="https://www.linode.com/?r=bfeecaf55a83cd3dd224a5f2a3a001fdf95d4c3d">Linode</a> 
-or
-<a href="https://www.digitalocean.com/">Digital Ocean</a> account.</p>
+Sign up for a hosting provider. I recommend getting a 
+<a href="https://www.linode.com/?r=bfeecaf55a83cd3dd224a5f2a3a001fdf95d4c3d">Linode VPS</a> 
+to set up your initial infrastructure and deploy your web application there.
+<a href="https://www.digitalocean.com/">Digital Ocean</a> and 
+<a href="http://prgmr.com/xen/">prgrmr</a> are other VPS options. You can change
+hosting providers later after the deployment process is automated.</p>
 <p><i class="fa fa-check-square-o"></i>
-Rent a VPS for a month. It will be provisioned and in a shutdown state 
+Provision your first server. It will be ready but in a shutdown state while
 awaiting your instructions.</p>
 <p><i class="fa fa-check-square-o"></i>
 Move to the <a href="/operating-systems.html">operating systems</a> section to learn 
diff --git a/source/content/pages/03-deployment/0303-servers.markdown b/source/content/pages/03-deployment/0303-servers.markdown
@@ -31,24 +31,6 @@ Production servers hold real data (again as opposed to test data) and must be
 secure against unauthorized access.
 
 
-## Servers learning checklist
-<i class="fa fa-check-square-o"></i>
-Understand the difference between bare metal servers, virtual private servers
-(VPS) and infrastructure-as-a-service. 
-
-<i class="fa fa-check-square-o"></i>
-Sign up for a hosting provider. I recommend getting a 
-[Linode VPS](https://www.linode.com/?r=bfeecaf55a83cd3dd224a5f2a3a001fdf95d4c3d) 
-to set up your initial infrastructure and deploy your web application there.
-[Digital Ocean](https://www.digitalocean.com/) and 
-[prgrmr](http://prgmr.com/xen/) are other VPS options. You can change
-hosting providers later after learning how to deploy web apps.
-
-<i class="fa fa-check-square-o"></i>
-Provision your first server and move on to the 
-[operating systems section](/operating-systems.html).
-
-
 ## "Bare metal" servers
 The term *bare metal* refers to purchasing the actual hardware and hooking 
 it up to the Internet either through a business-class internet service 
@@ -154,18 +136,21 @@ Python library for working with Amazon Web Services.
 
 ## Servers learning checklist
 <i class="fa fa-check-square-o"></i>
-Sign up for a 
-[Linode](https://www.linode.com/?r=bfeecaf55a83cd3dd224a5f2a3a001fdf95d4c3d) 
-or
-[Digital Ocean](https://www.digitalocean.com/) account.
+Sign up for a hosting provider. I recommend getting a 
+[Linode VPS](https://www.linode.com/?r=bfeecaf55a83cd3dd224a5f2a3a001fdf95d4c3d) 
+to set up your initial infrastructure and deploy your web application there.
+[Digital Ocean](https://www.digitalocean.com/) and 
+[prgrmr](http://prgmr.com/xen/) are other VPS options. You can change
+hosting providers later after the deployment process is automated.
 
 <i class="fa fa-check-square-o"></i>
-Rent a VPS for a month. It will be provisioned and in a shutdown state 
+Provision your first server. It will be ready but in a shutdown state while
 awaiting your instructions.
 
 <i class="fa fa-check-square-o"></i>
 Move to the [operating systems](/operating-systems.html) section to learn 
 how to load Ubuntu 12.04 LTS as a base OS for Python web applications.
 
 
+
 ### Keep going with setting up a server or try a PaaS?

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-05-30T09:20:58Z</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-05-30T09:30:32Z</updated></feed>`