From b0a46f19ca6c8b3db7d8aa6627e132b748aa2811 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:11:44 +0200
Subject: [PATCH 1/9] add desktop policy

---
 src/pages/desktop-privacy-notice.md | 94 +++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 src/pages/desktop-privacy-notice.md

diff --git a/src/pages/desktop-privacy-notice.md b/src/pages/desktop-privacy-notice.md
new file mode 100644
index 0000000..413c366
--- /dev/null
+++ b/src/pages/desktop-privacy-notice.md
@@ -0,0 +1,94 @@
+---
+layout: "../layouts/PageLayout.astro"
+title: Audacity | Desktop Privacy Policy
+---
+
+## About the Privacy Notice
+**Audacity versions 3.0.2 and earlier are not subject to the privacy notice below as they do not include networking features**
+
+With this updated version of our privacy notice below (dated 28 August 2022), we (the Audacity Team) would like to outline the changes that will come into play with Audacity 3.0.3 and later versions, as well as the purpose of those changes.
+
+As a responsible organisation, we have taken two important steps—we made sure that we have, at the discretion of our users, the information necessary to allow us to improve the Audacity app, and that by doing so we are compliant with national and international regulations, namely GDPR and CPPA. Most importantly, we have been, and will continue to be, transparent with our users and our developer community about the data we collect, when we collect it and why—before changes are implemented in the newer versions of the Audacity app.
+
+By default, we inform the user about any data we intend to collect:
+
+1. The first feature mentioned in the privacy notice that requires a network connection is **update checking**, where we notify users when there is a new version of Audacity available. The user is notified about update checking when Audacity is first installed and is provided with a clear link to disable it in Preferences. Update checking shares your IP address, your OS, and your Audacity version (including whether Audacity was compiled in 32 or 64 bit mode). As explained in the privacy notice, we take steps to anonymise your IP address immediately, which makes it impossible for us to identify you. Please note that we also use this anonymised information for statistics, which help us understand how many users we have per country, which version of Audacity they are using, and whether it is run on Windows, Mac or Linux. These statistics help us to plan app development and make decisions about which platforms we need to support.
+2. The other networking feature of Audacity is **error reporting**. If an application error occurs, a popup appears asking you whether you want to send us the details of that error, which you can review before sending. We have taken steps to ensure that all potentially identifiable information is filtered from the report data before storage, including the IP address, which we discard.
+
+Please note that some of the terminology in the privacy notice is potentially confusing to those without a legal or technical background. For example, in section 5.1 there is a line under **Data security** that states “**We use appropriate technical and organisational measures to protect the personal information that we collect and process about you”**. The ability to send any information over the internet requires an IP address, which is classified under CCPA & GDPR as ‘personal information’, and the steps we take to anonymise it count as ‘processing’. As with any application that makes use of a network connection, we cannot avoid seeing (“**collecting”**) an IP address, but as stated in 4.1, we do not store or share any personal information.
+
+Audacity is free and open source software, which means that the program’s source code is publicly available and can be inspected to confirm the very limited data that gets sent. You can also inspect our release executable files using network analysis tools.
+
+Audacity does not have age restrictions and it is a safe place for creators of any age.
+
+The notice below outlines:
+
+* The very limited data we collect and why we collect it
+* Your options in sharing or not sharing information with us
+* Your rights in managing information you share with us
+* Our responsibilities in protecting the data we collect and process
+
+## Audacity Desktop App
+# Privacy Notice
+Last updated: 28 August 2022
+
+## 1. About this Notice
+1. This Privacy Notice (“**Notice”**) explains what information we (as defined below) collect and use when you (“**you”** and “**your”**) use our desktop app, Audacity (the “**App”**), and explains how we use that information. Our App does not require you to create an account or profile and we do not ask you to provide us with your name, address or any other contact details in order to use our App.
+2. This Notice also sets out the rights that you have in relation to the information that we process about you and how you can exercise them.
+3. The Audacity Team treats compliance with its privacy obligations seriously. This is why we have developed this Notice, which describes the standards that the Audacity Team applies to protect your information.
+4. For the purposes of this Notice, MuseCY SM Ltd., a Cyprus company with an address at Spyrou Kyprianou, 84, 4004, Limassol, Cyprus (“**Audacity Team“**, “**us“**, “**we“**, or “**our“**) acts as the data controller for the personal information that is collected via the App and through the use of the App, as further outlined in section 2 (“**personal information”**). As a data controller, the Audacity Team makes sure that any processing of your personal information complies with applicable data protection law, and specifically with the General Data Protection Regulation (“**GDPR”**).
+5. Please take the time to read this Notice carefully. If you have any questions or comments, please contact us via privacy@audacityteam.org.
+
+## 2. What information does the Audacity Team collect and why?
+1. We use the information listed in the table at the end of this section to help us improve our App, for maintenance and security, and to run any updates that enable the App to function better.
+2. All network features are optional. Update checking can be disabled in the app preferences. We always ask your permission before sending an error report.
+3. Data is only collected for the specific network features you actually use.
+4. All network features require sending an Internet Protocol (IP) address. The full IP address is never stored.
+5. We rely on our legitimate interest as a business to offer you our App and ensure that our App is functioning correctly to process the personal information we collect.
+
+<table><thead><tr><th>Network&nbsp;feature</th><th>Data collected</th><th>Purpose</th></tr></thead><tbody><tr><td>Check&nbsp;for&nbsp;updates&nbsp;&nbsp;&nbsp;&nbsp;</td><td>• User-Agent string (Audacity version, OS name and version)<br>• Country from IP address</td><td>Audacity will periodically check to see if a new version of the application is available.<br><br>This feature is on by default. We provide clear links to disable it when the app is first opened.</td></tr><tr><td>Error&nbsp;reports</td><td>• Basic technical data (CPU info, Audacity version, OS name and version)<br>• Error codes<br>• Stack trace</td><td>If a serious error occurs in Audacity, you are shown the relevant information and given the option to send it or not sent it to us as a report.<br><br>We use this information to help us detect serious issues and fix them quickly.</td></tr></tbody></table>
+
+
+## 3. Data anonymisation
+1. For update checking, your IP address is anonymised immediately. We only store the first three octets of the IP address so that it is impossible for us to identify you.
+2. We use anonymised information from update checking (country, Audacity version, OS name and version) for analytics and statistical purposes.
+3. We anonymise error report information by discarding the IP address and filtering all file paths from the report data.
+
+## 4. Who do we share your personal information with?
+1. We do not store or share any personal information.
+
+## 5. How we protect your privacy
+1. We will process the personal information we collect in accordance with this Notice and based on the following principles:
+    1. **Fairness**: We process your personal information fairly, which means that we are both transparent about how we process it and we process it in accordance with applicable laws.
+    2. **Lawfulness**: We process your personal information only on a valid lawful ground.
+    3. **Purpose limitation**: We process your personal information for specified and legitimate purposes (as described above), and do not process it in a manner that is incompatible with those purposes, unless permitted by applicable data protection laws.
+    4. **Data minimization**: We only process information that is adequate, relevant and limited to what is necessary to achieve the purposes for which the data are processed.
+    5. **Data accuracy**: We take appropriate measures to ensure that any personal information we hold about you is accurate.
+    6. **Data security**: We use appropriate technical and organisational measures to protect the personal information that we collect and process. Such measures include to-date secure network architectures that contain firewalls, intrusion detection devices, and backups.
+
+## 6. Data storage, retention and deletion
+1. For update checking, your IP address is fully anonymised before storage. For error reporting, your IP address is discarded entirely. For these reasons, it is impossible for us to identify you.
+2. All data is anonymised before storage. We delete all data within 12 months of it being collected.
+
+## 7. Your data protection rights
+1. Under the GDPR, individuals have certain data protection rights, including the right to **access, correct, update or request deletion** of their personal information, which you can exercise by emailing privacy@audacityteam.org. However, these rights only apply to the extent that the controller is able to identify the individuals whose personal information is collected. As mentioned above, the Audacity Team anonymises or discards all information that would enable us to identify you, and the processing of the information we collect does not require us to identify you. For these reasons, the exercise of your GDPR rights may be limited, or in some cases, might not apply.
+2. If you have a complaint or concern about how we are processing your personal information then we will endeavour to address such concern(s). If you feel we have not sufficiently addressed your complaint or concern, you have the **right to complain to a data protection authority** about our collection and use of your personal information. For more information, please contact your local data protection authority. (Contact details for data protection authorities in the European Economic Area, Switzerland and certain non-European countries (including the US and Canada) are available [here](https://ec.europa.eu/justice/article-29/structure/data-protection-authorities/index_en.htm).)
+3. We respond to all requests we receive at via privacy@audacityteam.org from individuals wishing to exercise their data protection rights in accordance with applicable data protection laws.
+
+## 8. Linking to other websites
+1. The App may contain hyperlinks to websites. These websites have their own privacy policies and we urge you to review them. They will govern the use of personal information you submit whilst visiting these websites.
+2. We do not accept any responsibility or liability for the privacy practices of such third-party websites and your use of such websites is at your own risk.
+
+
+## 9. Updates to this Notice
+1. We may update this Notice from time to time in response to changing legal, technical, or business developments. When we update our Notice, we will take appropriate measures to inform you, consistent with the significance of the changes we make. We will obtain your consent to any material Notice changes if and where this is required by applicable data protection laws.
+2. You can see when this Notice was last updated by checking the “**last updated”** date displayed at the top of this Notice.
+
+## 10. How to contact us
+1. If you have any questions or comments, or if you wish to exercise your data protection rights, please contact us via privacy@audacityteam.org.
+
+## 11. Additional Information for California Consumers
+1. The California Consumer Privacy Act (“**CCPA”**) provides California residents, referred to in the law as “**consumers,”** with rights to receive certain disclosures regarding the collection, use, and sharing of personal information, as well as rights to access and control personal information. Certain information that we collect may be exempt from the CCPA because it is considered public information (because it is made available by a government entity) or covered by another federal privacy law, such as the Gramm-Leach-Bliley Act, the Health Insurance Portability and Accountability Act, or the Fair Credit Reporting Act.
+2. To the extent that we collect personal information about you that is subject to the CCPA, that information, our practices, and your rights are described below.
+3. **Right to information regarding the categories of personal information collected, sold, and disclosed**: You have the right to obtain information regarding the categories of personal information we collect. We collect the categories of information described above.
+4. We do not sell personal information.
\ No newline at end of file

From 323a3c80928efa4eca53e6cb683d4768fc97d4e4 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:33:53 +0200
Subject: [PATCH 2/9] point old website pages to new resources

---
 astro.config.mjs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/astro.config.mjs b/astro.config.mjs
index 5dd7de8..38ba4ac 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -33,6 +33,32 @@ export default defineConfig({
     '/help/documentation/': "https://support.audacityteam.org/",
     '/gitbook-plugins': "https://app.gitbook.com/invite/-MhmG2mhIIHTtQPuHV_k/kY9XD8X03nb2bluFgolK",
     '/devserver': "https://discord.gg/N3XKxzTrq3",
-    '/gitbook-access': "https://app.gitbook.com/invite/-MhmG2mhIIHTtQPuHV_k/acNI2LAF6LtdJW06t4Hc"
+    "/dev": "https://audacity.gitbook.io/dev/",
+    '/gitbook-access': "https://app.gitbook.com/invite/-MhmG2mhIIHTtQPuHV_k/acNI2LAF6LtdJW06t4Hc",
+    "/about/desktop-privacy-notice/": "/desktop-privacy-notice/",
+    "/about/license/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt",
+    "/about/citations-screenshots-and-permissions/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt",
+    "/about/credits/": "https://github.com/audacity/audacity/graphs/contributors",
+    "/about/features/": "/",
+    "/about/features/recording/": "/",
+    "/about/features/export-and-import/": "/",
+    "/about/features/sound-quality/": "/",
+    "/about/features/plug-ins/": "https://plugins.audacityteam.org/",
+    "/about/features/editing/": "/",
+    "/about/features/effects/": "/",
+    "/about/features/accessibility/": "/",
+    "/about/features/analysis/": "/",
+    "/about/screenshots/": "/",
+    "/about/nyquist/": "https://audacity.gitbook.io/dev/scripting/creating-your-own-nyquist-plugins",
+    "/about/news/": "/blog",
+    "/download/online-safety-when-downloading/": "/downloads",
+    "/download/source/": "/downloads",
+    "/help/": "https://support.audacityteam.org/",
+    "/contact/": "https://forum.audacityteam.org/",
+    "/community/": "https://support.audacityteam.org/community/contributing",
+    "/community/users/": "https://support.audacityteam.org/community/contributing",
+    "/community/developers/": "https://audacity.gitbook.io/dev",
+    "/community/translators/": "https://support.audacityteam.org/community/contributing/translating",
+    "/copyright/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt"
   }
 });

From 94df76c5737e454da5208fb2991dbb1a92e07c96 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 23:14:49 +0200
Subject: [PATCH 3/9] add additional cookie policy

---
 src/pages/cookie-policy.md | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/pages/cookie-policy.md b/src/pages/cookie-policy.md
index e1db7f0..36832de 100644
--- a/src/pages/cookie-policy.md
+++ b/src/pages/cookie-policy.md
@@ -3,9 +3,10 @@ layout: "../layouts/PageLayout.astro"
 title: Audacity | Cookie Policy
 ---
 
+Last updated: 11. September 2023
 ## About this Policy
 
-This Cookie Policy (“Policy”) explains how we use cookies and other similar technologies to recognise you when you visit our website https://www.audacityteam.org (“Website”). It explains what these technologies are and why we use them, as well as your rights to control our use of them.
+This Cookie Policy (“**Policy”**) explains how we use cookies and other similar technologies to recognise you when you visit our website https://www.audacityteam.org (“**Website”**). It explains what these technologies are and why we use them, as well as your rights to control our use of them.
 Please take the time to read this Policy carefully. If you have any questions or comments, please contact us via email at privacy@audacityteam.org.
 
 A note about your personal information
@@ -14,20 +15,28 @@ When you arrive on AudacityTeam.org, your IP address is anonymised before being
 ## What are cookies?
 Cookies are small data files that are placed on your computer or mobile device when you visit a website. Cookies are used by website owners in order to understand how you are using the website, by providing usage statistics which helps to maintain and improve it.
 Cookies have many different features, such as allowing you to navigate between pages efficiently, remembering your preferences, and generally improving your user experience.
-Cookies set by the Website itself (in this case, https://www.audacityteam.org) are called “first party cookies“. Please note that our Website does not use any third party cookies.
+Cookies set by the Website itself (in this case, https://www.audacityteam.org) are called “**first party cookies“**. Please note that our Website does not use any third party cookies.
 
 ## How do we use cookies?
 When you visit our Website, we place the following types of cookies:
-Necessary cookies: These cookies are strictly necessary to provide you with the services available through our Website and to use some of its features, such as security or cookies consent storage. Because these cookies are strictly necessary to deliver the Website to you, you cannot refuse them.
-Statistics (non-necessary) cookies: These cookies collect information that is used either in aggregate form to help us understand how our Website is being used, which helps us make improvements to it.
-By default we collect statistics that track the number of site visits as well as the number of downloads of Audacity. These analytics are anonymously collected: your IP address is anonymised before storage and by default, we do not collect any other personal information of any kind. You still have the option to disable the processing of these anonymized statistical cookies through the settings in our cookie banner (please refer section “How can I control cookies?” below for more info).
+* Necessary cookies: These cookies are strictly necessary to provide you with the services available through our Website and to use some of its features, such as security or cookies consent storage. Because these cookies are strictly necessary to deliver the Website to you, you cannot refuse them.
+* Statistics (non-necessary) cookies: These cookies collect information that is used either in aggregate form to help us understand how our Website is being used, which helps us make improvements to it.
+
+By default we collect statistics that track the number of site visits as well as the number of downloads of Audacity. These analytics are anonymously collected: your IP address is anonymised before storage and by default, we do not collect any other personal information of any kind. You still have the option to disable the processing of these anonymized statistical cookies through the settings in our cookie banner (please refer section “**How can I control cookies?”** below for more info).
 
 On our Website we use only first party cookies, which means that all your cookie data will be stored on our side in accordance with the rules applicable to the protection of privacy in the electronic communications sector.
 
-<!--table here-->
+
+
+|Cookie|Duration|Description|Type
+|------|--------|-----------|---------|
+|`cookieyes-consent`|1 year|Stores your cookie preferences|Necessary| 
+|`__cf_bm`|30 min|Cloudflare Bot Management - to distinguish between humans and bots|Necessary|
+
 
 ## How can I control cookies?
-You have the right to decide whether to accept or reject specific cookies. You can exercise your cookie preferences on the cookie banner available in the bottom right corner of the Website (“Privacy & Cookies Policy”).
+You have the right to decide whether to accept or reject specific cookies. You can exercise your cookie preferences on the cookie banner available in the bottom left corner of the Website (a blue circle with a white cookie symbol and checkmark).
+
 In addition to the preferences that you set within the cookie banner, you can set or amend your web browser controls to accept or refuse some cookies. If you choose to reject cookies, you may still use our Website. As means by which you can refuse cookies through your web browser controls vary from browser-to-browser, you should visit your browser’s help menu for more information.
 
 ## The cookies that were sent in the past
@@ -35,4 +44,5 @@ If you have disabled one or more cookies, we can use information collected by th
 
 ## Updates to this Notice
 We may update this Policy from time to time in response to changing legal, technical or business developments. When we update our Policy, we will take appropriate measures to inform you, consistent with the significance of the changes we make.
-You can see when this Policy was last updated by checking the “last updated” date displayed at the top of this Policy.
\ No newline at end of file
+
+You can see when this Policy was last updated by checking the “**last updated”** date displayed at the top of this Policy.
\ No newline at end of file

From 9086b0b499f3f4410c7f5e2a14fae6c0d4c21609 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 23:16:41 +0200
Subject: [PATCH 4/9] remove 3.4 announcement from main until we actually
 publish the thing

---
 src/pages/posts/audacity-3.4-timestretch.md | 15 ---------------
 src/pages/posts/audacity-3.4.md             | 19 -------------------
 2 files changed, 34 deletions(-)
 delete mode 100644 src/pages/posts/audacity-3.4-timestretch.md
 delete mode 100644 src/pages/posts/audacity-3.4.md

diff --git a/src/pages/posts/audacity-3.4-timestretch.md b/src/pages/posts/audacity-3.4-timestretch.md
deleted file mode 100644
index 3b9a71a..0000000
--- a/src/pages/posts/audacity-3.4-timestretch.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Time stretching in Audacity 3.4
-slug: audacity-3.4-timestretch
-thumbnail: /blog1.png
-author: Leo Wattenberg
-date: September 30, 2023
-layout: "../../layouts/PostLayout.astro"
-description: A technical look into time stretching in Audacity 3.4
----
-
-For Audacity 3.4, we've added a new time stretching feature, which can be accessed by holding Alt (macOS: Option) and dragging the edge of a clip. Additionally, when you change the project tempo, all clips in the project are adjusted to the new tempo.
-
-This feature uses a time stretching algorithm that originated in [Staffpad](https://staffpad.net) and marks the beginning of a wider code sharing effort. In the future, this code sharing will extend in particular to Musescore, which has various components we will use - such as buttons and the general UI system, but also larger features like the mixer - and also may turn bi-directional, with Musescore using some of our technology in the future. Audacity's continued efforts in librarization of the code base certainly make code sharing easier, both between Muse products and also with third party developers.
-
-<!-- add more dev-y talk here -->
\ No newline at end of file
diff --git a/src/pages/posts/audacity-3.4.md b/src/pages/posts/audacity-3.4.md
deleted file mode 100644
index dd8ed5c..0000000
--- a/src/pages/posts/audacity-3.4.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: Audacity 3.4 released
-slug: audacity-3.4
-thumbnail: /blog1.png
-author: Leo Wattenberg
-date: September 30, 2023
-layout: "../../layouts/PostLayout.astro"
-description: A first stab at Music features 
----
-
-[insert release video here]
-
-We are excited to announce Audacity 3.4, which adds the following features:
-
-* **Beats and measures grid**: You can now easily align your audio clips to the musical tempo and rhythm of your project. The grid shows you the subdivisions of each measure depending on your zoom level, and you can snap your clips to the nearest beat. 
-
-* **Time stretching**: You can now change the duration of your audio clips without affecting their pitch non-destructively. Audacity 3.4 uses a state-of-the-art algorithm that preserves the transients and harmonics of the original sound, while minimizing artifacts and distortion. You can [learn more about it here](audacity-3.4-timestretch.md).
-
-You can download Audacity on [audacityteam.org/download](/download).
\ No newline at end of file

From e7a2b74fefb7a67aa738e1fd32980ce6c7b3c605 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 23:37:33 +0200
Subject: [PATCH 5/9] factualize blogposts

---
 src/pages/posts/audacity-3.3.md | 18 +++++++++---------
 src/pages/posts/our-new-site.md | 10 ++++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/pages/posts/audacity-3.3.md b/src/pages/posts/audacity-3.3.md
index 50166db..b7170c2 100644
--- a/src/pages/posts/audacity-3.3.md
+++ b/src/pages/posts/audacity-3.3.md
@@ -3,19 +3,19 @@ title: Audacity 3.3
 slug: audacity-3.3
 thumbnail: /blog1.png
 author: Leo Wattenberg
-date: April 1, 2023
+date: April 25, 2023
 layout: "../../layouts/PostLayout.astro"
 description: A lot of our work has been focused on getting Audacity ready for a version 4. As such, a lot of under-the-hood work has been happening - in technical terms - reducing dependency on wxWidgets, library extractions and general refactoring. This work will continue for the next few releases in parallel with feature development. 
 ---
-
-In addition to its visually appealing interface, Audacity's new website brings improved functionality that enhances the overall user experience. Navigation has been streamlined, making it effortless to explore the different sections of the website, discover new features, and access tutorials and documentation. Whether you're a beginner seeking guidance or an experienced user looking for advanced tips and tricks, the revamped website is designed to cater to your needs.
-
-Audacity's commitment to accessibility shines through in its new website as well. The site has been optimized for various devices and screen sizes, ensuring a seamless browsing experience across desktop computers, laptops, tablets, and smartphones. No matter where you are or what device you're using, you can easily access Audacity's resources and engage with the vibrant community surrounding the software.
-
 <figure><img src="/beats-and-bars.png"/></figure>
+A lot of our work has been focused on getting Audacity ready for a version 4. As such, a lot of under-the-hood work has been happening - in technical terms - reducing dependency on wxWidgets, library extractions and general refactoring. This work will continue for the next few releases in parallel with feature development.
 
-Speaking of community, Audacity's new website offers an enhanced platform for users to connect, collaborate, and share their audio projects. The updated forum and support section provide a space for users to seek advice, share knowledge, and discuss their experiences. With an active community, comprehensive documentation, and helpful tutorials, Audacity continues to foster a supportive environment where users can learn, grow, and inspire one another.
+By and large Audacity 3.3 is a quiet update, with most of the work being done under the hood. Some noteworthy changes:
 
-Furthermore, the new website highlights Audacity's commitment to open-source software development and the spirit of collaboration. It showcases the latest updates, features, and enhancements, giving users a glimpse into the future of audio editing. By providing transparent and accessible information about ongoing development and future plans, Audacity invites users to actively contribute to the software's evolution and shape its future.
+* Some built-in effects are realtime capable now
+* A new **Shelf Filter** effect has been added, it’s in the EQ & Filters category
+* An initial (beta) version of a [beats and measures](https://support.audacityteam.org/music/aligning-music-to-beats-and-measures) feature has been added, you can enable it via View → Toolbars → Time Signature Toolbar (beta), then right-clicking the timeline to change to beats and measures, and then changing the snapping and time and selection toolbar clocks to a beats format.
+* A new vertical ruler (**Linear (dB)**) has been added, you can enable it by right-clicking on the vertical ruler.
+* **Project Rate** has been moved to the Audio Setup button → Audio Settings and renamed Project Sample Rate.
 
-Audacity's new website is more than just a visual upgrade; it represents a dedication to user satisfaction and a commitment to continuous improvement. With its sleek design, improved functionality, enhanced accessibility, and emphasis on community engagement, the new website serves as a gateway to an even more fulfilling and immersive audio editing experience. Whether you're a professional sound engineer or an aspiring podcaster, Audacity's new website is ready to accompany you on your creative journey, offering the tools and resources you need to bring your audio projects to life.
\ No newline at end of file
+More changes can be found in the changelog: [Audacity 3.3 – Audacity Support](https://support.audacityteam.org/additional-resources/changelog/audacity-3.3)
\ No newline at end of file
diff --git a/src/pages/posts/our-new-site.md b/src/pages/posts/our-new-site.md
index d45eeb6..91aba6b 100644
--- a/src/pages/posts/our-new-site.md
+++ b/src/pages/posts/our-new-site.md
@@ -3,15 +3,17 @@ title: Our new website
 slug: our-new-site
 thumbnail: /our-new-site.jpg
 author: Dawson Custons-Cole
-date: February 3, 2023
+date: August 3, 2023
 layout: "../../layouts/PostLayout.astro"
 description: audacityteam.org now has a new look!
 ---
 
 Hello everyone!
 
-This is a quick note to let you know we updated our website. As part of that, we have also updated the logo ever so slightly. Audacity itself will get a new look soon-ish as well, but unlike this website, that is a herculean task which is better measured in years than weeks.
+This is a quick note to let you know we updated our website. Audacity itself will get a new look soon-ish as well, though that is a herculean task which is better measured in years than weeks.
 
-In the future, we want to translate this website into more languages, too. We'll let you know when we're opening up translations here. In the meantime, you can check out [our transifex](LINK!) if you'd like to translate Audacity itself.
+This new website no longer uses Wordpress, opting for a much more lightweight static site generator instead. Additionally, things have been slimmed down a bit. Old posts got [archived](https://archive.org/details/posts.audacity.WordPress.2023-09-11) and the page structure has been consolidated. If you encounter any issues or have suggestions for this website in particular, feel free to raise an issue [on Github](https://github.com/audacity/audacity.github.io/issues). 
 
-Let us know what you think in our (also recently upgraded!) [Forum](https://forum.audacityteam.org/...) or [on Discord](https://discord.gg/audacity).
+In the future, we want to translate this website into more languages, too. We'll let you know when we're opening up translations here. In the meantime, you can get involved in [translating Audacity](https://support.audacityteam.org/community/contributing/translating) if translation is your thing. If you'd rather help other users, you can do so in our [Forum](https://forum.audacityteam.org/) (which also has a new look as of earlier this year) or [on Discord](https://discord.gg/audacity).
+
+And that's it! Let us know what you think! 
\ No newline at end of file

From 7d205a1a2bea8e4de97b5328cb3ab1d9c90bc534 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Tue, 12 Sep 2023 00:07:47 +0200
Subject: [PATCH 6/9] FAQ work

---
 astro.config.mjs | 18 +++++++++---------
 src/pages/FAQ.md | 28 ++++++++++++++--------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/astro.config.mjs b/astro.config.mjs
index 38ba4ac..48f88fe 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -39,16 +39,16 @@ export default defineConfig({
     "/about/license/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt",
     "/about/citations-screenshots-and-permissions/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt",
     "/about/credits/": "https://github.com/audacity/audacity/graphs/contributors",
-    "/about/features/": "/",
-    "/about/features/recording/": "/",
-    "/about/features/export-and-import/": "/",
-    "/about/features/sound-quality/": "/",
+    "/about/features/": "/FAQ#features",
+    "/about/features/recording/": "/FAQ#features",
+    "/about/features/export-and-import/": "/FAQ#what-audio-file-formats-are-compatible-with-audacity",
+    "/about/features/sound-quality/": "/FAQ#what-audio-quality-is-compatible-with-audacity",
     "/about/features/plug-ins/": "https://plugins.audacityteam.org/",
-    "/about/features/editing/": "/",
-    "/about/features/effects/": "/",
-    "/about/features/accessibility/": "/",
-    "/about/features/analysis/": "/",
-    "/about/screenshots/": "/",
+    "/about/features/editing/": "/FAQ#features",
+    "/about/features/effects/": "/FAQ#features",
+    "/about/features/accessibility/": "/FAQ#features",
+    "/about/features/analysis/": "/FAQ#features",
+    "/about/screenshots/": "/FAQ#features",
     "/about/nyquist/": "https://audacity.gitbook.io/dev/scripting/creating-your-own-nyquist-plugins",
     "/about/news/": "/blog",
     "/download/online-safety-when-downloading/": "/downloads",
diff --git a/src/pages/FAQ.md b/src/pages/FAQ.md
index eadef25..c99c986 100644
--- a/src/pages/FAQ.md
+++ b/src/pages/FAQ.md
@@ -30,11 +30,11 @@ A dedicated worldwide community of passionate audio lovers have collaborated to
 ## Download & install
 
 #### What devices are compatible with Audacity?
-Audacity is compatible with the following operating systems:
+Audacity is tested compatible with the following operating systems:
 
-- Windows X
-- Mac OS X
-- Linux
+- Windows 10 & 11, with Vista, 7 and 8.1 believed to work
+- MacOS 12 & 13, with OS X versions since 10.9 believed to still work
+- Linux: Ubuntu 22.04, with most major distributions believed to work.
 
 
 #### Is Audacity only available for desktop?
@@ -59,13 +59,13 @@ You can download Audacity via the Muse Hub. If you already have Audacity, you ca
 
 
 #### How do I install Audacity or update to the latest version?
-Learn how to install Audacity for Windows [here](https://manual.audacityteam.org/man/installing_and_updating_audacity_on_windows.html), for [Mac](https://manual.audacityteam.org/man/installing_and_updating_audacity_on_mac_os_x.html) here and for [Linux](https://manual.audacityteam.org/man/installing_and_updating_audacity_on_linux.html#:~:text=You%20can%20check%20to%20see,release%20version%20of%20Audacity%20is.) here.
+[Learn how to install Audacity](https://support.audacityteam.org/basics/downloading-and-installing-audacity) on Windows, macOS and Linux here: https://support.audacityteam.org/basics/downloading-and-installing-audacity
 
 
 #### Is Audacity safe to download?
-Yes. Audacity is entirely safe to download and install on your desktop computer if it has been downloaded directly from the [Audacity website](/).
+Yes. Audacity is entirely safe to download and install on your desktop computer if it has been downloaded directly from the [Audacity website](/). 
 
-However, there have been past instances of 'bad adverts' falsely using Audacity's name or logo to encourage downloads of unwanted software or malware in other channels. Please download Audacity from our website to avoid any issues. [Read this article for more safety information](https://www.audacityteam.org/download/online-safety-when-downloading/). 
+We also publish versions through the Microsoft Store, via `winget`, via Github and Fosshub. There also are third party Audacity builds around, though we cannot guarantee for the integrity of versions downloaded from places other than mentioned here.
 
 ---
 
@@ -113,12 +113,12 @@ Yes. Audacity is a DAW just like GarageBand, FL Studio, Ableton Live, Logic Pro
 The Audacity team is always looking for new ways to improve the experience for musicians and music producers, so look out for new features in future updates.
 
 #### I'm just getting started with Audacity. Are there any free tutorials available?
-The free, online [Audacity manual](https://manual.audacityteam.org/) includes both [How-Tos](https://manual.audacityteam.org/man/how_to_use_audacity.html) and step-by-step [Tutorials](https://manual.audacityteam.org/man/tutorials_for_audacity.html) for beginners.
+We have a beginner tutorial series available on https://support.audacityteam.org/, beginning with [installing Audacity](https://support.audacityteam.org/basics/downloading-and-installing-audacity) and [FFmpeg](https://support.audacityteam.org/basics/installing-ffmpeg), [recording your voice](https://support.audacityteam.org/basics/recording-your-voice-and-microphone), [recording desktop audio](https://support.audacityteam.org/basics/recording-desktop-audio), [editing audio](https://support.audacityteam.org/basics/audacity-editing),  [saving and exporting projects](https://support.audacityteam.org/basics/saving-and-exporting-projects) and more!
 
-#### Is Audacity compatible with third party plug-ins?
-Yes! As an open-source application many third party plug-ins have been developed for Audacity. Check out a list of some of our team's favorite Audacity plug-ins here.
+#### Is Audacity compatible with third party plugins?
+Yes! As an open-source application many third party plugins have been developed for Audacity. Check out a list of some of our team's favorite Audacity plugins at https://plugins.audacityteam.org/
 
-The software supports LADSPA, LV2, Nyquist, VST and Audio Unit plug-ins.
+Audacity supports VST3, LADSPA, LV2, Nyquist, VST and Audio Unit plugins.
 
 
 
@@ -135,14 +135,14 @@ The Audacity app only collects data relevant to error reporting (such as device
 
 The Audacity team will take all the necessary steps to keep your data protected. It is fully GDPR compliant in EU regions.
 
-Read Audacity's privacy policy in full [here](https://www.audacityteam.org/contact/privacy-policy/).
+Read Audacity's privacy policy in full [here](https://www.audacityteam.org/desktop-privacy-policy/).
 
 #### Is Audacity spyware?
 No. Audacity is entirely safe to use and only collects data relevant to error reporting (such as device information) and software updates.
 
 After Audacity 3.0.3 was released, we have since reviewed our privacy policy and will take all the necessary steps to keep your data protected. The Audacity team is fully GDPR compliant in EU regions.
 
-Read Audacity's privacy policy in full [here](https://www.audacityteam.org/contact/privacy-policy/).
+Read Audacity's privacy policy in full [here](https://www.audacityteam.org/desktop-privacy-policy/).
 
 #### I've shared my Audacity project on Audio.com. What are my legal rights regarding my project?
 If you are the sole creator of the audio project, the intellectual property rights and mechanical copyright is retained by you. Similar to other UGC (User Generated Content) platforms, by using [audio.com](https://audio.com/) you grant a license to host and show your work. You are also free to distribute your work on other platforms, if you wish. For more details read the full [Terms & Conditions](https://audio.com/legal/terms-of-use.pdf). 
@@ -160,7 +160,7 @@ Many frequently asked questions and issues are answered on our support page [her
 If you have a question you can't find the answer to, please leave a comment on the [Audacity forum](https://forum.audacityteam.org/), where one of our team (or someone in the Audacity community), will be happy to help!
 
 #### I'm an open-source developer working with Audacity. How can I get in touch with the team?
-No answer to this question yet
+Audacity is currently undergoing major restructuring, so we unfortunately have very limited capacity to support third parties. That said, feel free to drop by our [dev discord](/devserver). 
 
 #### What is the history of Audacity?
 Audacity has transformed the lives of musicians and audio content creators for over two decades. Since launching in 2000, the desktop app has been downloaded over 100 million times.

From 45e82fb8e5adb0e7451b0c04b3cd9f1bd42fee44 Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Tue, 12 Sep 2023 00:17:20 +0200
Subject: [PATCH 7/9] retain old page structure for downloads

---
 astro.config.mjs                                            | 4 ++--
 src/components/button/DownloadButton.jsx                    | 2 +-
 src/components/button/DownloadMuseHubButton.jsx             | 2 +-
 src/components/footer/Footer.astro                          | 6 +++---
 src/components/navigation/NavigationReact.jsx               | 2 +-
 src/pages/FAQ.md                                            | 2 +-
 src/pages/{downloads.astro => download.astro}               | 6 +++---
 .../download-for-linux.astro => download/linux.astro}       | 0
 .../download-for-mac.astro => download/mac.astro}           | 0
 .../download-for-windows.astro => download/windows.astro}   | 0
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename src/pages/{downloads.astro => download.astro} (95%)
 rename src/pages/{downloads/download-for-linux.astro => download/linux.astro} (100%)
 rename src/pages/{downloads/download-for-mac.astro => download/mac.astro} (100%)
 rename src/pages/{downloads/download-for-windows.astro => download/windows.astro} (100%)

diff --git a/astro.config.mjs b/astro.config.mjs
index 48f88fe..c79f48e 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -51,8 +51,8 @@ export default defineConfig({
     "/about/screenshots/": "/FAQ#features",
     "/about/nyquist/": "https://audacity.gitbook.io/dev/scripting/creating-your-own-nyquist-plugins",
     "/about/news/": "/blog",
-    "/download/online-safety-when-downloading/": "/downloads",
-    "/download/source/": "/downloads",
+    "/download/online-safety-when-downloading/": "/FAQ#is-audacity-safe-to-download",
+    "/download/source/": "/download",
     "/help/": "https://support.audacityteam.org/",
     "/contact/": "https://forum.audacityteam.org/",
     "/community/": "https://support.audacityteam.org/community/contributing",
diff --git a/src/components/button/DownloadButton.jsx b/src/components/button/DownloadButton.jsx
index 62df8a7..b0b01e5 100644
--- a/src/components/button/DownloadButton.jsx
+++ b/src/components/button/DownloadButton.jsx
@@ -44,7 +44,7 @@ function DownloadButton() {
         releaseData.lin[0].browser_download_url
       );
     default:
-      return renderButton("/downloads");
+      return renderButton("/download");
   }
 }
 
diff --git a/src/components/button/DownloadMuseHubButton.jsx b/src/components/button/DownloadMuseHubButton.jsx
index 87b42f5..37da814 100644
--- a/src/components/button/DownloadMuseHubButton.jsx
+++ b/src/components/button/DownloadMuseHubButton.jsx
@@ -43,7 +43,7 @@ function DownloadMuseHubButton() {
         "https://pub-c7a32e5b5d834ec9aeef400105452a42.r2.dev/Muse_Hub.deb"
       );
     default:
-      return renderButton("/downloads", "Download Audacity");
+      return renderButton("/download", "Download Audacity");
   }
 }
 
diff --git a/src/components/footer/Footer.astro b/src/components/footer/Footer.astro
index 69e6b6e..b1d8f2e 100644
--- a/src/components/footer/Footer.astro
+++ b/src/components/footer/Footer.astro
@@ -34,9 +34,9 @@ import "../../styles/fonts.css"
     >
       <h4>Downloads</h4>
       <ul class="mt-2 footer-link-list">
-        <li><a href="/downloads/download-for-windows">Windows</a></li>
-        <li><a href="/downloads/download-for-mac">Mac OS</a></li>
-        <li><a href="/downloads/download-for-linux">Linux</a></li>
+        <li><a href="/download/windows">Windows</a></li>
+        <li><a href="/download/mac">Mac OS</a></li>
+        <li><a href="/download/linux">Linux</a></li>
       </ul>
     </div>
 
diff --git a/src/components/navigation/NavigationReact.jsx b/src/components/navigation/NavigationReact.jsx
index 112423c..753ddb1 100644
--- a/src/components/navigation/NavigationReact.jsx
+++ b/src/components/navigation/NavigationReact.jsx
@@ -9,7 +9,7 @@ function NavigationReact() {
   const [isHamburgerMenuOpen, setIsHamburgerMenuOpen] = useState(false);
 
   const navLinks = [
-    { href: "/downloads", linkText: "Downloads", target: "" },
+    { href: "/download", linkText: "Downloads", target: "" },
     { href: "/FAQ", linkText: "FAQ", target: "" },
     { href: "/blog", linkText: "Blog", target: "" },
     {
diff --git a/src/pages/FAQ.md b/src/pages/FAQ.md
index c99c986..a6d1952 100644
--- a/src/pages/FAQ.md
+++ b/src/pages/FAQ.md
@@ -6,7 +6,7 @@ title: Audacity | FAQ
 ## About Audacity
 
 #### What is Audacity?
-Audacity is the world’s most popular free software for recording and editing audio. So if you're producing music, a podcast, or just playing around with audio, Audacity is for you. It is [available to download](/downloads) as a desktop app for Windows, macOS and Linux.
+Audacity is the world’s most popular free software for recording and editing audio. So if you're producing music, a podcast, or just playing around with audio, Audacity is for you. It is [available to download](/download) as a desktop app for Windows, macOS and Linux.
 
 #### Is Audacity free?
 Yes! Audacity has always — and will always — remain free for everyone. It is available to download from the [Audacity website](/).
diff --git a/src/pages/downloads.astro b/src/pages/download.astro
similarity index 95%
rename from src/pages/downloads.astro
rename to src/pages/download.astro
index 74e792f..6cfc005 100644
--- a/src/pages/downloads.astro
+++ b/src/pages/download.astro
@@ -31,17 +31,17 @@ const { version, src } = releaseData;
           <OperatingSystemCard
             title="Windows"
             description="32 & 64 bit"
-            targetURL="/downloads/download-for-windows"
+            targetURL="/download/windows"
           />
           <OperatingSystemCard
             title="Mac OS"
             description="Universal Binary"
-            targetURL="/downloads/download-for-mac"
+            targetURL="/download/mac"
           />
           <OperatingSystemCard
             title="Linux"
             description="64 bit appimage"
-            targetURL="/downloads/download-for-linux"
+            targetURL="/download/linux"
           />
         </div>
       </div>
diff --git a/src/pages/downloads/download-for-linux.astro b/src/pages/download/linux.astro
similarity index 100%
rename from src/pages/downloads/download-for-linux.astro
rename to src/pages/download/linux.astro
diff --git a/src/pages/downloads/download-for-mac.astro b/src/pages/download/mac.astro
similarity index 100%
rename from src/pages/downloads/download-for-mac.astro
rename to src/pages/download/mac.astro
diff --git a/src/pages/downloads/download-for-windows.astro b/src/pages/download/windows.astro
similarity index 100%
rename from src/pages/downloads/download-for-windows.astro
rename to src/pages/download/windows.astro

From b367a6857dbf8a0c830f92684f7f6511e2a014bc Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Tue, 12 Sep 2023 00:24:29 +0200
Subject: [PATCH 8/9] clarify recommended downloadd

---
 src/assets/js/releaseData.js | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/assets/js/releaseData.js b/src/assets/js/releaseData.js
index 0bb7a7b..073b7ed 100644
--- a/src/assets/js/releaseData.js
+++ b/src/assets/js/releaseData.js
@@ -1,6 +1,22 @@
 export const releaseData = {
   version: "3.3.3",
   win: [
+    {
+      name: "64 bit installer (recommended)",
+      browser_download_url:
+        "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-win-3.3.3-x64.exe",
+      checksum:
+        "379a03b37fba8d4b71e10cb0034e303e43cb2fbffb9af423a7b87be3b32bf94d",
+      type: ".exe",
+    },
+    {
+      name: "64 bit zip file",
+      browser_download_url:
+      "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-win-3.3.3-x64.zip",
+      checksum:
+      "3060f6a46b4eaf23816826037fb05934812199f19944162e9d9ba03ba5d8cc4a",
+      type: ".zip",
+    },
     {
       name: "32 bit installer",
       browser_download_url:
@@ -17,40 +33,24 @@ export const releaseData = {
         "b593f2496a8c945234ebac7da354b110faf404785f90dbda9be29c6426860d74",
       type: ".zip",
     },
-    {
-      name: "64 bit installer",
-      browser_download_url:
-        "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-win-3.3.3-x64.exe",
-      checksum:
-        "379a03b37fba8d4b71e10cb0034e303e43cb2fbffb9af423a7b87be3b32bf94d",
-      type: ".exe",
-    },
-    {
-      name: "64 bit zip file",
-      browser_download_url:
-        "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-win-3.3.3-x64.zip",
-      checksum:
-        "3060f6a46b4eaf23816826037fb05934812199f19944162e9d9ba03ba5d8cc4a",
-      type: ".zip",
-    },
   ],
   mac: [
     {
-      name: "ARM 64 dmg",
-      browser_download_url:
-        "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-macOS-3.3.3-arm64.dmg",
-      checksum: "783262df08e76fd247590a47b42e921d8b1a0ad38bb050854654e10f6030760e",
-      type: ".dmg",
-    },
-    {
-      name: "Universal dmg",
+      name: "Universal dmg (recommended)",
       browser_download_url:
         "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-macOS-3.3.3-universal.dmg",
       checksum: "e9fd97ddf1b489d547d4c2dfd2573cff4e62cb92e92ee50f7adf9f62a5dfbeb0",
       type: ".dmg",
     },
     {
-      name: "x86_64 dmg",
+      name: "ARM 64 dmg (Apple Silicon)",
+      browser_download_url:
+        "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-macOS-3.3.3-arm64.dmg",
+      checksum: "783262df08e76fd247590a47b42e921d8b1a0ad38bb050854654e10f6030760e",
+      type: ".dmg",
+    },
+    {
+      name: "x86_64 dmg (Intel)",
       browser_download_url:
         "https://github.com/audacity/audacity/releases/download/Audacity-3.3.3/audacity-macOS-3.3.3-x86_64.dmg",
       checksum: "eab0687b4f218a80ee4b661f45a09e7674b387033b6aa04efdd31a1f0d9f77c6",

From f931597376247a8664d1e551e6823445313faa4c Mon Sep 17 00:00:00 2001
From: LWinterberg <87814144+LWinterberg@users.noreply.github.com>
Date: Tue, 12 Sep 2023 00:33:02 +0200
Subject: [PATCH 9/9] minor FAQ work

---
 src/pages/FAQ.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/FAQ.md b/src/pages/FAQ.md
index a6d1952..8582318 100644
--- a/src/pages/FAQ.md
+++ b/src/pages/FAQ.md
@@ -65,7 +65,7 @@ You can download Audacity via the Muse Hub. If you already have Audacity, you ca
 #### Is Audacity safe to download?
 Yes. Audacity is entirely safe to download and install on your desktop computer if it has been downloaded directly from the [Audacity website](/). 
 
-We also publish versions through the Microsoft Store, via `winget`, via Github and Fosshub. There also are third party Audacity builds around, though we cannot guarantee for the integrity of versions downloaded from places other than mentioned here.
+We also publish official versions through the Microsoft Store, via `winget`, via Github and Fosshub. There also are third party Audacity builds around, though we cannot guarantee for the integrity of versions downloaded from places other than mentioned here.
 
 ---
 
@@ -135,7 +135,7 @@ The Audacity app only collects data relevant to error reporting (such as device
 
 The Audacity team will take all the necessary steps to keep your data protected. It is fully GDPR compliant in EU regions.
 
-Read Audacity's privacy policy in full [here](https://www.audacityteam.org/desktop-privacy-policy/).
+Read Audacity's privacy policy in full [here](/desktop-privacy-policy/). The cookie policy for this website can be found [here](/cookie-policy/).
 
 #### Is Audacity spyware?
 No. Audacity is entirely safe to use and only collects data relevant to error reporting (such as device information) and software updates.