diff --git a/etc/account-server.conf-sample b/etc/account-server.conf-sample
index 08a9fe4066..2e773220ab 100644
--- a/etc/account-server.conf-sample
+++ b/etc/account-server.conf-sample
@@ -26,6 +26,7 @@ use = egg:swift#account
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_requests = True
+# auto_create_account_prefix = .
 
 [account-replicator]
 # You can override the default log routing for this app here (don't use set!):
@@ -33,8 +34,6 @@ use = egg:swift#account
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # vm_test_mode = no
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 # per_diff = 1000
 # max_diffs = 100
 # concurrency = 8
@@ -47,7 +46,9 @@ use = egg:swift#account
 # node_timeout = 10
 # conn_timeout = 0.5
 # The replicator also performs reclamation
-# reclaim_age = 86400
+# reclaim_age = 604800
+# Time in seconds to wait between replication passes
+# run_pause = 30
 
 [account-auditor]
 # You can override the default log routing for this app here (don't use set!):
@@ -56,8 +57,6 @@ use = egg:swift#account
 # log_level = INFO
 # Will audit, at most, 1 account per device per interval
 # interval = 1800
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 
 [account-reaper]
 # You can override the default log routing for this app here (don't use set!):
@@ -68,8 +67,6 @@ use = egg:swift#account
 # interval = 3600
 # node_timeout = 10
 # conn_timeout = 0.5
-# log_facility = LOG_LOCAL0
-# log_level = INFO
 # Normally, the reaper begins deleting account information for deleted accounts
 # immediately; you can set this to delay its work however. The value is in
 # seconds; 2592000 = 30 days for example.
diff --git a/etc/container-server.conf-sample b/etc/container-server.conf-sample
index f9f85950cf..452950f7d6 100644
--- a/etc/container-server.conf-sample
+++ b/etc/container-server.conf-sample
@@ -32,6 +32,7 @@ use = egg:swift#container
 # node_timeout = 3
 # conn_timeout = 0.5
 # allow_versions = False
+# auto_create_account_prefix = .
 
 [container-replicator]
 # You can override the default log routing for this app here (don't use set!):
@@ -47,6 +48,9 @@ use = egg:swift#container
 # conn_timeout = 0.5
 # The replicator also performs reclamation
 # reclaim_age = 604800
+# Time in seconds to wait between replication passes
+# run_pause = 30
+
 
 [container-updater]
 # You can override the default log routing for this app here (don't use set!):
diff --git a/etc/object-expirer.conf-sample b/etc/object-expirer.conf-sample
index a94242957c..17be2d41ef 100644
--- a/etc/object-expirer.conf-sample
+++ b/etc/object-expirer.conf-sample
@@ -8,6 +8,8 @@
 
 [object-expirer]
 # interval = 300
+# auto_create_account_prefix = .
+# report_interval = 300
 
 [pipeline:main]
 pipeline = catch_errors cache proxy-server
diff --git a/etc/object-server.conf-sample b/etc/object-server.conf-sample
index 89f1b66c20..a18c88dc68 100644
--- a/etc/object-server.conf-sample
+++ b/etc/object-server.conf-sample
@@ -28,13 +28,14 @@ use = egg:swift#object
 # network_chunk_size = 65536
 # disk_chunk_size = 65536
 # max_upload_time = 86400
-# slow = 1
+# slow = 0
 # on PUTs, sync data every n MB
 # mb_per_sync = 512
 # Comma separated list of headers that can be set in metadata on an object.
 # This list is in addition to X-Object-Meta-* headers and cannot include
 # Content-Type, etag, Content-Length, or deleted
 # allowed_headers = Content-Disposition, Content-Encoding, X-Delete-At, X-Object-Manifest
+# auto_create_account_prefix = .
 
 [filter:recon]
 use = egg:swift#recon
@@ -63,6 +64,7 @@ recon_cache_path = /var/cache/swift
 # enable logging of replication stats for recon
 # recon_enable = no
 # recon_cache_path = /var/cache/swift
+# ring_check_interval = 15
 
 [object-updater]
 # You can override the default log routing for this app here (don't use set!):
diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index f5e793a43c..ee671603d7 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -60,6 +60,10 @@ use = egg:swift#proxy
 # max_containers_whitelist =
 # comma separated list of Host headers the proxy will be deny requests to
 # deny_host_headers =
+# prefix used when automatically creating accounts
+# auto_create_account_prefix = .
+# depth of the proxy put queue
+# put_queue_depth = 10
 
 [filter:tempauth]
 use = egg:swift#tempauth