Update branch&tag naming convention in CONTRIBUTING

(cherry picked from commit 5248a3e7dbbb0040e1f976ff06525eff175ad377)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 4875c0ea0139ac0a3e6fc1973db416502dc17db3..928ee67a6d93b23854ab277307b0cc5b8aa2237a 100644 (file)
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -57,14 +57,14 @@ To clone the repository, use:
 
       $ git clone https://gitlab.isc.org/isc-projects/bind9.git
 
-Release branch names are of the form v9_X, where X represents the second
-number in the BIND 9 version number. So, to check out the BIND 9.12
+Release branch names are of the form bind-9.X, where X represents the
+second number in the BIND 9 version number. So, to check out the BIND 9.18
 branch, use:
 
-      $ git checkout v9_12
+      $ git checkout bind-9.18
 
 Whenever a branch is ready for publication, a tag is placed of the form
-v9_X_Y. The 9.12.0 release, for instance, is tagged as v9_12_0.
+v9.X.Y. The 9.18.0 release, for instance, is tagged as v9.18.0.
 
 The branch in which the next major release is being developed is called
 main.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0b7661b6717f3b2b628f46d40905bdf7843fa4b2..4b3db8938114b53e01f81c1dac473f1cae0c3bc6 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,14 +71,14 @@ To clone the repository, use:
 
 >       $ git clone https://gitlab.isc.org/isc-projects/bind9.git
 
-Release branch names are of the form `v9_X`, where X represents the second
-number in the BIND 9 version number.  So, to check out the BIND 9.12
+Release branch names are of the form `bind-9.X`, where X represents the second
+number in the BIND 9 version number.  So, to check out the BIND 9.18
 branch, use:
 
->       $ git checkout v9_12
+>       $ git checkout bind-9.18
 
 Whenever a branch is ready for publication, a tag is placed of the
-form `v9_X_Y`.  The 9.12.0 release, for instance, is tagged as `v9_12_0`.
+form `v9.X.Y`.  The 9.18.0 release, for instance, is tagged as `v9.18.0`.
 
 The branch in which the next major release is being developed is called
 `main`.