Merge branch 'main' into license-exception-howto

website/content/accessibility/deaf-and-hard-of-hearing/conference-best-practices.md

@@ -20,14 +20,14 @@ To make the process as straightforward as possible, we've listed as much as we c
 
 ### DEIA: Diversity + Equity + Inclusion + Accessibility
 
-We encourage you to include the A in your DEI efforts: **Diversity + Equity + Inclusion + Accessibility (DEIA)** — too often our is community an afterthought. We want to change that and need your support!
+We encourage you to include the A in your DEI efforts: **Diversity + Equity + Inclusion + Accessibility (DEIA)** — too often our community _is_ an afterthought. We want to change that and need your support!
 
 #### Disabilities coordinator
 
 We recommend appointing a designated disabilities coordinator to handle any prompt communications involving accommodations before and during the conference. This includes communication with attendees, speakers, facilities, and other event organizers. For signing attendees specifically, the coordinator typically:
-- Facilitates communications between interpreters, assigns them to deaf attendees and location, solicits feedback, and determines fit (e.g., some deaf people may not like the interpreter's signing style, clarity, or quality).
+- Facilitates communications between interpreters, assigns them to deaf attendees and location, solicits feedback, and determines the fit (e.g., some deaf people may not feel comfortable with the interpreter's signing style, clarity, or quality).
 - Ensures proper lighting and interpreter staging.
-- Provide extra equipment in case of failures, such as lights, stands, chairs, etc.
+- Provides extra equipment in case of failures, such as lights, stands, chairs, etc.
 - Takes attendee feedback on interpreters
 
 #### Be ADA-compliant (whether US-based or not)
@@ -79,7 +79,7 @@ If you record your sessions, be sure the interpreters are on screen so deaf atte
 
 ### Captions
 
-There is no need to provide interpreters for every session, but captions should be available for all sessions. While there are lots of live captions software options, not all work well. Using a tool with low accuracy can be very confusing for deaf/hoh individuals, so select one that has proven to work.
+There is no need to provide interpreters for every session, but captions should be available for all sessions. While there are lots of live captions software options, not all work well. Using a tool with low accuracy can be very confusing for deaf/hoh individuals, so select one that has been proven to work effectively.
 
 Some caption tools work for virtual events only, others for in-person and virtual. 
 
@@ -89,11 +89,11 @@ Captions at the bottom of the screen are not visible unless attendees are sittin
 
 Some captions are highly **accurate but lag** significantly. That creates a disconnect between the message received and the speaker/audience (not syncing with body language, laughter, etc.), which can create a feeling of ‘missing out.’
 
-Unlike hearing people, deaf/hoh individuals can only focus on the captions or look at the speaker/slides (e.g., a technical graphic). So if they do look away, they will miss what's said. Hence, leaving content on the screen longer by **adding more than one line** will help people rely on captions. 
+Unlike hearing people, deaf/hoh individuals can only focus on the captions or look at the speaker/slides (e.g., a technical graphic). So if they do look away, they will miss what's said. Hence, leaving content on the screen longer by **adding more than one line** will help people who rely on captions. 
 
 Every session should have captions in the main conference language **on the screen by default** (vs. captions available on the phone). Reading captions on-screen makes attendees feel more engaged than looking at their phones (speakers might think they aren't interested). With a phone, attendees are constantly required to shift focus between their phones and speaker(s) and will miss parts of the message. This is even more critical when there are live demos because, to understand what is going on, attendees must see what's on-screen and read captions at the same time. Captions on the phone make that impossible. 
 
-#### Caption use cases beyond deaf/hoh
+#### Captions use cases beyond deaf/hoh
 
 Some attendees can hear but may be neurodivergent ( e.g. on the autism spectrum, with ADHD, and more) and have a hard time processing auditory cues — captioning is incredibly beneficial for them, too. Additionally, non-native speakers who aren’t fluent will benefit from captions as well.
 

website/content/accessibility/deaf-and-hard-of-hearing/tips-when-attending-or-speaking-at-a-conference.md

@@ -22,6 +22,7 @@ But to change that, you need to — not only show up — but also be transparent
 4. **Use Google Slides' captions capability**: If the conference doesn't have captions, you can use Google Slides' captions capabilities. While they are far from great, they are better than no captions. 
 5. **Ask for a microphone for Q&A**: If you are hard of hearing, ensure there is a microphone for questions, and as a speaker, repeat the questions into your mic so the recording will pick up the vocals and captions will pick up the question.
 6. **Share your slide links beforehand or at the start of the presentation**: If you have speaker notes, this will help reinforce the content.
-7. **Be sure any videos or pre-recorded demos have captions**. If running a command line demo, be sure you have plenty of comments in the demo to explain each steps, what is expected to do, and the intended outcome. They should reinforce your voice over but stand on their own without your voice. ```
+7. **Be sure any videos or pre-recorded demos have captions**. If running a command line demo, be sure you have plenty of comments in the demo to explain each steps, what is expected to be done, and the intended outcome. They should reinforce your voice over but stand on their own without your voice.
+8. **Provide a heads-up to the interpreters**.If you are working with interpreters, send them the slides, including speaker notes and the [CNCF Glossary](https://glossary.cncf.io/) (or any relevant glossary), in advance. Also, ensure they know the speaker(s)'s sign name.
 
 There are many small things you can do to help bring change. While it might be frustrating and draining having to do that repeatedly, it is necessary if we want to change the status quo. Conference organizers want to welcome everyone but need to learn how. So don't be afraid to speak up. It's important for you and the next generation.

website/content/resources/how-to/change-affiliation.md

@@ -1,3 +1,8 @@
 ---
 title: Change Affiliation
----
+---
+
+* Send a PR with updates to [cncf/gitdm](https://github.com/cncf/gitdm?tab=readme-ov-file#addingupdating-affiliation).
+* Send a PR with updates to [project-maintainers.csv](https://github.com/cncf/foundation/blob/main/project-maintainers.csv).
+* Update your [Individual Dashboard profile](https://openprofile.dev/).
+* Send an email to <[email protected]> for access to Service Desk and the mailing lists for the new address.

website/content/resources/how-to/change-email.md

@@ -1,3 +1,7 @@
 ---
 title: Change Email
----
+---
+
+Follow the same steps as on the [Change affiliation](https://contribute.cncf.io/resources/how-to/change-affiliation/) page.
+
+The only difference is that we will need to remove your old account from Service Desk and create a new account for you, so you will lose access to your older tickets (unless someone re-adds your new address).

website/content/resources/project-services/cncf-support/_index.md

@@ -14,7 +14,7 @@ CNCF staff is available to assist and guide your project. Below are some of the
 - Facilitating community meetings with support for online participation
 - Administrative support for communication and project processes
 - Biweekly or monthly check in meetings with CNCF Staff as requested
-- Project activity tracking and contribution reporting via [DevStats](https://devstats.cncf.io)
+- Project activity tracking and contribution reporting via [DevStats](https://devstats.cncf.io) and [Insights](https://insights.lfx.linuxfoundation.org/)
 
 ## Design and Aesthetics
 

website/content/resources/project-services/faq.md

@@ -82,7 +82,7 @@ The CNCF has a special partnership with GitHub, please file a [Service Desk](htt
 
 ### I don't have a Service Desk account
 
-Head to the [Service Desk](https://cncfservicedesk.atlassian.net/servicedesk/customer/portal/1/user/login) website and try to log in, if you can't find an account, email <[email protected]> and one will be created for you.
+If you are a maintainer, head to the [Service Desk](https://cncfservicedesk.atlassian.net/servicedesk/customer/portal/1/user/login) website and try to log in, if you can't find an account, email <[email protected]> and one will be created for you.
 
 #### I am a Kubernetes SIG chair and I don't have a Service Desk account
 

website/content/resources/project-services/hosted-tools/_index.md

@@ -8,34 +8,37 @@ weight: 3
 
 CNCF Projects may freely select their own tools, produce their own documentation, and build their own websites. CNCF staff can support a project's activities in this area and can provide recommendations and/or access to these tools for your project. We also have special relationships with many vendors that offer enterprise-level support.
 
-- [Zoom](https://zoom.us/) video conferencing Pro accounts for video meetings, recordings, and scheduling
-- [LastPass](https://www.lastpass.com/), [1Password](https://github.com/1Password/1password-teams-open-source), and [Keybase](https://keybase.io) to manage access to shared secrets
-- [Netlify](https://netlify.com) for website hosting, DNS management, and improved workflow/automation around documentation and websites
+Most services can be requested through a Service Desk ticket, unless otherwise noted below.
+
+- [Zoom](https://zoom.us/) video conferencing Pro accounts for video meetings, recordings, and scheduling.
+- [LastPass](https://www.lastpass.com/), [1Password](https://github.com/1Password/1password-teams-open-source), and [Keybase](https://keybase.io) to manage access to shared secrets.
+- [Netlify](https://netlify.com) for website hosting, DNS management, and improved workflow/automation around documentation and websites.
 - [Discourse](https://www.discourse.org/) for community discussion (e.g., <https://discuss.kubernetes.io>)
-- [Slack](https://slack.com) for communication for all projects in the Cloud Native Computing Foundation Slack
-- [FOSSA](https://fossa.io) for license and security scanning
-- [Snyk](https://snyk.io) for container image scanning
-- [Lift](https://www.sonatype.com/products/sonatype-lift/) for cloud-native and collaborative code analysis platform built for developers
-- [HackerOne](https://www.hackerone.com) for bug bounties
-- [Docker Hub](https://hub.docker.com/) for storing and managing container images
+- [Slack](https://slack.com) for communication for all projects in the Cloud Native Computing Foundation Slack.
+- [FOSSA](https://fossa.io) for license and security scanning.
+- [Snyk](https://snyk.io) for container image scanning.
 - [LFX Security](https://lfx.linuxfoundation.org/tools/security/) for source code security scanning and license compliance (white-labeled Snyk)
-- [Credly](https://info.credly.com) Custom badges powered by Credly (for example [Linkerd Hero](https://www.youracclaim.com/badges/538d249f-ec6d-4c5c-93f4-44d7c5596b36/twitter) program)
+- [Fastly](https://www.fastly.com/) has provided a [commitment to support CNCF and LF projects](https://www.fastly.com/blog/fast-forward-were-here-for-the-maintainers/). Apply for access directly with Fastly through that page.
+- [Lift](https://www.sonatype.com/products/sonatype-lift/) for cloud-native and collaborative code analysis platform built for developers.
+- [HackerOne](https://www.hackerone.com) for bug bounties.
+- [Docker Hub](https://hub.docker.com/) for storing and managing container images.
+- [Credly](https://info.credly.com) Custom badges powered by Credly (for example [Linkerd Hero](https://www.youracclaim.com/badges/538d249f-ec6d-4c5c-93f4-44d7c5596b36/twitter) program).
+- [Holopin](https://www.holopin.io/) Lightweight digital badges that maintainers can use to recognize contributors. Apply directly to [Holopin's open source program](https://www.holopin.io/opensource) (not CNCF managed) for access.
 - [Scarf](https://scarf.sh) for advanced analytics for container & artifact distribution, package installation, and web traffic to source documentation. [Get started](https://docs.scarf.sh/quick-start/).
-- [Dosu](https://dosu.dev/) is a new AI teammate that lives in your GitHub repo, helping you respond to issues, triage bugs, and build better documentation (early access for CNCF projects).
-- [Peritus.ai](https://peritus.ai/) for Machine Learning analytics and self-service for developer communities
-- [Curiefense](https://curiefense.io) for application layer protection (web/API) - WAF, DDoS, Rate limiting, and more
-- [CLOMonitor](https://clomonitor.io) scans repositories daily, checking for adherence to a wide range of actions that are taken to ensure best practise providing a way for end users to assess the health of open source projects from multiple points of view
-- [CLOWarden](https://clowarden.io) an extensible, Git Ops-based access control service that controls and audits access to GitHub repositories for individuals and teams
-- [CLOTributor](https://clotributor.dev/) search engine for people looking for opportunites to become Cloud Native contributors
-- [GitVote](https://github.com/cncf/gitvote) a GitHub application that allows voting in issues and pull requests
+- [Dosu](https://dosu.dev/) is a new AI teammate that lives in your GitHub repo, helping you respond to issues, triage bugs, and build better documentation (early access program, mention CNCF when applying).
+- [Peritus.ai](https://peritus.ai/) for Machine Learning analytics and self-service for developer communities.
+- [CLOMonitor](https://clomonitor.io) scans repositories daily, checking for adherence to a wide range of actions that are taken to ensure best practise providing a way for end users to assess the health of open source projects from multiple points of view.
+- [CLOWarden](https://clowarden.io) an extensible, Git Ops-based access control service that controls and audits access to GitHub repositories for individuals and teams.
+- [CLOTributor](https://clotributor.dev/) search engine for people looking for opportunites to become Cloud Native contributors.
+- [GitVote](https://github.com/cncf/gitvote) a GitHub application that allows voting in issues and pull requests.
 - [Gitpod](https://www.gitpod.io/) cloud development environments are on-demand and pre-configured with all tools, libraries and dependencies required to be ready-to-code.
 
 CNCF staff is familiar with and can help projects with, hosting on AWS, GCP, Oracle, and Azure clouds. In some cases, we have free credits ([AWS](https://www.cncf.io/announcement/2019/11/19/cloud-native-computing-foundation-receives-200000-in-credits-from-amazon-web-services-aws/), [GCP](https://www.cncf.io/google-cloud-recommits-3m-to-kubernetes/), [Oracle](https://www.cncf.io/blog/2024/02/02/oracle-oci-credits-are-now-available-to-cncf-projects-here-is-what-you-need-to-know/)) for free hosting. We also have our own [Community Infrastructure Lab](https://www.cncf.io/community/infrastructure-lab/).
 
 ## CI/CD
 
-In the contemporary software landscape, virtually all major projects require heavy investment in continuous integration (CI) systems, which provide those projects with automated testing, dependency checking, security vetting, and so on. The CNCF covers CI needs for our hosted projects and allows those projects to select their own platforms; many CI systems are currently in use amongst CNCF projects, including, [GitHub Actions](https://github.com/features/actions) and [Prow](https://github.com/kubernetes/test-infra/tree/master/prow), the Kubernetes-based (and thus CNCF-sponsored) CI system used for Kubernetes and even some non-CNCF projects. 
+In the contemporary software landscape, virtually all major projects require heavy investment in continuous integration (CI) systems, which provide those projects with automated testing, dependency checking, security vetting, and so on. The CNCF covers CI needs for our hosted projects and allows those projects to select their own platforms; many CI systems are currently in use amongst CNCF projects, including, [GitHub Actions](https://github.com/features/actions) and [Prow](https://github.com/kubernetes/test-infra/tree/master/prow), the Kubernetes-based (and thus CNCF-sponsored) CI system used for Kubernetes and even some non-CNCF projects.
 
 Some projects are perfectly well served with fairly basic CI setups, whereas projects like Kubernetes and Envoy require significant financial and human resources.
 
-When projects come to the CNCF requesting some form of CI help, we try to steer them towards GitHub Actions as much as possible. Projects that are part of the CNCF's GitHub Enterprise Account gain access to larger resource runners and runners hosted across various environments using the [GitHub Action Runner Controller](https://github.com/actions/actions-runner-controller).
+When projects come to the CNCF requesting some form of CI help, we try to steer them towards GitHub Actions as much as possible. Projects that are part of the CNCF's GitHub Enterprise Account gain access to larger resource runners and runners hosted across various environments using the [GitHub Action Runner Controller](https://github.com/actions/actions-runner-controller).