contact: Add item on postal mail; mention security

2 files changed, 28 insertions, 8 deletions

diff --git a/inside-gentoo/contact/index.html b/inside-gentoo/contact/index.html
index b7cfea4..50f0cc2 100644
--- a/inside-gentoo/contact/index.html
+++ b/inside-gentoo/contact/index.html
@@ -39,6 +39,10 @@ title: Contact
     <span class="fa fa-fw fa-question-circle"></span>
     I have a <strong>generic question</strong> or nothing above really fits.
   </a>
+  <a href="#mail" class="list-group-item">
+    <span class="fa fa-fw fa-envelope-o"></span>
+    Where do I send <strong>postal mail?</strong>
+  </a>
 </div>
 
 <hr>
@@ -54,7 +58,7 @@ title: Contact
     For more information, check out our dedicated support page.
   </div>
   <div class="panel-footer text-right">
-    <a href="/support/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-life-buoy"></span> Support Information</a>
+    <a href="/support/" class="btn btn-primary btn-sm">View support information</a>
   </div>
 </div>
 
@@ -69,11 +73,14 @@ title: Contact
       Our <a href="/support/" class="alert-link">support venues</a> help you ascertain whether your issue warrants a bug report.
     </div>
     Prior to reporting your first bug, please take a look at our <a href="https://wiki.gentoo.org/wiki/Beautiful_bug_reports">guide to creating beautiful bug reports</a>.
-    <br><br>
+    <br>
     When you're ready to report the issue, head over to our Bugzilla, where you can file a bug after registering and logging in.
+    <br><br>
+    <strong>Security issues</strong><br>
+    If you would like to report a vulnerability in one of our packages, please get in touch with our <a href="/support/security/#contact">Security team</a>.
   </div>
   <div class="panel-footer text-right">
-    <a href="https://bugs.gentoo.org/" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-bug"></span> Go to Bugzilla</a>
+    <a href="https://bugs.gentoo.org/" class="btn btn-primary btn-sm">Go to Bugzilla</a>
   </div>
 </div>
 
@@ -105,7 +112,7 @@ title: Contact
     If the issue you would like to report is already listed there; or the service in question marked as being down or in maintenance, you don't need to send another message, they are already aware.
   </div>
   <div class="panel-footer text-right">
-    <a href="mailto:infra@gentoo.org" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-wrench"></span> Contact Infrastructure</a>
+    <a href="mailto:infra@gentoo.org" class="btn btn-primary btn-sm">Contact Infrastructure Team</a>
   </div>
 </div>
 
@@ -118,13 +125,13 @@ title: Contact
     you will likely want to speak to the Gentoo Foundation's Board of Trustees.
   </div>
   <div class="panel-footer text-right">
-    <a href="mailto:trustees@gentoo.org" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-institution"></span> Contact Board of Trustees</a>
+    <a href="mailto:trustees@gentoo.org" class="btn btn-primary btn-sm">Contact Board of Trustees</a>
   </div>
 </div>
 
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class="panel-title" id="other"><span class="fa fa-fw fa-question-circle"></span> I have a <strong>generic question</strong> or nothing above really fits</h3>
+    <h3 class="panel-title" id="other"><span class="fa fa-fw fa-question-circle"></span> I have a generic question or nothing above really fits</h3>
   </div>
   <div class="panel-body">
     <div class="alert alert-danger">
@@ -136,6 +143,19 @@ title: Contact
     </p>
   </div>
   <div class="panel-footer text-right">
-    <a href="mailto:pr@gentoo.org" class="btn btn-primary btn-sm"><span class="fa fa-fw fa-users"></span> Contact Public Relations</a>
+    <a href="mailto:pr@gentoo.org" class="btn btn-primary btn-sm">Contact Public Relations</a>
+  </div>
+</div>
+
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title" id="mail"><span class="fa fa-fw fa-envelope-o"></span> Where do I send postal mail?</h3>
+  </div>
+  <div class="panel-body">
+    Please get in touch with our Public Relations team <strong class="text-danger">before posting anything.</strong>
+    They will provide you with the correct address depending on the matter.
+  </div>
+  <div class="panel-footer text-right">
+    <a href="mailto:pr@gentoo.org" class="btn btn-primary btn-sm">Contact Public Relations</a>
   </div>
 </div>
diff --git a/support/security/index.html b/support/security/index.html
index 8e32c25..09da6b0 100644
--- a/support/security/index.html
+++ b/support/security/index.html
@@ -65,7 +65,7 @@ layout: page-nav3
   GLSA announcements are sent to the <a href="/get-involved/mailing-lists/">gentoo-announce@gentoo.org mailing-list</a>, and are published via <a href="https://security.gentoo.org/subscribe">RSS and Atom feeds</a>.
 </p>
 
-<h3>Security Team contact information</h3>
+<h3 id="contact">Security Team contact information</h3>
 <p>
   Gentoo Linux takes security vulnerability reports very seriously.
   Please file new vulnerability reports on <a href="https://bugs.gentoo.org">Gentoo Bugzilla</a>