From: Karel Zak <kzak@redhat.com>
Date: Mon, 22 Oct 2007 08:47:46 +0000 (+0200)
Subject: docs: add info about .bugfix releases and branches
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c75045a19987ba183cc6af87e0ff569ac6f7ab8;p=util-linux

docs: add info about .bugfix releases and branches

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/README b/README
index b4b0c1dd..103fd539 100644
--- a/README
+++ b/README
@@ -42,11 +42,12 @@ VERSION SCHEMA:
 
       Standard releases:
 
-          <major>.<minor>.<maint>
+          <major>.<minor>[.<maint>[.<bugfix>]]
 
              major = fatal and deep changes
              minor = typical release with new fetures
              maint = maintenance releases; bug fixes only
+             bugfix = unplanned releases for critical/security bugs
 
       Development releases:
 
diff --git a/README.devel b/README.devel
index 25ad051d..621bddc9 100644
--- a/README.devel
+++ b/README.devel
@@ -51,8 +51,14 @@ SCM (source code management):
      git clone git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git util-linux-ng
 
 
-    * maintenance (stable) branch(es)
-        - created for every <major>.<minor> release, branch name: stable/v<major>.<minor>
+    * maintenance (stable) branch
+        - created for every <major>.<minor> release
+        - branch name: stable/v<major>.<minor>
+
+    * bugfix branch
+        - created for <major>.<minor>.<maint> release for critical/security bugs only
+        - this branch is optional
+        - branch name: stable/v<major>.<minor>.<maint>
 
     * master branch
         - the status of this branch is: "it works for me". It means useful
@@ -64,6 +70,4 @@ SCM (source code management):
 
     * A new tag object is created for:
         - every release, tag name: v<version>
-        - every public snapshot, tag name: s<version>-YYYYMMDD
-