Rename the git branch used for development to 'main'

This follows the convention used by many projects and hosting platforms.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f24c143d0a4fe1e6e696b6a426a6099a49df1a4..a267ed2c18503729f3ac6dc9766e422752264ad3 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ variables:
   ###
   WINDOWS_TAG: "2023-05-12.0"
 
-  UPSTREAM_BRANCH: 'master'
+  UPSTREAM_BRANCH: 'main'
   UPSTREAM_REPO: 'dbus/dbus'
   WINDOWS_AMD64_SUFFIX: 'amd64/windows'
   WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$UPSTREAM_BRANCH"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a6e54171ece7f9598324625a830ac17f0e2bf79..5041308bd4915012d686bd1dbbaa87ed3975baf0 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,12 +59,12 @@ branch in future.
 
 Stable branches are named after the version number itself (`dbus-1.2`,
 `dbus-1.4`), whereas the development branch is simply known as
-`master`.
+`main`.
 
 New features, enhancements, minor bug fixes, and bug fixes that are
-unusually intrusive should always be based on the `master` branch.
+unusually intrusive should always be based on the `main` branch.
 
-Fixes for significant bugs should be developed on the `master` branch
+Fixes for significant bugs should be developed on the `main` branch
 and cherry-picked to the most recent stable branch.
 
 Depending on the release cycles of various Linux distributions, some

diff --git a/NEWS b/NEWS
index 0cd4bf14a36985d100d25017d51f81e229341fbf..c69885f104b9b6f444e2b429d6fd398711e36035 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -190,7 +190,7 @@ Build-time configuration changes:
   It is incomplete and not ready for production use, and has been
   compile-time-disabled and impossible to enable without patching
   since 1.13.20. To reduce confusion, delete the code completely.
-  It remains present on the git `master` branch for 1.17.x, and will
+  It remains present on the git `main` branch for 1.17.x, and will
   hopefully be reinstated during the 1.17.x cycle.
   (dbus!488, dbus!490; Simon McVittie)
 

diff --git a/maint/release-checklist.md b/maint/release-checklist.md
index fe0c6183d0d990b1092fcad13487adc23ed12867..181d0180c1960b17aa70aa655d066728dba0ed29 100644 (file)
--- a/maint/release-checklist.md
+++ b/maint/release-checklist.md
@@ -46,7 +46,7 @@ To make a release of D-Bus, do the following:
    dbus-specification.xml and set the release date to "(not finalized)".
 
  - push your changes and the tag to the central repository with
-     `git push origin master dbus-X.Y dbus-X.Y.Z`
+     `git push --atomic origin main dbus-X.Y dbus-X.Y.Z`
 
  - scp your tarball to freedesktop.org server and copy it to
    `dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus/`.
@@ -72,7 +72,7 @@ Because we won't make minor changes like keeping up with the latest
 deprecations on a stable branch, stable branches should turn off the
 gcc warning for deprecated declarations (e.g. see commit 76a68867).
 
-Be extra-careful not to merge master (or any branch based on master) into a
+Be extra-careful not to merge main (or any branch based on main) into a
 stable branch.
 
 To branch: