diff --git a/doc/config-reference/source/samples/ceilometer.conf b/doc/config-reference/source/samples/ceilometer.conf
index 8ab3062056..0aaef02ced 100644
--- a/doc/config-reference/source/samples/ceilometer.conf
+++ b/doc/config-reference/source/samples/ceilometer.conf
@@ -55,7 +55,7 @@
 
 # Dispatchers to process event data. (multi valued)
 # Deprecated group/name - [DEFAULT]/dispatcher
-#event_dispatchers = database
+#event_dispatchers =
 
 # Exchange name for Ironic notifications. (string value)
 #ironic_exchange = ironic
@@ -106,11 +106,6 @@
 # (integer value)
 #http_timeout = 600
 
-# Indicates if expirer expires only samples. If set true, expired samples will
-# be deleted, but residual resource and meter definition data will remain.
-# (boolean value)
-#sql_expire_samples_only = false
-
 # Path to the rootwrap configuration file touse for running commands as root
 # (string value)
 #rootwrap_config = /etc/ceilometer/rootwrap.conf
@@ -369,15 +364,6 @@
 # From ceilometer
 #
 
-# The port for the ceilometer API server. (port value)
-# Minimum value: 0
-# Maximum value: 65535
-# Deprecated group/name - [DEFAULT]/metering_api_port
-#port = 8777
-
-# The listen IP for the ceilometer API server. (string value)
-#host = 0.0.0.0
-
 # Toggle Pecan Debug Middleware. (boolean value)
 #pecan_debug = false
 
@@ -385,11 +371,6 @@
 # Minimum value: 1
 #default_api_return_limit = 100
 
-# Number of workers for api, default value is 1. (integer value)
-# Minimum value: 1
-# Deprecated group/name - [DEFAULT]/api_workers
-#workers = 1
-
 
 [collector]
 
@@ -549,6 +530,11 @@
 # connection is used) (string value)
 #event_connection = <None>
 
+# Indicates if expirer expires only samples. If set true, expired samples will
+# be deleted, but residual resource and meter definition data will remain.
+# (boolean value)
+#sql_expire_samples_only = false
+
 #
 # From oslo.db
 #
@@ -683,11 +669,6 @@
 # activity (string value)
 #filter_project = gnocchi
 
-# DEPRECATED: URL to Gnocchi. default: autodetection (string value)
-# This option is deprecated for removal.
-# Its value may be silently ignored in the future.
-#url = <None>
-
 # The archive policy to use when the dispatcher create a new metric. (string
 # value)
 #archive_policy = <None>
@@ -1005,8 +986,8 @@
 #
 
 # Number of queues to parallelize workload across. This value should be larger
-# than the number of active notification agents for optimal results. (integer
-# value)
+# than the number of active notification agents for optimal results. WARNING:
+# Once set, lowering this value may result in lost data. (integer value)
 # Minimum value: 1
 #pipeline_processing_queues = 10
 
@@ -1014,10 +995,6 @@
 # Deprecated group/name - [collector]/ack_on_event_error
 #ack_on_event_error = true
 
-# Save event details. (boolean value)
-# Deprecated group/name - [collector]/store_events
-#store_events = false
-
 # WARNING: Ceilometer historically offered the ability to store events as
 # meters. This usage is NOT advised as it can flood the metering database and
 # cause performance degradation. (boolean value)
@@ -1035,13 +1012,14 @@
 # rabbit-cinder:5672. (multi valued)
 #messaging_urls =
 
-# Number of notification messages to wait before publishing them (integer
-# value)
-#batch_size = 1
+# Number of notification messages to wait before publishing them. Batching is
+# advised when transformations areapplied in pipeline. (integer value)
+# Minimum value: 1
+#batch_size = 100
 
 # Number of seconds to wait before publishing sampleswhen batch_size is not
 # reached (None means indefinitely) (integer value)
-#batch_timeout = <None>
+#batch_timeout = 5
 
 # Number of workers for notification service, default value is 1. (integer
 # value)