From 856670e1e5f1a65f3904946bc01d152314d3b2de Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Thu, 21 Aug 2014 19:45:22 +0000
Subject: [PATCH] Document how committers can merge non-FreeBSD.org Bugzilla
 accounts

Approved by: jmmv (mentor)
Reviewed by: wblock
---
 en_US.ISO8859-1/articles/committers-guide/article.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 67549a2c0a..a2dc931c0c 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -2871,6 +2871,14 @@ Relnotes:           yes</programlisting>
       considered nice if you take time to close any PRs associated
       with your commits, if appropriate.</para>
 
+    <para>Committers with
+      non-<systemitem class="domainname">&os;.org</systemitem>
+      Bugzilla accounts can have the old account merged with the
+      <systemitem class="domainname">&os;.org</systemitem> account by
+      entering a new bug. Choose <literal>Supporting Services</literal>
+      as the Product, and <literal>Bug Tracker</literal> as the
+      Component.</para>
+
     <para>You can find out more about <application>Bugzilla</application>
       at:</para>