Update various out-dated links, emails, etc.

.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.

.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.)

.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!
 

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,
+Thomas S. Hatch is the creator of Salt. He was the founder, owner,
-maintainer and lead of the Salt project, as well as author of the majority
+maintainer that lead Salt project, as well as author of the majority
-of the Salt code and documentation.
+of initial Salt code and documentation.
+
+SaltStack, Inc. was acquired by VMware in 2020. In 2023, VMware was
+acquired by Broadcom.
+
+The Salt Project core team of developers are employed by Broadcom.
 
 Documentation System
 ----------------------------
 
-The documentation system was put together by Seth House, much of the
+The initial documentation system was put together by Seth House.
-documentation is being maintained by Seth.
-
-Developers
-----------------------------
-
-Aaron Bull Schaefer <aaron@elasticdog.com>
-Aaron Toponce <aaron.toponce@gmail.com>
-Andrew Hammond <andrew.george.hammond@gmail.com>
-Aditya Kulkarni <adi@saltstack.com>
-Alexander Pyatkin <asp@thexyz.net>
-Andre Sachs <andre@sachs.nom.za>
-Andrew Colin Kissa <andrew@topdog.za.net>
-Andrew Kuhnhausen <trane@errstr.com>
-Antti Kaihola <akaihol+github@ambitone.com>
-archme <archme.mail@gmail.com>
-Brad Barden <brad@mifflinet.net>
-Bret Palsson <bretep@gmail.com>
-Brian Wagner <wags@wagsworld.net>
-C. R. Oldham <cr@saltstack.com>
-Carl Loa Odin <carlodin@gmail.com>
-Carlo Pires <carlopires@gmail.com>
-Chris Rebert <chris.rebert@hulu.com>
-Chris Scheller <schelcj@umich.edu>
-Christer Edwards <christer.edwards@gmail.com>
-Clint Savage <herlo1@gmail.com>
-Colton Myers <cmyers@saltstack.com>
-Corey Quinn <corey@sequestered.net>
-Corin Kochenower <ckochenower@saltstack.com>
-Dan Garthwaite <dan@garthwaite.org>
-Daniel Wallace <danielwallace at gtmanfred dot com>
-David Boucha <boucha@gmail.com>
-David Pravec <alekibango@pravec.tk>
-deutsche
-Dmitry Kuzmenko <dkuzmenko@saltstack.com>
-Doug Renn <renn@nestegg.com>
-Eivind Uggedal <eivind@uggedal.com>
-epoelke@gmail.com <epoelke@heartflow.com>
-Eric Poelke <epoelke@gmail.com>
-Erik Nolte <enolte@beyondoblivion.com>
-Evan Borgstrom <evan@fatbox.ca>
-Forrest Alvarez <forrest.alvarez@gmail.com>
-Fred Reimer <freimer@freimer.org>
-Henrik Holmboe <henrik@holmboe.se>
-Gareth J. Greenaway <gareth@wiked.org>
-Jacob Albretsen <jakea@xmission.com>
-Jed Glazner <jglazner@coldcrow.com>
-Jeff Bauer <jbauer@rubic.com>
-Jeff Hutchins <jhutchins@getjive.com>
-Jeffrey C. Ollie <jeff@ocjtech.us>
-Jeff Schroeder <jeffschroeder@computer.org>
-Johnny Bergström
-Jonas Buckner <buckner.jonas@gmail.com>
-Jonathan Harker <k.jonathan.harker@hp.com>
-Joseph Hall <joseph@saltstack.com>
-Josmar Dias <josmarnet@gmail.com>
-Kent Tenney <ktenney@gmail.com>
-lexual
-Marat Shakirov
-Marc Abramowitz <marc+github@marc-abramowitz.com>
-Martin Schnabel <mb0@mb0.org>
-Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
-Matt Black
-Matthew Printz <hipokrit@gmail.com>
-Matthias Teege <matthias-git@mteege.de>
-Maxim Burgerhout <maxim@wzzrd.com>
-Mickey Malone <mickey.malone@gmail.com>
-Michael Steed <msteed@saltstack.com>
-Mike Place <mp@saltstack.com>
-Mircea Ulinic <ping@mirceaulinic.net>
-Mitch Anderson <mitch@metauser.net>
-Mostafa Hussein <mostafa.hussein91@gmail.com>
-Nathaniel Whiteinge <seth@eseth.com>
-Nicolas Delaby <nicolas.delaby@ezeep.com>
-Nicole Thomas <nicole@saltstack.com>
-Nigel Owen <nigelowen2.gmail.com>
-Nitin Madhok <nmadhok@g.clemson.edu>
-Oleg Anashkin <oleg.anashkin@gmail.com>
-Pedro Algarvio <pedro@algarvio.me>
-Peter Baumgartner
-Pierre Carrier <pierre@spotify.com>
-Rhys Elsmore <me@rhys.io>
-Rafael Caricio <rafael@caricio.com>
-Robert Fielding
-Sean Channel <pentabular@gmail.com>
-Seth House <seth@eseth.com>
-Seth Vidal <skvidal@fedoraproject.org>
-Stas Alekseev <stas.alekseev@gmail.com>
-Thibault Cohen <titilambert@gmail.com>
-Thomas Schreiber <tom@rizumu.us>
-Thomas S Hatch <thatch45@gmail.com>
-Tor Hveem <xt@bash.no>
-Travis Cline <travis.cline@gmail.com>
-Wieland Hoffmann <themineo+github@gmail.com>
 
+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
+Salt is a rapidly growing project with a large community, and has had more than
-contributors please check Github, this file can sometimes be out of date:
+2,400 contributors over the years. To view all contributors, please check Github:
 
 https://github.com/saltstack/salt/graphs/contributors
 

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

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,

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 original sponsor of our community, SaltStack, was acquired by VMware in 2020.
-The Salt Project remains an open source ecosystem that VMware supports and
+`VMware was later acquired by Broadcom in 2023 <https://investors.broadcom.com/news-releases/news-release-details/broadcom-completes-acquisition-vmware>`__.
-contributes to. VMware ensures the code integrity and quality of the Salt
+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,11 +148,9 @@ 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
@@ -167,10 +158,9 @@ 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/105f69bacd4541baa849529aed37eb2d@vmware.com/434ec2155b2b4cce90144c87f0dd03d56626754050155294962/calendar.html
-.. _Calendar ics: https://outlook.office365.com/owa/calendar/105f69bacd4541baa849529aed37eb2d@vmware.com/434ec2155b2b4cce90144c87f0dd03d56626754050155294962/calendar.ics

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
+**Salt Project Discord** - Join the Salt Project Community Discord!
-LiberaChat at #salt. There is no need to introduce yourself, or ask permission
+Use the following link to join the Discord server:
-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.
 
 `<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
-salt-users+subscribe@googlegroups.com and you may post to the list by emailing
+``salt-users+subscribe@googlegroups.com`` and you may post to the list by emailing
-salt-users@googlegroups.com
+``salt-users@googlegroups.com``
 
 **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
+**Salt Project Support** - If you need dedicated, prioritized support, please
-consider a SaltStack Support package that fits your needs:
+consider taking a look at the Enterprise product:
-`<http://www.saltstack.com/support>`_
+`Tanzu Salt <https://www.vmware.com/products/app-platform/tanzu-salt>`__

doc/_themes/saltstack/layout.html

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

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 %} #}-->

doc/conf.py

@@ -181,20 +181,6 @@ rst_prolog = """\
 .. _`salt-announce`: https://groups.google.com/forum/#!forum/salt-announce
 .. _`salt-packagers`: https://groups.google.com/forum/#!forum/salt-packagers
 .. _`salt-discord`: https://discord.com/invite/J7b7EscrAs
-.. |windownload| raw:: html
-
-     <p>Python3 x86: <a
-     href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-x86-Setup.exe"><strong>Salt-Minion-{release}-x86-Setup.exe</strong></a>
-      | <a href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-x86-Setup.exe.md5"><strong>md5</strong></a></p>
-
-     <p>Python3 AMD64: <a
-     href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-AMD64-Setup.exe"><strong>Salt-Minion-{release}-AMD64-Setup.exe</strong></a>
-      | <a href="https://packages.broadcom.com/artifactory/saltproject-generic/windows/{release}/Salt-Minion-{release}-Py3-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
-
-.. |osxdownloadpy3| raw:: html
-
-     <p>x86_64: <a href="https://packages.broadcom.com/artifactory/saltproject-generic/macos/{release}/salt-{release}-py3-x86_64.pkg"><strong>salt-{release}-py3-x86_64.pkg</strong></a>
-      | <a href="https://packages.broadcom.com/artifactory/saltproject-generic/macos/{release}/salt-{release}-py3-x86_64.pkg.md5"><strong>md5</strong></a></p>
 
 """.format(
     release=stripped_release

doc/faq.rst

@@ -30,7 +30,7 @@ SaltStack the company does make proprietary products which use Salt and its libr
 I think I found a bug! What should I do?
 ----------------------------------------
 
-The salt-users mailing list as well as the salt IRC channel can both be helpful
+The salt-users mailing list as well as the Community Discord can both be helpful
 resources to confirm if others are seeing the issue and to assist with
 immediate debugging.
 

doc/ref/configuration/delta_proxy.rst

@@ -146,8 +146,8 @@ Before installing the delta proxy minion, ensure that:
 Install or upgrade Salt
 -----------------------
 Ensure your Salt masters are running at least Salt version 3004. For instructions
-on installing or upgrading Salt, see the `Salt install guide
+on installing or upgrading Salt, see the
-<https://docs.saltproject.io/salt/install-guide>`_.
+`Salt Install Guide <https://docs.saltproject.io/salt/install-guide/en/latest/>`__.
 
 
 .. _delta-proxy-install:

doc/ref/modules/index.rst

@@ -539,8 +539,6 @@ the module using the following field lists:
 
 .. code-block:: text
 
-    :maintainer:    Thomas Hatch <thatch@saltstack.com, Seth House <shouse@saltstack.com>
-    :maturity:      new
     :depends:       python-mysqldb
     :platform:      all
 

doc/topics/development/conventions/formulas.rst

@@ -221,14 +221,10 @@ The best way to create new Formula repositories for now is to create a
 repository in your own account on GitHub and notify a SaltStack employee when
 it is ready. We will add you to the Contributors team on the
 `saltstack-formulas`_ organization and help you transfer the repository over.
-Ping a SaltStack employee on IRC (`#salt`_ on LiberaChat), join the
+Join the ``#formulas`` channel on the `salt-discord`_
-``#formulas`` channel on the `salt-discord`_ (bridged to ``#saltstack-formulas``
+or send an email to the `salt-users`_ mailing list.
-on LiberaChat) or send an email to the `salt-users`_ mailing list.  Note that
-IRC logs are available at http://ngxbot.nginx.org/logs/%23salt/ and archives
-for FreeNode (up to mid-June 2021) https://logbot-archive.s3.amazonaws.com/freenode/salt.gz
-and https://logbot-archive.s3.amazonaws.com/freenode/saltstack-formulas.gz.
 
-There are a lot of repositories in that organization! Team members can manage
+Team members can manage
 which repositories they are subscribed to on GitHub's watching page:
 https://github.com/watching.
 
@@ -246,7 +242,7 @@ your pull request has stayed open for more than a couple days feel free to
 "selfie-merge" your own pull request.
 
 .. _`at-mention`: https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams
-.. _`#salt`: https://web.libera.chat/#salt
+.. _`#salt`: https://discord.com/invite/J7b7EscrAs
 
 Style
 -----

doc/topics/development/conventions/style.rst

@@ -97,7 +97,7 @@ When adding a new function or state, where possible try to use a
         print(msg)
 
 If you are uncertain what version should be used, either consult a core
-developer in IRC or bring this up when opening your :ref:`pull request
+developer in the Community Discord or bring this up when opening your :ref:`pull request
 <installing-for-development>` and a core developer will let you know what
 version to add. Typically this will be the next element in the `periodic table
 <https://en.wikipedia.org/wiki/List_of_chemical_elements>`_.

pkg/old/suse/salt-api.spec

@@ -20,7 +20,7 @@ Version:        0.8.3
 Release:        0
 License:        Apache-2.0
 Summary:        The api for Salt a parallel remote execution system
-Url:            http://saltstack.org/
+Url:            http://saltproject.io/
 Group:          System/Monitoring
 Source0:        http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
 Source1:		salt-api

pkg/old/suse/salt.spec

@@ -41,7 +41,7 @@ Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
 Group:          System/Monitoring
-Url:            http://saltstack.org/
+Url:            http://saltproject.io/
 Source0:        http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d

pkg/rpm/salt.bash

@@ -1,6 +1,3 @@
-# written by David Pravec
-#   - feel free to /msg alekibango on IRC if you want to talk about this file
-
 # TODO: check if --config|-c was used and use configured config file for queries
 # TODO: solve somehow completion for  salt -G pythonversion:[tab]
 #       (not sure what to do with lists)

salt/modules/tls.py

@@ -1982,7 +1982,7 @@ if __name__ == "__main__":
         L="Centerville",
         O="SaltStack",
         OU=None,
-        emailAddress="test_system@saltstack.org",
+        emailAddress="test_system@saltproject.io",
     )
     create_ca_signed_cert("koji", "test_system")
     create_pkcs12("koji", "test_system", passphrase="test")

salt/renderers/stateconf.py

@@ -6,7 +6,7 @@ A flexible renderer that takes a templating engine and a data format
 :platform: all
 """
 
-# See http://docs.saltstack.org/en/latest/ref/renderers/all/salt.renderers.stateconf.html
+# See http://docs.saltproject.io/en/latest/ref/renderers/all/salt.renderers.stateconf.html
 # for a guide to using this module.
 #
 # FIXME: I really need to review and simplify this renderer, it's getting out of hand!

tests/pytests/pkg/download/test_pkg_download.py

@@ -198,7 +198,7 @@ def setup_redhat_family(
     # It contains the gpg key url so we don't need to download it here
     salt_repo_url = "https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo"
     repo_file = pytest.helpers.download_file(
-        salt_repo_url, downloads_path / f"salt.repo"
+        salt_repo_url, downloads_path / "salt.repo"
     )
 
     commands = [

tests/support/pkg.py

@@ -783,7 +783,7 @@ class SaltPkgInstall:
             elif self.file_ext == "msi":
                 win_pkg = f"Salt-Minion-{self.prev_version}-Py3-AMD64.{self.file_ext}"
             else:
-                log.debug(f"Unknown windows file extension: {self.file_ext}")
+                log.debug("Unknown windows file extension: %s", self.file_ext)
 
             win_pkg_url = (
                 f"{root_url}/saltproject-generic/windows/{major_ver}/{win_pkg}"

tests/support/win_installer.py

@@ -26,7 +26,7 @@ def latest_installer_name(arch="AMD64", **kwargs):
     # This is where windows packages are found
     # Each version is in its own directory, so we need to list the directories
     # and use the last one as the latest
-    html_response = requests.get(REPO)
+    html_response = requests.get(REPO, timeout=60)
 
     versions = []