Skip to content

Commit

Permalink
Merge branch '3006.x' into fix_65095
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurphy18 committed Aug 27, 2024
2 parents 3a8c60b + 137ccc4 commit d90d3ba
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
:alt: PyPi Package Downloads
:target: https://lgtm.com/projects/g/saltstack/salt/context:python

.. image:: https://img.shields.io/badge/slack-SaltProject-blue.svg?logo=slack
:alt: Salt Project Slack Community
:target: https://via.vmw.com/salt-slack
.. 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
Expand Down Expand Up @@ -103,7 +103,7 @@ Report bugs or problems using Salt by opening an issue: `<https://github.com/sal

To join our community forum where you can exchange ideas, best practices,
discuss technical support questions, and talk to project maintainers, join our
Slack workspace: `Salt Project Community Slack`_
Discord workspace: `Salt Project Community Discord`_


Salt Project documentation
Expand All @@ -127,7 +127,7 @@ announcements.

Other channels to receive security announcements include the
`Salt Community mailing list <https://groups.google.com/forum/#!forum/salt-users>`_
and the `Salt Project Community Slack`_.
and the `Salt Project Community Discord`_.


Responsibly reporting security vulnerabilities
Expand All @@ -153,7 +153,7 @@ Please be sure to review our
Also, check out some of our community resources including:

* `Salt Project Community Wiki <https://github.com/saltstack/community/wiki>`_
* `Salt Project Community Slack`_
* `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>`_
Expand All @@ -165,8 +165,7 @@ to the **Salt Project Community Events Calendar** on the main
`<https://saltproject.io>`_ website.

If you have additional questions, email us at [email protected] or reach out
directly to the Community Manager, Jimmy Chunga via Slack. We'd be glad to
have you join our community!
directly to the Community Discord. We'd be glad to have you join our community!


License
Expand All @@ -180,7 +179,7 @@ used by external modules.
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 Slack: https://via.vmw.com/salt-slack
.. _Salt Project Community Discord: https://discord.com/invite/J7b7EscrAs
.. _VMware Aria Automation Config: https://www.vmware.com/products/vrealize-automation/saltstack-config.html
.. _Latest Salt Documentation: https://docs.saltproject.io/en/latest/
.. _Open an issue: https://github.com/saltstack/salt/issues/new/choose
Expand Down

0 comments on commit d90d3ba

Please sign in to comment.