From 8bb373293473080343c6176eed4b5c3246c1ef46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Aug 2018 08:27:52 +0200 Subject: [PATCH] Fix typos --- Documentation/deployment.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentation/deployment.md b/Documentation/deployment.md index 489711402..a74c3ce30 100644 --- a/Documentation/deployment.md +++ b/Documentation/deployment.md @@ -1,11 +1,13 @@ # Deployment -We know 3 types of release builds: +We provide 3 different types of release builds: + - development (beta/dev) - staging (rc) - production (stable) ## Versioning + The format of version is *MAJOR.BUILD*. Everytime we create a new release with same userland, we bump the build number. The development use here own major number they will be bump for the stable version and the development version go to next major number. @@ -16,11 +18,11 @@ The development use here own major number they will be bump for the stable versi 3.x = stable ``` -## GIT Branch/Tag -The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch hould the development -version from they we build a beta release. +## Git branch/Tag -If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the hole cycle of this release. +The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release. + +If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release. ## Upload release files