Update various out-dated links, emails, etc.

Author: ScriptAutomate

Diff for: .github/ISSUE_TEMPLATE/config.yml

@@ -6,6 +6,3 @@ contact_links:
   - name: Salt-Users Forum
     url: https://groups.google.com/forum/#!forum/salt-users
     about: Please ask and answer questions here.
-  - name: Salt on LiberaChat
-    url: https://web.libera.chat/#salt
-    about: Please ask and answer questions here.

Diff for: .github/ISSUE_TEMPLATE/tech-debt.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 ### Description of the tech debt to be addressed, include links and screenshots
-<!-- Note: Please direct questions to the salt-users google group, IRC or Community Discord. -->
+<!-- Note: Please direct questions to the salt-users google group, GitHub Discussions or Community Discord. -->
 
 ### Versions Report
 (Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions.)

Diff for: .github/config.yml

@@ -11,18 +11,16 @@ newIssueWelcomeComment: >
   Also, check out some of our community
   resources including:
 
-    - [Community Wiki](https://github.com/saltstack/community/wiki)
     - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
     - [Join our Community Discord](https://discord.com/invite/J7b7EscrAs)
-    - [IRC on LiberaChat](https://web.libera.chat/#salt)
     - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
-    - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
+    - [Community Wiki](https://github.com/saltstack/community/wiki)
 
   There are lots of ways to get involved in our community. Every month, there are around a dozen
   opportunities to meet with other contributors and the Salt Core team and collaborate in real
   time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
 
-  If you have additional questions, email us at saltproject@vmware.com. We’re glad
+  If you have additional questions, email us at saltproject.pdl@broadcom.com. We’re glad
   you’ve joined our community and look forward to doing awesome things with
   you!
 
@@ -37,18 +35,16 @@ newPRWelcomeComment: >
   Also, check out some of our community
   resources including:
 
-    - [Community Wiki](https://github.com/saltstack/community/wiki)
     - [Salt’s Contributor Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html)
     - [Join our Community Discord](https://discord.com/invite/J7b7EscrAs)
-    - [IRC on LiberaChat](https://web.libera.chat/#salt)
     - [Salt Project YouTube channel](https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg)
-    - [Salt Project Twitch channel](https://www.twitch.tv/saltprojectoss)
+    - [Community Wiki](https://github.com/saltstack/community/wiki)
 
   There are lots of ways to get involved in our community. Every month, there are around a dozen
   opportunities to meet with other contributors and the Salt Core team and collaborate in real
   time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
 
-  If you have additional questions, email us at saltproject@vmware.com. We’re glad
+  If you have additional questions, email us at saltproject.pdl@broadcom.com. We’re glad
   you’ve joined our community and look forward to doing awesome things with
   you!
 

Diff for: AUTHORS

@@ -8,114 +8,28 @@ Whos Who in Salt
 The Man With the Plan
 ----------------------------
 
-Thomas S. Hatch is the main developer of Salt. He is the founder, owner,
-maintainer and lead of the Salt project, as well as author of the majority
-of the Salt code and documentation.
+Thomas S. Hatch is the creator of Salt. He was the founder, owner,
+maintainer that lead Salt project, as well as author of the majority
+of initial Salt code and documentation.
 
-Documentation System
-----------------------------
+SaltStack, Inc. was acquired by VMware in 2020. In 2023, VMware was
+acquired by Broadcom.
 
-The documentation system was put together by Seth House, much of the
-documentation is being maintained by Seth.
+The Salt Project core team of developers are employed by Broadcom.
 
-Developers
+Documentation System
 ----------------------------
 
-Aaron Bull Schaefer <[email protected]>
-Aaron Toponce <[email protected]>
-Andrew Hammond <[email protected]>
-Aditya Kulkarni <[email protected]>
-Alexander Pyatkin <[email protected]>
-Andre Sachs <[email protected]>
-Andrew Colin Kissa <[email protected]>
-Andrew Kuhnhausen <[email protected]>
-Antti Kaihola <[email protected]>
-archme <[email protected]>
-Brad Barden <[email protected]>
-Bret Palsson <[email protected]>
-Brian Wagner <[email protected]>
-C. R. Oldham <[email protected]>
-Carl Loa Odin <[email protected]>
-Carlo Pires <[email protected]>
-Chris Rebert <[email protected]>
-Chris Scheller <[email protected]>
-Christer Edwards <[email protected]>
-Clint Savage <[email protected]>
-Colton Myers <[email protected]>
-Corey Quinn <[email protected]>
-Corin Kochenower <[email protected]>
-Dan Garthwaite <[email protected]>
-Daniel Wallace <danielwallace at gtmanfred dot com>
-David Boucha <[email protected]>
-David Pravec <[email protected]>
-deutsche
-Dmitry Kuzmenko <[email protected]>
-Doug Renn <[email protected]>
-Eivind Uggedal <[email protected]>
-[email protected] <[email protected]>
-Eric Poelke <[email protected]>
-Erik Nolte <[email protected]>
-Evan Borgstrom <[email protected]>
-Forrest Alvarez <[email protected]>
-Fred Reimer <[email protected]>
-Henrik Holmboe <[email protected]>
-Gareth J. Greenaway <[email protected]>
-Jacob Albretsen <[email protected]>
-Jed Glazner <[email protected]>
-Jeff Bauer <[email protected]>
-Jeff Hutchins <[email protected]>
-Jeffrey C. Ollie <[email protected]>
-Jeff Schroeder <[email protected]>
-Johnny Bergström
-Jonas Buckner <[email protected]>
-Jonathan Harker <[email protected]>
-Joseph Hall <[email protected]>
-Josmar Dias <[email protected]>
-Kent Tenney <[email protected]>
-lexual
-Marat Shakirov
-Marc Abramowitz <[email protected]>
-Martin Schnabel <[email protected]>
-Mathieu Le Marec - Pasquet <[email protected]>
-Matt Black
-Matthew Printz <[email protected]>
-Matthias Teege <[email protected]>
-Maxim Burgerhout <[email protected]>
-Mickey Malone <[email protected]>
-Michael Steed <[email protected]>
-Mike Place <[email protected]>
-Mircea Ulinic <[email protected]>
-Mitch Anderson <[email protected]>
-Mostafa Hussein <[email protected]>
-Nathaniel Whiteinge <[email protected]>
-Nicolas Delaby <[email protected]>
-Nicole Thomas <[email protected]>
-Nigel Owen <nigelowen2.gmail.com>
-Nitin Madhok <[email protected]>
-Oleg Anashkin <[email protected]>
-Pedro Algarvio <[email protected]>
-Peter Baumgartner
-Pierre Carrier <[email protected]>
-Rhys Elsmore <[email protected]>
-Rafael Caricio <[email protected]>
-Robert Fielding
-Sean Channel <[email protected]>
-Seth House <[email protected]>
-Seth Vidal <[email protected]>
-Stas Alekseev <[email protected]>
-Thibault Cohen <[email protected]>
-Thomas Schreiber <[email protected]>
-Thomas S Hatch <[email protected]>
-Tor Hveem <[email protected]>
-Travis Cline <[email protected]>
-Wieland Hoffmann <[email protected]>
+The initial documentation system was put together by Seth House.
 
+Documentation is now primarily maintained by the Salt Project core team and
+community members.
 
 Growing Community
 --------------------------------
 
-Salt is a rapidly growing project with a large community, to view all
-contributors please check Github, this file can sometimes be out of date:
+Salt is a rapidly growing project with a large community, and has had more than
+2,400 contributors over the years. To view all contributors, please check Github:
 
 https://github.com/saltstack/salt/graphs/contributors
 

Diff for: CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-conduct@saltstack.com.
+saltproject.pdl@broadcom.com.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

Diff for: CONTRIBUTING.rst

@@ -8,7 +8,7 @@ ways you can help improve Salt:
 - Use Salt and report bugs with clear, detailed descriptions.
 - Join a `working group <https://github.com/saltstack/community>`__ to
   collaborate with other contributors.
-- Answer questions on platforms like `IRC <https://web.libera.chat/#salt>`__,
+- Answer questions on platforms like
   the `community Discord <https://discord.com/invite/J7b7EscrAs>`__,
   the `salt-users mailing list <https://groups.google.com/forum/#!forum/salt-users>`__,
   `Server Fault <https://serverfault.com/questions/tagged/saltstack>`__,
@@ -135,7 +135,7 @@ Then activate it:
 
 Sweet! Now you're ready to clone Salt so you can start hacking away! If
 you get stuck at any point, check out the resources at the beginning of
-this guide. IRC and Discord are particularly helpful places to go.
+this guide. Discord and GitHub Discussions are particularly helpful places to go.
 
 
 Get the source!
@@ -631,7 +631,7 @@ your PR is submitted during the week you should be able to expect some
 kind of communication within that business day. If your tests are
 passing and we're not in a code freeze, ideally your code will be merged
 that week or month. If you haven't heard from your assigned reviewer, ping them
-on GitHub, `irc <https://web.libera.chat/#salt>`__, or Community Discord.
+on GitHub or `Community Discord <https://discord.com/invite/J7b7EscrAs>`__.
 
 It's likely that your reviewer will leave some comments that need
 addressing - it may be a style change, or you forgot a changelog entry,

Diff for: README.rst

@@ -6,18 +6,10 @@
    :alt: PyPi Package Downloads
    :target: https://pypi.org/project/salt
 
-.. image:: https://img.shields.io/lgtm/grade/python/github/saltstack/salt
-   :alt: PyPi Package Downloads
-   :target: https://lgtm.com/projects/g/saltstack/salt/context:python
-
 .. image:: https://img.shields.io/badge/discord-SaltProject-blue.svg?logo=discord
    :alt: Salt Project Discord Community
    :target: https://discord.com/invite/J7b7EscrAs
 
-.. image:: https://img.shields.io/twitch/status/saltprojectoss
-   :alt: Salt Project Twitch Channel
-   :target: https://www.twitch.tv/saltprojectoss
-
 .. image:: https://img.shields.io/reddit/subreddit-subscribers/saltstack?style=social
    :alt: Salt Project subreddit
    :target: https://www.reddit.com/r/saltstack/
@@ -71,20 +63,21 @@ In addition to configuration management Salt can also:
 
 About our sponsors
 ==================
-Salt powers VMware's `VMware Aria Automation Config`_
-(previously vRealize Automation SaltStack Config / SaltStack Enterprise), and can be found
+
+Salt powers VMware by Broadcom's `Tanzu Salt`_
+(previously Aria Automation Config / vRealize Automation SaltStack Config / SaltStack Enterprise), and can be found
 under the hood of products from Juniper, Cisco, Cloudflare, Nutanix, SUSE, and
 Tieto, to name a few.
 
-The original sponsor of our community, SaltStack, was `acquired by VMware in 2020 <https://www.vmware.com/company/acquisitions/saltstack.html>`_.
-The Salt Project remains an open source ecosystem that VMware supports and
-contributes to. VMware ensures the code integrity and quality of the Salt
+The original sponsor of our community, SaltStack, was acquired by VMware in 2020.
+`VMware was later acquired by Broadcom in 2023 <https://investors.broadcom.com/news-releases/news-release-details/broadcom-completes-acquisition-vmware>`__.
+The Salt Project remains an open source ecosystem that Broadcom supports and
+contributes to. Broadcom ensures the code integrity and quality of the Salt
 modules by acting as the official sponsor and manager of the Salt project. Many
-of the core Salt Project contributors are also VMware employees. This team
+of the core Salt Project contributors are also Broadcom employees. This team
 carefully reviews and enhances the Salt modules to ensure speed, quality, and
 security.
 
-
 Download and install Salt
 =========================
 Salt is tested and packaged to run on CentOS, Debian, RHEL, Ubuntu, MacOS,
@@ -93,11 +86,11 @@ Windows, and more. Download Salt and get started now. See
 for more information.
 
 To download and install Salt, see:
-* `The Salt install guide <https://docs.saltproject.io/salt/install-guide/en/latest/index.html>`_
-* `Salt Project repository <https://packages.broadcom.com/artifactory/saltproject-generic/>`_
-* `Salt Project debian repository <https://packages.broadcom.com/artifactory/saltproject-deb/>`_
-* `Salt Project redhat repository <https://packages.broadcom.com/artifactory/saltproject-rpm/>`_
 
+* `The Salt install guide <https://docs.saltproject.io/salt/install-guide/en/latest/index.html>`_
+    * `Salt Project Repository: Linux (RPM) <https://packages.broadcom.com/artifactory/saltproject-rpm>`__ - Where Salt ``rpm`` packages are officially stored and distributed.
+    * `Salt Project Repository: Linux (DEB) <https://packages.broadcom.com/artifactory/saltproject-deb>`__ - Where Salt ``deb`` packages are officially stored and distributed.
+    * `Salt Project Repository: GENERIC <https://packages.broadcom.com/artifactory/saltproject-generic>`__ - Where Salt Windows, macOS, etc. (non-rpm, non-deb) packages are officially stored and distributed.
 
 Technical support
 =================
@@ -155,22 +148,19 @@ Please be sure to review our
 `Code of Conduct <https://github.com/saltstack/salt/blob/master/CODE_OF_CONDUCT.md>`_.
 Also, check out some of our community resources including:
 
-* `Salt Project Community Wiki <https://github.com/saltstack/community/wiki>`_
 * `Salt Project Community Discord`_
-* `Salt Project: IRC on LiberaChat <https://web.libera.chat/#salt>`_
 * `Salt Project YouTube channel <https://www.youtube.com/channel/UCpveTIucFx9ljGelW63-BWg>`_
-* `Salt Project Twitch channel <https://www.twitch.tv/saltprojectoss>`_
+* `Salt Project Community Notes and Wiki <https://github.com/saltstack/community/>`_
 
 There are lots of ways to get involved in our community. Every month, there are
 around a dozen opportunities to meet with other contributors and the Salt Core
 team and collaborate in real time. The best way to keep track is by subscribing
 to the **Salt Project Community Events Calendar** on the main
 `<https://saltproject.io>`_ website.
 
-If you have additional questions, email us at saltproject@vmware.com or reach out
+If you have additional questions, email us at saltproject.pdl@broadcom.com or reach out
 directly to the Community Discord. We'd be glad to have you join our community!
 
-
 License
 =======
 Salt is licensed under the Apache 2.0 license. Please
@@ -183,9 +173,7 @@ A complete list of attributions and dependencies can be found here:
 `salt/DEPENDENCIES.md <https://github.com/saltstack/salt/blob/master/DEPENDENCIES.md>`_
 
 .. _Salt Project Community Discord: https://discord.com/invite/J7b7EscrAs
-.. _VMware Aria Automation Config: https://www.vmware.com/products/vrealize-automation/saltstack-config.html
+.. _Tanzu Salt: https://www.vmware.com/products/app-platform/tanzu-salt
 .. _Latest Salt Documentation: https://docs.saltproject.io/en/latest/
 .. _Open an issue: https://github.com/saltstack/salt/issues/new/choose
 .. _SECURITY.md: https://github.com/saltstack/salt/blob/master/SECURITY.md
-.. _Calendar html: https://outlook.office365.com/owa/calendar/[email protected]/434ec2155b2b4cce90144c87f0dd03d56626754050155294962/calendar.html
-.. _Calendar ics: https://outlook.office365.com/owa/calendar/[email protected]/434ec2155b2b4cce90144c87f0dd03d56626754050155294962/calendar.ics

Diff for: SUPPORT.rst

@@ -1,15 +1,8 @@
-Get SaltStack Support and Help
-==============================
+Get Salt Project Support and Help
+=================================
 
-**IRC Chat** - Join the vibrant, helpful and positive SaltStack chat room in
-LiberaChat at #salt. There is no need to introduce yourself, or ask permission
-to join in, just help and be helped! Make sure to wait for an answer, sometimes
-it may take a few moments for someone to reply.
-
-`<https://web.libera.chat/#salt>`_
-
-**SaltStack Slack** - Alongside IRC is our SaltStack Community Discord for the
-SaltStack Working groups. Use the following link to request an invitation.
+**Salt Project Discord** - Join the Salt Project Community Discord!
+Use the following link to join the Discord server:
 
 `<https://discord.com/invite/J7b7EscrAs>`_
 
@@ -20,13 +13,13 @@ anyone can help answer. Join the conversation!
 `<https://groups.google.com/forum/#!forum/salt-users>`_
 
 You may subscribe to the list without a Google account by emailing
-[email protected] and you may post to the list by emailing
-[email protected]
+``[email protected]`` and you may post to the list by emailing
+``[email protected]``
 
 **Reporting Issues** - To report an issue with Salt, please follow the
 guidelines for filing bug reports:
 `<https://docs.saltproject.io/en/master/topics/development/reporting_bugs.html>`_
 
-**SaltStack Support** - If you need dedicated, prioritized support, please
-consider a SaltStack Support package that fits your needs:
-`<http://www.saltstack.com/support>`_
+**Salt Project Support** - If you need dedicated, prioritized support, please
+consider taking a look at the Enterprise product:
+`Tanzu Salt <https://www.vmware.com/products/app-platform/tanzu-salt>`__

Diff for: doc/_themes/saltstack/layout.html

@@ -247,8 +247,8 @@ <h4>Contact Us</h4>
                                 </div>
                                 <div class="footerCol">
                                         <h4>Community</h4>
-                                        <a href="http://saltstack.org">saltstack.org</a>
-                                        <a href="http://docs.saltstack.org/en/latest/">Documentation</a>
+                                        <a href="http://saltproject.io">saltproject.io</a>
+                                        <a href="http://docs.saltproject.io/en/latest/">Documentation</a>
 <!--                                    <a href="#">Blogs</a> -->
                                 </div>
                         </div>

Diff for: doc/_themes/saltstack2/layout.html

@@ -290,7 +290,7 @@
                 {% if on_saltstack %}
                 {#
                 {% if [True, False]|random %}
-                <a href="http://saltconf.com/register" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/banner-saltconf.png', 1) }}"/></a>
+                <a href="http://saltproject.io" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/banner-saltconf.png', 1) }}"/></a>
                 {% else %}
                 <a href="http://saltstack.com/support" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/banner-support.png', 1) }}"/></a>
                 {% endif %} #}-->