Merge "ChangeScreen2: Show "Included in" information for merged changes"

Documentation/config-gerrit.txt

diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 19749a3..fcce877 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -935,6 +935,13 @@
 values are configured, they are passed in order on the command line,
 separated by spaces.  These options are appended onto 'JAVA_OPTIONS'.
 
+For example, it is possible to overwrite Gerrit's default log4j
+configuration:
+
+----
+  javaOptions = -Dlog4j.configuration=file:///home/gerrit/site/etc/log4j.properties
+----
+
 [[container.slave]]container.slave::
 +
 Used on Gerrit slave installations. If set to true the Gerrit JVM is

gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java
index f40f534..59d3711 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java
@@ -24,9 +24,9 @@
 /**
  * Definition of a field stored in the secondary index.
  *
- * @param I input type from which documents are created and search results are
+ * @param <I> input type from which documents are created and search results are
  *     returned.
- * @param T type that should be extracted from the input object when converting
+ * @param <T> type that should be extracted from the input object when converting
  *     to an index document.
  */
 public abstract class FieldDef<I, T> {