diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index f5871e0290..e2401ee9ed 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -54,8 +54,10 @@ trove_volume_support = True
 block_device_mapping = vdb
 device_path = /dev/vdb
 mount_point = /var/lib/mysql
+# Maximum volume size for an instance
 max_accepted_volume_size = 10
 max_instances_per_user = 5
+# Maximum volume capacity (in GB) spanning across all trove volumes per tenant
 max_volumes_per_user = 100
 max_backups_per_user = 5
 volume_time_out=30
diff --git a/trove/common/cfg.py b/trove/common/cfg.py
index e0d2a60959..394bb21ef6 100644
--- a/trove/common/cfg.py
+++ b/trove/common/cfg.py
@@ -99,7 +99,8 @@ common_opts = [
     cfg.IntOpt('max_accepted_volume_size', default=5,
                help='Default maximum volume size for an instance.'),
     cfg.IntOpt('max_volumes_per_user', default=20,
-               help='Default maximum for total volume used by a tenant.'),
+               help='Default maximum volume capacity (in GB) spanning across '
+                    'all trove volumes per tenant'),
     cfg.IntOpt('max_backups_per_user', default=50,
                help='Default maximum number of backups created by a tenant.'),
     cfg.StrOpt('quota_driver',