[PATCH] docs: link to website for IRC and mailing list

[PATCH] docs: link to website for IRC and mailing list

[Paolo Bonzini]

Provide an easy and always up-to-date way to get more information on
how to contact maintainers and other developers.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 docs/devel/conflict-resolution.rst | 7 ++++---
 docs/devel/index.rst               | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/devel/conflict-resolution.rst b/docs/devel/conflict-resolution.rst
index bb25f61865f..b6122323978 100644
--- a/docs/devel/conflict-resolution.rst
+++ b/docs/devel/conflict-resolution.rst
@@ -18,9 +18,10 @@ How we resolve conflicts
 
 If you are experiencing conflict, please consider first addressing the
 perceived conflict directly with other involved parties, preferably through
-a real-time medium such as IRC. You could also try to get a third-party (e.g.
-a mutual friend, and/or someone with background on the issue, but not
-involved in the conflict) to intercede or mediate.
+a real-time medium such as `IRC <https://www.qemu.org/contribute/>`__. You could
+also try to get a third-party (e.g. a mutual friend, and/or someone with
+background on the issue, but not involved in the conflict) to intercede or
+mediate.
 
 If this fails or if you do not feel comfortable proceeding this way, or
 if the problem requires immediate escalation, report the issue to the QEMU
diff --git a/docs/devel/index.rst b/docs/devel/index.rst
index 29f032d6a82..6f9ff4a0b91 100644
--- a/docs/devel/index.rst
+++ b/docs/devel/index.rst
@@ -10,8 +10,8 @@ QEMU is a large and mature project with a number of complex subsystems
 that can be overwhelming to understand. The development documentation
 is not comprehensive but hopefully presents enough to get you started.
 If there are areas that are unclear please reach out either via the
-IRC channel or mailing list and hopefully we can improve the
-documentation for future developers.
+`IRC channel or mailing list <https://www.qemu.org/contribute/>`__ and
+hopefully we can improve the documentation for future developers.
 
 All developers will want to familiarise themselves with
 :ref:`development_process` and how the community interacts. Please pay
-- 
2.55.0

Re: [PATCH] docs: link to website for IRC and mailing list

[Markus Armbruster]

Paolo Bonzini <pbonzini@redhat.com> writes:

> Provide an easy and always up-to-date way to get more information on
> how to contact maintainers and other developers.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>