[rkward] /: Updates

[Thomas Friedrichsmeier]

Git commit 6b636ebe28da617e0630cb560c6eac2734bffc6c by Thomas Friedrichsmeier.
Committed on 15/04/2018 at 20:01.
Pushed by tfry into branch 'master'.

Updates

M  +4    -4    CommitPolicy.txt

https://commits.kde.org/rkward/6b636ebe28da617e0630cb560c6eac2734bffc6c

diff --git a/CommitPolicy.txt b/CommitPolicy.txt
index 3cbe14ed..05bc9d29 100644
--- a/CommitPolicy.txt
+++ b/CommitPolicy.txt
@@ -3,7 +3,7 @@ Committing to the RKWard repository
 
 This is a very short guideline, primarily for those who have KDE developer access, and are wondering whether, and how to commit to the RKWard repository, directly.
 
-If you do not have KDE developer access, contact us on the mailing list (rkward-devel at kde.org), or submit patches via reviewboard (see below).
+If you do not have KDE developer access, contact us on the mailing list (rkward-devel at kde.org), or submit patches via phabricator (see below).
 
 Library dependencies
 ====================
@@ -23,8 +23,6 @@ Branches and policies
 
 * master: 
   Most development happens in master. For the time being master is always open for commits, although you are encouraged to develop more elaborate new features in a separate branch. Do try to keep this branch compilable and functional at all times (some rough edges are allowed, though). For more disruptive work, use a "work" branch (see below).
-* frameworks:
-  The KF5 port of RKWard. This is the future master branch (it will be renamed to master, when the time has come). All commits to master get merged into this branch, but not vice-versa. For as long as this branch is _not_ yet master, the commit policy is somewhat more relaxed than master. As the port is stabilizing, you should still try to avoid fundamental breakage.
 * releases/*
   These branches are more restricted. In general you should:
   * not add any new features (only fixes) to these
@@ -34,6 +32,8 @@ Branches and policies
   This will be updated for each new stable release, but _only_ for each new stable release. Meant to allow tracking released versions. In general, please don't commit / push anything, here, unless you are the release manager.
 * work/*
   For longer, experimental, or disruptive work, consider creating a branch named "work/feature_description". Do let us know, when the feature is merged (or discarded), and the branch can be removed.
+* kde4:
+  The latest KDE4 based development version of RKWard. There may or may not be future bugfix releases for KDE4, but no active development is expected on this branch.
 
 Testing
 =======
@@ -49,4 +49,4 @@ and after your changes. If in any doubt, ask on the mailing list rkward-devel at kd
 Review
 ======
 
-There is no strict policy on code reviews. It is never wrong to ask for review on git.reviewboard.kde.org, though. Always select group "rkward". It is also possible to create a "Differential" fo RKWArd in Phabriactor: https://phabricator.kde.org/differential/diff/create/ .
+There is no strict policy on code reviews. It is never wrong to ask for review on git.reviewboard.kde.org, though. Always select group "rkward". It is also possible to create a "Differential" fo RKWard in Phabriactor: https://phabricator.kde.org/differential/diff/create/ .