From d8293f720e6610ab17948cc69bc75040e17699f3 Mon Sep 17 00:00:00 2001 From: Stephan Druskat Date: Tue, 2 Jun 2026 19:11:58 +0200 Subject: [PATCH] Replace relevant instances of 'master' with 'main' --- README.md | 6 +++--- _drafts/i-am-a-test-draft.md | 2 +- _posts/2017-03-22-welcome-to-the-de-rse-blog.md | 2 +- _posts/2017-03-22-willkommen-beim-de-rse-blog.md | 2 +- de/join.md | 2 +- de/map.md | 2 +- en/join.md | 2 +- en/map.md | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 14141f8b..9c0075e2 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ For all flags use the `--help` flag. ## Contributions -To contribute, please fork, change, test locally (see above) and create a pull request against `master`. +To contribute, please fork, change, test locally (see above) and create a pull request against `main`. You can use [rake](http://rake.rubyforge.org/) to comfortably create content. @@ -84,13 +84,13 @@ For help on syntax have a look at: ## Map -The map is fed by [mapdata.js](https://github.com/DE-RSE/de-rse.github.io/blob/master/_includes/mapdata.js). Adding someone to the map is as simple as adding a new section in this geoJSON file. Coordinates are available from [http://geojson.io/](http://geojson.io/) . Right now pictures should be 75px high. Inspiration for a nice testimonial can be found at Stephan Druskat's entry. +The map is fed by [mapdata.js](https://github.com/DE-RSE/de-rse.github.io/blob/main/_includes/mapdata.js). Adding someone to the map is as simple as adding a new section in this geoJSON file. Coordinates are available from [http://geojson.io/](http://geojson.io/) . Right now pictures should be 75px high. Inspiration for a nice testimonial can be found at Stephan Druskat's entry. The map appeared on Dec 6th 2017 on the website. It's based on [leaflet](http://leafletjs.com) v1.2 and [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster) ## Events -Events are included per year from . No language specific remarks in favor of maintainability. +Events are included per year from . No language specific remarks in favor of maintainability. ## Converting slack signup domain list diff --git a/_drafts/i-am-a-test-draft.md b/_drafts/i-am-a-test-draft.md index 0788b8a0..895ce37f 100644 --- a/_drafts/i-am-a-test-draft.md +++ b/_drafts/i-am-a-test-draft.md @@ -14,6 +14,6 @@ It's simple, really. Once you're finished, save me under a new name (e.g., "my-real-draft.md") in the `_drafts` directory (where I also live). Then, run `rake publish` and pick me from all the drafts listed, to publish me. -Once you're done, simply push your clone of the `master` branch back to your repository, and create a *pull request* against `master` on [my repository](https://github.com/DE-RSE/www). +Once you're done, simply push your clone of the `main` branch back to your repository, and create a *pull request* against `main` on [my repository](https://github.com/DE-RSE/www). You're done :). \ No newline at end of file diff --git a/_posts/2017-03-22-welcome-to-the-de-rse-blog.md b/_posts/2017-03-22-welcome-to-the-de-rse-blog.md index e1bb0f80..28006ed3 100644 --- a/_posts/2017-03-22-welcome-to-the-de-rse-blog.md +++ b/_posts/2017-03-22-welcome-to-the-de-rse-blog.md @@ -7,7 +7,7 @@ menulang: en This weblog will contain posts on subjects that are relevant to the Research Software Engineers community. -**You, too**, can contribute (in English or German). Simply clone [this website's GitHub repository](https://github.com/DE-RSE/de-rse.github.io/), check out the [README](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) (we use [Jekyll](https://jekyllrb.com/), and it's easy to create and publish drafts with `rake`), create a blog post, and submit it to us via a GitHub pull request against `master`! +**You, too**, can contribute (in English or German). Simply clone [this website's GitHub repository](https://github.com/DE-RSE/de-rse.github.io/), check out the [README](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) (we use [Jekyll](https://jekyllrb.com/), and it's easy to create and publish drafts with `rake`), create a blog post, and submit it to us via a GitHub pull request against `main`! Happy reading, happy contributing! diff --git a/_posts/2017-03-22-willkommen-beim-de-rse-blog.md b/_posts/2017-03-22-willkommen-beim-de-rse-blog.md index 70b59858..b9f62bb9 100644 --- a/_posts/2017-03-22-willkommen-beim-de-rse-blog.md +++ b/_posts/2017-03-22-willkommen-beim-de-rse-blog.md @@ -7,7 +7,7 @@ menulang: de Dieses Weblog wird Artikel beinhalten, die für die Research Software Engineers Community relevant sind. -**Jede\*r** kann beitragen (auf Deutsch oder Englisch). Einfach das [GitHub repository dieser Website](https://github.com/DE-RSE/de-rse.github.io/) klonen, sich die [README](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) anschauen (wir benutzen [Jekyll](https://jekyllrb.com/) und es ist einfach, mit `rake` Artikelentwürfe zu generieren und zu veröffentlichen), einen Artikel schreiben und ihn per GitHub Pull Request gegen `master` einreichen! +**Jede\*r** kann beitragen (auf Deutsch oder Englisch). Einfach das [GitHub repository dieser Website](https://github.com/DE-RSE/de-rse.github.io/) klonen, sich die [README](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) anschauen (wir benutzen [Jekyll](https://jekyllrb.com/) und es ist einfach, mit `rake` Artikelentwürfe zu generieren und zu veröffentlichen), einen Artikel schreiben und ihn per GitHub Pull Request gegen `main` einreichen! Viel Spaß beim Lesen und Beitragen! diff --git a/de/join.md b/de/join.md index 36c605fa..b10d103a 100644 --- a/de/join.md +++ b/de/join.md @@ -63,7 +63,7 @@ Termine für die monatlichen Calls findet Ihr [hier](https://pad.okfn.de/p/opens Der Blog auf der Webseite wird von der Community gemeinschaftlich gestaltet. Deine Ideen, Themen und Beiträge auf Deutsch, English, oder beidem sind sehr willkommen! -In der Datei [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) +In der Datei [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) findest du eine Anleitung wie Du eine Vorschau der Seite auf deinem eigenen Rechner bekommen kannst. diff --git a/de/map.md b/de/map.md index eeee665c..900356e3 100644 --- a/de/map.md +++ b/de/map.md @@ -10,7 +10,7 @@ Andernorts in Europa und in der Welt werden Personen, die wissenschaftliche Soft de-RSE adressiert gleichermaßen Software entwickelnde Wissenschaftlerinnen und Wissenschaftler, in der Forschung tätige Informatikerinnen und Informatiker und andere aus den Computerwissenschaften stammende Personen, skriptende Administratorinnen und Administratoren, (Post-)Doktorandinnen und (Post-)Doktoranden, in der Forschung tätige Studentinnen und Studenten, Softwareprojektmanagerinnen und -projektmanager sowie all jene, die einen Beitrag zur Softwareentwicklung in Wissenschaft und Forschung leisten. -Zeig, dass Du dazu gehörst: +Zeig, dass Du dazu gehörst: Wie-andere-RSE-definieren: diff --git a/en/join.md b/en/join.md index 342cfaea..f51c7e58 100644 --- a/en/join.md +++ b/en/join.md @@ -63,7 +63,7 @@ Dates and times for the monthly community calls are [listed here](https://pad.ok The website hosts a blog with contributions from the community members. Your ideas, topics and posts in German, English, or both are very welcome! -The [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) includes instructions for getting a local preview of the site. +The [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) includes instructions for getting a local preview of the site. ## Local RSE groups diff --git a/en/map.md b/en/map.md index bfc2e14a..b30d0d6a 100644 --- a/en/map.md +++ b/en/map.md @@ -10,7 +10,7 @@ Elsewhere in Europe and the world, people who develop scientific software or res de-RSE addresses both, software-developing researchers, PhD students and postdocs as well as computer scientists and other computer science professionals, scripting administrators and software project managers active in research - and all those who professionally contribute to software development in science and research. -Is this you? Then add yourself and show who we are: +Is this you? Then add yourself and show who we are: What others say what an RSE is: