Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Fix broken link in 2.12.4 release notes
  doc: add reference to Gerrit its-storyboard plugin
  doc: add reference to Gerrit review-strategy plugin

Change-Id: If5b2ae792feaed0c23359d2e9586175a396bd179
diff --git a/Documentation/config-plugins.txt b/Documentation/config-plugins.txt
index f0dc904..2ada886 100644
--- a/Documentation/config-plugins.txt
+++ b/Documentation/config-plugins.txt
@@ -114,6 +114,16 @@
 link:https://gerrit.googlesource.com/plugins/reviewnotes/+doc/master/src/main/resources/Documentation/about.md[
 Documentation]
 
+[[review-strategy]]
+=== review-strategy
+
+This plugin allows users to configure different review strategies.
+
+link:https://gerrit-review.googlesource.com/#/admin/projects/plugins/review-strategy[
+Project] |
+link:https://gerrit.googlesource.com/plugins/review-strategy/+/master/src/main/resources/Documentation/about.md[
+Documentation]
+
 [[singleusergroup]]
 === singleusergroup
 
@@ -357,6 +367,16 @@
 link:https://gerrit.googlesource.com/plugins/its-rtc/+doc/master/src/main/resources/Documentation/config.md[
 Configuration]
 
+[[its-storyboard]]
+==== its-storyboard
+
+Plugin to integrate with Storyboard task tracking system.
+
+link:https://gerrit-review.googlesource.com/#/admin/projects/plugins/its-storyboard[
+Project] |
+link:https://gerrit.googlesource.com/plugins/its-storyboard/+doc/master/src/main/resources/Documentation/about.md[
+Documentation]
+
 [[javamelody]]
 === javamelody
 
diff --git a/ReleaseNotes/ReleaseNotes-2.12.4.txt b/ReleaseNotes/ReleaseNotes-2.12.4.txt
index 411011e..64252c6 100644
--- a/ReleaseNotes/ReleaseNotes-2.12.4.txt
+++ b/ReleaseNotes/ReleaseNotes-2.12.4.txt
@@ -124,5 +124,5 @@
 It was possible for refs to be replicated to remotes despite not being
 visible to groups mentioned in the `authGroup` setting.
 
-* link::https://bugs.chromium.org/p/gerrit/issues/detail?id=4036[Issue 4036]:
+* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4036[Issue 4036]:
 Fix hanging query when using `is:watched` without authentication.