diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index d735cf27d9..1465156b20 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -13,7 +13,7 @@ default_store = file
 
 # List of which store classes and store class locations are
 # currently known to glance at startup.
-# known_stores = glance.store.filesystem.Store,
+#known_stores = glance.store.filesystem.Store,
 #               glance.store.http.Store,
 #               glance.store.rbd.Store,
 #               glance.store.s3.Store,
@@ -41,7 +41,7 @@ backlog = 4096
 
 # TCP_KEEPIDLE value in seconds when creating socket.
 # Not supported on OS X.
-# tcp_keepidle = 600
+#tcp_keepidle = 600
 
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
@@ -72,10 +72,10 @@ workers = 0
 #allow_anonymous_access = False
 
 # Allow access to version 1 of glance api
-# enable_v1_api = True
+#enable_v1_api = True
 
 # Allow access to version 2 of glance api
-# enable_v2_api = True
+#enable_v2_api = True
 
 # ================= Syslog Options ============================
 
@@ -84,25 +84,25 @@ workers = 0
 use_syslog = False
 
 # Facility to use. If unset defaults to LOG_USER.
-# syslog_log_facility = LOG_LOCAL0
+#syslog_log_facility = LOG_LOCAL0
 
 # ================= SSL Options ===============================
 
 # Certificate file to use when starting API server securely
-# cert_file = /path/to/certfile
+#cert_file = /path/to/certfile
 
 # Private key file to use when starting API server securely
-# key_file = /path/to/keyfile
+#key_file = /path/to/keyfile
 
 # CA certificate file to use to verify connecting clients
-# ca_file = /path/to/cafile
+#ca_file = /path/to/cafile
 
 # ================= Security Options ==========================
 
 # AES key for encrypting store 'location' metadata, including
 # -- if used -- Swift or S3 credentials
 # Should be set to a random string of length 16, 24 or 32 bytes
-# metadata_encryption_key = <16, 24 or 32 char registry metadata key>
+#metadata_encryption_key = <16, 24 or 32 char registry metadata key>
 
 # ============ Registry Options ===============================
 
@@ -119,17 +119,17 @@ registry_client_protocol = http
 # The path to the key file to use in SSL connections to the
 # registry server, if any. Alternately, you may set the
 # GLANCE_CLIENT_KEY_FILE environ variable to a filepath of the key file
-# registry_client_key_file = /path/to/key/file
+#registry_client_key_file = /path/to/key/file
 
 # The path to the cert file to use in SSL connections to the
 # registry server, if any. Alternately, you may set the
 # GLANCE_CLIENT_CERT_FILE environ variable to a filepath of the cert file
-# registry_client_cert_file = /path/to/cert/file
+#registry_client_cert_file = /path/to/cert/file
 
 # The path to the certifying authority cert file to use in SSL connections
 # to the registry server, if any. Alternately, you may set the
 # GLANCE_CLIENT_CA_FILE environ variable to a filepath of the CA cert file
-# registry_client_ca_file = /path/to/ca/file
+#registry_client_ca_file = /path/to/ca/file
 
 # ============ Notification System Options =====================
 
@@ -225,11 +225,11 @@ swift_enable_snet = False
 
 # If set to True enables multi-tenant storage mode which causes Glance images
 # to be stored in tenant specific Swift accounts.
-# swift_store_multi_tenant = False
+#swift_store_multi_tenant = False
 
 # A list of tenants that will be granted read/write access on all Swift
 # containers created by Glance in multi-tenant mode.
-# swift_store_admin_tenants = []
+#swift_store_admin_tenants = []
 
 # ============ S3 Store Options =============================
 
@@ -259,7 +259,7 @@ s3_store_create_bucket_on_put = False
 # When sending images to S3, the data will first be written to a
 # temporary buffer on disk. By default the platform's temporary directory
 # will be used. If required, an alternative directory can be specified here.
-# s3_store_object_buffer_dir = /path/to/dir
+#s3_store_object_buffer_dir = /path/to/dir
 
 # ============ RBD Store Options =============================
 
diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf
index e9c168707c..5fc270a2fe 100644
--- a/etc/glance-registry.conf
+++ b/etc/glance-registry.conf
@@ -20,7 +20,7 @@ backlog = 4096
 
 # TCP_KEEPIDLE value in seconds when creating socket.
 # Not supported on OS X.
-# tcp_keepidle = 600
+#tcp_keepidle = 600
 
 # SQLAlchemy connection string for the reference implementation
 # registry server. Any valid SQLAlchemy connection string is fine.
@@ -54,18 +54,18 @@ limit_param_default = 25
 use_syslog = False
 
 # Facility to use. If unset defaults to LOG_USER.
-# syslog_log_facility = LOG_LOCAL1
+#syslog_log_facility = LOG_LOCAL1
 
 # ================= SSL Options ===============================
 
 # Certificate file to use when starting registry server securely
-# cert_file = /path/to/certfile
+#cert_file = /path/to/certfile
 
 # Private key file to use when starting registry server securely
-# key_file = /path/to/keyfile
+#key_file = /path/to/keyfile
 
 # CA certificate file to use to verify connecting clients
-# ca_file = /path/to/cafile
+#ca_file = /path/to/cafile
 
 [keystone_authtoken]
 auth_host = 127.0.0.1