From 1a2241cb539dfe3f89d39907ccb264d451985df5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 5 Apr 2014 16:25:44 +0200 Subject: [PATCH] Update documentation. Refs #5855 --- doc/1-about.md | 11 ++--------- doc/2.1-setting-up-icinga-2.md | 13 ++++++------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/doc/1-about.md b/doc/1-about.md index 736a62d59..688ccc028 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -12,7 +12,7 @@ multiple locations. Icinga 2 and the Icinga 2 documentation are licensed under the terms of the GNU General Public License Version 2, you will find a copy of this license in the -LICENSE file included in the package. +LICENSE file included in the source package. ## Support @@ -22,7 +22,7 @@ the support overview page at [https://support.icinga.org]. ## Contribute There are many ways to contribute to Icinga - be it by sending patches, testing and -reporting bugs, reviewing and updating the documentation, ... every contribution +reporting bugs, reviewing and updating the documentation. Every contribution is appreciated! Please get in touch with the Icinga team at [https://www.icinga.org/ecosystem/]. @@ -64,10 +64,3 @@ Please get in touch with the Icinga team at [https://www.icinga.org/ecosystem/]. Please check the `ChangeLog` file. - - - - - - - diff --git a/doc/2.1-setting-up-icinga-2.md b/doc/2.1-setting-up-icinga-2.md index adb825924..a9cb15c73 100644 --- a/doc/2.1-setting-up-icinga-2.md +++ b/doc/2.1-setting-up-icinga-2.md @@ -8,10 +8,9 @@ operating system and distribution you are running. ------------------------|--------------------------- Debian | http://packages.icinga.org/debian/ Ubuntu | http://packages.icinga.org/ubuntu/ - RHEL/CentOS 5 | http://packages.icinga.org/epel/5/release/ - RHEL/CentOS 6 | http://packages.icinga.org/epel/6/release/ - OpenSUSE 12.3 | http://packages.icinga.org/openSUSE/12.3/release/ - SLES 11 SP3 | http://packages.icinga.org/SUSE/sles11-sp3/release/ + RHEL/CentOS | http://packages.icinga.org/epel/ + OpenSUSE | http://packages.icinga.org/openSUSE/ + SLES | http://packages.icinga.org/SUSE/ Packages for distributions other than the ones listed above may also be available. Please check http://packages.icinga.org/ to see if packages @@ -19,9 +18,9 @@ are available for your favourite distribution. > **Note** > -> The RHEL/CentOS 5 packages depend on packages which are distributed as part of -> the [EPEL repository](http://fedoraproject.org/wiki/EPEL). Please make sure to -> enable this repository. +> The packages for RHEL/CentOS 5 depend on other packages which are distributed +> as part of the [EPEL repository](http://fedoraproject.org/wiki/EPEL). Please +> make sure to enable this repository. You can install Icinga 2 by using your distribution's package manager to install the `icinga2` package. -- 2.40.0