diff --git a/src/site/es/xdoc/configuration.xml b/src/site/es/xdoc/configuration.xml
index fc58eba8ee2..1bf5c4314a4 100644
--- a/src/site/es/xdoc/configuration.xml
+++ b/src/site/es/xdoc/configuration.xml
@@ -199,6 +199,25 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
                 PARTIAL
               </td>
             </tr>
+            <tr>
+              <td>
+                autoMappingUnknownColumnBehavior
+              </td>
+              <td>
+                Specify the behavior when detects an unknown column (or unknown property type) of automatic mapping target.
+                <ul>
+                  <li><code>NONE</code>: Do nothing</li>
+                  <li><code>WARNING</code>: Output warning log (The log level of <code>'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'</code> must be set to <code>WARN</code>)</li>
+                  <li><code>FAILING</code>: Fail mapping (Throw <code>SqlSessionException</code>)</li>
+                </ul>
+              </td>
+              <td>
+                NONE, WARNING, FAILING
+              </td>
+              <td>
+                NONE
+              </td>
+            </tr>
             <tr>
               <td>
                 defaultExecutorType
@@ -411,6 +430,7 @@ A continuación se muestra un ejemplo del elemento settings al completo:
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
   <setting name="autoMappingBehavior" value="PARTIAL"/>
+  <setting name="autoMappingUnknownColumnBehavior" value="WARNING"/>
   <setting name="defaultExecutorType" value="SIMPLE"/>
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
diff --git a/src/site/ja/xdoc/configuration.xml b/src/site/ja/xdoc/configuration.xml
index 5127da32efc..8024dbd1226 100644
--- a/src/site/ja/xdoc/configuration.xml
+++ b/src/site/ja/xdoc/configuration.xml
@@ -224,6 +224,25 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
                 PARTIAL
               </td>
             </tr>
+            <tr>
+              <td>
+                autoMappingUnknownColumnBehavior
+              </td>
+              <td>
+                自動マッピング対象のプロパティが存在しない(又はプロパティ型がサポート外の)カラムを検知した時の動作を指定します。
+                <ul>
+                  <li><code>NONE</code>: 何もしません</li>
+                  <li><code>WARNING</code>: 警告ログを出力します (<code>'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'</code> のログレベルを<code>WARN</code>に設定してください)</li>
+                  <li><code>FAILING</code>: 自動マッピング処理をエラーにします。(<code>SqlSessionException</code>が発生します)</li>
+                </ul>
+              </td>
+              <td>
+                NONE, WARNING, FAILING
+              </td>
+              <td>
+                NONE
+              </td>
+            </tr>
             <tr>
               <td>
                 defaultExecutorType
@@ -441,6 +460,7 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
   <setting name="autoMappingBehavior" value="PARTIAL"/>
+  <setting name="autoMappingUnknownColumnBehavior" value="WARNING"/>
   <setting name="defaultExecutorType" value="SIMPLE"/>
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
diff --git a/src/site/ko/xdoc/configuration.xml b/src/site/ko/xdoc/configuration.xml
index 475e450aae3..7a96dca9da6 100644
--- a/src/site/ko/xdoc/configuration.xml
+++ b/src/site/ko/xdoc/configuration.xml
@@ -192,6 +192,25 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
                 PARTIAL
               </td>
             </tr>
+            <tr>
+              <td>
+                autoMappingUnknownColumnBehavior
+              </td>
+              <td>
+                Specify the behavior when detects an unknown column (or unknown property type) of automatic mapping target.
+                <ul>
+                  <li><code>NONE</code>: Do nothing</li>
+                  <li><code>WARNING</code>: Output warning log (The log level of <code>'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'</code> must be set to <code>WARN</code>)</li>
+                  <li><code>FAILING</code>: Fail mapping (Throw <code>SqlSessionException</code>)</li>
+                </ul>
+              </td>
+              <td>
+                NONE, WARNING, FAILING
+              </td>
+              <td>
+                NONE
+              </td>
+            </tr>
             <tr>
               <td>
                 defaultExecutorType
@@ -416,6 +435,7 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
   <setting name="autoMappingBehavior" value="PARTIAL"/>
+  <setting name="autoMappingUnknownColumnBehavior" value="WARNING"/>
   <setting name="defaultExecutorType" value="SIMPLE"/>
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
diff --git a/src/site/xdoc/configuration.xml b/src/site/xdoc/configuration.xml
index b1498f1527f..99a5b2e2a3c 100644
--- a/src/site/xdoc/configuration.xml
+++ b/src/site/xdoc/configuration.xml
@@ -277,6 +277,25 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
                 PARTIAL
               </td>
             </tr>
+            <tr>
+              <td>
+                autoMappingUnknownColumnBehavior
+              </td>
+              <td>
+                Specify the behavior when detects an unknown column (or unknown property type) of automatic mapping target.
+                <ul>
+                  <li><code>NONE</code>: Do nothing</li>
+                  <li><code>WARNING</code>: Output warning log (The log level of <code>'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'</code> must be set to <code>WARN</code>)</li>
+                  <li><code>FAILING</code>: Fail mapping (Throw <code>SqlSessionException</code>)</li>
+                </ul>
+              </td>
+              <td>
+                NONE, WARNING, FAILING
+              </td>
+              <td>
+                NONE
+              </td>
+            </tr>
             <tr>
               <td>
                 defaultExecutorType
@@ -503,6 +522,7 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
   <setting name="autoMappingBehavior" value="PARTIAL"/>
+  <setting name="autoMappingUnknownColumnBehavior" value="WARNING"/>
   <setting name="defaultExecutorType" value="SIMPLE"/>
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
diff --git a/src/site/zh/xdoc/configuration.xml b/src/site/zh/xdoc/configuration.xml
index 143b6a49252..2b46806367e 100644
--- a/src/site/zh/xdoc/configuration.xml
+++ b/src/site/zh/xdoc/configuration.xml
@@ -207,6 +207,25 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
                 PARTIAL
               </td>
             </tr>
+            <tr>
+              <td>
+                autoMappingUnknownColumnBehavior
+              </td>
+              <td>
+                Specify the behavior when detects an unknown column (or unknown property type) of automatic mapping target.
+                <ul>
+                  <li><code>NONE</code>: Do nothing</li>
+                  <li><code>WARNING</code>: Output warning log (The log level of <code>'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'</code> must be set to <code>WARN</code>)</li>
+                  <li><code>FAILING</code>: Fail mapping (Throw <code>SqlSessionException</code>)</li>
+                </ul>
+              </td>
+              <td>
+                NONE, WARNING, FAILING
+              </td>
+              <td>
+                NONE
+              </td>
+            </tr>
             <tr>
               <td>
                 defaultExecutorType
@@ -422,6 +441,7 @@ SqlSessionFactory factory = sqlSessionFactoryBuilder.build(reader, environment,
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
   <setting name="autoMappingBehavior" value="PARTIAL"/>
+  <setting name="autoMappingUnknownColumnBehavior" value="WARNING"/>
   <setting name="defaultExecutorType" value="SIMPLE"/>
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>