LOG4J2-2859 - Fixed typos where mergeFactory should be mergeStrategy.
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
index 3e05ed4..6104071 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/LegacyPropertiesCompatibilityTest.java
@@ -39,7 +39,7 @@
public static Object[][] data() {
return new Object[][]{
{"log4j2.configurationFile", "log4j.configurationFile"},
- {"log4j2.mergeFactory", "log4j.mergeFactory"},
+ {"log4j2.mergeStrategy", "log4j.mergeStrategy"},
{"log4j2.contextSelector", "Log4jContextSelector"},
{"log4j2.logEventFactory", "Log4jLogEventFactory"},
{"log4j2.configurationFactory", "log4j.configurationFactory"},
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e895585..f6e7e53 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -178,6 +178,9 @@
</action>
</release>
<release version="2.14.0" date="2020-MM-DD" description="GA Release 2.14.0">
+ <action issue="LOG4J2-2859" dev="rgoers" type="fix" due-to="Yanming Zhou">
+ Fixed typos where mergeFactory should be mergeStrategy.
+ </action>
<action issue="LOG4J2-2832" dev="rgoers" type="fix" due-to="Benjamin Asbach">
Correct class name printed in error message in RollingFileAppender.
</action>
diff --git a/src/site/asciidoc/manual/configuration.adoc b/src/site/asciidoc/manual/configuration.adoc
index 1ff74b1..bac83d3 100644
--- a/src/site/asciidoc/manual/configuration.adoc
+++ b/src/site/asciidoc/manual/configuration.adoc
@@ -1701,9 +1701,9 @@
internal logging to the console if system property `log4j2.debug` is
defined (with any or no value).
-|[[mergeFactory]]log4j2.mergeFactory +
-([[log4j.mergeFactory]]log4j.mergeFactory)
-|LOG4J_MERGE_FACTORY
+|[[mergeStrategy]]log4j2.mergeStrategy +
+([[log4j.mergeStrategy]]log4j.mergeStrategy)
+|LOG4J_MERGE_STRATEGY
|
|The name of the class that implements the MergeStrategy interface. If not
specified `DefaultMergeStrategy` will be used when creating a CompositeConfiguration.
