Merge branch 'mautic:main' into move-content-to-rst

.all-contributorsrc

@@ -0,0 +1,80 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "goba",
+      "name": "Gábor Hojtsy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/235185?v=4",
+      "profile": "http://hojtsy.hu",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sdoering",
+      "name": "Sven Döring",
+      "avatar_url": "https://avatars.githubusercontent.com/u/765204?v=4",
+      "profile": "https://www.schriftrolle.de/?utm_source=github&utm_medium=profilLink",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "deborahsalves",
+      "name": "Déborah Salves",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79517214?v=4",
+      "profile": "https://github.com/deborahsalves",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "tobsowo",
+      "name": "Oluwatobi Owolabi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5642737?v=4",
+      "profile": "https://github.com/tobsowo",
+      "contributions": [
+        "review"
+      ]
+    },
+    {
+      "login": "rcheesley",
+      "name": "Ruth Cheesley",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2930593?v=4",
+      "profile": "https://www.ruthcheesley.co.uk",
+      "contributions": [
+        "review"
+      ]
+    },
+    {
+      "login": "IonutOjicaDE",
+      "name": "IonutOjicaDE",
+      "avatar_url": "https://avatars.githubusercontent.com/u/96743055?v=4",
+      "profile": "https://ionutojica.com",
+      "contributions": [
+        "review",
+        "doc"
+      ]
+    },
+    {
+      "login": "daniellord32",
+      "name": "Daniel Lord",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25160505?v=4",
+      "profile": "https://github.com/daniellord32",
+      "contributions": [
+        "review"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "skipCi": true,
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "projectName": "mautic-community-handbook",
+  "projectOwner": "mautic"
+}

.github/styles/Vocab/Mautic/accept.txt

@@ -83,12 +83,15 @@ Packagist
 PATCH
 patch
 PHP
+PHPUnit
 Pipedrive
 Piwik
 POST
 post
 PUT
 Rackspace
+Rebase
+rebase
 Remarketing
 Salesforce
 SAML

README.md

@@ -1,4 +1,7 @@
 # Mautic community handbook
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 
 A handbook for all things related to the Mautic Community.
@@ -7,3 +10,31 @@ To contribute please make a PR for review by the Community Leadership Team.
 
 [![Documentation Status](https://readthedocs.org/projects/mautic-community-handbook/badge/?version=latest)](https://mautic-community-handbook.readthedocs.io/en/latest/?badge=latest)
 
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://hojtsy.hu"><img src="https://avatars.githubusercontent.com/u/235185?v=4?s=100" width="100px;" alt="Gábor Hojtsy"/><br /><sub><b>Gábor Hojtsy</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/commits?author=goba" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.schriftrolle.de/?utm_source=github&utm_medium=profilLink"><img src="https://avatars.githubusercontent.com/u/765204?v=4?s=100" width="100px;" alt="Sven Döring"/><br /><sub><b>Sven Döring</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/commits?author=sdoering" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/deborahsalves"><img src="https://avatars.githubusercontent.com/u/79517214?v=4?s=100" width="100px;" alt="Déborah Salves"/><br /><sub><b>Déborah Salves</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/commits?author=deborahsalves" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tobsowo"><img src="https://avatars.githubusercontent.com/u/5642737?v=4?s=100" width="100px;" alt="Oluwatobi Owolabi"/><br /><sub><b>Oluwatobi Owolabi</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/pulls?q=is%3Apr+reviewed-by%3Atobsowo" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.ruthcheesley.co.uk"><img src="https://avatars.githubusercontent.com/u/2930593?v=4?s=100" width="100px;" alt="Ruth Cheesley"/><br /><sub><b>Ruth Cheesley</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/pulls?q=is%3Apr+reviewed-by%3Archeesley" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://ionutojica.com"><img src="https://avatars.githubusercontent.com/u/96743055?v=4?s=100" width="100px;" alt="IonutOjicaDE"/><br /><sub><b>IonutOjicaDE</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/pulls?q=is%3Apr+reviewed-by%3AIonutOjicaDE" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/mautic/mautic-community-handbook/commits?author=IonutOjicaDE" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/daniellord32"><img src="https://avatars.githubusercontent.com/u/25160505?v=4?s=100" width="100px;" alt="Daniel Lord"/><br /><sub><b>Daniel Lord</b></sub></a><br /><a href="https://github.com/mautic/mautic-community-handbook/pulls?q=is%3Apr+reviewed-by%3Adaniellord32" title="Reviewed Pull Requests">👀</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

pages/04.community-leadership/01.current-leadership-team/docs.md → pages/03.community-leadership/01.current-leadership-team/docs.md

@@ -22,20 +22,20 @@ The current leadership team and their terms are as follows:
 | Nico Grienauer          | Community Team Assistant Lead                   | [email protected]                      |  2020               |  2022             |
 | Favour Kelvin         | Education Team Lead                   | [email protected]                      |   2021              | 2024              |
 | Position Vacant         | Education Team Assistant Lead                   |                      |                 |               |
-| Legal@Acquia       | Legal & Finance Team Lead                   | [email protected]                     |   N/A              |  N/A             |
-| Legal@Acquia         | Legal & Finance Team Assistant Lead                   | [email protected]                      |  N/A               | N/A              |
+| Ruth Cheesley      | Legal & Finance Team Lead                   | [email protected]                     |   N/A              |  N/A             |
 | Oluwatobi Owolabi        | Marketing Team Lead                  | [email protected]                      |  2021               |   2024            |
-| Déborah Salves         | Marketing Team Assistant Lead                   |   deborah.salves@mautic.org                   |   2021              |      2023         |
+| Sven Döring         | Marketing Team Assistant Lead                   |   sven.doering@mautic.org                   |   2023              |      2025         |
 | Norman Pracht         | Product Team Lead                   | [email protected]                      |  2020               |   2023            |
 | Joey Keller      | Product Team Assistant Lead (Product)                  | [email protected]                      |  2021               |  2023             |
 | Mohit Aghera     | Product Team Assistant Lead (Development)                  | [email protected]                      | 2021                | 2023              |
 
-## Honour Role
+## Honour Roll
 
 These are people who have served on the Mautic Community Leadership Team in the past.
 
 | Name      | Role     | Term commenced | Term ended |
 |-----------|--------------------|-----------------|---------------|
+| Déborah Salves | Marketing Team Assistant Lead | 2021 | 2023 |
 | Dennis Ameling         | Product Team Assistant Lead                   | 2020                 | 2021              |
 | Leon Oltmanns         | Education Team Lead                   |  2020               |   2021            |
 | Radu Zlatianu         | Marketing Team Lead                   |  2020               |   2021            |

pages/04.community-leadership/03.community-council/docs.md → pages/03.community-leadership/03.community-council/docs.md

@@ -14,15 +14,15 @@ taxonomy:
 ---
 ## What is the Community Council?
 
-The Community Council is formed of four elected representatives from the Mautic Community, and four Acquians.  
+The Community Council discusses topics that impact the community as a whole, or things which are bigger than just one team. The council normally meets every 3 months and is formed of four elected representatives from the Mautic Community, and four Acquians.
 
 ## Who are on the Community Council?
 
 | Name      | Role     | Email address |
 |-----------|--------------------|-----------------------|
 | Ruth Cheesley | Mautic Project Lead at Acquia | [email protected]            | 
 | Dries Buytaert | Acquia Co-founder and CTO | [email protected]            | 
-| TBC | Community Specialist | TBC         | 
+| Gábor Hojtsy | Community Specialist | [email protected]         | 
 | John Linhart | Technical Community Lead at Acquia | [email protected]           |
 | Ekkehard Gümbel  | Community Representative | [email protected]            | 
 | Oluwatobi Owolabi  | Community Representative | [email protected]            | 

pages/03.community-structure/01.governance-model/docs.md → pages/03.governance/01.project-governance/01.archive/docs.md

@@ -1,5 +1,5 @@
 ---
-title: 'Governance model'
+title: 'Governance model v1 (archive)'
 media_order: 'Mautic-Community-Governance-4-1024x721.png,dev-pacsi (1).png,marketing-pacsi (1).png,legal-pacsi (1).png'
 slug: governance
 twitterenable: true