diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index ee6ed798ad..91421ce3d2 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -340,17 +340,33 @@
 # value and unit. Value ``0`` signifies no quota enforcement. Negative values
 # are invalid and result in errors.
 #
+# This has no effect if ``use_keystone_limits`` is enabled.
+#
 # Possible values:
 #     * A string that is a valid concatenation of a non-negative integer
 #       representing the storage value and an optional string literal
 #       representing storage units as mentioned above.
 #
 # Related options:
-#     * None
+#     * use_keystone_limits
 #
 #  (string value)
 #user_storage_quota = 0
 
+#
+# Utilize per-tenant resource limits registered in Keystone.
+#
+# Enabling this feature will cause Glance to retrieve limits set in keystone
+# for resource consumption and enforce them against API users. Before turning
+# this on, the limits need to be registered in Keystone or all quotas will be
+# considered to be zero, and thus reject all new resource requests.
+#
+# These per-tenant resource limits are independent from the static
+# global ones configured in this config file. If this is enabled, the
+# relevant static global limits will be ignored.
+#  (boolean value)
+#use_keystone_limits = false
+
 #
 # Host address of the pydev server.
 #
@@ -1122,7 +1138,7 @@
 #use_eventlog = false
 
 # The amount of time before the log files are rotated. This option is ignored
-# unless log_rotation_type is setto "interval". (integer value)
+# unless log_rotation_type is set to "interval". (integer value)
 #log_rotate_interval = 1
 
 # Rotation interval type. The time of the last file change (or the time when the
@@ -1626,8 +1642,6 @@
 
 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0
 # indicates no limit. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
 #max_pool_size = 5
 
 # Maximum number of database connection retries during startup. Set to -1 to
@@ -4762,9 +4776,9 @@
 # client connection from the pool. (integer value)
 #memcache_pool_conn_get_timeout = 10
 
-# (Optional) Use the advanced (eventlet safe) memcached client pool. The
-# advanced pool will only work under python 2.x. (boolean value)
-#memcache_use_advanced_pool = false
+# (Optional) Use the advanced (eventlet safe) memcached client pool. (boolean
+# value)
+#memcache_use_advanced_pool = true
 
 # (Optional) Indicate whether to set the X-Service-Catalog header. If False,
 # middleware will not ask for service catalog on token validation and will not
diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
index b32124072e..7406087d87 100644
--- a/etc/glance-cache.conf
+++ b/etc/glance-cache.conf
@@ -282,17 +282,33 @@
 # value and unit. Value ``0`` signifies no quota enforcement. Negative values
 # are invalid and result in errors.
 #
+# This has no effect if ``use_keystone_limits`` is enabled.
+#
 # Possible values:
 #     * A string that is a valid concatenation of a non-negative integer
 #       representing the storage value and an optional string literal
 #       representing storage units as mentioned above.
 #
 # Related options:
-#     * None
+#     * use_keystone_limits
 #
 #  (string value)
 #user_storage_quota = 0
 
+#
+# Utilize per-tenant resource limits registered in Keystone.
+#
+# Enabling this feature will cause Glance to retrieve limits set in keystone
+# for resource consumption and enforce them against API users. Before turning
+# this on, the limits need to be registered in Keystone or all quotas will be
+# considered to be zero, and thus reject all new resource requests.
+#
+# These per-tenant resource limits are independent from the static
+# global ones configured in this config file. If this is enabled, the
+# relevant static global limits will be ignored.
+#  (boolean value)
+#use_keystone_limits = false
+
 #
 # Host address of the pydev server.
 #
@@ -668,7 +684,7 @@
 #use_eventlog = false
 
 # The amount of time before the log files are rotated. This option is ignored
-# unless log_rotation_type is setto "interval". (integer value)
+# unless log_rotation_type is set to "interval". (integer value)
 #log_rotate_interval = 1
 
 # Rotation interval type. The time of the last file change (or the time when the
diff --git a/etc/glance-manage.conf b/etc/glance-manage.conf
index 985fe95812..50eefcfc71 100644
--- a/etc/glance-manage.conf
+++ b/etc/glance-manage.conf
@@ -69,7 +69,7 @@
 #use_eventlog = false
 
 # The amount of time before the log files are rotated. This option is ignored
-# unless log_rotation_type is setto "interval". (integer value)
+# unless log_rotation_type is set to "interval". (integer value)
 #log_rotate_interval = 1
 
 # Rotation interval type. The time of the last file change (or the time when the
@@ -194,8 +194,6 @@
 
 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0
 # indicates no limit. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
 #max_pool_size = 5
 
 # Maximum number of database connection retries during startup. Set to -1 to
diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf
index d460c8367a..c2676181b1 100644
--- a/etc/glance-scrubber.conf
+++ b/etc/glance-scrubber.conf
@@ -282,17 +282,33 @@
 # value and unit. Value ``0`` signifies no quota enforcement. Negative values
 # are invalid and result in errors.
 #
+# This has no effect if ``use_keystone_limits`` is enabled.
+#
 # Possible values:
 #     * A string that is a valid concatenation of a non-negative integer
 #       representing the storage value and an optional string literal
 #       representing storage units as mentioned above.
 #
 # Related options:
-#     * None
+#     * use_keystone_limits
 #
 #  (string value)
 #user_storage_quota = 0
 
+#
+# Utilize per-tenant resource limits registered in Keystone.
+#
+# Enabling this feature will cause Glance to retrieve limits set in keystone
+# for resource consumption and enforce them against API users. Before turning
+# this on, the limits need to be registered in Keystone or all quotas will be
+# considered to be zero, and thus reject all new resource requests.
+#
+# These per-tenant resource limits are independent from the static
+# global ones configured in this config file. If this is enabled, the
+# relevant static global limits will be ignored.
+#  (boolean value)
+#use_keystone_limits = false
+
 #
 # Host address of the pydev server.
 #
@@ -663,7 +679,7 @@
 #use_eventlog = false
 
 # The amount of time before the log files are rotated. This option is ignored
-# unless log_rotation_type is setto "interval". (integer value)
+# unless log_rotation_type is set to "interval". (integer value)
 #log_rotate_interval = 1
 
 # Rotation interval type. The time of the last file change (or the time when the
@@ -788,8 +804,6 @@
 
 # Maximum number of SQL connections to keep open in a pool. Setting a value of 0
 # indicates no limit. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
 #max_pool_size = 5
 
 # Maximum number of database connection retries during startup. Set to -1 to