Document the change of development branch name to main

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5041308bd4915012d686bd1dbbaa87ed3975baf0..7155d49a7ca0d54b50d3260081b3b2fd00ad01b0 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,6 +10,20 @@ Source code and issue tracking for the D-Bus specification and its
 reference implementation 'dbus' are provided by freedesktop.org Gitlab:
 <https://gitlab.freedesktop.org/dbus/dbus>.
 
+## Default branch renamed to `main`
+
+The default development branch for dbus has been renamed to `main`. To
+update your local checkout, use steps similar to:
+
+```sh
+git checkout master
+git branch -m master main
+git fetch
+git branch --unset-upstream
+git branch --set-upstream-to=origin/main
+git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+```
+
 ## Reporting security vulnerabilities
 
 If you find a security vulnerability that is not known to the public,

diff --git a/NEWS b/NEWS
index c69885f104b9b6f444e2b429d6fd398711e36035..5d20ed8cf207a06f6b4c7967d4cac609358019dc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ Build system and dependencies:
   the compile-time DBUS_VERSION or the runtime dbus_get_version().
   (dbus#530, dbus!494; Simon McVittie)
 
+• The branch used for development releases has been renamed to `main`.
+  Please see CONTRIBUTING.md for details of how to update existing checkouts.
+  (dbus#530, Simon McVittie)
+
 Bug fixes:
 
 • On Linux, fix build regression with libselinux ≥ 3.8 and verbose mode