Improve consistency on city names and adding a validator (#1118)

* Improve consistency on city names and adding a validator * Update page/src/misc/geolocations.json * Improving the validation and fixing the existing problems --------- Co-authored-by: Aurelie Vache <[email protected]>
scraly · Aug 28, 2024 · fb023c2 · fb023c2
1 parent 0a7a555
commit fb023c2
Show file tree

Hide file tree

Showing 14 changed files with 294 additions and 539 deletions.
diff --git a/.github/workflows/check_geocodes_duplication.yml b/.github/workflows/check_geocodes_duplication.yml
@@ -0,0 +1,25 @@
+name: CheckGeolocationsDuplications
+on: pull_request
+
+jobs:
+  GeolocationsDuplicationsValidator:
+    name: GeolocationsDuplicationsValidator 
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: npm
+          cache-dependency-path: '**/package-lock.json'
+      - working-directory: page
+        run: npm install -D
+      - name: Validate Geolocations duplication 
+        working-directory: tools
+        run: |
+          npm install -D
+          node mdParser.js
+          node geoCodes.js
+          node validateGeolocations.js
diff --git a/README.md b/README.md
diff --git a/archives/2017.md b/archives/2017.md
@@ -7,7 +7,7 @@
 
 ### May
 
-* 08-11: [O'reilly oscon](https://conferences.oreilly.com/oscon/oscon-tx) - Austin (USA)
+* 08-11: [O'reilly oscon](https://conferences.oreilly.com/oscon/oscon-tx) - Austin, TX (USA)
 * 10-12: [Microsoft Build](https://build.microsoft.com/) - Seattle (USA)
 * 11-12: [Devoxx UK](http://www.devoxx.co.uk) - London (UK)
 * 11-12: [Riviera DEV](https://rivieradev.fr/) - Sophia Antipolis (France)
@@ -20,14 +20,14 @@
 * 18-19: [NewCrafts](http://ncrafts.io/) - Bordeaux (France)
 * 19-20: [SudWeb](https://sudweb.fr/) - Aix-en-Provence (France)
 * 22-23: [GitHub Satellite](https://githubuniverse.com/satellite/) - London (UK)
-* 22-24: [Monitorama](http://monitorama.com/) - Portland (USA)
-* 26-27: [JEEConf](http://jeeconf.com/) - Kiev (Ukraine)
-* 29-31: [NG Cruise](https://ngcruise.com/#/) - Miami (USA)
+* 22-24: [Monitorama](http://monitorama.com/) - Portland, OR (USA)
+* 26-27: [JEEConf](http://jeeconf.com/) - Kyiv (Ukraine)
+* 29-31: [NG Cruise](https://ngcruise.com/#/) - Miami, FL (USA)
 * 30-31: [jPrime](http://jprime.io/) - Sofia (Bulgaria)
 
 ### June
 
-* 01-02: [NG Cruise](https://ngcruise.com/#/) - Miami (USA)
+* 01-02: [NG Cruise](https://ngcruise.com/#/) - Miami, FL (USA)
 * 01-02: [Shift](http://shift.codeanywhere.com/) - Croatia
 * 07-09: [Web2Day](https://web2day.co/) - France
 * 08: [DevTalks](http://www.devtalks.ro/bucharest/) - Romania

diff --git a/archives/2018.md b/archives/2018.md
@@ -2,7 +2,7 @@
 
 ### January
 
-* 18-19: [DevOpsDays NYC](https://www.eventbrite.com/e/devopsdays-nyc-2018-tickets-39330760363) - USA
+* 18-19: [DevOpsDays NYC](https://www.eventbrite.com/e/devopsdays-nyc-2018-tickets-39330760363) - New York, NY (USA)
 * 22-26: [Linux Conf AU](http://linux.conf.au) - Sydney (Australia)
 * 23: [Azure Red Shirt Dev Tour](https://experiences.microsoft.fr/evenements/technique/azure-red-shirt-dev-tour/) - Paris (France)
 * 24-27: [SnowCamp](http://snowcamp.io/fr/) - France
@@ -17,29 +17,29 @@
 * 15: [Serverlessconf Paris](http://paris.serverlessconf.io) - Paris (France)
 * 15-16: [Frontend Love](http://frontenddeveloperlove.com) - Netherlands
 * 19-21: [DevOps Gathering 2018](https://devops-gathering.io/) - Bochum (Germany)
-* 20-22: [IndexConf](http://indexconf.com) - San Francisco (USA)
+* 20-22: [IndexConf](http://indexconf.com) - San Francisco, CA (USA)
 * 22-23: [Lambda Days](http://www.lambdadays.org/lambdadays2018) - Krakow (Poland)
 * 23: [Touraine Tech](https://touraine.tech/) - France
-* 27-01: [Elastic{ON}](https://www.elastic.co/elasticon/conf/2018/sf) - San Francisco (USA)
+* 27-01: [Elastic{ON}](https://www.elastic.co/elasticon/conf/2018/sf) - San Francisco, CA (USA)
 
 ### March
 
 * 01-02: [GrafanaEu Con](https://grafana.com/) - Netherlands
 * 01-02: [ngVikings](https://ngvikings.org/) - Helsinki (Finland)
 * 08: [VoxxedDays Zurich](https://voxxeddays.com/) - Switzerland
 * 8: [Git Merge](https://git-merge.com) - Barcelona (Spain)
-* 09-13: [DrupalCon](https://events.drupal.org/) - Nashville (USA)
+* 09-13: [DrupalCon](https://events.drupal.org/) - Nashville, TN (USA)
 * 12-13: [VoxxedDays Vienna](https://voxxeddays.com/) - Austria
 * 12-13: [VoxxedDays Bristol](https://voxxeddays.com/) - Bristol (UK)
 * 12-13: [Big Data Paris](https://www.bigdataparis.com/) - Paris (France)
 * 15: [pg Day Paris](https://2018.pgday.paris) - Paris (France)
-* 19: [Google Developer Day](https://events.withgoogle.com) - San Francisco (USA)
+* 19: [Google Developer Day](https://events.withgoogle.com) - San Francisco, CA (USA)
 * 20: [Day of Cloud native](https://www.code-conf.com/dcn/) - Oslo (Norway)
 * 22-23: [VoxxedDays Bucharest](https://voxxeddays.com/) - Romania
 * 22-25: [FOSS Asia](http://fossasia.org) - Singapore
 * 28-30: [BreizhCamp](http://www.breizhcamp.org/) - Rennes (France)
 * 29-30: [SymfonyLive Paris 2018](https://paris2018.live.symfony.com/) - Paris (France)
-* 30: [TensorFlow Dev Summit](http://www.tensorflow.org) - Mountain View (USA)
+* 30: [TensorFlow Dev Summit](http://www.tensorflow.org) - Mountain View, CA (USA)
 
 ### April
 
@@ -49,11 +49,11 @@
 * 13-15: [Isle Of Ruby](https://isleofruby.org) - Exeter (UK)
 * 19-20: [MiXiT](https://mixitconf.org/) - France
 * 18-20: [Devoxx France](https://devoxx.fr/) - Paris (France)
-* 19-20: [DroidCon Turin](http://it.droidcon.com/2018/) - Turin (Italy)
+* 19-20: [DroidCon Turin](http://it.droidcon.com/2018/) - Torino (Italy)
 * 23-24: [Android Makers France](https://androidmakers.fr/) - Paris (France)
 * 23-27: [The Web Conference](https://www2018.thewebconf.org/) - Lyon (France)
 * 23: [WS-REST 2018](http://2018.ws-rest.org/) - Lyon (France)
-* 27: [Gotham Go](http://gothamgo.com) - New York (USA)
+* 27: [Gotham Go](http://gothamgo.com) - New York, NY (USA)
 
 ### May
 
@@ -64,7 +64,7 @@
 * 08-11: [Craft Conf](https://craft-conf.com/) - Budapest (Hungary)
 * 9-11: [GeeCON](https://geecon.org) - Krakow (Poland)
 * 09-11: [Devoxx UK](http://devoxx.com) - London (UK)
-* 9-17: [PyCon](https://us.pycon.org/2018/) - Cleveland (USA)
+* 9-17: [PyCon](https://us.pycon.org/2018/) - Cleveland, OH (USA)
 * 15-17: [Innorobo](https://innorobo.com/en/home/) - Paris (France)
 * 16-18: [Riviera DEV](https://rivieradev.fr/) - Sophia Antipolis (France)
 * 17: [DataXDay](http://dataxday.fr) - Paris (France)
@@ -92,7 +92,7 @@
 * 08: [DevTalks](http://www.devtalks.ro/bucharest/) - Romania
 * 11-12: [AIParis](https://aiparis.fr/) - Paris (France)
 * 12-13: [GitHub Satellite](https://githubuniverse.com/satellite/) - Japan
-* 12-15: [DockerCon](https://2018.dockercon.com) - San Francisco (USA)
+* 12-15: [DockerCon](https://2018.dockercon.com) - San Francisco, CA (USA)
 * 13-14: [EclipseCon France](https://www.eclipsecon.org/france2018/) - France
 * 13-15: [Web2Day](https://web2day.co/) - Nantes (France)
 * 19: [AWS Summit Paris](https://aws.amazon.com/fr/summits/paris/inscription/) - Paris (France)
@@ -102,9 +102,9 @@
 * 21: [JHipster Conf](https://jhipster-conf.github.io) - Paris (France)
 * 22: [VoxxedDays Luxembourg](https://voxxeddays.com/) - Luxembourg
 * 25-26: [USI](https://www.usievents.com/fr) - Paris (France)
-* 25-29: [QCon New York](https://qconnewyork.com) - New York (USA)
+* 25-29: [QCon New York](https://qconnewyork.com) - New York, NY (USA)
 * 26: [Paris Container Day](http://paris-container-day.fr/) - France
-* 26-27: [MongoDB World](https://www.mongodb.com/world18) - New York (USA)
+* 26-27: [MongoDB World](https://www.mongodb.com/world18) - New York, NY (USA)
 * 28: [Jenkins User Conference](https://juc-paris.jfrog.com/fr/) - Paris (France)
 * 28-29: [Sunny Tech](https://sunny-tech.io/) - France
 * 30-01: [La nuit du Hack](https://www.nuitduhack.com/fr) - Paris (France)
@@ -119,7 +119,7 @@
 ### August
 
 * 1-3: [GopherCon UK](http://gophercon.co.uk) - London (UK)
-* 28-29: [GopherCon](https://www.gophercon.com/) - Denver (USA)
+* 28-29: [GopherCon](https://www.gophercon.com/) - Denver, CO (USA)
 * 29-31: [SRECon](https://www.usenix.org/conference/srecon18europe) - Dusseldorf (Germany)
 
 ### September
@@ -138,8 +138,8 @@
 * 16: [DevOps REX](https://www.devopsrex.fr/) - Paris (France)
 * 18-19: [DevFest Nantes 2018](https://devfest.gdgnantes.com) - Nantes (France)
 * 18-19: [GeeCON](https://geecon.org) - Prague (Czech Republic)
-* 22-24: [Hashi Conf](https://www.hashiconf.com/) - San Francisco (USA)
-* 22-25: [JavaOne](https://twitter.com/JavaOneConf) - San Francisco (USA)
+* 22-24: [Hashi Conf](https://www.hashiconf.com/) - San Francisco, CA (USA)
+* 22-25: [JavaOne](https://twitter.com/JavaOneConf) - San Francisco, CA (USA)
 * 23-25: [EclipseCon Europe 2018](https://www.eclipsecon.org/europe2018) - Ludwigsburg (Germany)
 * 25-26: [Forum PHP 2018](https://event.afup.org/) - Paris (France)
 * 29-31: [VoxxedDays Microservices](https://voxxeddays.com/microservices/) - Paris (France)
@@ -150,7 +150,7 @@
 * 03: [DevFest Belgium](http://devfest-be.cfp.io/) - Belgium
 * 05-06: [µCon London 2018](https://skillsmatter.com/conferences/10336-mucon-london-2018-the-microservices-conference) - London (UK)
 * 06-07: [Microsoft Experiences 18](https://experiences18.microsoft.fr/) - Paris (France)
-* 07-08: [GraphQL Summit](https://summit.graphql.com/) - San Francisco (USA)
+* 07-08: [GraphQL Summit](https://summit.graphql.com/) - San Francisco, CA (USA)
 * 08: [DevFest Toulouse](http://devfesttoulouse.fr) - Toulouse (France)
 * 08: [dotCSS](https://www.dotcss.io) - Paris (France)
 * 08: [MongoDB Europe'18](https://www.mongodb.com/europe18) - London (UK)

diff --git a/archives/2019.md b/archives/2019.md
@@ -31,18 +31,18 @@
 
 ### April
 
-* 9-11: [Google Cloud Next](https://cloud.withgoogle.com/next/sf/) - San Francisco (USA)
+* 9-11: [Google Cloud Next](https://cloud.withgoogle.com/next/sf/) - San Francisco, CA (USA)
 * 10-11: [Dublin Tech Summit](https://t.co/vzYtTZmZ6Y) - Dublin (Ireland)
 * 13: [Voxxed Milan](https://voxxeddays.com/milan/) - Milan (Italy)
 * 17-19: [Devoxx France](https://www.devoxx.fr/) - Paris (France)
 * 25: [Future Sync](http://futuresync.co.uk) - Plymouth (UK)
-* 29-2: [DockerCon 2019](https://dockercon19.smarteventscloud.com/portal/newreg.ww) - San Francisco (USA)
-* 30-2: [Rails Conf](https://railsconf.com/) - Minneapolis (USA)
+* 29-2: [DockerCon 2019](https://dockercon19.smarteventscloud.com/portal/newreg.ww) - San Francisco, CA (USA)
+* 30-2: [Rails Conf](https://railsconf.com/) - Minneapolis, MN (USA)
 
 ### May
 
-* 01: [Voxxed CERN](https://voxxeddays.com/cern/) - Genève (Switzerland)
-* 7-9: [Google IO](https://events.google.com/io/) - Mountain View (USA)
+* 01: [Voxxed CERN](https://voxxeddays.com/cern/) - Geneva (Switzerland)
+* 7-9: [Google IO](https://events.google.com/io/) - Mountain View, CA (USA)
 * 8-10: [Devoxx UK](https://www.devoxx.co.uk/) - London (UK)
 * 13-14: [Voxxed Melbourne](https://australia.voxxeddays.com) - Melbourne (Australia)
 * 13-14: [Voxxed Sidney](https://australia.voxxeddays.com) - Sydney (Australia)
@@ -74,7 +74,7 @@
 * 06-07: [Best Of Web](http://bestofweb.paris/) - France
 * 06-08: [Voxxed Athens](https://voxxeddays.com/athens/) - Athens (Greece)
 * 10-13: [O'Reilly Software Architecture Conference](https://conferences.oreilly.com/software-architecture/sa-ça) - San Jose (USA)
-* 11: [Flow Factor Conference](https://flowfactorconference.com/) - Salt Lake City (USA)
+* 11: [Flow Factor Conference](https://flowfactorconference.com/) - Salt Lake City, UT (USA)
 * 11-13: [OW2Con](https://www.ow2con.org/view/2019/) - Paris (France)
 * 11-13: [Scala Days](https://scaladays.org/) - Lausanne (Switzerland)
 * 11-14: [INFORSID](http://inforsid.fr/Paris2019/) - Paris (France)
@@ -85,7 +85,7 @@
 * 24-26: [Container days](https://www.containerdays.io) - Hamburg (Germany)
 * 24-27: [Devoxx Poland](http://devoxx.pl) - Krakow (Poland)
 * 24-28: [COMPAS](https://2019.compas-conference.fr/) - Anglet (France)
-* 24-28: [QCon New York](https://qconnewyork.com/) - New York (USA)
+* 24-28: [QCon New York](https://qconnewyork.com/) - New York, NY (USA)
 * 27: [DataXDay](https://dataxday.fr/) - Paris (France) <a href="https://conference-hall.io/public/event/sciLlnq7UjZdqYhVCMHO"><img alt="DataXDay" src="https://img.shields.io/static/v1?label=CFP&message=March-31-2019&color=red"> </a>
 * 27: [GopherCon Poland](http://twitter.com/GopherConPL) - Gdansk (Poland)
 * 27: [JHipster Conf](https://jhipster-conf.github.io/) - Paris (France)
@@ -94,13 +94,13 @@
 ### July
 
 * 8-10: [HashiConf EU](https://hashiconfeu.hashicorp.com/) - Amsterdam (Netherlands) <a href="https://hashiconfeu.hashicorp.com/#submit-a-talk"><img alt="HashiConf EU" src="https://img.shields.io/static/v1?label=CFP&message=March-15-2019&color=red"> </a>
-* 24-27: [GopherCon](https://www.gophercon.com) - San Diego (USA)
+* 24-27: [GopherCon](https://www.gophercon.com) - San Diego, CA (USA)
 
 ### August
 
-* 12-15: [Devops World](https://www.cloudbees.com/devops-world) - San Francisco (USA)
+* 12-15: [Devops World](https://www.cloudbees.com/devops-world) - San Francisco, CA (USA)
 * 21-23: [GopherCon UK](https://www.gophercon.com) - London (UK)
-* 23: [Anxiety Tech](https://www.anxietytech.com/) - New York (USA)
+* 23: [Anxiety Tech](https://www.anxietytech.com/) - New York, NY (USA)
 
 ### September
 

diff --git a/archives/2020.md b/archives/2020.md
@@ -3,10 +3,10 @@
 
 ### January
 
-* 14: [GitLab Commit](https://about.gitlab.com/events/commit/) - San Francisco (USA)
+* 14: [GitLab Commit](https://about.gitlab.com/events/commit/) - San Francisco, CA (USA)
 * 15-18: [iOS Conf Singapore](https://2020.iosconf.sg/) - Singapore
 * 22-25: [SnowCamp](http://snowcamp.io/fr/) - Grenoble (France)
-* 30-31: [Re Work](https://www.re-work.co/summits/sanfrancisco-summit-2020) - San Francisco (USA)
+* 30-31: [Re Work](https://www.re-work.co/summits/sanfrancisco-summit-2020) - San Francisco, CA (USA)
 * 31: [Touraine Tech](https://touraine.tech/) - Tours (France)
 
 ### February
@@ -42,7 +42,7 @@
 ### April
 
 * [Virtualized] 1-2: [KubeCon Europe](https://events19.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2020/) - Amsterdam (Netherlands)
-* [Virtualized] 6-8: [Google Cloud Next](https://cloud.withgoogle.com/next/sf) - San Francisco (USA)
+* [Virtualized] 6-8: [Google Cloud Next](https://cloud.withgoogle.com/next/sf) - San Francisco, CA (USA)
 * [Canceled] 20-23: [O'Reilly Strata Data & AI London](https://conferences.oreilly.com/strata-data-ai/public/content/eu) - London (UK)
 * [Canceled] 27-28: [Kafka Summit London](https://kafka-summit.org/) - London (UK)
 * [Canceled] 28-29: [CodeMobile](http://www.codemobile.co.uk/) - London (UK)
@@ -55,7 +55,7 @@
 * [Virtualized] 12-14: [Google IO](https://events.google.com/io/) - USA
 * [Canceled] 13-15: [Riviera DEV](https://rivieradev.fr/) - Sophia Antipolis (France)
 * 15: [AFUP Day](https://event.afup.org/) - Lille, Lyon, Nantes, Tours (France)
-* [Canceled] 16: [VoxxedDays Milano](https://voxxeddays.com/milan/) - Milano (Italy)
+* [Canceled] 16: [VoxxedDays Milano](https://voxxeddays.com/milan/) - Milan (Italy)
 * [Virtualized] 20-21: [GitOps Days](https://www.gitopsdays.com/)
 * 21-22: [VoxxedDays Frontend Bucharest](https://romania.voxxeddays.com/frontend/) - Bucharest (Romania)
 * [Canceled] 25-26: [ngVikings](https://ngvikings.org/) - Oslo (Norway)
@@ -72,10 +72,10 @@
 * 9-12: [Craft Conf](https://craft-conf.com/) - Budapest (Hungary)
 * [Canceled] 12: [DevFest Lille](http://devfest.gdglille.org) - Lille (France)
 * [Virtualized] 18: [Cloud Ouest](https://cloudouest.fr/) - Nantes (France)
-* 15-18: [DockerCon](https://www.docker.com/dockercon/) - Austin (USA)
+* 15-18: [DockerCon](https://www.docker.com/dockercon/) - Austin, TX (USA)
 * 15-18: [O'Reilly Infrastructure and Ops Conference](https://conferences.oreilly.com/infrastructure-ops) - Santa Clara (USA)
 * [Canceled] 18-19: [VoxxedDays Luxembourg](https://luxembourg.voxxeddays.com/) - Luxembourg
-* 23-25: [Spark+AI Summit](https://databricks.com/sparkaisummit) - San Francisco (USA)
+* 23-25: [Spark+AI Summit](https://databricks.com/sparkaisummit) - San Francisco, CA (USA)
 * [Virtualized] 27: [Hack Commit Push](https://paris2020.hack-commit-pu.sh/) - Paris (France)
 * [Virtualized] End of June [GopherCon Europe](https://gophercon.berlin/) - Berlin (Germany)
 
@@ -102,7 +102,7 @@
 
 * [Canceled] 9-11: [KotlinConf](https://www.kotlinconf.com/) - Montreal (Canada)
 * 11: [JUG Summer Camp](https://www.jugsummercamp.org/edition/11) - La Rochelle (France)
-* 14-17: [O'Reilly Strata Data & AI New York](https://conferences.oreilly.com/strata-data-ai/stai-ny) - New York (USA)
+* 14-17: [O'Reilly Strata Data & AI New York](https://conferences.oreilly.com/strata-data-ai/stai-ny) - New York, NY (USA)
 * 15: [VoxxedDays Zurich](https://voxxeddays.com/zurich/) - Zurich (Switzerland)
 * 17-18: [DevOps Days Istanbul](https://devopsdays.istanbul/) - Istanbul (Turkey)
 * 24-25: [DevOps Days London](https://devopsdays.org/events/2020-london/welcome/) - London (UK)
@@ -117,7 +117,7 @@
 * [Canceled] 15-16: [Volcamp](https://volcamp.io/) - Clermont-Ferrand (France)
 * 15-16: [VoxxedDays Thessaloniki](https://voxxeddays.com/thessaloniki/) - Thessaloniki (Greece)
 * 22: [Incontro DevOps](https://2020.incontrodevops.it/) - Bologna (Italy)
-* 16-17: [RustLab](https://www.rustlab.it/home) - Firenze (Italy)
+* 16-17: [RustLab](https://www.rustlab.it/home) - Florence (Italy)
 * [Virtualized] 19-22: [EclipseCon 2020](https://www.eclipsecon.org/2020) - Ludwigsburg (Germany)
 * 26-30: [Le Halloween des Speakers 2020](https://rdv-speakers.fr/) - Online
 * 27-29: [SRECon](https://www.usenix.org/srecon) - Amsterdam (Netherlands)
@@ -134,4 +134,4 @@
 * 16-19: [O'Reilly Infrastructure and Ops Conference](https://conferences.oreilly.com/infrastructure-ops) - Berlin (Germany)
 * 19: [Codeurs en Seine](https://www.codeursenseine.com) - Rouen (France)
 * [Virtualized] 19: [Cloud Nord](https://cloudnord.fr/) - Lille (France)
-* 27-28: [DroidCon Turin](https://it.droidcon.com/2020/it) - Turin (Italy)
+* 27-28: [DroidCon Turin](https://it.droidcon.com/2020/it) - Torino (Italy)
diff --git a/archives/2021.md b/archives/2021.md
@@ -87,7 +87,7 @@
 
 ### September
 
-* 7-8: [DevOpsDays Zürich](https://devopsdays.org/events/2021-zurich/welcome/) - Winterthur, Zürich (Switzerland)
+* 7-8: [DevOpsDays Zürich](https://devopsdays.org/events/2021-zurich/welcome/) - Winterthur, Zurich (Switzerland)
 * 10: [JUG Summer Camp](https://www.jugsummercamp.org/edition/12) - La Rochelle (France)
 * 10: [API Platform Conference](https://api-platform.com/con/2021/) - Lille (France) & Online
 * 10-12: [International Sketchnote Camp 2021](https://isc20be.home.blog/registration/) - Brussels (Belgium) & Online
@@ -148,14 +148,14 @@
 * 20-21: [Pycon APAC Thailand 2021](https://th.pycon.org/) - Bangkok (Thailand)
 * 23: [DevDayBE](https://www.devday.be/) - Louvain-La-Neuve (Belgium)
 * <span><details><summary>24-26: <a href="https://www.jchateau.org/">JChateau / JAlba</a> - Online</summary>JChateau et JAlba ont fusionné en 1 unique **non conférence**.</details></span>
-* 29-3/12: [AWS re:Invent](https://reinvent.awsevents.com/) - Las Vegas (USA)
+* 29-3/12: [AWS re:Invent](https://reinvent.awsevents.com/) - Las Vegas, NV (USA)
 
 ### December
 
 * 5-8: [GopherCon](https://www.gophercon.com/) - Online
 * 6-9: [GOTO Amsterdam 2021](https://gotoams.nl/) - Beurs van Berlage (Netherlands)
-* 8: [ArgoCon '21](https://argoproj.github.io/argocon21/) - San Francisco (USA) & Online
-* 9: [The Privacy Engineer Conference](https://privacyengineercon.com/) - Paris(France) & Online
+* 8: [ArgoCon '21](https://argoproj.github.io/argocon21/) - San Francisco, CA (USA) & Online
+* 9: [The Privacy Engineer Conference](https://privacyengineercon.com/) - Paris (France) & Online
 * 9-10: [KubeCon + CloudNativeCon + Open Source Summit China](https://www.lfasiallc.com/kubecon-cloudnativecon-open-source-summit-china/) - Online
 * 11 : [Continuous Delivery: Better Software Faster](https://devternity.com/) - Online
 * 15: [Tech A11y Summit](https://techa11y.dev/) - Online