New link to contact on start page, some adjustments to the contact page

1 files changed, 119 insertions, 95 deletions

diff --git a/english/contact.wml b/english/contact.wml
index 8fb05777d72..94f126eff98 100644
--- a/english/contact.wml
+++ b/english/contact.wml
@@ -1,111 +1,129 @@
-#use wml::debian::template title="Getting in Contact with Us" NOCOMMENTS="yes"
+#use wml::debian::template title="How to contact us" NOCOMMENTS="yes" MAINPAGE="true"
 
-<p>Debian is a large organization and there are a lot of ways to contact it.
-This page will summarize the often requested means of contacting; it is by
-no means exhaustive. Please refer to the rest of the web pages for other
-contact methods.</p>
-
-<p>
-Please note that most of the e-mail addresses below
-represent open mailing lists with public archives.
-Read the <a href="$(HOME)/MailingLists/disclaimer">\
-disclaimer</a> before sending any messages.
-</p>
-
-<p>English language is the common language for communication with Debian
-developers. We therefore ask that initial enquiries to developers be made
-in <strong>English</strong>. If this is not possible, go through
-<a href="https://lists.debian.org/users.html#debian-user">the user mailing list for your
-language</a>.</p>
+<link href="$(HOME)/font-awesome.css" rel="stylesheet" type="text/css">
 
 <ul class="toc">
-  <li><a href="#generalinfo">General information</a>
-  <li><a href="#installuse">Installing and Using Debian</a>
-  <li><a href="#press">Publicity / Press</a>
-  <li><a href="#events">Events / Conferences</a>
+  <li><a href="#generalinfo">General Information</a>
+  <li><a href="#installuse">Installing and using Debian</a>
+  <li><a href="#press">Publicity &amp; Press</a>
+  <li><a href="#events">Events &amp; Conferences</a>
   <li><a href="#helping">Helping Debian</a>
-  <li><a href="#packageproblems">Reporting problems in Debian packages</a>
+  <li><a href="#packageproblems">Reporting Problems in Debian Packages</a>
   <li><a href="#development">Debian Development</a>
-  <li><a href="#infrastructure">Problems with Debian infrastructure</a>
-  <li><a href="#harassment">Harassment issues</a>
+  <li><a href="#infrastructure">Problems with the Debian Infrastructure</a>
+  <li><a href="#harassment">Harassment Issues</a>
 </ul>
 
+<aside>
+<p><span class="fas fa-caret-right fa-3x"></span> We kindly ask you to send initial enquiries in <strong>English</strong>, as this is the language most of us speak. If this is not possible, please ask for help on one of our <a href="https://lists.debian.org/users.html#debian-user">user mailing lists</a>, which are available in many different languages.</p>
+</aside>
+
+<p>
+Debian is a large organization and there are several ways to get in touch with project members and other Debian users. This page summarizes often requested means of contact; it is by no means exhaustive. Please refer to the rest of the web pages for other contact methods.
+</p>
+
+<p>
+Please note that most of the e-mail addresses below represent open mailing lists with public archives. Read the <a href="$(HOME)/MailingLists/disclaimer">disclaimer</a> before sending any messages.
+</p>
+
 <h2 id="generalinfo">General Information</h2>
 
-<p>Most of the information about Debian is collected on our web site,
-<a href="$(HOME)">https://www.debian.org/</a>, so please browse and
-<a href="$(SEARCH)">search</a> through it before contacting us.
+<p>
+Most information about Debian is collected on our website <a href="$(HOME)">https://www.debian.org/</a>, so please browse and <a href="$(SEARCH)">search</a> through it before contacting us.
+</p>
+
+<p>
+You can send questions regarding the Debian project to the <email debian-project@lists.debian.org> mailing list. Please don't ask general questions about Linux on this list; read on for more information about other mailing lists.
+</p>
 
-<p>Our <a href="doc/user-manuals#faq">FAQ</a> will answer many of your questions.
+<p style="text-align:center"><button type="button"><span class="fas fa-book-open fa-2x"></span> <a href="doc/user-manuals#faq">Read our FAQ</a></button></p>
 
-<p>Questions regarding the Debian Project in general can be sent to the
-<em>debian-project</em> mailing list, at
-<email debian-project@lists.debian.org>.
-Please don't send questions about using Linux to that list; read on
-below for that.
+<aside class="light">
+  <span class="fa fa-envelope fa-5x"></span>
+</aside>
+<h2 id="installuse">Installing and using Debian</h2>
 
-<h2 id="installuse">Installing and Using Debian</h2>
+<p>
+If you are certain the documentation on the installation media and on our
+website doesn't have a solution to your problem, there's a very active user
+mailing list where Debian users and developers can answer your questions.
+Here, you can ask all kinds of questions regarding the following topics:
+</p>
 
-<p>If you are certain the documentation on the installation media and on our
-web site doesn't have a solution to your problem, there's a very active user
-mailing list where Debian users and developers can answer your questions,
-the <em>debian-user</em> mailing list.
-All questions regarding
 <ul>
-  <li>installation
-  <li>configuration
-  <li>supported hardware
-  <li>machine administration
-  <li>using Debian
+  <li>Installation
+  <li>Configuration
+  <li>Supported hardware
+  <li>Machine administration
+  <li>Using Debian
 </ul>
-should be sent to that list.
-Simply <a href="https://lists.debian.org/debian-user/">subscribe to
-<em>debian-user</em></a> and send your question to
-<email debian-user@lists.debian.org>.
 
-<p>Additionally, there are user mailing lists for speakers of various
-languages. See the <a href="https://lists.debian.org/users.html#debian-user">subscription info
-for international mailing lists</a>.
+<p>
+Please <a href="https://lists.debian.org/debian-user/">subscribe</a> to
+the list and send your questions to <email debian-user@lists.debian.org>.
+</p>
+
+<p>
+Additionally, there are user mailing lists for speakers of various languages. See the subscription info for <a href="https://lists.debian.org/users.html#debian-user">international mailing lists</a>.
+</p>
+
+<p>
+On top of that, it's possible to browse our mailing lists as newsgroups, for example with <a href="http://groups.google.com/d/homeredir">Google's web interface</a>.
+</p>
+
+<p>
+If you think you've found a bug in our installation system, please write to the <email debian-boot@lists.debian.org> mailing list. You can also file a <a href="$(HOME)/releases/stable/i386/ch05s04#submit-bug">bug report</a> against the <a href="https://bugs.debian.org/debian-installer">debian-installer</a> pseudo-package.
+</p>
 
-<p>Furthermore, you can browse our mailing lists as newsgroups using a web
-interface, such as <a href="http://groups.google.com/d/homeredir">Google</a>.
+<aside class="light">
+  <span class="far fa-newspaper fa-5x"></span>
+</aside>
+<h2 id="press">Publicity &amp; Press</h2>
 
-<p>If you think you've found a bug in our installation system, send
-information about it to
-<email debian-boot@lists.debian.org>
-or <a href="$(HOME)/releases/stable/i386/ch05s04#submit-bug">file a bug report</a> against the <a
-href="https://bugs.debian.org/debian-installer">debian-installer</a>
-pseudo-package.
+<p>
+The <a href="https://wiki.debian.org/Teams/Publicity">Debian Publicity Team</a> moderates news and announcements in all the Debian official resources, for example some mailing lists, the blog, the micronews website, and official social media channels.
+</p>
 
-<h2 id="press">Publicity / Press</h2>
+<p>
+If you're writing about Debian and need help or information, please contact the <a href="mailto:press@debian.org">publicity team</a>. This is also the right address if you're planning to submit news for our own news page.
+</p>
 
-<p>Those requesting information for articles or submitting news for our
-news page should contact our <a href="mailto:press@debian.org">publicity
-department</a>.
+<aside class="light">
+  <span class="fas fa-handshake fa-5x"></span>
+</aside>
+<h2 id="events">Events &amp; Conferences</h2>
 
-<h2 id="events">Events / Conferences</h2>
+<p>
+Please send invitations for <a href="$(HOME)/events/">conferences</a>, exhibitions, or other events to <email events@debian.org>.
+</p>
 
-<p>Invitations for <a href="$(HOME)/events/">conferences</a> and
-exhibitions or other type of events should be sent to <a
-href="mailto:events@debian.org">events department</a>.  Requests for
-flyers, posters and participation in Europe should be sent to the
-European <a href="mailto:debian-events-eu@lists.debian.org">events
-list</a>.</p>
+<p>
+Requests for flyers, posters, and participation in Europe should be sent to the <email debian-events-eu@lists.debian.org> mailing list.
+</p>
 
+<aside class="light">
+  <span class="fas fa-hands-helping fa-5x"></span>
+</aside>
 <h2 id="helping">Helping Debian</h2>
 
-<p>If you would like to contact Debian to offer help, please see the
-<a href="devel/join/">possible ways of helping</a> first.
+<p>
+There are plenty of possibilities to support the Debian project and contribute to the distribution. If you would like to offer help, please visit our <a href="devel/join/">How to join Debian</a> page first.
+</p>
 
 <p>If you would like to maintain a Debian mirror, see the pages about
 <a href="mirror/">mirroring Debian</a>. New mirrors are submitted using
 <a href="mirror/submit">this form</a>. Problems with existing mirrors
 can be reported at <email mirrors@debian.org>.
+</p>
 
-<p>If you would like to sell Debian CDs, see the <a href="CD/vendors/info">\
+<p>If you would like to sell Debian CDs/DVDs, see the <a href="CD/vendors/info">\
 information for CD vendors</a>. To get listed on the CD vendor list, please
-<a href="CD/vendors/adding-form">do so using this form</a>.
+use <a href="CD/vendors/adding-form">this form</a>.
+</p>
 
+<aside class="light">
+  <span class="fas fa-bug fa-5x"></span>
+</aside>
 <h2 id="packageproblems">Reporting problems in Debian packages</h2>
 
 <p>If you would like to file a bug against a Debian package, we have a bug
@@ -115,30 +133,39 @@ tracking system where you can easily report your problem. Please read the
 <p>If you simply want to communicate with the maintainer of a Debian
 package, then you can use the special mail aliases set up for each package.
 Any mail sent to &lt;<var>package name</var>&gt;@packages.debian.org will be
-forwarded to the maintainer responsible for that package.
+forwarded to the maintainer in charge of that package.
+</p>
 
 <p>If you would like to make the developers aware of a Debian security
-problem in a discreet manner, send e-mail to
+problem in a discreet manner, please send an email to
 <email security@debian.org>.
+</p>
 
+<aside class="light">
+  <span class="fas fa-code-branch fa-5x"></span>
+</aside>
 <h2 id="development">Debian Development</h2>
 
-<p>If you have questions that are more development related, there are
-several <a href="https://lists.debian.org/devel.html">development mailing lists</a>
-in Debian that you can use to contact our developers.
+<p>If you have questions about the development of Debian, we have
+several <a href="https://lists.debian.org/devel.html">mailing lists</a>
+for that. Here you can get in touch with our developers.
+</p>
 
-<p>The general development mailing list is <em>debian-devel</em>: you can
-<a href="https://lists.debian.org/debian-devel/">subscribe</a> to it and
-then send e-mail to
-<email debian-devel@lists.debian.org>.
+<p>
+There is also a general mailing list for developers: <email debian-devel@lists.debian.org>.
+Please follow this <a href="https://lists.debian.org/debian-devel/">link</a> to subscribe to it.
+</p>
 
-<h2 id="infrastructure">Problems with Debian infrastructure</h2>
+<aside class="light">
+  <span class="fas fa-network-wired fa-5x"></span>
+</aside>
+<h2 id="infrastructure">Problems with the Debian Infrastructure</h2>
 
 <p>To report a problem with a Debian service, you can usually
 <a href="Bugs/Reporting">report a bug</a> against the appropriate
 <a href="Bugs/pseudo-packages">pseudo-package</a>.
 
-<p>Alternatively, you can use e-mail to contact them.
+<p>Alternatively, you can send an email to one of the following addresses:</p>
 
 <define-tag btsurl>package: <a href="https://bugs.debian.org/%0">%0</a></define-tag>
 
@@ -159,13 +186,10 @@ then send e-mail to
       <email owner@bugs.debian.org></dd>
 </dl>
 
-<h2 id="harassment">Harassment issues</h2>
-
-<p>Debian is a community of people who value respect and dialog.  If
-you are a victim of any behaviour that harms you or feel you have been
-harassed, whether it is during a conference or sprint organised by the
-project, or through general project interactions, please contact the
-Community Team at: <email community@debian.org>.</p>
+<aside class="light">
+  <span class="fas fa-umbrella fa-5x"></span>
+</aside>
+<h2 id="harassment">Harassment Issues</h2>
 
-<p>We also have a complete list of different <a href="intro/organization">
-jobs and e-mails to use</a> to contact various parts of the organization.
+<p>Debian is a community of people who values respect. If you are the victim of inappropriate behaviour, if someone in the project has harmed you, or if you feel you have been harassed, please contact the Community Team: <email community@debian.org>
+</p>