Index: configuration.html
===================================================================
--- configuration.html	(revision 1653064)
+++ configuration.html	(working copy)
@@ -30,7 +30,7 @@
     </tr>
     <tr>
       <td>port</td>
-      <td>6667</td>
+      <td>9092</td>
       <td>The port on which the server accepts client connections.</td>
     </tr>
     <tr>
@@ -57,7 +57,7 @@
     </tr>
     <tr>
       <td>background.threads</td>
-      <td>4</td>
+      <td>10</td>
       <td>The number of threads to use for various background processing tasks such as file deletion. You should not need to change this.</td>
     </tr>
     <tr>
@@ -148,7 +148,7 @@
     </tr>
     <tr>
       <td>log.cleaner.io.max.bytes.per.second</td>
-      <td>None</td>
+      <td>Double.MaxValue</td>
       <td>The maximum amount of I/O the log cleaner can do while performing log compaction. This setting allows setting a limit for the cleaner to avoid impacting live request serving.</td>
     </tr>
     <tr>
@@ -193,17 +193,17 @@
     </tr>
     <tr>
       <td>log.flush.interval.messages</td>
-      <td>None</td>
+      <td>Long.MaxValue</td>
       <td>The number of messages written to a log partition before we force an fsync on the log. Setting this lower will sync data to disk more often but will have a major impact on performance. We generally recommend that people make use of replication for durability rather than depending on single-server fsync, however this setting can be used to be extra certain.</td>
     </tr>
     <tr>
       <td>log.flush.scheduler.interval.ms</td>
-      <td>3000</td>
+      <td>Long.MaxValue</td>
       <td>The frequency in ms that the log flusher checks whether any log is eligible to be flushed to disk.</td>
     </tr>
     <tr>
       <td>log.flush.interval.ms</td>
-      <td>None</td>
+      <td>Long.MaxValue</td>
       <td>The maximum time between fsync calls on the log. If used in conjuction with log.flush.interval.messages the log will be flushed when either criteria is met.</td>
     </tr>
     <tr>
@@ -219,7 +219,7 @@
     <tr>
       <td>auto.create.topics.enable</td>
       <td>true</td>
-      <td>Enable auto creation of topic on the server.  If this is set to true then attempts to produce, consume, or fetch metadata for a non-existent topic will automatically create it with the default replication factor and number of partitions.</td>
+      <td>Enable auto creation of topic on the server.  If this is set to true then attempts to produce data or fetch metadata for a non-existent topic will automatically create it with the default replication factor and number of partitions.</td>
     </tr>
     <tr>
       <td>controller.socket.timeout.ms</td>
@@ -228,7 +228,7 @@
     </tr>
     <tr>
       <td>controller.message.queue.size</td>
-      <td>10</td>
+      <td>Int.MaxValue</td>
       <td>The buffer size for controller-to-broker-channels</td>
     </tr>
     <tr>
@@ -285,12 +285,12 @@
     </tr>
     <tr>
       <td>fetch.purgatory.purge.interval.requests</td>
-      <td>10000</td>
+      <td>1000</td>
       <td>The purge interval (in number of requests) of the fetch request purgatory.</td>
     </tr>
     <tr>
       <td>producer.purgatory.purge.interval.requests</td>
-      <td>10000</td>
+      <td>1000</td>
       <td>The purge interval (in number of requests) of the producer request purgatory.</td>
     </tr>
     <tr>
@@ -341,7 +341,7 @@
     </tr>
     <tr>
       <td>offset.metadata.max.bytes</td>
-      <td>1024</td>
+      <td>4096</td>
       <td>The maximum amount of metadata to allow clients to save with their offsets.</td>
     </tr>
     <tr>
@@ -557,7 +557,7 @@
     </tr>
     <tr>
       <td>queued.max.message.chunks</td>
-      <td colspan="1">10</td>
+      <td colspan="1">2</td>
       <td>Max number of message chunks buffered for consumption. Each chunk can be up to fetch.message.max.bytes.</td>
     </tr>
     <tr>