From 35fa97e120c437a7e52f95b2b6f6ddaa1e7434ea Mon Sep 17 00:00:00 2001 From: Dave Morriss Date: Sat, 9 Sep 2023 23:26:15 +0100 Subject: [PATCH] Cleaning up after bad merge --- templates/content-about.tpl.html | 88 -------------------------------- 1 file changed, 88 deletions(-) diff --git a/templates/content-about.tpl.html b/templates/content-about.tpl.html index 15f3e71..e6c46b7 100644 --- a/templates/content-about.tpl.html +++ b/templates/content-about.tpl.html @@ -1,24 +1,6 @@

Welcome to HPR.

About HPR.

-<<<<<<< HEAD -

The HPR Community.

-

What differentiates HPR from other podcasts is that the shows are crowd sourced from the community - fellow listeners like you. There is no restriction on how long the show can be, nor on the topic you can cover as long as they are not spam and "are of interest to Hackers". If you want to see what topics have been covered so far just have a look at our Archive. We also allow for a series of shows so that hosts can go into more detail on a topic.

-=======

The HPR Community.

What differentiates HPR from other podcasts is that the shows are crowd sourced from the community - fellow listeners like you. There is no restriction on how long the show can be, nor on the topic you can cover as long as they are not spam and "are of interest to Hackers". If you want to see what topics have been covered so far just have a look at our Archive. We also allow for a series of shows so that hosts can go into more detail on a topic.

->>>>>>> 167_Several_templates_use_non-existent_absolute_url

You can download/listen to the shows here or you can subscribe to the show in your favorite podcatching client to automatically get our new shows as soon as they are available. You can copy and redistribute the shows for free provided you adhere to the Creative Commons Attribution Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License.

-<<<<<<< HEAD -

History.

-

Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. HPR has a long lineage going back to Radio FreeK America, Binary Revolution Radio & Infonomicon, and it is a direct continuation of Twatech radio. Please listen to StankDawg's "Introduction to HPR" for more information.

- -

Free Culture.

-

Hacker Public Radio is dedicated to sharing knowledge. We do not accept donations so please consider supporting our patrons. If you listen to HPR, then we would love you to contribute one show a year. Our shows are by default released under a Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license. All the software we use is Free software. All the code we develop is published in our gittea repository. All the media is available via the feeds. We are going through an audit process to release the website code as well.

- -

Governance.

-

HPR is entirely community driven. Policy decisions are proposed and discussed on the Mailing list, which is open to anyone to join. Mailing list discussions are brought to the attention of the listening community on the first Monday of the month in the HPR Community News show. This show is also open to anyone to participate in. The schedule for the Community News shows can be downloaded as an iCal calendar containing recording dates for the next 12 months. A reminder is also sent to the mailing list in the week before the recording.

-

Our hosting is kindly provided to us by Josh Knapp from AnHonestHost.com, and he has the last word in issues related to site security. A changing team of volunteers called the "admins" or "Janitors", deal with the day to day operation of HPR. Acting as the first point of contact, processing the shows, coordinating policy discussions, removing spam, updating the website, etc. They are contactable via the email account admin @ HPR. They have no more say over policy than anyone else. Anyone who has shown a long term dedication to the project and is trusted by the community, can become an admin. -=======

History.

Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. HPR has a long lineage going back to Radio FreeK America, Binary Revolution Radio & Infonomicon, and it is a direct continuation of Twatech radio. Please listen to StankDawg's "Introduction to HPR" for more information.

@@ -68,7 +33,6 @@

Governance.

HPR is entirely community driven. Policy decisions are proposed and discussed on the Mailing list, which is open to anyone to join. Mailing list discussions are brought to the attention of the listening community on the first Monday of the month in the HPR Community News show. This show is also open to anyone to participate in. The schedule for the Community News shows can be downloaded as an iCal calendar containing recording dates for the next 12 months. A reminder is also sent to the mailing list in the week before the recording.

Our hosting is kindly provided to us by Josh Knapp from AnHonestHost.com, and he has the last word in issues related to site security. A changing team of volunteers called the "admins" or "Janitors", deal with the day to day operation of HPR. Acting as the first point of contact, processing the shows, coordinating policy discussions, removing spam, updating the website, etc. They are contactable via the email account admin @ HPR. They have no more say over policy than anyone else. Anyone who has shown a long term dedication to the project and is trusted by the community, can become an admin. ->>>>>>> 167_Several_templates_use_non-existent_absolute_url

See the section stuff you need to know for more information.

Recent Policy Changes

@@ -94,23 +58,6 @@ -

Mail List

-

- HPR is governed by the community, so decisions about how Hacker Public Radio should be run are made on the mailing list you can join it by going to :
- /maillist -=======

  • Website:
  • Maillist: Mailing list
  • #oggcastplanet
    • @@ -122,31 +69,12 @@

    HPR is governed by the community, so decisions about how Public Radio should be run are made on the mailing list you can join it by going to :
             ->>>>>>> 167_Several_templates_use_non-existent_absolute_url

    In the Press.

    @@ -247,15 +174,10 @@ If you can't think of anything to talk about then please just record a show telling us how you got into tech as a way to introducing yourself to the community.

    -<<<<<<< HEAD -

    3. Record your show.

    - -=======

    3. Record your show.

    Please select more detailed information on how to record a show:

    ->>>>>>> 167_Several_templates_use_non-existent_absolute_url

    0.3 Can I submit a show made for another podcast?