From bbc7aed9a404f4db0e7bd1711afa3acede086aba Mon Sep 17 00:00:00 2001
From: JoergAtGithub <JoergAtGithub@worldwartweb.com>
Date: Thu, 19 Sep 2024 22:37:30 +0200
Subject: [PATCH 1/3] Unified tags, to group related articles

---
 content/news/2024-07-31-Midsummer-Mixxx.md                      | 2 +-
 content/news/2024-08-24-gsoc-project-report-daniel-fernandes.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/news/2024-07-31-Midsummer-Mixxx.md b/content/news/2024-07-31-Midsummer-Mixxx.md
index 5ab4db33..fe32953a 100644
--- a/content/news/2024-07-31-Midsummer-Mixxx.md
+++ b/content/news/2024-07-31-Midsummer-Mixxx.md
@@ -1,6 +1,6 @@
 title: Midsummer Mixxx
 authors: Evelynne Veys
-tags: summer, info, news, update, harmonic, key, stem
+tags: harmonic mixing, stems
 comments: yes
 date: 2024-07-31 17:18:23
 
diff --git a/content/news/2024-08-24-gsoc-project-report-daniel-fernandes.md b/content/news/2024-08-24-gsoc-project-report-daniel-fernandes.md
index 9b6c02f7..efe87f3e 100644
--- a/content/news/2024-08-24-gsoc-project-report-daniel-fernandes.md
+++ b/content/news/2024-08-24-gsoc-project-report-daniel-fernandes.md
@@ -1,6 +1,6 @@
 title: GSoC 2024 Project Report - Harmonic Mixing Enhancements
 authors: Daniel Fernandes
-tags: gsoc, harmonic mixing
+tags: gsoc, gsoc-2024, harmonic mixing
 comments: yes
 date: 2024-08-24 07:50:11
 

From 1795c35a1810952f496aa9eac67d145a2b750352 Mon Sep 17 00:00:00 2001
From: JoergAtGithub <JoergAtGithub@worldwartweb.com>
Date: Thu, 19 Sep 2024 22:43:40 +0200
Subject: [PATCH 2/3] Replaced wrong term encoders by potentiometers

---
 content/news/2024-07-31-Midsummer-Mixxx.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/news/2024-07-31-Midsummer-Mixxx.md b/content/news/2024-07-31-Midsummer-Mixxx.md
index fe32953a..c6afefab 100644
--- a/content/news/2024-07-31-Midsummer-Mixxx.md
+++ b/content/news/2024-07-31-Midsummer-Mixxx.md
@@ -53,9 +53,9 @@ working and can be experimental mapped in controller mappings.
 
 DJ-ing with stems is a gamechanger, it takes away limitations, gives your creativity a boost.
 A hint: controlling stems with the mouse is rather difficult, some controllers are already stems-ready which means they incorporated
-volume encoders and mute buttons for the different stem tracks. But don't throw away your valuable controller.
+volume potentiometers and mute buttons for the different stem tracks. But don't throw away your valuable controller.
 I have experimented successful creating a OSC midi controller to control stems (and samplers) from a tablet, when finished the files will be available.
-Or you can start looking for an extra midi-controller that has enough encoders to control the volume and mute buttons of the stems (advice: 4 encoders, 4 mute buttons maybe encoders for the effect on the stem-track and buttons to select the deck).
+Or you can start looking for an extra midi-controller that has enough potentiometers to control the volume and mute buttons of the stems (advice: 4 volume potentiometers, 4 mute buttons maybe 4 potentiometers for the effect on the stem-track and buttons to select the deck).
 
 If you're waiting for an official release with stem support, you'll have to be more patient.
 

From 27768b685a9398330cc8da87cf0a6fc0558f68e1 Mon Sep 17 00:00:00 2001
From: JoergAtGithub <JoergAtGithub@worldwartweb.com>
Date: Thu, 19 Sep 2024 22:54:45 +0200
Subject: [PATCH 3/3] AntoineC -> Mixxx Core Devs

---
 pelicanconf.py                     | 2 +-
 theme/templates/pages/contact.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelicanconf.py b/pelicanconf.py
index d641af0c..c5a13e44 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -284,7 +284,7 @@ def __init__(self, url, title, context, css="", children=()):
     "Antoine Colombier": {
         "github": "acolombier",
         "email": "mixxx@acolombier.dev",
-        "tagline": "Mixxx Contributor",
+        "tagline": "Mixxx Core Developer",
     },
 }
 
diff --git a/theme/templates/pages/contact.html b/theme/templates/pages/contact.html
index 5b7784db..b12378c7 100644
--- a/theme/templates/pages/contact.html
+++ b/theme/templates/pages/contact.html
@@ -33,6 +33,7 @@ <h2><a class="headline-link" href="#developers">{% trans %}Mixxx Development Tea
     <div>J&ouml;rg Wartenberg</div>
     <div>Fredrik Wieczerkowski</div>
     <div>Maarten de Boer</div>
+    <div>Antoine Colombier</div>
   </div>
 </div>
 
@@ -81,7 +82,6 @@ <h6><a class="headline-link docs-header" href="#contributors">{% trans %}With co
     <div>Jakob Leifhelm</div>
     <div>Florian Goth</div>
     <div>Chase Durand</div>
-    <div>Antoine Colombier</div>
     <div>John Last</div>
     <div>Saksham Hans</div>
     <div>Robbert van der Helm</div>