Merge branch 'stable-3.1'
* stable-3.1:
Design docs: Foster early alternative(s) reviews
Design docs: Reiterate Code of Conduct for reviews
Design docs: Clarify unrelated topics as optional
Clarify documentation of container.javaOptions
Fix formatting of container.javaOptions section
Add master's external attributes to the added link in the documentation.
Change-Id: I8b5fceba3020a41f8c2cfdef96eb846ba20617ad
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 82cb3f9..eea0cc3 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1589,13 +1589,14 @@
[[container.javaOptions]]container.javaOptions::
+
-Additional options to pass along to the Java runtime. If multiple
-values are configured, they are passed in order on the command line,
-separated by spaces. These options are appended onto 'JAVA_OPTIONS'.
-
+Additional options to pass along to the Java runtime. May be specified
+multiple times to configure multiple values. If multiple 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
----
diff --git a/Documentation/dev-design-docs.txt b/Documentation/dev-design-docs.txt
index 888b7dc..1ab5a26 100644
--- a/Documentation/dev-design-docs.txt
+++ b/Documentation/dev-design-docs.txt
@@ -59,8 +59,9 @@
* All possible solutions are fairly discussed with their pros and cons,
and treated equally until a conclusion is made.
* Unrelated issues (judged by the design doc owner) that are identified
- during discussions are extracted into new design docs (initially
- consisting only of an `index.md` and a `use-cases.md` file).
+ during discussions may be extracted into new design docs (initially
+ consisting only of an `index.md` and a `use-cases.md` file). Doing so
+ is optional yet can be done by either the design owner or reviewers.
* Changes making iterative improvements can be submitted frequently
(e.g. additional uses-cases can be added later, solutions can be
submitted without describing implementation details, etc.).
@@ -97,7 +98,9 @@
== Design doc review
Everyone in the link:dev-roles.html[Gerrit community] is welcome to
-take part in the design review and comment on the design.
+take part in the design review and comment on the design. As such, every
+design reviewer is expected to respect the community
+link:https://www.gerritcodereview.com/codeofconduct.html[Code of Conduct,role=external,window=_blank].
Positive `Code-Review` votes on changes that add/modify design docs are
sticky. This means any `Code-Review+1` and `Code-Review+2` vote is
@@ -107,7 +110,10 @@
change manually.
Ideas for alternative solutions should be uploaded as a change that
-describes the solution (see link:#collaboration[above]).
+describes the solution (see link:#collaboration[above]). This should be
+done as early as possible during the review process, so that related
+comment threads stop there and do not clutter the current review. It is up
+to the alternative reviews to then host their related comments.
Changes which make a conclusion on a design (changes that add/change
the `conclusion.md` file, see link:#structure[Design Doc Structure])
