diff --git a/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
index c5e77f4107..abab6316b6 100644
--- a/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
@@ -928,11 +928,11 @@ class UserId implements Serializable {
         name="propertyName"
         class="ClassName"
         mapped="true|false"
-        access="field|property|ClassName">
-        node="element-name|."
+        access="field|property|ClassName"
+        node="element-name|.">
 
         <key-property name="propertyName" type="typename" column="column_name"/>
-        <key-many-to-one name="propertyName class="ClassName" column="column_name"/>
+        <key-many-to-one name="propertyName" class="ClassName" column="column_name"/>
         ......
 &lt;/composite-id&gt;</programlisting>
 
diff --git a/documentation/manual/src/main/docbook/en-US/content/configuration.xml b/documentation/manual/src/main/docbook/en-US/content/configuration.xml
index 9e79d07cf1..2518b0804f 100644
--- a/documentation/manual/src/main/docbook/en-US/content/configuration.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/configuration.xml
@@ -518,7 +518,7 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect</programlisting>
 
             <entry>Set this property to <literal>true</literal> if your JDBC
             driver returns correct row counts from
-            <literal>executeBatch()</literal>. Iit is usually safe to turn
+            <literal>executeBatch()</literal>. It is usually safe to turn
             this option on. Hibernate will then use batched DML for
             automatically versioned data. Defaults to
             <literal>false</literal>. <para> <emphasis
@@ -1598,7 +1598,7 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect</programlisting>
       one will be started and associated with that JTA transaction the first
       time you call <literal>sessionFactory.getCurrentSession()</literal>. The
       <literal>Session</literal>s retrieved via
-      <literal>getCurrentSession()</literal> in the<literal>"jta"</literal>
+      <literal>getCurrentSession()</literal> in the <literal>"jta"</literal>
       context are set to automatically flush before the transaction completes,
       close after the transaction completes, and aggressively release JDBC
       connections after each statement. This allows the