Skip to content

Commit

Permalink
more occurrences
Browse files Browse the repository at this point in the history
  • Loading branch information
Mario Colombo committed Apr 17, 2024
1 parent 533e166 commit 4691a15
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 19 deletions.
3 changes: 1 addition & 2 deletions docs/contributing/code_of_conduct.rst
Expand Up @@ -11,8 +11,7 @@ and polite.
We will not tolerate abusive behaviour or language or any form of harassment.

Individuals whose behaviour is a cause for concern will be given a warning, and if
necessary will be excluded from participation in official django CMS channels (Slack
group, email lists, etc) and events. The `Django Software Foundation
necessary will be excluded from participation in official django CMS channels and events. The `Django Software Foundation
<http://djangoproject.com/foundation/>`_ will also be informed of the issue.

Raising a concern
Expand Down
12 changes: 4 additions & 8 deletions docs/contributing/development-community.rst
Expand Up @@ -69,19 +69,15 @@ But before you start getting your hands dirty, you should make sure to join us o
order to stay updated with the latest news and to connect with other users across the
world.

You can join us online:
You can join us online through our `support channels <https://www.django-cms.org/support/>`_

- in our `django CMS Slack channel <https://www.django-cms.org/slack>`_
- on `StackOverflow <https://stackoverflow.com/questions/tagged/django-cms>`_

You should make sure to join our Slack workspace. It is our main communication platform.
Users from all over the world use Slack to talk about django CMS and to support each
You should make sure to join our Discord server. It is our main communication platform.
Users from all over the world use Discord to talk about django CMS and to support each
other in answering support requests. StackOverflow is a very popular, community-based
space to find and contribute answers to technical challenges

You can also follow:

- the `@djangocms <https://twitter.com/djangocms>`_ Twitter account for general
announcements
- the `django CMS Youtube account <https://www.youtube.com/c/djangocms>`_
- the `django CMS Association LinkedIn
<https://www.linkedin.com/company/django-cms-association>`_ account
4 changes: 2 additions & 2 deletions docs/contributing/development-policies.rst
Expand Up @@ -62,7 +62,7 @@ To create a proposal...
1. please use this `DEP template <https://github.com/django/deps/blob/main/template.rst>`_
2. create a discussion in the main `Github repository <https://github.com/django-cms/django-cms/discussions>`_
3. discuss, discuss, discuss
4. join the Tech Committee `Slack Channel <https://www.django-cms.org/slack>`_ (#technical-committee) and make the team aware of your proposal after the proposal has been reviewed by the Technical Committee, it is put to a vote at one of the weekly meetings of the technical committee
4. join the Tech Committee (`#technical-committee <https://discord.gg/H8UgPktb>`_) and make the team aware of your proposal after the proposal has been reviewed by the Technical Committee, it is put to a vote at one of the weekly meetings of the technical committee


****************
Expand All @@ -82,7 +82,7 @@ Example of retrospective approach.
* ...
* Unscheduled Releases -> e.g. bug fix -> 3.x.x

The release management workgroup can be found on `Slack <https://www.django-cms.org/slack>`_ in #release-management channel.
Release management is managed on `Discord <https://discord.gg/H8UgPktb>`_ in the #technical-committee channel.
For questions regarding the release process please join the channel and reach out. We're happy to help.

Long-Term Support Release
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/guideline-for-django-cms-projects.rst
Expand Up @@ -31,8 +31,8 @@ Approval by Tech Committee of the django CMS Association
New projects or project transfers under the django CMS patronage must first be approved
by the `Tech Committee
<https://github.com/django-cms/django-cms-mgmt/blob/master/tech-committee/about.md>`_.
For that you should join the #tech-committee channel on `Slack
<https://www.django-cms.org/slack>`_ and simply submit your proposal. Then, the TC
For that you should join the #tech-committee channel on `Discord
<https://discord.gg/H8UgPktb>`_ and simply submit your proposal. Then, the TC
decides whether or not your project is in line with the product roadmap and overall
vision for django CMS.

Expand Down
3 changes: 1 addition & 2 deletions docs/contributing/management.rst
Expand Up @@ -27,8 +27,7 @@ Raising an issue


Except in the case of security matters, of course, you're welcome to raise
issues in any way that suits you - the Slack group
<development-community>` or in person if you happen to meet another django CMS
issues in any way that suits you or in person if you happen to meet another django CMS
developer.

It's very helpful though if you don't just raise an issue by mentioning it to people, but actually
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Expand Up @@ -123,10 +123,10 @@ organisation that exists to support the development of django CMS and its commun

.. rst-class:: column column2

Slack
Discord
~~~~~

Join `our friendly Slack group <https://www.django-cms.org/slack>`_ for **support** and
Join `our friendly Discord server <https://discord.gg/6cf2FKBR>`_ for **support** and
to **share ideas** and **discuss technical questions** with other members of the
community.

Expand Down
2 changes: 1 addition & 1 deletion docs/introduction/index.rst
Expand Up @@ -37,4 +37,4 @@ django CMS by hand, rather than using the django CMS quistart project, see
:doc:`/introduction/01-install` and then follow the rest of the tutorials.

Either way, you'll be able to find support and help from the numerous friendly members
of the django CMS community on `our Slack group <https://www.django-cms.org/slack>`_.
of the django CMS community on `our Discord server <https://discord.gg/6cf2FKBR>`_.

0 comments on commit 4691a15

Please sign in to comment.