Merge pull request #6305 from gunnarbeutner/feature/environment-variable

[icinga2] / README.md

diff --git a/README.md b/README.md
index c4d01a9bd8f1ea2cd56fd79af064fff1f8cf0414..7e5314b1ff491309e1cc30b15176c84359904c58 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
+[![Build Status](https://travis-ci.org/Icinga/icinga2.svg?branch=master)](https://travis-ci.org/Icinga/icinga2)
+
 # Icinga 2
 
-![Icinga Logo](https://www.icinga.org/wp-content/uploads/2014/06/icinga_logo.png)
+![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
 
 #### Table of Contents
 
@@ -9,7 +11,7 @@
 3. [Installation][Installation]
 4. [Documentation][Documentation]
 5. [Support][Support]
-6. [Development and Contributions][Development]
+6. [Contributing][Contributing]
 
 ## About
 
@@ -23,13 +25,27 @@ Icinga 2 as monitoring core works best with [Icinga Web 2](https://www.icinga.co
 as web interface.
 
 More information can be found at [www.icinga.com](https://www.icinga.com/products/icinga-2/)
-and inside the [documentation](doc/1-about.md).
+and inside the [documentation](https://www.icinga.com/docs/icinga2/latest/).
 
-## License
+## Licensing
 
 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 source package.
+COPYING file included in the source package.
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the
+OpenSSL library under certain conditions as described in each
+individual source file, and distribute linked combinations including
+the two.
+
+You must obey the GNU General Public License in all respects for all
+of the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the
+file(s), but you are not obligated to do so. If you do not wish to do
+so, delete this exception statement from your version. If you delete
+this exception statement from all source files in the program, then
+also delete it here.
 
 ## Installation
 
@@ -46,39 +62,18 @@ Check the project website at https://www.icinga.com for status updates. Join the
 [community channels](https://www.icinga.com/community/get-involved/) for questions
 or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/).
 
-## Development
-
-The Git repository is located on [GitHub](https://github.com/Icinga/icinga2).
-
-Icinga 2 is written in C++ and can be built on Linux/Unix and Windows.
-Read more about development builds in the [INSTALL.md](INSTALL.md) file.
-
-### Contributing
+## Contributing
 
 There are many ways to contribute to Icinga -- whether it be sending patches,
 testing, reporting bugs, or reviewing and updating the documentation. Every
 contribution is appreciated!
 
-Read the [contributing section](https://www.icinga.com/community/get-involved/) and
-get familiar with the code.
-
-Pull requests on [GitHub](https://github.com/Icinga/icinga2) are preferred.
-
-### Testing
-
-Basic unit test coverage is provided by running `make test` during package builds.
-Read the [INSTALL.md](INSTALL.md) file for more information about development builds.
-
-Snapshot packages from the laster development branch are available inside the
-[package repository](http://packages.icinga.org).
-
-You can help test-drive the latest Icinga 2 snapshot packages inside the
-[Icinga 2 Vagrant boxes](https://github.com/icinga/icinga-vagrant).
-
+Please continue reading in the [contributing chapter](CONTRIBUTING.md).
 
+<!-- TOC URLs -->
 [About]: #about
 [License]: #license
 [Installation]: #installation
 [Documentation]: #documentation
 [Support]: #support
-[Development]: #development
+[Contributing]: #contributing