diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index eb2e70e869..3af7db0f8a 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -43,7 +43,6 @@ use = egg:swift#proxy
 # If set to 'true' any authorized user may create and delete accounts; if
 # 'false' no one, even authorized, can.
 # allow_account_management = false
-# put_queue_depth = 10
 
 # Only needed for DevAuth
 [filter:auth]
diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index b87f585c96..0a0991c517 100644
--- a/swift/proxy/server.py
+++ b/swift/proxy/server.py
@@ -519,6 +519,10 @@ class Controller(object):
         Sends an HTTP request to multiple nodes and aggregates the results.
         It attempts the primary nodes concurrently, then iterates over the
         handoff nodes as needed.
+
+        :param headers: a list of dicts, where each dict represents one
+                        backend request that should be made.
+        :returns: a webob Response object
         """
         nodes = self.iter_nodes(part, ring.get_part_nodes(part), ring)
         pile = GreenPile(ring.replica_count)