From c2ad703409afbfbdebe195512ca5250d4ce620e4 Mon Sep 17 00:00:00 2001
From: Ken Fallon <ken_fallon@josh@dao-mail.com>
Date: Tue, 30 Dec 2025 12:28:59 +0000
Subject: [PATCH] Update templates/content-new_year.tpl.html

Ground rules are important
---
 templates/content-new_year.tpl.html | 77 ++++++++++++++---------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/templates/content-new_year.tpl.html b/templates/content-new_year.tpl.html
index 733f323..cde8d4d 100644
--- a/templates/content-new_year.tpl.html
+++ b/templates/content-new_year.tpl.html
@@ -11,19 +11,7 @@ We will leave the recording going until at least <!--% get_new_year_show_end() %
 So please stop in. Say "Hi" and maybe join in the conversation with other HPR listeners and contributors. It's always a good time!!<br />
 </p>
 
-<h2>Join the conversation on Mumble</h2>
-
-<p>Already have Mumble installed, then <a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0">this link will bring you to the HPR Room</a>.</p>
-<p>Get the PC Client <a href="https://wiki.mumble.info/wiki/Main_Page">https://wiki.mumble.info/wiki/Main_Page</a><br />
-<p>Get the Android Client Mumla <a href="https://f-droid.org/packages/se.lublin.mumla">https://f-droid.org/packages/se.lublin.mumla</a></p>
-<p>Then join the Server: <strong>chatter.skyehaven.net</strong><br />
-Port: <strong>64738</strong><br />
-Channel: <strong>HPR</strong></p>
-<p><strong>Use Push to Talk</strong>. With so many people hands free is not an option.</p>
-<p>For those who have never used Mumble before, see this <a href="https://hackerpublicradio.org/mumble-howto">how-to explaining the setup of the desktop Mumble client</a>, 
-or listen to <a href="https://hackerpublicradio.org/eps.php?id=3503">hpr3503 :: Configuring Mumble</a>.</p>
-
-<h2>Listen to the live stream</h2>
+<h1>Listen to the live stream</h1>
 
 <p>
 <img src="images/livestream.png" /><br />
@@ -34,32 +22,7 @@ or listen to <a href="https://hackerpublicradio.org/eps.php?id=3503">hpr3503 ::
 <a href="https://hackerpublicradio.org/live">https://hackerpublicradio.org/live</a><br />
 </p>
 
-<p>
-For those who wish to see the video of some of the participants we have a jitsi server.<br />
-<a href="https://jitsi.minnix.dev/hprnye">https://jitsi.minnix.dev/hprnye</a><br />
-<strong>Please make sure your mic is muted!</strong>
-</p>
-
-<h3>Add to the Show-notes</h2>
-<p>
-<strong>Please help fill out the show notes</strong><br />
-<a href="https://shownotes.lugcast.mywire.org/p/hpr-nye-2026">https://shownotes.lugcast.mywire.org/p/hpr-nye-2026</a><br />
-We are using Etherpad for people to share links and info to things they are discussing. 
-The Etherpad will be used for the HPR audio shownotes so please feel free to add to it. 
-The entire event will be broken into 2 to 3 hour segments and made available as HPR episodes.<br/>
-<em>This really, really helps us out to post the show faster !</em>
-</p>
-
-<h2>History</h2>
-
-<p>Suggested by <a href="https://hackerpublicradio.org/correspondents/0128.html">pokey</a> in 2011.
-As podcasting tends to be a one way conversation, he thought it would be nice to get all the FLOSS, Linux, Free Culture, podcasters and Listeners in one place to get together and chat in person.
-Initially it was planned to be just a few hours, but we kept missing members from other parts of the world. 
-The show was extended to welcome ever time zone to the New Year, which actually turns out to be <a href="https://en.wikipedia.org/wiki/List_of_UTC_offsets">38 Timezones</a>, over 26 Hours.</p>
-
-<p>So we will record for at least 26 Hours, but will keep the recording going for an "After Show".
-Some years the after show has been even longer than the show itself.
-While this is on the HPR Site, it is entirely a community initiative which is supported heavily by the fine folks over at the <a href="https://linuxlugcast.com/">LinuxLugCast</a>, with the Mumble Server been provided by <a href="https://hackerpublicradio.org/correspondents/0228.html">Delwin</a>.</p>
+<h1>Join the conversation on Mumble</h1>
 
 <h2>Ground Rules</h2>
 <h3>Use Push to Talk, and a Headset</h3>
@@ -100,4 +63,40 @@ Before the recording is posted as a podcast the <a href="https://manual.audacity
 <p>The recording will be released as a podcast on HPR under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/"> Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</a> license. 
 The recordings will be released mid year, when there is a lull in submissions.</p>
 
+<p>Already have Mumble installed, then <a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0">this link will bring you to the HPR Room</a>.</p>
+<p>Get the PC Client <a href="https://wiki.mumble.info/wiki/Main_Page">https://wiki.mumble.info/wiki/Main_Page</a><br />
+<p>Get the Android Client Mumla <a href="https://f-droid.org/packages/se.lublin.mumla">https://f-droid.org/packages/se.lublin.mumla</a></p>
+<p>Then join the Server: <strong>chatter.skyehaven.net</strong><br />
+Port: <strong>64738</strong><br />
+Channel: <strong>HPR</strong></p>
+<p><strong>Use Push to Talk</strong>. With so many people hands free is not an option.</p>
+<p>For those who have never used Mumble before, see this <a href="https://hackerpublicradio.org/mumble-howto">how-to explaining the setup of the desktop Mumble client</a>, 
+or listen to <a href="https://hackerpublicradio.org/eps.php?id=3503">hpr3503 :: Configuring Mumble</a>.</p>
+
+<p>
+For those who wish to see the video of some of the participants we have a jitsi server.<br />
+<a href="https://jitsi.minnix.dev/hprnye">https://jitsi.minnix.dev/hprnye</a><br />
+<strong>Please make sure your mic is muted!</strong>
+</p>
+
+<h3>Add to the Show-notes</h2>
+<p>
+<strong>Please help fill out the show notes</strong><br />
+<a href="https://shownotes.lugcast.mywire.org/p/hpr-nye-2026">https://shownotes.lugcast.mywire.org/p/hpr-nye-2026</a><br />
+We are using Etherpad for people to share links and info to things they are discussing. 
+The Etherpad will be used for the HPR audio shownotes so please feel free to add to it. 
+The entire event will be broken into 2 to 3 hour segments and made available as HPR episodes.<br/>
+<em>This really, really helps us out to post the show faster !</em>
+</p>
+
+<h2>History</h2>
+
+<p>Suggested by <a href="https://hackerpublicradio.org/correspondents/0128.html">pokey</a> in 2011.
+As podcasting tends to be a one way conversation, he thought it would be nice to get all the FLOSS, Linux, Free Culture, podcasters and Listeners in one place to get together and chat in person.
+Initially it was planned to be just a few hours, but we kept missing members from other parts of the world. 
+The show was extended to welcome ever time zone to the New Year, which actually turns out to be <a href="https://en.wikipedia.org/wiki/List_of_UTC_offsets">38 Timezones</a>, over 26 Hours.</p>
+
+<p>So we will record for at least 26 Hours, but will keep the recording going for an "After Show".
+Some years the after show has been even longer than the show itself.
+While this is on the HPR Site, it is entirely a community initiative which is supported heavily by the fine folks over at the <a href="https://linuxlugcast.com/">LinuxLugCast</a>, with the Mumble Server been provided by <a href="https://hackerpublicradio.org/correspondents/0228.html">Delwin</a>.</p>