Fix a couple of wrong white spaces

[icinga2] / RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
index 1d16c1b409f29d25d30f22ae5d01539bfda7f2bb..41cde4358fc0cb3e1160d38fdffa94f8cdffeaf7 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -26,15 +26,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
 
 Changelog:
 
-    $ ./changelog.py --version 2.3.5 --project i2
+    $ ./changelog.py --version 2.3.10 --project i2
 
 Docs:
 
-    $ ./changelog.py --version 2.3.5 --project i2 --links
+    $ ./changelog.py --version 2.3.10 --project i2 --links
 
 Wordpress:
 
-    $ ./changelog.py --version 2.3.5 --project i2 --html --links
+    $ ./changelog.py --version 2.3.10 --project i2 --html --links
 
 ## Git Tag
 
@@ -62,8 +62,15 @@ Push the tag.
 For major releases: Create a new "support" branch:
 
     $ git checkout master
-    $ git checkout -b support/2.x
-    $ git push -u origin support/2.x
+    $ git checkout -b support/2.3
+    $ git push -u origin support/2.3
+
+For minor releases: Push the support branch and cherry-pick the release commit into master:
+
+    $ git push -u origin support/2.3
+    $ git checkout master
+    $ git cherry-pick support/2.3
+    $ git push origin master
 
 # External Dependencies
 
@@ -78,8 +85,11 @@ For major releases: Create a new "support" branch:
 Example for CentOS7:
 
     $ sudo docker run -ti centos:latest bash
+
     # yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
-    # yum -y install icinga
+    # yum -y install icinga2
+    # icinga2 daemon -C
+
     # systemctl start icinga2
     # tail -f /var/log/icinga2/icinga2.log