Browse Source

Rename "master" development branch to "main" to use more inclusive language (#684).

Dan Helfman 2 years ago
parent
commit
3b21ce4ce8
5 changed files with 9 additions and 7 deletions
  1. 1 1
      .drone.yml
  2. 3 1
      NEWS
  3. 1 1
      README.md
  4. 1 1
      docs/how-to/develop-on-borgmatic.md
  5. 3 3
      docs/how-to/set-up-backups.md

+ 1 - 1
.drone.yml

@@ -53,6 +53,6 @@ trigger:
   repo:
   repo:
     - borgmatic-collective/borgmatic
     - borgmatic-collective/borgmatic
   branch:
   branch:
-    - master
+    - main
   event:
   event:
     - push
     - push

+ 3 - 1
NEWS

@@ -2,6 +2,8 @@
  * #375: Restore particular PostgreSQL schemas from a database dump via "borgmatic restore --schema"
  * #375: Restore particular PostgreSQL schemas from a database dump via "borgmatic restore --schema"
    flag. See the documentation for more information:
    flag. See the documentation for more information:
    https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#restore-particular-schemas
    https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#restore-particular-schemas
+ * #684: Rename "master" development branch to "main" to use more inclusive language. You'll need to
+   update your development checkouts accordingly.
 
 
 1.7.12
 1.7.12
  * #413: Add "log_file" context to command hooks so your scripts can consume the borgmatic log file.
  * #413: Add "log_file" context to command hooks so your scripts can consume the borgmatic log file.
@@ -367,7 +369,7 @@
  * #398: Clarify canonical home of borgmatic in documentation.
  * #398: Clarify canonical home of borgmatic in documentation.
  * #406: Clarify that spaces in path names should not be backslashed in path names.
  * #406: Clarify that spaces in path names should not be backslashed in path names.
  * #423: Fix error handling to error loudly when Borg gets killed due to running out of memory!
  * #423: Fix error handling to error loudly when Borg gets killed due to running out of memory!
- * Fix build so as not to attempt to build and push documentation for a non-master branch.
+ * Fix build so as not to attempt to build and push documentation for a non-main branch.
  * "Fix" build failure with Alpine Edge by switching from Edge to Alpine 3.13.
  * "Fix" build failure with Alpine Edge by switching from Edge to Alpine 3.13.
  * Move #borgmatic IRC channel from Freenode to Libera Chat due to Freenode takeover drama.
  * Move #borgmatic IRC channel from Freenode to Libera Chat due to Freenode takeover drama.
    IRC connection info: https://torsion.org/borgmatic/#issues
    IRC connection info: https://torsion.org/borgmatic/#issues

+ 1 - 1
README.md

@@ -165,5 +165,5 @@ Also, please check out the [borgmatic development
 how-to](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) for
 how-to](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) for
 info on cloning source code, running tests, etc.
 info on cloning source code, running tests, etc.
 
 
-<a href="https://build.torsion.org/borgmatic-collective/borgmatic" alt="build status">![Build Status](https://build.torsion.org/api/badges/borgmatic-collective/borgmatic/status.svg?ref=refs/heads/master)</a>
+<a href="https://build.torsion.org/borgmatic-collective/borgmatic" alt="build status">![Build Status](https://build.torsion.org/api/badges/borgmatic-collective/borgmatic/status.svg?ref=refs/heads/main)</a>
 
 

+ 1 - 1
docs/how-to/develop-on-borgmatic.md

@@ -7,7 +7,7 @@ eleventyNavigation:
 ---
 ---
 ## Source code
 ## Source code
 
 
-To get set up to hack on borgmatic, first clone master via HTTPS or SSH:
+To get set up to hack on borgmatic, first clone it via HTTPS or SSH:
 
 
 ```bash
 ```bash
 git clone https://projects.torsion.org/borgmatic-collective/borgmatic.git
 git clone https://projects.torsion.org/borgmatic-collective/borgmatic.git

+ 3 - 3
docs/how-to/set-up-backups.md

@@ -279,7 +279,7 @@ that, you can configure a separate job runner to invoke it periodically.
 ### cron
 ### cron
 
 
 If you're using cron, download the [sample cron
 If you're using cron, download the [sample cron
-file](https://projects.torsion.org/borgmatic-collective/borgmatic/src/master/sample/cron/borgmatic).
+file](https://projects.torsion.org/borgmatic-collective/borgmatic/src/main/sample/cron/borgmatic).
 Then, from the directory where you downloaded it:
 Then, from the directory where you downloaded it:
 
 
 ```bash
 ```bash
@@ -303,9 +303,9 @@ you may already have borgmatic systemd service and timer files. If so, you may
 be able to skip some of the steps below.)
 be able to skip some of the steps below.)
 
 
 First, download the [sample systemd service
 First, download the [sample systemd service
-file](https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/sample/systemd/borgmatic.service)
+file](https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/main/sample/systemd/borgmatic.service)
 and the [sample systemd timer
 and the [sample systemd timer
-file](https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/sample/systemd/borgmatic.timer).
+file](https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/main/sample/systemd/borgmatic.timer).
 
 
 Then, from the directory where you downloaded them:
 Then, from the directory where you downloaded them: