diff --git a/openjpa-project/src/doc/manual/ref_guide_conf.xml b/openjpa-project/src/doc/manual/ref_guide_conf.xml
index 000f8b212..d557e3016 100644
--- a/openjpa-project/src/doc/manual/ref_guide_conf.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_conf.xml
@@ -1853,6 +1853,29 @@ transaction affect the query, and if so to either evaluate the query in-memory
 or flush before running it against the datastore.
             </para>
         </section>
+        <section id="openjpa.Id">
+            <title>openjpa.Id</title>
+            <indexterm zone="openjpa.Id">
+                <primary>Id</primary>
+            </indexterm>
+            <para>
+            <emphasis role="bold">Property name:</emphasis>
+            <literal>openjpa.Id</literal>
+            </para>
+            <para>
+            <emphasis role="bold">Resource adaptor config-property:</emphasis>
+            <literal>Id</literal>
+            </para>
+            <para>
+            <emphasis role="bold">Default:</emphasis> none
+            </para>
+            <para>
+            <emphasis role="bold">Description:</emphasis> An
+            environment-specific identifier for this configuration. This
+            might correspond to a JPA persistence-unit name, or to some other
+            more-unique value available in the current environment.
+            </para>
+        </section>
         <section id="openjpa.InverseManager">
             <title>
                 openjpa.InverseManager
diff --git a/openjpa-project/src/doc/manual/ref_guide_logging.xml b/openjpa-project/src/doc/manual/ref_guide_logging.xml
index 7a4613a7f..5066a618a 100644
--- a/openjpa-project/src/doc/manual/ref_guide_logging.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_logging.xml
@@ -248,15 +248,14 @@ By default, OpenJPA uses a basic logging framework with the following output
 format:
         </para>
         <para>
-<literal>millis</literal><literal>level</literal> [<literal>thread 
-name</literal>] <literal>channel</literal> - <literal>message</literal>
+<literal>millis</literal>&nbsp;&nbsp;<literal>diagnostic context</literal>&nbsp;&nbsp;<literal>level</literal>&nbsp;&nbsp;[<literal>thread name</literal>]&nbsp;&nbsp;<literal>channel</literal> - <literal>message</literal>
         </para>
         <para>
 For example, when loading an application that uses OpenJPA, a message like the
 following will be sent to the <literal>openjpa.Runtime</literal> channel:
         </para>
 <programlisting>
-2107  INFO   [main] openjpa.Runtime - Starting OpenJPA 4.0.0
+2107  INFO   [main] openjpa.Runtime - Starting OpenJPA 0.9.7
 </programlisting>
         <para>
 The default logging system accepts the following parameters:
@@ -280,7 +279,8 @@ and <literal>ERROR</literal>. Defaults to <literal>INFO</literal>.
             <listitem>
                 <para>
 <literal>DiagnosticContext</literal>: A string that will be prepended to all
-log messages.
+log messages. If this is not supplied and a <literal>openjpa.Id</literal>
+property value is available, that value will be used.
                 </para>
             </listitem>
             <listitem>