Update community pages and nav.

Content from koobs@

4 files changed, 23 insertions, 45 deletions

diff --git a/website/content/en/community/_index.adoc b/website/content/en/community/_index.adoc
index ae5e5a68e1..a1a2719beb 100644
--- a/website/content/en/community/_index.adoc
+++ b/website/content/en/community/_index.adoc
@@ -7,27 +7,27 @@ include::shared/en/urls.adoc[]
 
 = Community
 
-There are more than one hundred link:../community/mailinglists/[mailing lists],
-dozens of web-based https://forums.freebsd.org/[forums],
-and several link:{handbook}#eresources-news[newsgroups] available.
-There are over {{< get-usergroups-info "usergroups" >}} user groups in {{< get-usergroups-info "countries" >}} unique countries around the world.
-There is also an active link:../community/irc/[IRC] community.
-Developers and key contributors also maintain a https://wiki.freebsd.org/[wiki],
-which contains information about FreeBSD development and related projects.
+FreeBSD's community is diverse and extensive, and can be found everywhere great conversations and activity takes place.
+You'll find our community and spaces intelligent, welcoming and approachable.
 
+The project maintains several official community spaces where developers, contributors and users can find help and support, stay up to date, coordinate and collaborate or just kick back, relax and socialise.
+
+If you prefer asynchronous and long-lived communications channels, FreeBSD offers over one hundred https://lists.freebsd.org/mailman/listinfo[mailing lists] covering a vast range of topics, and provides web-based https://forums.freebsd.org/[forums] and several Usenet link:{handbook}eresources/#eresources-news[newsgroups].
+
+For more real-time collaboration, we run a number of https://wiki.freebsd.org/IRC/[FreeBSD IRC channels] and host a https://wiki.freebsd.org/Discord[Discord] server where you can find support, learn to contribute, watch live streams and a whole lot more.
+
+If you are interested in professional development and networking opportunities then follow us on https://www.linkedin.com/company/freebsd/[LinkedIn] and join our official https://www.linkedin.com/groups/47628[FreeBSD LinkedIn Group].
+
+For regularly run in-person and online meets, you might like to look into our https://www.freebsd.org/events[FreeBSD Events] where we maintain a feed and calendar of upcoming events.
 Last year there were {{< get-event-last-year-info "events" >}} FreeBSD events in {{< get-event-last-year-info "countries" >}} different countries around the world.
-A calendar and link:../events/feed.xml[RSS] feed of upcoming FreeBSD-related events are maintained on our events page.
-There are dozens of videos from past events on the https://www.youtube.com/user/bsdconferences[BSD Conferences] channel on YouTube.
 
-== Latest Videos
+On twitter, you can follow https://twitter.com/freebsd[@freebsd], https://twitter.com/freebsdhelp[@freebsdhelp], or https://twitter.com/freebsdcore[@freebsdcore].
 
-{{< youtube id="?listType=user_uploads&list=bsdconferences" title="BSD Conferences channel" >}}
+Beyond officially run community spaces, there are https://www.freebsd.org/usergroups/[User Groups] user groups in {{< get-usergroups-info "countries" >}} countries, along with highly active FreeBSD communities on https://twitter.com/search?q=freebsd[Twitter], https://stackoverflow.com/questions/tagged/freebsd[StackOverflow], https://serverfault.com/questions/tagged/freebsd[ServerFault], and https://www.meetup.com/topics/freebsd/[MeetUp.com], among many other technology-related spaces.
 
-== Social Networking
+Developers and key contributors also maintain a https://wiki.freebsd.org/[wiki], which contains information about FreeBSD development and related projects.
 
-FreeBSD is represented on a number of different social networks.
+== Video Content
 
-* There are thousands of photos from user group meetings, conferences, and hackathons tagged as 'freebsd' on flickr.
-* There are hundreds of videos from conferences, screencasts, and demonstrations relating to https://www.youtube.com/results?search_query=freebsd[FreeBSD] on https://www.youtube.com/[YouTube]. In particular, there is an official link:https://www.youtube.com/FreeBSDProject[FreeBSD] channel with developer summits, office hours and other event recordings, and a link:https://www.youtube.com/bsdconferences[BSD Conferences] channel with full taped presentations from FreeBSD technical conferences.
-* There is a https://www.facebook.com/groups/FreeSBD/[FreeBSD Users Group] on https://www.facebook.com/[Facebook] and a https://www.linkedin.com/groups/47628/[FreeBSD Group] on https://www.linkedin.com/[LinkedIn].
-* You can follow https://twitter.com/freebsd[@freebsd], https://twitter.com/freebsdhelp[@freebsdhelp], or https://twitter.com/freebsdcore[@freebsdcore] on https://twitter.com/[Twitter].
+On YouTube, we host an official link:https://www.youtube.com/FreeBSDProject[FreeBSD] channel with
+developer summits and "office hours" events, and a link:https://www.youtube.com/bsdconferences[BSD Conferences] channel with full taped presentations from FreeBSD technical conferences.
diff --git a/website/content/en/community/mailinglists.adoc b/website/content/en/community/mailinglists.adoc
index e6a01b253f..3cefad22d2 100644
--- a/website/content/en/community/mailinglists.adoc
+++ b/website/content/en/community/mailinglists.adoc
@@ -7,15 +7,11 @@ include::shared/en/urls.adoc[]
 
 = Mailing Lists
 
-Mailing lists are the primary communication channels for the FreeBSD community, and cover many topic areas.
+Mailing lists are the primary communication channels for the FreeBSD community, and cover many topic areas. They are generally English language unless otherwise stated; a list is given link:{handbook}eresources/#eresources-mail[in the FreeBSD Handbook].
 
 == Mailing list archives
 
-You can link:../../search/#mailinglists[search] or https://www.FreeBSD.org/mail/[browse] the mailing list archives at https://www.FreeBSD.org/[www.FreeBSD.org.] It is also possible to https://lists.FreeBSD.org/mailman/listinfo[browse] the mailing lists via the Mailman Web interface.
-
-== English Mailing lists
-
-The English speaking mailing lists are link:{handbook}eresources/#eresources-mail[listed in the FreeBSD Handbook].
+You can link:../../search/#mailinglists[search] or https://lists.FreeBSD.org/archives/[browse] the mailing list archives. At the current time, archives prior to May 2021 are in https://lists.freebsd.org/pipermail/[a separate archive].
 
 == Non-English Mailing lists
 
diff --git a/website/content/en/community/webresources.adoc b/website/content/en/community/webresources.adoc
deleted file mode 100644
index bd93234f7d..0000000000
--- a/website/content/en/community/webresources.adoc
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: "Web Resources"
-sidenav: community
----
-
-= Web Resources
-
-Our web pages remain one of the best sources of information, and are also mirrored at many sites around the world. Try connecting to www.FreeBSD.org**/yourcountry** (e.g., https://www.freebsd.org/de/[www.FreeBSD.org/de/] for Germany or select a mirror from the drop-down list on the link:../../[front page].
-
-The FreeBSD web pages are translated into several languages. Links to the translated versions of these web pages can be found on the link:../../[front page].
-
-Several other non-English resources exist:
-
-* http://bsd.hu/[Hungarian]
-* http://www.gufi.org/[Italian]
-* https://www.freebsd.org/ja/[Japanese]
-
-For information on recent FreeBSD progress and releases, see the link:../../news[Newsflash] page.
diff --git a/website/content/en/search/_index.adoc b/website/content/en/search/_index.adoc
index bc29f2a7c1..7ad9629ca1 100644
--- a/website/content/en/search/_index.adoc
+++ b/website/content/en/search/_index.adoc
@@ -25,7 +25,7 @@ link:opensearch[List of FreeBSD OpenSearch Plugins]
 '''''
 
 [[web]]
-== Web pages (including link:{faq}[FAQ], link:{handbook}[Handbook], link:https://lists.freebsd.org[Mailing Lists], link:https://wiki.freebsd.org[Wiki] and link:https://forums.freebsd.org[Forums])
+== Web pages (including link:{faq}[FAQ], link:{handbook}[Handbook], link:https://lists.freebsd.org/index[Mailing Lists], link:https://wiki.freebsd.org[Wiki] and link:https://forums.freebsd.org[Forums])
 
 === Search within sites:
 
@@ -54,10 +54,10 @@ link:opensearch[List of FreeBSD OpenSearch Plugins]
 [[mailinglists]]
 == Mailing list archives
 
-The https://www.FreeBSD.org/mail/[mailing list archive] indexes are now updated weekly!
+The https://lists.FreeBSD.org/index/[mailing list archive] indexes are now updated weekly!
 
-An alternative way to read the mailing lists archives is to use the http://lists.FreeBSD.org/mailman/listinfo[Mailman/Pipermail list archive] (note that this archive only carries messages from March 2003 onward).
+An alternative way to read the mailing lists archives is to use the http://lists.FreeBSD.org/pipermail[Pipermail list archive] (note that this archive contains messages between March 2003 and May 2021).
 
-The mailing lists (as well as many others) have also been archived by http://markmail.org/browse/?q=list:org.freebsd[MarkMail].
+The mailing lists have also been archived by https://freebsd.markmail.org/search/?q=[MarkMail] (as well as many others).
 
 {{< form-search-mail >}}