[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  dbd8c68b4c9da8e031408c265f6013fdf9e50c7d (commit)
      from  329a4e846ea00835aa44bd316ec1b02c49de771a (commit)


- Log -----------------------------------------------------------------
commit dbd8c68b4c9da8e031408c265f6013fdf9e50c7d
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Nov 16 00:34:30 2017 -0500

    Unify to one address

-----------------------------------------------------------------------

Summary of changes:
 community/contacts.html | 47 ++++++++++++-----------------------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/community/contacts.html b/community/contacts.html
index 9ded7b1..145c3be 100644
--- a/community/contacts.html
+++ b/community/contacts.html
@@ -9,51 +9,28 @@
   <div id="content">
     <div class="blog-index">
       <article>
-	<header><h2>Contact Us</h2></header>
+	<header><h2>Postal Addresses</h2></header>
 	<div class="entry-content">
-	  <p>
-
-	  <p>Apart from email addresses and names, some organizations require
-	  a physical address as contact for open source projects.  Physical
-	  addresses can be useful in other cases as well.  Therefore, some
-	  people have stepped forward and volunteered as "official" contacts
-	  for OpenSSL.  If you want to get in touch with any of these
-	  people, please consider using email first, since that will also
-	  reach other team members in case your contact is temporarily not
-	  available.</p>
-
-	  <p>Please remember to be kind to the contacts.  Their time is
-	  their own to dispose of.  You may <em>request</em> support, but
-	  it's the contact's responsibility and freedom alone to decide if
-	  he wants to give any support or not, regardless of who makes the
-	  request.</p>
-
 	  <p>The <em>OpenSSL Software Foundation</em> represents the OpenSSL
 	  project in most capacities including contributor license
-	  agreements, managing donations, and so on.
-
-	  <blockquote>
-	    OpenSSL Software Foundation<br>
-	    20-22 Wenlock Road<br>
-	    London<br>
-	    N1 7GU<br>
-	    United Kingdom<br>
-	    +44 1785508015<br>
-	    <a href="mailto:info at opensslfoundation.org">info at opensslfoundation.org</a>
-	  </blockquote>
-	  </p>
+          agreements, managing donations, and so on.</p>
 
 	  <p><em>OpenSSL Software Services</em> represents the OpenSSL
-	  project for selected commercial or quasi-commercial contexts, such
-	  as providing formal support contracts and brokering consulting
-	  contracts for OpenSSL team members.
+	  as needed in selected commercial or quasi-commercial contexts, such
+          as providing formal support contracts.</p>
+
+	  <p>
+          Both organizations have the same contact information.
+          The best way to contact us is by sending an email to
+          <a href="mailto:osf-contact at openssl.org">osf-contact at openssl.org</a>.
+          For postal or telephone contact, use the following:
+
 	  <blockquote>
-	    OpenSSL Software Services Inc.<br>
 	    40 E Main St, Suite 744<br>
 	    Newark DE 19711<br>
 	    USA<br>
 	    +1 240-215-3103<br>
-	    <a href="mailto:info at opensslservices.com">info at opensslservices.com</a>
+            <a href="maito:osf-contact at openssl.org">osf-contact at openssl.org</a>.
 	  </blockquote>
 	  </p>