merge: DOCS-771

Author: Sam Kleinman

source/reference/config-database.txt

@@ -45,8 +45,8 @@ Collections
       .. code-block:: javascript
 
          {
-          "_id" : "d.local-2012-12-11T14:09:21-0",
-          "server" : "<hostanme>:<port>",
+          "_id" : "<hostname>-<timestamp>-<increment>",
+          "server" : "<hostname>:<port>",
           "clientAddr" : "127.0.0.1:63381",
           "time" : ISODate("2012-12-11T14:09:21.039Z"),
           "what" : "split",
@@ -70,7 +70,7 @@ Collections
                    "<database>" : "<value>"
                 },
                 "lastmod" : Timestamp(1000, 1),
-                "lastmodEpoch" : ObjectId("50c73e0bca6554d8d3b19a83")
+                "lastmodEpoch" : ObjectId(<...>)
              },
              "right" : {
                 "min" : {
@@ -80,27 +80,23 @@ Collections
                    "<database>" : { $maxKey : 1 }
                 },
                 "lastmod" : Timestamp(1000, 2),
-                "lastmodEpoch" : ObjectId("50c73e0bca6554d8d3b19a83")
+                "lastmodEpoch" : ObjectId("<...>")
              }
           }
          }
 
    Each document in the :data:`changelog` collection contains the
    following fields:
 
-   .. What? commenting out because the description isn't clear and it
-      doesn't appear in the example above.
+   .. data:: changelog._id
 
-      .. data:: changelog.changeID
-
-         hostname-time-increment
+      The value of ``changelog._id`` is:
+      ``<hostname>-<timestamp>-<increment>``.
 
    .. data:: changelog.server
 
       The hostname of the server that holds this data.
 
-      .. FACTCHECK above.
-
    .. data:: changelog.clientAddr
 
       A string that holds the address of the client, a