Corrected contact info on contacts page and in page footers

Author: tillkamppeter

_config.yml

@@ -82,12 +82,6 @@ bing_site_verification   :
 yandex_site_verification :
 
 # Social Sharing
-twitter:
-  username               : "mmistakes"
-facebook:
-  username               :
-  app_id                 :
-  publisher              :
 og_image                 : "/assets/images/bio-photo.jpg"
 # For specifying social profiles
 # - https://developers.google.com/structured-data/customize/social-profiles
@@ -106,37 +100,35 @@ analytics:
 # Site Author
 author:
   name             : "OpenPrinting"
-#  avatar           : "/assets/images/logo.png"
+  avatar           : "/assets/images/logo.png"
   bio              : "Making Printing Just Work!"
-  location         : "Linux Foundation"
+  location         : "The Linux Foundation"
   links:
     - label: "Website"
       icon: "fas fa-fw fa-link"
-      url: "https://openprinting.github.io"
-    # - label: "Twitter"
-    #   icon: "fab fa-fw fa-twitter-square"
-    #   url: "https://twitter.com/"
+      url: "https://www.openprinting.org/"
     - label: "GitHub"
       icon: "fab fa-fw fa-github"
       url: "https://github.com/openprinting"
-    # - label: "Instagram"
-    #   icon: "fab fa-fw fa-instagram"
-    #   url: "https://instagram.com/"
-
+    - label: "Mastodon"
+      icon: "fab fa-fw fa-mastodon"
+      url: "https://ubuntu.social/tags/OpenPrinting"
+    - label: "LinkedIn"
+      icon: "fab fa-fw fa-linkedin"
+      url: "https://www.linkedin.com/company/openprinting/posts/"
 
 # Site Footer
 footer:
   links:
-    - label: "Twitter"
-      icon: "fab fa-fw fa-twitter-square"
-      #url: "https://twitter.com/intent/tweet?button_hashtag=OpenPrinting&ref_src=twsrc%5Etfw"
-      url: "https://twitter.com/open_printing"
     - label: "GitHub"
       icon: "fab fa-fw fa-github"
       url: "https://github.com/openprinting"
-    - label: "Facebook"
-      icon: "fab fa-fw fa-facebook"
-      url: "https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fopenprinting.github.io%2F&src=sdkpreparse"
+    - label: "Mastodon"
+      icon: "fab fa-fw fa-mastodon"
+      url: "https://ubuntu.social/tags/OpenPrinting"
+    - label: "LinkedIn"
+      icon: "fab fa-fw fa-linkedin"
+      url: "https://www.linkedin.com/company/openprinting/posts/"
     - label: "Code of Conduct"
       icon: "fas fa-file-contract"
       url: "/codeofconduct/"

_pages/contact.md

@@ -9,28 +9,20 @@ header:
 excerpt: "Feel Free To Contact Us!"
 author_profile: false
 ---
-<p>
-<strong>Important:</strong> We protect the e-mail addresses of our mentors and mailing lists against spam bots. Please replace all occurrences of “ at ” and “ dot ” by “@” and “.” resp.
-</p>
-<div>
-    <h1>Mailing Lists:</h1>
-    <p>
-        The lists were moved to the mail server <a href="https://subspace.kernel.org/lists.linux.dev.html">list.linux.dev</a>.
-        <ul>
-            <li><a href="https://lore.kernel.org/printing-architecture/" title="https://lore.kernel.org/printing-architecture/"  rel="nofollow">Architecture</a></li>
-            <li><a href="https://lore.kernel.org/printing-users/" title="https://lore.kernel.org/printing-users/"  rel="nofollow">Users</a></li>
-        </ul>
-    </p>
-    <p>
-        <h1>Telegram</h1>
-        <ul>
-            <li><a href="https://t.me/+RizBbjXz4uU2ZWM1" title="Join our Telegram chat.">OpenPrinting chat</a></li>
-        </ul> 
-    </p> 
-    <h1>GitHub</h1>
-    <p>
-        <ul>
-        <li><a href="https://github.com/OpenPrinting" title="https://github.com/OpenPrinting"  rel="nofollow">OpenPrinting GitHub</a></li>
-        </ul>
-    </p>
-</div>
+## Our Mailing lists
+We protect the e-mail addresses of our mailing lists against spam bots. Please replace all occurrences of “ at ” and “ dot ” by “@” and “.” resp.
+
+- **Development:** printing-architecture AT lists DOT linux DOT dev ([Archive](https://lore.kernel.org/printing-architecture/))
+- **Users:** printing-users AT lists DOT linux DOT dev ([Archive](https://lore.kernel.org/printing-users/))
+
+Subscribing/Unsubscribing [instructions](https://subspace.kernel.org/subscribing.html)
+
+## Telegram
+- Main chat room: [OpenPrinting](https://t.me/+RizBbjXz4uU2ZWM1)
+
+## Mastodon
+- [#OpenPrinting](https://ubuntu.social/tags/OpenPrinting)
+- [@till@ubuntu.social](https://ubuntu.social/@till)
+
+## LinkedIn
+- [@OpenPrinting](https://www.linkedin.com/company/openprinting/posts/)