Fix a couple of wrong white spaces

[icinga2] / RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
index 9d1c1cc48ba34fdeef90c8334a3f530f0b9d5a43..41cde4358fc0cb3e1160d38fdffa94f8cdffeaf7 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -5,14 +5,38 @@ https://dev.icinga.org/projects/i2/roadmap
 
 # Release Workflow
 
+## Authors
+
 Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
 
     $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
 
-Update the version number in the icinga2.spec file.
+## Version
+
+Update the version number in the following files:
+
+* [icinga2.spec]: Version: (.*)
+* [icinga2.nuspec]: <version>(.*)</version>
+* [tools/chocolateyInstall.ps1]: Icinga2-v(.*).exe
+
+## Changelog
 
 Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using
-the changelog.py script.
+the changelog.py script. Also generate HTML for the wordpress release announcement.
+
+Changelog:
+
+    $ ./changelog.py --version 2.3.10 --project i2
+
+Docs:
+
+    $ ./changelog.py --version 2.3.10 --project i2 --links
+
+Wordpress:
+
+    $ ./changelog.py --version 2.3.10 --project i2 --html --links
+
+## Git Tag
 
 Commit these changes to the "master" branch:
 
@@ -38,15 +62,41 @@ 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
 
 ## Build Server
 
+### Linux
+
 * Build the newly created git tag for Debian/RHEL/SuSE.
 * Provision the vagrant boxes and test the release packages.
+* Start a new docker container and install/run icinga2
+
+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 icinga2
+    # icinga2 daemon -C
+
+    # systemctl start icinga2
+    # tail -f /var/log/icinga2/icinga2.log
+
+### Windows
+
+* Build the newly created git tag for Windows.
+* Test the [setup wizard](http://packages.icinga.org/windows/) inside a Windows VM.
 
 ## Github Release
 
@@ -60,6 +110,6 @@ and pull the current icinga2 revision to update what's new".
 
 ## Announcement
 
-* Create a new blog post on www.icinga.org
+* Create a new blog post on www.icinga.org/blog
 * Send announcement mail to icinga-announce@lists.icinga.org
-* Social media
+* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](http://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)