-This guide assumes that you already have an AWS account, as well as a log-in account on a Linux machine with an administrator who's willing to open a port for you.
+This guide assumes that you already have an AWS account, as well as a log-in account on a Linux machine with a system administrator who's willing to open a port for you.  All the terminal commands (shown on a grey background) and file edits (shown on a green background) take place on the Linux machine.  You can perform the web-based steps from wherever is convenient, although it will save you some copying if you can run a browser on the Linux machine.
 
 Before using =condor_annex= for the first time, you'll have to do three things:
 
@@ -10,17 +10,105 @@
 
 {section: Install a personal Condor}
 
-We recommend that you install a personal condor to make use of =condor_annex=; it's simpler to configure that way.  Get started by following the instructions for CreatingPersonalHtcondor; be sure to download one of the (binary) tarballs for version 8.7.0.  (Later versions will probably have different instructions.)
+We recommend that you install a personal condor to make use of =condor_annex=; it's simpler to configure that way.
 
-For the rest of these instructions, where you see =LOCAL_DIR=, replace it with the LOCAL_DIR defined by the installation instructions above; the value used in the examples was =/scratch/local/condor84=.  Likewise, where you see =RELEASE_DIR=, replace it with the RELEASE_DIR defined by the installation instructions above; the value used in the examples was =/scratch/condor84=.
+These instructions assume that it's OK to create a directory named 'condor-8.7.0' in your home directory; adjust accordingly if you want to install HTCondor somewhere else.
+
+Start by {link: https://research.cs.wisc.edu/htcondor/downloads/ downloading} the 8.7.0 release from the "tarballs" section that matches your Linux version (and copying it to your Linux machine, if necessary).  These instructions assume that the file you downloaded is located in your home directory.  (If you don't know your Linux version, ask your system administrator.)
+
+Then do the following:
+
+{term}
+$ mkdir ~/condor-8.7.0; cd ~/condor-8.7.0; mkdir local
+$ tar -z -x -f condor-8.7.0-*-stripped.tar.gz
+$ ./condor-8.7.0-UW_development-sl6.3-stripped/condor_install --local-dir `pwd`/local --make-personal-condor
+$ . ./condor.sh
+$ condor_master
+{endterm}
+
+{subsection: Testing}
+
+Give HTCondor a few seconds to spin up and the try a few commands to make sure the basic are working:
+
+{term}
+$ condor_q
+-- Schedd: submit-3.batlab.org : <128.104.100.22:12258?... @ 02/03/17 13:52:56
+OWNER BATCH_NAME      SUBMITTED   DONE   RUN    IDLE   HOLD  TOTAL JOB_IDS
+
+0 jobs; 0 completed, 0 removed, 0 idle, 0 running, 0 held, 0 suspended
+$ condor_status -any
+MyType             TargetType         Name
+
+Negotiator         None               NEGOTIATOR
+Collector          None               Personal Condor at 127.0.0.1@submit-3.bat
+Machine            Job                slot1@submit-3.batlab.org
+Machine            Job                slot2@submit-3.batlab.org
+Machine            Job                slot3@submit-3.batlab.org
+Machine            Job                slot4@submit-3.batlab.org
+Machine            Job                slot5@submit-3.batlab.org
+Machine            Job                slot6@submit-3.batlab.org
+Machine            Job                slot7@submit-3.batlab.org
+Machine            Job                slot8@submit-3.batlab.org
+Scheduler          None               submit-3.batlab.org
+DaemonMaster       None               submit-3.batlab.org
+Accounting         none               <none>
+{endterm}
+
+You should also try to submit a job; create the following file
+
+{file: ~/condor-annex/sleep.submit}
+executable = /bin/sleep
+arguments = 60
+queue
+{endfile}
+
+and submit it:
+
+{term}
+$ condor_submit ~/condor-annex/sleep.submit
+Submitting job(s).
+1 job(s) submitted to cluster 1.
+$ condor_reschedule
+{endterm}
+
+After a little while:
+
+{term}
+$ condor_q
+
+
+-- Schedd: submit-3.batlab.org : <127.0.0.1:12815?... @ 02/03/17 13:57:35
+OWNER    BATCH_NAME         SUBMITTED   DONE   RUN    IDLE  TOTAL JOB_IDS
+tlmiller CMD: /bin/sleep   2/3  13:56      _      1      _      1 3.0
+
+1 jobs; 0 completed, 0 removed, 0 idle, 1 running, 0 held, 0 suspended
+{endterm}
+
+{subsection: Configure public interface}
+
+The default personal Condor uses the loop-back interface, which basically just means it won't talk to anyone other than itself.  For =condor_annex= to work, your personal condor needs to use the Linux machine's public interface.  In most cases, that's as simple as adding the following lines to =~/condor-8.7.0/local/condor_config.local=.
+
+{file: ~/condor-8.7.0/local/condor_config.local}
+NETWORK_INTERFACE = *
+CONDOR_HOST = $(FULL_HOSTNAME)
+{endfile}
+
+Restart HTCondor to force the changes to take effect:
+
+{term}
+$ condor_restart
+Sent "Restart" command to local master
+{endterm}
+
+Repeat the steps under "Testing" to make sure that this configuration works for you, and then proceed onto the next section.
 
 {subsection: Configure a pool password}
 
 In this section, you'll configure your personal Condor to use a pool password.  This is a simple but effective method of securing Condor's communications to AWS.
 
-Add the following lines to =LOCAL_DIR/condor_config.local=.
+Add the following lines to =~/condor-8.7.0/local/condor_config.local=.
 
-{file: LOCAL_DIR/condor_config.local}
+{file: ~/condor-8.7.0/local/condor_config.local}
 SEC_PASSWORD_FILE = $(LOCAL_DIR)/condor_pool_password
 SEC_DAEMON_INTEGRITY = REQUIRED
 SEC_DAEMON_AUTHENTICATION = REQUIRED
@@ -47,9 +135,9 @@
 
 {subsection: Tell HTCondor about the open port}
 
-By default, HTCondor will use port 9618.  If the Linux machine doesn't already have HTCondor installed, and the admin is willing to open that port, then you don't have to do anything.  Otherwise, you'll need to add a line like the following to =LOCAL_DIR/condor_config.local=, replacing '9618' with whatever port the administrator opened for you.
+By default, HTCondor will use port 9618.  If the Linux machine doesn't already have HTCondor installed, and the admin is willing to open that port, then you don't have to do anything.  Otherwise, you'll need to add a line like the following to =~/condor-8.7.0/local/condor_config.local=, replacing '9618' with whatever port the administrator opened for you.
 
-{file: LOCAL_DIR/condor_config.local}
+{file: ~/condor-8.7.0/local/condor_config.local}
 COLLECTOR_HOST = $(FULL_HOSTNAME):9618
 {endfile}