Index: bitten/templates/bitten_admin_master.html
===================================================================
--- bitten/templates/bitten_admin_master.html	(revision 1002)
+++ bitten/templates/bitten_admin_master.html	(working copy)
@@ -72,9 +72,8 @@
           </label>
         </div>
         <p class="hint">
-          The timeout in seconds after which a build started by a slave
-          is considered aborted, in case there has been no activity from
-          that slave in that time.
+          Inactivity period in seconds after which a build started by a slave
+          is considered aborted. Aborted builds are rescheduled automatically.
         </p>
         <div class="field">
           <label>
Index: bitten/slave.py
===================================================================
--- bitten/slave.py	(revision 1002)
+++ bitten/slave.py	(working copy)
@@ -227,6 +227,7 @@
         if self.local:
             self.urls = urls
         else:
+            # adding /builds suffix if it's missing
             self.urls = [
                 not url.endswith('/builds') and url.rstrip('/') + '/builds'
                 or url for url in urls]