Merge branch 'main' into pre-commit-ci-update-config

ansible · Sep 5, 2024 · ef8cc4a · ef8cc4a
2 parents a21f5f4 + cff4a55
commit ef8cc4a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,17 @@ A pip-like install for ansible collections.
 
 By placing collections into the python site-packages directory they are discoverable by ansible as well as python and pytest.
 
+## Communication
+
+- Join the Ansible forum:
+
+  - [Get Help](https://forum.ansible.com/c/help/6): get help or help others. Please add appropriate tags if you start new discussions.
+  - [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact with fellow enthusiasts.
+  - [News & Announcements](https://forum.ansible.com/c/news/5): track project-wide announcements including social events.
+  - [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn): used to announce releases and important changes.
+
+For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+
 ## Usage
 
 ### Setting up a development environment

diff --git a/docs/index.md b/docs/index.md
@@ -2,6 +2,17 @@
 
 A pip-like install for Ansible collections.
 
+## Communication
+
+- Join the Ansible forum:
+
+  - [Get Help](https://forum.ansible.com/c/help/6): get help or help others. Please add appropriate tags if you start new discussions.
+  - [Social Spaces](https://forum.ansible.com/c/chat/4): gather and interact with fellow enthusiasts.
+  - [News & Announcements](https://forum.ansible.com/c/news/5): track project-wide announcements including social events.
+  - [Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn): used to announce releases and important changes.
+
+For more information about communication, see the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+
 ## Features
 
 - Promotes an "ephemeral" development approach

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -33,9 +33,9 @@ extra:
     - icon: simple/matrix
       link: https://matrix.to/#/#devtools:ansible.com
       name: Matrix
-    - icon: fontawesome/solid/comments
-      link: https://github.com/ansible/ansible-dev-environment/discussions
-      name: Discussions
+    - icon: fontawesome/brands/discourse
+      link: https://forum.ansible.com/c/project/7
+      name: Ansible forum
     - icon: fontawesome/brands/github-alt
       link: https://github.com/ansible/ansible-dev-environment
       name: GitHub