update docs

CONTRIBUTING.md

@@ -1,10 +1,8 @@
 # Developing locally
-Clone the repo and develop on the Devel branch. Each release will have its own Tag.
-
-I know its simple but for now will work ;)
+Clone the repo and develop on the "develop" branch for new features and version branches (eg. v3.3) for bug fixes.
 
 # Contributing to the project
-All features and bugfixes must be fully tested and reference an issue in  [GitHub](https://github.com/koseven/koseven/issues), **there are absolutely no exceptions**.
+All features and bugfixes must be fully tested and must have a reference to an issue in [GitHub](https://github.com/koseven/koseven/issues), **there are absolutely no exceptions**.
 
 It's highly recommended that you write/run unit tests during development as it can help you pick up on issues early on.  See the Unit Testing section below.
 

README.md

@@ -39,7 +39,7 @@ So far is mostly as the last stable version of Kohana 3.3.6 released on Jul 25,
 
 Our focus is to keep the framework compatible with new releases of PHP, fix bugs and try to improve the speed. New features can be added using modules.
 
-There is a dedicated [roadmap](https://koseven.ga/roadmap.html) page for the supported versions and plans.
+There is a dedicated [versions and roadmap](https://koseven.ga/roadmap.html) page for the supported versions and plans.
 
 ## Are modules of the original Kohana compatible?
 

ROADMAP.md

@@ -1,17 +1,18 @@
 # Versions
 
-## 3.3.x
+### 3.3.x
 - The 3.3.x versions are planned to be released every 4 months or an as needed basis.
 - There will be no new features only bug fixes for this version.
 
-## After 3.3.x
+### After 3.3.x
 - Koseven will use semantic versioning after 3.3.x.
 - Major versions are planned to be released at november every year.
 - Minor versions are planned to be released every 4 months.
 - Patch versions are released for fixing security bugs only.
-- Support end is target PHP version support end +1 year. Bug fixes are backported to previous versions.
+- Support end is target PHP version support end +1 year.
+- Only the latest minor versions (branches) receive support.
 
-## Version list
+### Version list and support schedule
 
 | Koseven version | Target PHP version | Release date | Support until |
 | --------------- | ------------------ | ------------ | ------------- |
@@ -19,6 +20,14 @@
 | 4.x.x           | 7.3                | 2019.11.??   | 2021.12.31.   |
 | 5.x.x           | 7.4                | 2020.11.??   | 2022.12.31.   |
 
-## Roadmap
+### Branches
 
-For planned new features and goals for koseven versions please visit https://github.com/koseven/koseven/milestones .
+| Name    | Designation                                             |
+| --------| ------------------------------------------------------- |
+| develop | Latest development version. Don't use it in production! |
+| v4.0    | Next major version (created when 4.0.0 released)        |
+| v3.3    | Current major version (stable)                          |
+
+# Roadmap
+
+For planned new features and goals please visit https://github.com/koseven/koseven/milestones .

system/classes/Kohana/Core.php

@@ -17,7 +17,7 @@ class Kohana_Core {
 
 	// Release version and codename
 	const VERSION  = '3.3.8';
-	const CODENAME = 'lazarus';
+	const CODENAME = 'cubelles';
 
 	// Common environment type constants for consistency and convenience
 	const PRODUCTION  = 10;