From c8ff8f8d7571ad2fc6f15da12bdb175960d79f0c Mon Sep 17 00:00:00 2001
From: yousaf465 <83491212+yousaf465@users.noreply.github.com>
Date: Thu, 21 Dec 2023 08:59:01 +0500
Subject: [PATCH 1/6] Update ens160.rst (#3481)

* Update ens160.rst

update datasheet link. pervious one is broken

* Update ens160.rst
---
 components/sensor/ens160.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sensor/ens160.rst b/components/sensor/ens160.rst
index fd13e9c64..ffa793163 100644
--- a/components/sensor/ens160.rst
+++ b/components/sensor/ens160.rst
@@ -6,7 +6,7 @@ ENS160 Sensor
     :keywords: ENS160
 
 The ``ens160`` sensor platform allows you to use your ENS160
-(`datasheet <https://www.sciosense.com/wp-content/uploads/documents/SC-001224-DS-7-ENS160-Datasheet.pdf>`__) air-quality sensors with ESPHome. The :ref:`I²C <i2c>` component is
+(`datasheet <https://www.sciosense.com/wp-content/uploads/documents/SC-001224-DS-9-ENS160-Datasheet.pdf>`__) air-quality sensors with ESPHome. The :ref:`I²C <i2c>` component is
 required to be set up in your configuration for this sensor to work.
 
 .. note::

From 60b7943eab1339e547e04fb040e0c11a34ae06a1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:33:36 +0900
Subject: [PATCH 2/6] Bump version to 2023.12.1

---
 Doxygen         | 2 +-
 Makefile        | 2 +-
 _static/version | 2 +-
 conf.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doxygen b/Doxygen
index b9c151364..88b3c9aa4 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2023.12.0
+PROJECT_NUMBER         = 2023.12.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index b87fa4225..26004aa9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2023.12.0
+ESPHOME_REF = 2023.12.1
 
 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index aa240b72d..5f73c59e9 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2023.12.0
\ No newline at end of file
+2023.12.1
\ No newline at end of file
diff --git a/conf.py b/conf.py
index 30410272a..55aaad6a2 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2023.12"
 # The full version, including alpha/beta/rc tags.
-release = "2023.12.0"
+release = "2023.12.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 887c86a64cce38be13976690fd5aa03184731b16 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:33:54 +0900
Subject: [PATCH 3/6] Update changelog for 2023.12.1

---
 changelog/2023.12.0.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog/2023.12.0.rst b/changelog/2023.12.0.rst
index 353b1cf72..acaf4f2df 100644
--- a/changelog/2023.12.0.rst
+++ b/changelog/2023.12.0.rst
@@ -1,4 +1,4 @@
-ESPHome 2023.12.0 - 20th December 2023
+eESPHome 2023.12.0 - 20th December 2023
 ======================================
 
 .. seo::
@@ -47,6 +47,10 @@ MCP3008 breaking changes
 The MCP3008 has has a restructure of the code and at the same time the default update interval has been changed to 60 seconds,
 the units, device class and state class default have also been set to sane defaults expected for a voltage sensor.
 
+Release 2023.12.1 - December 21
+-------------------------------
+
+- Fix replaced - in allowed characters during object_id sanitizing :esphomepr:`5983` by :ghuser:`jesserockz`
 
 Full list of changes
 --------------------

From 09b205a347e4cfdb6bef1988ac8348452937f6b8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:34:27 +0900
Subject: [PATCH 4/6] Update supporters for 2023.12.1

---
 guides/supporters.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/guides/supporters.rst b/guides/supporters.rst
index b3bc075b9..4cef66f3d 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -232,6 +232,7 @@ Contributors
 - `Stroe Andrei Catalin (@catalin2402) <https://github.com/catalin2402>`__
 - `Carter Nelson (@caternuson) <https://github.com/caternuson>`__
 - `cathelest (@cathelest) <https://github.com/cathelest>`__
+- `Chris AtLee (@catlee) <https://github.com/catlee>`__
 - `cbialobos (@cbialobos) <https://github.com/cbialobos>`__
 - `Cameron Bulock (@cbulock) <https://github.com/cbulock>`__
 - `Ciprian Constantinescu (@cciprian5) <https://github.com/cciprian5>`__
@@ -552,6 +553,7 @@ Contributors
 - `Jadson Santos (@gtjadsonsantos) <https://github.com/gtjadsonsantos>`__
 - `Guillaume DELVIT (@guiguid) <https://github.com/guiguid>`__
 - `guillempages (@guillempages) <https://github.com/guillempages>`__
+- `Fabian Pflug (@gumulka) <https://github.com/gumulka>`__
 - `Guyohms (@Guyohms) <https://github.com/Guyohms>`__
 - `Gilles van den Hoven (@gvdhoven) <https://github.com/gvdhoven>`__
 - `h0jeZvgoxFepBQ2C (@h0jeZvgoxFepBQ2C) <https://github.com/h0jeZvgoxFepBQ2C>`__
@@ -611,7 +613,6 @@ Contributors
 - `imwoo90 (@imwoo90) <https://github.com/imwoo90>`__
 - `Dom (@Ing-Dom) <https://github.com/Ing-Dom>`__
 - `Ingo Becker (@ingobecker) <https://github.com/ingobecker>`__
-- `Ingurum (@Ingurum) <https://github.com/Ingurum>`__
 - `Marc J (@InvncibiltyCloak) <https://github.com/InvncibiltyCloak>`__
 - `IoT-devices LLC (@iotdevicesdev) <https://github.com/iotdevicesdev>`__
 - `irtimaled (@irtimaled) <https://github.com/irtimaled>`__
@@ -624,13 +625,11 @@ Contributors
 - `J0RD4N300 (@J0RD4N300) <https://github.com/J0RD4N300>`__
 - `jacobswe (@jacobswe) <https://github.com/jacobswe>`__
 - `Fredrik Gustafsson (@jagheterfredrik) <https://github.com/jagheterfredrik>`__
-- `Jan Harkes (@jaharkes) <https://github.com/jaharkes>`__
 - `jakehdk (@jakehdk) <https://github.com/jakehdk>`__
 - `Jake Shirley (@JakeShirley) <https://github.com/JakeShirley>`__
 - `jakub-medrzak (@jakub-medrzak) <https://github.com/jakub-medrzak>`__
 - `James Braid (@jamesbraid) <https://github.com/jamesbraid>`__
 - `James Duke (@jamesduke) <https://github.com/jamesduke>`__
-- `James Gao (@jamesgao) <https://github.com/jamesgao>`__
 - `James Hirka (@jameshirka) <https://github.com/jameshirka>`__
 - `James Lakin (@jamesorlakin) <https://github.com/jamesorlakin>`__
 - `Jason (@jamman9000) <https://github.com/jamman9000>`__
@@ -642,7 +641,6 @@ Contributors
 - `Jared Ring (@jaredring) <https://github.com/jaredring>`__
 - `Jason-nz (@Jason-nz) <https://github.com/Jason-nz>`__
 - `Jason2866 (@Jason2866) <https://github.com/Jason2866>`__
-- `JasperPlant (@JasperPlant) <https://github.com/JasperPlant>`__
 - `Jas Strong (@jasstrong) <https://github.com/jasstrong>`__
 - `Jay Greco (@jaygreco) <https://github.com/jaygreco>`__
 - `Jay Newstrom (@JayNewstrom) <https://github.com/JayNewstrom>`__
@@ -673,6 +671,7 @@ Contributors
 - `jmichiel (@jmichiel) <https://github.com/jmichiel>`__
 - `JMoratelli (@JMoratelli) <https://github.com/JMoratelli>`__
 - `Jonathas Barbosa (@jnthas) <https://github.com/jnthas>`__
+- `jochenvg (@jochenvg) <https://github.com/jochenvg>`__
 - `Johboh (@Johboh) <https://github.com/Johboh>`__
 - `John Moxley (@johnmoxley) <https://github.com/johnmoxley>`__
 - `Dave Johnston (@johnsto) <https://github.com/johnsto>`__
@@ -694,7 +693,6 @@ Contributors
 - `Jules-R (@Jules-R) <https://github.com/Jules-R>`__
 - `Julie Koubová (@juliekoubova) <https://github.com/juliekoubova>`__
 - `Mike Ryan (@justfalter) <https://github.com/justfalter>`__
-- `Jasper van der Neut - Stulen (@jvanderneutstulen) <https://github.com/jvanderneutstulen>`__
 - `Jack Wozny (@jwozny) <https://github.com/jwozny>`__
 - `Kris (@K-r-i-s-t-i-a-n) <https://github.com/K-r-i-s-t-i-a-n>`__
 - `k0rtina (@k0rtina) <https://github.com/k0rtina>`__
@@ -752,6 +750,7 @@ Contributors
 - `Juraj Liso (@LiJu09) <https://github.com/LiJu09>`__
 - `Li Junru (@lijunru-hub) <https://github.com/lijunru-hub>`__
 - `lillborje71 (@lillborje71) <https://github.com/lillborje71>`__
+- `Citric Lee (@limengdu) <https://github.com/limengdu>`__
 - `lingex (@lingex) <https://github.com/lingex>`__
 - `Markus (@Links2004) <https://github.com/Links2004>`__
 - `LinusHeu (@LinusHeu) <https://github.com/LinusHeu>`__
@@ -804,6 +803,7 @@ Contributors
 - `Masterz69 (@Masterz69) <https://github.com/Masterz69>`__
 - `Christopher Masto (@masto) <https://github.com/masto>`__
 - `Mat931 (@Mat931) <https://github.com/Mat931>`__
+- `mathieu-mp (@mathieu-mp) <https://github.com/mathieu-mp>`__
 - `matikij (@matikij) <https://github.com/matikij>`__
 - `Michel Marti (@matoxp) <https://github.com/matoxp>`__
 - `matt123p (@matt123p) <https://github.com/matt123p>`__
@@ -860,6 +860,7 @@ Contributors
 - `Michael Davidson (@MrMDavidson) <https://github.com/MrMDavidson>`__
 - `mrred2k (@mrred2k) <https://github.com/mrred2k>`__
 - `André Cirne (@MrSuicideParrot) <https://github.com/MrSuicideParrot>`__
+- `mrtoy-me (@mrtoy-me) <https://github.com/mrtoy-me>`__
 - `Murray Scott (@mscottco) <https://github.com/mscottco>`__
 - `MSe-5-14 (@MSe-5-14) <https://github.com/MSe-5-14>`__
 - `mtl010957 (@mtl010957) <https://github.com/mtl010957>`__
@@ -1257,7 +1258,6 @@ Contributors
 - `Wauter (@Wauter) <https://github.com/Wauter>`__
 - `WeekendWarrior1 (@WeekendWarrior1) <https://github.com/WeekendWarrior1>`__
 - `Thomas Aldrian (@Weissnix4711) <https://github.com/Weissnix4711>`__
-- `Ian Wells (@wellsi) <https://github.com/wellsi>`__
 - `Andrew Garrett (@werdnum) <https://github.com/werdnum>`__
 - `whimsee (@whimsee) <https://github.com/whimsee>`__
 - `wifwucite (@wifwucite) <https://github.com/wifwucite>`__

From a760ae2af54e6de362a6d6d55b1826300eb2b3a6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:44:55 +0900
Subject: [PATCH 5/6] Remove extra character

---
 changelog/2023.12.0.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/2023.12.0.rst b/changelog/2023.12.0.rst
index acaf4f2df..53ffba7bc 100644
--- a/changelog/2023.12.0.rst
+++ b/changelog/2023.12.0.rst
@@ -1,4 +1,4 @@
-eESPHome 2023.12.0 - 20th December 2023
+ESPHome 2023.12.0 - 20th December 2023
 ======================================
 
 .. seo::

From d3b6751e807f24031a41ace241e6a67f9b0f26d6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 22 Dec 2023 14:42:40 +1300
Subject: [PATCH 6/6] Add a bit more text to the pin reuse message in changelog
 (#3484)

---
 changelog/2023.12.0.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog/2023.12.0.rst b/changelog/2023.12.0.rst
index 53ffba7bc..f8e3f8c06 100644
--- a/changelog/2023.12.0.rst
+++ b/changelog/2023.12.0.rst
@@ -32,7 +32,9 @@ Pin Reuse validation
 
 There is a new validation performed on configurations to ensure that pins are not reused unintentionally.
 This is a common source of issues and generally a pin does not need to be reused across multiple components
-in a single configuration. The error can be bypassed by specifically adding another config item to all of the
+in a single configuration. Pins should only be reused in a very limited set of circumstances and seeing the
+error will generally mean that you need to reorganise your configuration to not reuse the pins.
+The error can be bypassed by specifically adding another config item to all of the
 duplicate pin definitions. See the :ref:`config-pin_schema` for details.
 
 Touchscreen internal changes