From: Karel Zak <kzak@redhat.com>
Date: Wed, 25 Apr 2007 13:23:21 +0000 (+0200)
Subject: docs: fix info about devel/master branchs
X-Git-Tag: v2.13-rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f92b00b4608ebabc25234098cc9a0cd4e34cc3;p=thirdparty%2Futil-linux.git

docs: fix info about devel/master branchs

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

diff --git a/README.devel b/README.devel
index 7ef4891357..05300f3bf1 100644
--- a/README.devel
+++ b/README.devel
@@ -55,15 +55,9 @@ SCM (source code management):
 
 
     * maintenance branch(es)
-        - created for every <major>.<minor> release, branch name: v<major>.<minor>
+        - created for every <major>.<minor> release, branch name: v<major>.<minor>-mnt
 
     * master branch
-        - contains what are reasonably tested and ready to next release
-        - it's source for releases and release candidates
-        - active development does not usually happen on "master" (except trivial
-          and non-invasive patches).
-
-    * devel branch
         - the status of this branch is: "it works for me". It means useful
           but not well tested patches.
         - it's source for occasional snapshots