-{section: How to upgrade Condor gracefully}
+{section: How to upgrade HTCondor gracefully}
 
-Known to work with Condor version: 7.0
+Known to work with HTCondor version: 7.0
 
-There are 2 approaches to upgrading to a newer version of Condor:
+There are 2 approaches to upgrading to a newer version of HTCondor:
 
-1:  One way to gracefully upgrade is to shut down the pool, install the new version of Condor, and then start it back up.  To do that,
-see {wiki: HowToShutDownCondor How to shut down Condor without killing jobs}.  However, before you do that, consider the consequence of waiting for jobs to finish.  On multi-core machines, if all cores but one are idle, because you are waiting for a job to finish, this may be worse than killing everything and quickly restarting.
+1:  One way to gracefully upgrade is to shut down the pool, install the new version of HTCondor, and then start it back up.  To do that,
+see {wiki: HowToShutDownCondor How to shut down HTCondor without killing jobs}.  However, before you do that, consider the consequence of waiting for jobs to finish.  On multi-core machines, if all cores but one are idle, because you are waiting for a job to finish, this may be worse than killing everything and quickly restarting.
 
-2:  Another way to upgrade leaves Condor running.  Condor will automatically restart itself if the condor_master binary is updated.  To take advantage of this, configure Condor so that the path to binaries (for example, =MASTER=) points to the new binaries.  One way to do that (under Unix) is to use a symbolic link that points to the current Condor installation directory (e.g. /opt/condor).  Once the new files are in place, change the symbolic link to point to the new directory.  If Condor is configured to locate its binaries via the symbolic link, then after the symbolic link changes, the condor_master daemon will notice the new binaries and restart itself.  How frequently it checks is controlled by the configuration variable =MASTER_CHECK_NEW_EXEC_INTERVAL=, which defaults 5 minutes.
+2:  Another way to upgrade leaves HTCondor running.  HTCondor will automatically restart itself if the condor_master binary is updated.  To take advantage of this, configure HTCondor so that the path to binaries (for example, =MASTER=) points to the new binaries.  One way to do that (under Unix) is to use a symbolic link that points to the current HTCondor installation directory (e.g. /opt/condor).  Once the new files are in place, change the symbolic link to point to the new directory.  If HTCondor is configured to locate its binaries via the symbolic link, then after the symbolic link changes, the condor_master daemon will notice the new binaries and restart itself.  How frequently it checks is controlled by the configuration variable =MASTER_CHECK_NEW_EXEC_INTERVAL=, which defaults 5 minutes.
 
 _: When the condor_master notices new binaries, it begins a graceful restart, which may not be exactly what you want.  On an execute machine, a graceful restart means that running jobs are preempted.  Standard universe jobs will attempt to checkpoint, which could be a problem if all machines in a large pool attempt to do this at the same time.  If they do not complete within the cutoff time specified by the =KILL= policy expression (default 10 minutes), then they are killed without producing a checkpoint.  You may therefore want to increase this cutoff time, and you may also want to upgrade the pool in stages rather than all at once.
 
@@ -15,9 +15,9 @@
 
 _:Another time limit to be aware of is the configuration variable =SHUTDOWN_GRACEFUL_TIMEOUT=.  This defaults to 30 minutes.  If the graceful restart is not completed within this time, a fast restart ensues.  This causes jobs to be hard-killed.
 
-{subsection: How to check what version of Condor is running on all machines in a pool}
+{subsection: How to check what version of HTCondor is running on all machines in a pool}
 
-On Unix platforms, the following is a handy way to summarize the Condor versions that exist in the pool:
+On Unix platforms, the following is a handy way to summarize the HTCondor versions that exist in the pool:
 
 {code}
 condor_status -master -format "%s\n" CondorVersion | sort | uniq -c