diff --git a/example.conf b/example.conf
index 6132eb4be..eb363d364 100644
--- a/example.conf
+++ b/example.conf
@@ -92,6 +92,7 @@
 # configuration is set in the configuration file and other logging
 # configuration options are ignored (for example,
 # logging_context_format_string). (string value)
+# Note: This option can be changed without restarting.
 # Deprecated group/name - [DEFAULT]/log_config
 #log_config_append = <None>
 
@@ -253,8 +254,12 @@
 # From oslo.db
 #
 
-# The file name to use with SQLite. (string value)
+# DEPRECATED: The file name to use with SQLite. (string value)
 # Deprecated group/name - [DEFAULT]/sqlite_db
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Should use config option connection or slave_connection to
+# connect the database.
 #sqlite_db = oslo.sqlite
 
 # If True, SQLite uses synchronous mode. (boolean value)
@@ -563,7 +568,14 @@
 # From keystonemiddleware.auth_token
 #
 
-# Complete public Identity API endpoint. (string value)
+# Complete "public" Identity API endpoint. This endpoint should not be
+# an "admin" endpoint, as it should be accessible by all end users.
+# Unauthenticated clients are redirected to this endpoint to
+# authenticate. Although this endpoint should  ideally be unversioned,
+# client support in the wild varies.  If you're using a versioned v2
+# endpoint here, then this  should *not* be the same endpoint the
+# service user utilizes  for validating tokens, because normal end
+# users may not be  able to reach that endpoint. (string value)
 #auth_uri = <None>
 
 # API version of the admin Identity API endpoint. (string value)
@@ -789,7 +801,7 @@
 # replacements can be used: {uuid} - node UUID or "unknown", {bmc} -
 # node BMC address or "unknown", {dt} - current UTC date and time,
 # {mac} - PXE booting MAC or "unknown". (string value)
-#ramdisk_logs_filename_format = {uuid}_bmc_{bmc}-{dt:%Y.%m.%d_%H.%M.%S_%f}.tar.gz
+#ramdisk_logs_filename_format = {uuid}_{dt:%Y%m%d-%H%M%S.%f}.tar.gz
 
 
 [swift]