# HG changeset patch
# User hodgestar
# Date 1287410667 0
# Node ID 0a59d3e71870bdd02036227939266e932f099aef
# Parent  467e993df52dd71cb9eb64b5f2a7e27127fe452b
0.6dev: Merged [948] from trunk.

diff --git a/bitten/slave.py b/bitten/slave.py
--- a/bitten/slave.py
+++ b/bitten/slave.py
@@ -84,7 +84,8 @@
     Normal key/value items are treated as regular parameters, but key/tuple
     items are treated as files, where a value tuple is a (filename, data) tuple.
 
-    For example:
+    For example::
+
         fields = {
             'foo': 'bar',
             'foofile': ('foofile.txt', 'contents of foofile'),
@@ -208,7 +209,7 @@
         :param poll_interval: the time in seconds to wait between requesting
                               builds from the build master (default is five
                               minutes)
-        :param keep_alive_interval: the time in seconds to wait between sending
+        :param keepalive_interval: the time in seconds to wait between sending
                                     keepalive heartbeats (default is 30 seconds)
         :param username: the username to use when authentication against the
                          build master is requested