diff --git a/README.md b/README.md index 13e55d19dd..7662a435b6 100644 --- a/README.md +++ b/README.md @@ -316,6 +316,9 @@ All the data (past and coming) are available publicly in JSON: * 4: [SOSS Policy Summit DC](https://events.linuxfoundation.org/soss-policy-summit-dc/) - Washington D.C. (USA) * 4-6: [Devnexus 2025](https://devnexus.com/) - Atlanta, GA (USA) CFP Devnexus 2025 * 6-7: [Code BEAM America 2025](https://codebeamamerica.com) - San Francisco, CA (USA) CFP Code BEAM America 2025 +* 6-7: [Planet Nix](https://planetnix.com/) - Pasadena, CA (USA) CFP Planet Nix +* 6-9: [Southern California Linux Expo 22x](https://www.socallinuxexpo.org) - Pasadena, CA (USA) +* 7: [DevOpsDays LA](https://devopsdays.org/events/2025-los-angeles/welcome/) - Pasadena, CA (USA) * 12-13: [DevOpsDays Zurich](https://www.devopsdays.ch) - Winterthur, Zurich (Switzerland) CFP DevOpsDays Zurich 2025 * 12-13: [Vue.js Amsterdam](https://vuejs.amsterdam/) - Amsterdam (Netherlands) * 13: [dxday 2025](https://2025.dxday.it) - Bologna (Italy) CFP dxday 2025 diff --git a/archives/2023.md b/archives/2023.md index 3dcc163c19..323d3f72a0 100644 --- a/archives/2023.md +++ b/archives/2023.md @@ -62,7 +62,7 @@ * 7: [Kubernetes Community Days France](https://community.cncf.io/events/details/cncf-kcd-france-presents-kubernetes-community-days-france-2023/) - Paris (France) CFP KCD Paris * 7-8: [ElasticON Global](https://www.elasticon.com/event/e4d4b4ed-77a7-48d2-b711-74fea8341273/summary) - Online * 9: [KCD Los Angeles](https://community.cncf.io/events/details/cncf-kcd-los-angeles-presents-kcd-los-angeles-at-scale-20x/) - Los Angeles, CA (USA) -* 9-12: [Scale 20x](https://www.socallinuxexpo.org/scale/20x) - Pasadena (USA) +* 9-12: [Scale 20x](https://www.socallinuxexpo.org/scale/20x) - Pasadena, CA (USA) * 11-12: [Chemnitz Linux Days](https://chemnitzer.linux-tage.de/2023/en/) - Chemnitz (Germany) CFP Chemnitz Linux Days * 10: [DevOps Days Los Angeles](https://devopsdays.org/events/2023-los-angeles/welcome/) - Los Angeles, CA (USA) * 10-11: [DevRel Con Yokohama](https://developerrelations.com/event/devrelcon-yokohama-2023) - Yokohama (Japan) diff --git a/archives/2024.md b/archives/2024.md index 3fd9c0017b..35392f833c 100644 --- a/archives/2024.md +++ b/archives/2024.md @@ -104,7 +104,7 @@ * 14-15: [WASM IO](https://2024.wasmio.tech/) - Barcelona (Spain) CFP WASM IO Scholarship * 14-15: [T3chfest](https://t3chfest.es) - Madrid (Spain) T3chfest * 14-15: [Netnod Meeting 2024](https://www.netnod.se/netnod-events/netnod-meeting-2024) - Stockholm (Sweden) CFP Netnod Meeting -* 14-17: [SCaLE 21x](https://www.socallinuxexpo.org) - Pasadena (USA) CFP SCaLE 21x +* 14-17: [SCaLE 21x](https://www.socallinuxexpo.org) - Pasadena, CA (USA) CFP SCaLE 21x * 15: [GitHub Field New York City](https://githubfieldday.com/nyc2024/) - New York, NY (USA) * 15: [DevOpsDays Los Angeles](https://devopsdays.org/events/2024-los-angeles/welcome/) - Los Angeles, CA (USA) * 15: [Incontro DevOps Italia](https://2024.incontrodevops.it/) - Bologna (Italy) CFP Incontro DevOps Italia diff --git a/page/src/misc/geolocations.json b/page/src/misc/geolocations.json index d40108dd72..0eb197159b 100644 --- a/page/src/misc/geolocations.json +++ b/page/src/misc/geolocations.json @@ -1567,7 +1567,7 @@ "latitude": 44.8014788, "longitude": 10.3279911 }, - "Pasadena (USA)": { + "Pasadena, CA (USA)": { "latitude": 34.1476507, "longitude": -118.1441551 },