HTCondorWiki: Creating Condor Pools At Amazon

 
 The general approach will be to use the Marketplace entry to start a _head node_, which will be the brains of the new HTCondor pool, as well as be where you'll log in to and submit jobs from.  Once the head node is up and running, you'll use =condor_annex= to add cloud resources to your new pool.  Then you can start running jobs, and when they're done, shut everything down.
 
-0: Log into AWS
-1: Start a Head Node
+1: Launch HTCondor in the Cloud
 1:: Create a Key Pair
 1:: Start a Head Node
 2: Add Cloud Resources to Your New Pool
@@ -22,13 +21,13 @@
 4:: The Cloud Resources
 4:: The Head Node
 
-{section: 0 Log into AWS}
+{section: Log into AWS}
 
 The first step is to log in to {link: https://console.aws.amazon.com/ec2/home?#KeyPairs:sort=keyName AWS}.
 
-{section: 1 Start a Head Node}
+{section: 1 Launch HTCondor in the Cloud}
 
-Every head node needs an address and, for security, a key.  AWS will automatically provide the address, but you need to do a little work to specify the key.  For technical reasons, AWS refers to these as key pairs.  If you already have one (if, for instance, you're following these instructions a second time), you can skip to section 1.2, but creating another key pair won't cause problems.
+In this section, you'll launch HTCondor in the Cloud by starting a head node.  A head node needs an address and, for security, a lock.  AWS will automatically provide the address, but you need to do a little work to make sure the lock is one for which you have a key.  For technical reasons, AWS refers to these lock/key pairs as just "key pairs".  If you already have one (if, for instance, you're following these instructions a second time), you can skip to section 1.2, but creating another key pair won't cause problems.
 
 {subsection: 1.1 Create a Key Pair}
 
@@ -37,7 +36,7 @@
 1: Enter a name; "HTCondorKeyPair" would be fine.  Click the blue "Create" button.
 1: Your browser will probably bring up a dialog box asking you what to do with "HTCondorKeyPair.pem".  (It may just start saving it for you.)  Save it some place you won't accidentally delete it and make a note of the location.
 
-When you later connect to your head node, you'll need to know the location so you can specify the file.
+When you later connect to your head node, you'll need to know the location of "HTCondorKeyPair.pem" so you can specify that file.
 
 {subsection: 1.2 Start a Head Node}
 
@@ -55,7 +54,7 @@
 
 1: Find the HTCondor entry and click the 'View Instances' button.
 1: There should only be one instance; click on the "Manage in AWS Console" link.  This will bring up the EC2 console with your head node selected.
-1: Right-click on the selected instance and select 'Connect'.  Follow the instructions, except replace =root@= with =ec2-user@=.
+1: Right-click on the selected instance and select 'Connect'.  Follow the instructions.
 
 {subsection: 2.2 Obtain an Access Key}