tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,607 Commits 347 Branches 117 Tags 189 MiB
Commit Graph

364 Commits

Author SHA1 Message Date
Gunnar Beutner fb323ee215 Evaluate apply filters in the for loop 
fixes #7610
 2015-01-29 12:38:25 +01:00
Tobias von der Krone 201883ff70 Add OpenTSDB perfdata plugin 
refs #7256

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
 2015-01-28 12:39:01 +01:00
Michael Friedrich 78bfd0204c Update copyright year 2015-01-22 12:00:23 +01:00
Michael Friedrich a4e63de893 Documentation: Update Icinga Web 2 uri to /icingaweb2 
fixes #8201
 2015-01-13 20:42:42 +01:00
Gunnar Beutner 7be19a2134 Move the InstallConfig include into the top-level CMakeLists.txt file 
refs #7794
 2014-12-19 09:51:14 +01:00
Gunnar Beutner cb7f93dc19 Implement CMake options for some of the modules 
fixes #7794
fixes #7795
 2014-12-19 09:46:41 +01:00
Gunnar Beutner bd7b2f30ef Validate configuration files during reload 
fixes #7045
 2014-12-11 09:27:31 +01:00
Tim Hardeck ac6768d870 Use Icinga 1.x Apache conf 
This Apache conf is from Icinga 1.x and should work with Apache 2.2 and
2.4.

fixes #7929
 2014-12-03 17:03:04 +01:00
Lars Engels ba5f20224e Remove bashisms from some of the shell scripts 
fixes #7685

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
 2014-12-02 09:59:56 +01:00
Gunnar Beutner 00885f10d0 Add support for Apache 2.4 in the Classic UI config file 
fixes #7739
 2014-12-01 10:00:05 +01:00
Malte Rabenseifner 76d774d396 Fix group permission in prepare-dirs 
fixes #7890

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
 2014-11-29 20:14:34 +01:00
Michael Friedrich 842b3a9cd7 Documentation: Explain macro array support, repeat_key, add icmp example 
fixes #7868
fixes #7867
 2014-11-27 16:59:17 +01:00
Gunnar Beutner 7ee0eef562 Move the icinga2-prepare-dirs script to /usr/lib 
fixes #7786
 2014-11-27 14:47:51 +01:00
Gunnar Beutner 9f0e0aac86 Fix the init script 
refs #7613
 2014-11-26 08:16:13 +01:00
Michael Friedrich 9818477a44 Make sure that user/group exists when starting Icinga 2 
fixes #7173
fixes #7613
 2014-11-25 18:44:25 +01:00
Gunnar Beutner b22d3c099a Add notification custom vars to the satellite-{host,service} templates 
fixes #7770
 2014-11-21 14:02:51 +01:00
Gunnar Beutner 184e38b122 Add Windows-specific example config files 2014-11-19 08:27:27 +01:00
Gunnar Beutner cbaece61e7 Fix another incorrect argument name 
refs #7726
 2014-11-18 16:48:58 +01:00
Lars Engels 9217ea3143 Add support for FreeBSD and DragonFlyBSD 
refs #7680

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
 2014-11-14 10:43:51 +01:00
Michael Friedrich 1820425562 GelfWriter: Add documentation 
refs #7619
 2014-11-11 14:16:48 +01:00
Michael Friedrich f838fc4e6c GelfWriter: Fix default example port 
refs #7619
 2014-11-11 14:16:48 +01:00
Michael Friedrich a4ed44247e Add 'gelf' feature config 
refs #7619
 2014-11-11 14:16:48 +01:00
Michael Friedrich c1f4d2243e Documentation: Better apply rule best practice in monitoring basics 
fixes #7480
fixes #7543
fixes #7187
fixes #7573
 2014-11-07 04:13:45 +01:00
Michael Friedrich 3f91e5358c Revamp sample configuration: add NodeName host, move services into apply rules schema 
fixes #7594
 2014-11-07 04:13:45 +01:00
Michael Friedrich 0f4e3004b6 Documentation: Add some more remote client details 
Rename agents.conf too.

refs #7254
 2014-11-02 21:56:11 +01:00
Michael Friedrich 4eeed787ea Docs: Add first draft for setting up remote clients using Icinga 2 
refs #7254
 2014-11-02 20:35:16 +01:00
Gunnar Beutner 2ab43a63cb Rename templates "agent-{host,service}" to "satellite-{host,service}" 
refs #7525
 2014-10-31 13:15:51 +01:00
Gunnar Beutner 4b6abd9aa7 Update downtimes.conf example config 
fixes #7472
 2014-10-30 12:22:31 +01:00
Gunnar Beutner 75b599c801 Set host/service variable in apply rules 
fixes #7479
 2014-10-29 10:09:40 +01:00
Michael Friedrich 64298c35ef Cli: Add agents.conf w/ default agent templates for 'agent update-config' 
refs #7248
 2014-10-28 19:46:10 +01:00
Michael Friedrich fec8e92221 Cli: Make sure to create & include 'repository.d' 
refs #7255
 2014-10-27 19:19:45 +01:00
Gunnar Beutner 35a1930629 Create repository.d directory 2014-10-24 14:24:59 +02:00
Gunnar Beutner 9ee523e601 Clean up the "agent setup" command a bit 
refs #7423
 2014-10-23 03:35:01 +02:00
Gunnar Beutner 6e17eadf8f Remove {DAEMON,ICINGA2}_USER and {DAEMON,ICINGA2}_GROUP variables 
refs #7370
 2014-10-20 21:41:04 +02:00
Gunnar Beutner 7db8588980 Implement auto-completion for positional arguments 
refs #7255
 2014-10-17 15:54:46 +02:00
Gunnar Beutner ac47649722 Remove unnecessary arguments from the systemd service file 2014-10-17 14:37:43 +02:00
Gunnar Beutner f433679b13 Implement the "pki request" and "pki ticket" commands 
refs #7244
 2014-10-16 12:27:34 +02:00
Michael Friedrich a895a6236a Fix systemd unit file 
refs #7246
 2014-10-16 12:08:21 +02:00
Gunnar Beutner d7d6d6096f Remove icinga2-enable-feature and icinga2-disable-feature 
refs #7250
 2014-10-14 18:35:52 +02:00
Gunnar Beutner 533ec940b8 Remove superfluous config directive 
refs #7246
 2014-10-14 17:45:48 +02:00
Gunnar Beutner 2a60ce8625 Improve auto-completion for arguments 
fixes #7375
 2014-10-14 16:45:00 +02:00
Gunnar Beutner 15bd96aa9a Remove --user and --group 
refs #7246
 2014-10-13 16:07:04 +02:00
Gunnar Beutner a01fb6d6e6 Make sure we're using the right user/group for CLI commands 
refs #7246
 2014-10-13 13:44:45 +02:00
Michael Friedrich 4195d23d97 Fix typo in sample config for http ServiceGroup 
fixes #7365
 2014-10-11 16:49:15 +02:00
Gunnar Beutner 8fa7bde4da Fix incorrect index in the bash autocompletion script 
refs #7246
 2014-10-10 11:38:37 +02:00
Gunnar Beutner 4c8d0b9283 Fix auto-completion for arguments 
refs #7246
 2014-10-10 10:07:56 +02:00
Gunnar Beutner a4081f1445 Implement support for CLI commands 
fixes #7246
 2014-10-08 15:33:10 +02:00
Gunnar Beutner 5ae1f4273c Init script: Check whether the PID file exists 
fixes #7047
 2014-09-02 13:48:48 +02:00
Gunnar Beutner dde00a3f16 Use LSB-compliant exit codes for the init script 
fixes #7044
 2014-09-02 13:40:33 +02:00
Michael Friedrich b4953a613b Fix the documentation for manubulon check plugin commands 
refs #6650
 2014-08-27 19:57:44 +02:00
Carlos Cesario fe6dc00a85 Add some manubulon snmp plugins 
refs #6650
 2014-08-27 19:57:43 +02:00
Michael Friedrich 32c20132d0 Documentation: Rewrite cluster docs 
* Re-organize structure
* New section with HA features
* Permissions and security
* How to add a new node
* Cluster requirements
* Additional hints on installation
* More troubleshooting

fixes #6743
fixes #6703
fixes #6997
 2014-08-24 11:21:54 +02:00
Gunnar Beutner 495bc5b733 Use the icingacmd group for /var/{cache,log,run}/icinga2 
refs #6948
 2014-08-19 14:05:02 +02:00
Gunnar Beutner 72d66e4f17 Remove if(NOT DEFINED ICINGA2_SYSCONFIGFILE) in etc/initsystem/CMakeLists.txt 
fixes #6832
 2014-08-01 12:26:45 +02:00
Gunnar Beutner 20c16a8e93 Rename ICINGA2_PLUGIN_PATH to ICINGA2_PLUGINDIR 
refs #6548
 2014-07-22 13:26:42 +02:00
Gunnar Beutner a49a598eef Make location of the /run directory configurable 
fixes #6627
 2014-07-22 13:26:37 +02:00
Gunnar Beutner e6dc8c21a1 Add cmake constant for PluginDir 
fixes #6548
 2014-07-16 09:03:51 +02:00
Michael Friedrich af2645d7c1 sample config: add check commands location hint (itl/plugin check commands) 
fixes #6713
 2014-07-12 13:30:51 +02:00
Gunnar Beutner 5fb52a4e48 Remove superfluous quotes and commas in dictionaries 
fixes #6687
 2014-07-11 14:38:15 +02:00
Michael Friedrich d56da32a16 Use CMAKE_INSTALL_FULL_SYSCONFDIR for ICINGA2_SYSCONFIGFILE variable 
fixes #6657
 2014-07-09 17:20:23 +02:00
Gerd von Egidy 9667fb40b7 Improve the systemd service definition file 
- put "Icinga" back in the "Description=" field as usually only the description is displayed on unit start/stop or shown in syslog
- add dependency to carbon-cache.service
(systemd only cares about dependencies if the respective services are enabled, so this does not hurt if someone does not have carbon-cache
installed at all or is not using it at the moment)

fixes #6551

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
 2014-06-24 13:40:44 +02:00
Gerd von Egidy 933e2480fc add new cmake option INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT requested for Gentoo packaging 
fixes #6498

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
 2014-06-24 13:39:38 +02:00
Gerd von Egidy 3ac3c91499 Separate CMakeLists.txt for etc/initsystem. 
Refs #6491
 2014-06-16 01:58:59 +02:00
Gerd von Egidy fe62fb90e6 Don't call check_run in the initscript, this function is gone. 
Refs #4794
 2014-06-15 20:08:45 +02:00
Gerd von Egidy dd9b7bcd73 Move the sysdefines.conf file to /etc/sysconfig. 
As /etc/sysconfig is distro specific, the filename used can be configured via the CMake parameter
ICINGA2_SYSCONFIGFILE

Refs #4794
 2014-06-15 19:47:27 +02:00
Sam Kottler 4568f68f90 Remove mention of icinga in the description since it's already in the name and might cause versioning confusion 
Refs #4794
 2014-06-15 17:00:30 +02:00
Gerd von Egidy 4ebde46520 Move code preparing dirs and permissions to icinga2-prepare-dirs, use this for SysV-Init and systemd. 
Refs #4794

Conflicts:
	etc/initsystem/icinga2.init.d.cmake
 2014-06-15 16:25:50 +02:00
Gerd von Egidy ef49658474 Unify resources for SysV-Init and systemd. 
- Move system-specific defines like paths and usernames to /etc/icinga2/sysdefines.conf
  Do not use /etc/sysconfig for this as per suggestion on the systemd mailinglist: it is RedHat-specific
- Use /etc/icinga2/sysdefines.conf in SysV-Init and systemd
- Move both the sources of the SysV-Initscript and the systemd-service definition to etc/initsystem

Refs #4794

Conflicts:
	etc/initsystem/icinga2.init.d.cmake
 2014-06-15 15:49:13 +02:00
Gerd von Egidy 59a1a133c3 Reloading with systemd is fixed now. 
Refs #4794
 2014-06-15 15:32:13 +02:00
Gerd von Egidy 7bfd2f1ea2 Systemd can't resolve variables recursively. 
Refs #4794
 2014-06-15 15:31:32 +02:00
Gerd von Egidy 954ceb3c6a Fix CMake escaping. 
Refs #4794
 2014-06-15 15:31:10 +02:00
Gerd von Egidy 69c06115d2 First try at a systemd service definition file, install it from CMake. 
Native systemd support is enabled with cmake -DUSE_SYSTEMD=ON

Refs #4794
 2014-06-15 15:30:53 +02:00
Tim Hardeck 74751a4e22 Fix logrotate should rotate log files as icinga user 
fixes #6477
 2014-06-13 09:47:26 +02:00
Michael Friedrich 6bebdddf98 Less verbose start output using the initscript 
All output is dumped to startup.log and only shown in case of
'checkconfig' as parameter, but not during a reload/restart.

Furtermore some additional formatting to make it fit line by line.

fixes #5822
 2014-06-12 16:05:45 +02:00
Michael Friedrich d9289add62 Documentation: Emphasize on global zone on all nodes 
refs #6254
 2014-06-12 14:33:59 +02:00
Michael Friedrich 318136257f Remove default example config. 
Refs #6254
 2014-06-11 21:28:01 +02:00
Michael Friedrich a3b2b1d780 Add global zone identifier for global object/template configuration. 
Refs #6254
 2014-06-11 16:49:30 +02:00
Michael Friedrich 63df43eea2 Revert "Fix configuration error on missing NodeName." 
This reverts commit 72ef0d31fd.

Refs #6393
 2014-06-04 10:23:39 +02:00
Michael Friedrich 72ef0d31fd Fix configuration error on missing NodeName. 
Fixes #6393
 2014-06-03 14:54:21 +02:00
Michael Friedrich 25e4e81e50 Yet another kernel removal fix. 
Refs #6369
 2014-06-02 14:54:59 +02:00
Michael Friedrich 26f0ef7657 Drop missing file from install. 
Refs #6369
 2014-06-02 14:06:48 +02:00
Michael Friedrich 9225f7ed00 Drop check_kernel in favor of check_running_kernel, add plugin command. 
Refs #6369
 2014-06-02 13:34:35 +02:00
Gunnar Beutner 32e6e6ff04 Rewrite the check_kernel script and implement support for RHEL, Fedora and Ubuntu. 
Fixes #6332
 2014-05-31 09:13:01 +02:00
Carlos Cesario a7a234a600 Add missing file icingastatus.conf. 
Fixes #6308

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>
 2014-05-26 16:07:37 +02:00
Gunnar Beutner a222442e70 Comment out the NodeName constant. 
Fixes #6306
 2014-05-26 14:40:57 +02:00
Gunnar Beutner 7183495d89 Make username in the logrotate config configurable. 
Fixes #6295
 2014-05-26 09:01:23 +02:00
Michael Friedrich e873ce6b9c Fix wrong service apply rule examples for ping{4,6}. 
Refs #6266
 2014-05-22 23:05:39 +02:00
Michael Friedrich 4df2721d4e Documentation: Fix Getting Started based on revamped example configuration. 
Refs #6266
 2014-05-22 22:47:32 +02:00
Michael Friedrich 0eec68aec4 Emphasize on apply rules in example config. 
- move all templates into templates.conf
- move service apply ping{4,6} to services.conf
- apply notifications based on vars.sla == "24x7"
- apply scheduled downtime based on host/service name
- apply ping{4,6} based on hostgroup membership
- keep hosts/localhost for real local configuration

Fixes #6266
 2014-05-22 22:19:41 +02:00
Michael Friedrich ec7d9b0f3d Move zone specific configuration to zones.conf included in icinga2.conf. 
Fixes #6208
 2014-05-22 21:00:42 +02:00
Michael Friedrich 3f361bcb05 Fix checkconfig error message. 
Fixes #6269
 2014-05-22 17:26:56 +02:00
Gunnar Beutner 7223ae1dc2 Update documentation. 
Refs #5795
 2014-05-22 13:33:54 +02:00
Gunnar Beutner 95d9b6f221 Fix invalid logrotate option. 
Fixes #6265
 2014-05-22 12:02:11 +02:00
Gunnar Beutner 2350593ef0 Fix logrotate config. 
Fixes #6229
 2014-05-22 11:22:30 +02:00
Gunnar Beutner cffe3cf57c Simplify "ignore where" condition in the example config. 
Refs #5795
 2014-05-18 08:59:13 +02:00
Gunnar Beutner 34abe21420 Add missing file. 
Refs #6191
 2014-05-13 13:26:57 +02:00
Gunnar Beutner 0d36cc8d5f Implement support for the zones.d config directory. 
Refs #6191
 2014-05-13 13:19:43 +02:00
Gunnar Beutner ff3de818f6 Move kernel check to the Debian package directory. 
Refs #6012
 2014-05-13 07:00:22 +02:00
Michael Friedrich 4b75d8f8c8 Disable non-working kernel check in sample config. 
Refs #6012
 2014-05-13 00:15:05 +02:00
Michael Friedrich d06d4f2540 Include monitoring plugin commands seperately. 
Fixes #6130
 2014-05-10 19:02:51 +02:00
Gunnar Beutner 3926b68c04 Decrease default check intervals. 
Refs #6107
 2014-05-08 13:56:28 +02:00
Gunnar Beutner 656d6ff13a Update scripts and example config. 
Refs #6107
 2014-05-08 12:17:21 +02:00
Gunnar Beutner 45270f1bb8 Refactor the agent and cluster components. 
Refs #6107
 2014-05-08 09:13:04 +02:00
Michael Friedrich 2cfc0afc8a icinga2 init script should start/stop mysql/pgsql. 
Fixes #5479
 2014-04-29 17:26:39 +02:00
Gerd von Egidy 3a294bbd5d Fork new process from previous daemon on reload. 
The previously planned logic of forking a new daemon from the reload-process didn't work with
systemd: systemd does not allow long-running processes started from within the reload command.

Replaces parameter --reload with --reload-internal which is used when starting the new daemon.

Refs #5788
 2014-04-29 10:34:01 +02:00
Gerd von Egidy 33bd909b71 Add --reload command-line parameter. 
Refs #5788
 2014-04-29 10:34:01 +02:00
Gerd von Egidy 19afcd894a Split ConfigItem::ActivateItems() into ConfigItem::ValidateItems() and ConfigItem::ActivateItems(). 
Also removes the -Z commandline parameter: won't be needed when this feature is done.

Refs #5788
 2014-04-29 10:34:01 +02:00
Gunnar Beutner d617c7b1f6 Implement support for optional command arguments. 
Fixes #5933
 2014-04-26 15:03:38 +02:00
Michael Friedrich 7a147d268e Add group assign/ignore rules. 
Fixes #5910
 2014-04-23 15:50:00 +02:00
Michael Friedrich 0e42a5724b Add apply ping{4,6} to generic-host example config again. 
Fixes #6056
 2014-04-23 14:58:44 +02:00
Gunnar Beutner e749f6eae5 Make sure the installer doesn't overwrite config files. 
Refs #4865
 2014-04-20 11:22:15 +02:00
Gunnar Beutner bf39244f48 Add missing files for the Windows installer. 
Refs #4865
 2014-04-18 14:44:07 +02:00
Gunnar Beutner 0fb55f3404 Fix NSIS installer and Windows service. 
Refs #4865
 2014-04-18 12:15:01 +02:00
Gunnar Beutner 63e6bc8ce7 Add missing files. 
Refs #6002
 2014-04-13 17:35:07 +02:00
Gunnar Beutner 87cead02ed Split localhost config into several files. 
Refs #6002
 2014-04-13 17:32:38 +02:00
Gunnar Beutner 365779d360 Remove the SNMP auto-discovery scripts. 
Refs #4865
 2014-04-13 01:20:51 +02:00
Gunnar Beutner 3f2238b46c Increase default syslog log level to "warning". 
Refs #4865
 2014-04-12 11:53:04 +02:00
Gunnar Beutner 750603c49d Update the example config. 
Refs #4865
 2014-04-12 10:28:31 +02:00
Gunnar Beutner bc7609fd18 Add missing file. 
Refs #4865
 2014-04-12 09:25:04 +02:00
Gunnar Beutner eee198ecab Update example config. 
Refs #4865
 2014-04-12 08:54:09 +02:00
Gunnar Beutner aad78fee10 Install missing file. 
Refs #4865
 2014-04-12 08:53:09 +02:00
Gunnar Beutner 899b9da5b4 Update ITL commands. 
Refs #4865
 2014-04-12 08:18:51 +02:00
Gunnar Beutner 606834e190 Rename the notification attributes. 
Fixes #5906
 2014-04-09 10:25:23 +02:00
Gunnar Beutner 5619498762 Fix re-notification interval. 
Refs #5909
 2014-04-09 01:11:01 +02:00
Gunnar Beutner 510610741b Update the example config. 
Refs #5979
 2014-04-09 00:11:29 +02:00
Gunnar Beutner 3df3930a92 Update example config. 
Refs #5909
 2014-04-09 00:07:39 +02:00
Gunnar Beutner ba2309338e Update the example config. 
Refs #5909
 2014-04-08 23:16:31 +02:00
Gunnar Beutner 0fdb9ea21b Implement attributes for some well-known macros and allow macro recursion. 
Refs #5856
Fixes #5959
 2014-04-08 13:23:24 +02:00
Michael Friedrich 9ab4b3dd16 Remove the 'Icinga' prefix for global constants. 
Fixes #5960
 2014-04-07 21:42:23 +02:00
Gunnar Beutner cea15e11dc Implement new state and type filters. 
Fixes #5906
 2014-04-07 14:00:18 +02:00
Gunnar Beutner 323f3ec6c5 Update example config. 
Refs #5925
 2014-04-05 22:20:57 +02:00
Gunnar Beutner 5e38c81eb5 Implement apply target types. 
Fixes #5924
 2014-04-05 13:53:55 +02:00
Gunnar Beutner c42a582307 Rename "short_name", "host" and "sevice" attributes. 
Fixes #5857
 2014-04-05 09:15:40 +02:00
Michael Friedrich 09cbf18b26 Implement 'env' dictionary instead of 'export_macros' array. 
Revamp notification runtime macros too.

Refs #5855
 2014-04-04 22:57:56 +02:00
Michael Friedrich 3d419cd48b Rename 'hostcheck' to 'hostalive' check command. 
Refs #5939
 2014-04-04 19:04:13 +02:00
Michael Friedrich 9dd37cf9bc Add ITL hostcheck command for sample config. 
Fixes #5939
 2014-04-04 16:22:12 +02:00
Michael Friedrich 5c58eb368c Merge 'macros' and 'custom' attributes into 'vars', part 1. 
Refs #5855
 2014-04-03 11:35:25 +02:00
Gunnar Beutner 0fddb46b68 Fix Vagrant config. 
Refs #5870
 2014-04-01 11:17:06 +02:00
Gunnar Beutner 5eca503362 Support new-lines in addition to commas to separate commands. 
Fixes #5901
 2014-04-01 09:45:57 +02:00
Gunnar Beutner 036fd3303f Replace $plugindir$ macro with a constant. 
Fixes #5877
 2014-03-31 13:11:36 +02:00
Gunnar Beutner 79a7a0be92 Update documentation. 
Refs #5870
 2014-03-31 12:00:10 +02:00
Gunnar Beutner 93baea247c Only apply ping4 service to hosts which have an address macro. 
Fixes #5891
 2014-03-31 09:49:45 +02:00
Michael Friedrich 020a856bce Config: Fix IcingaMacros const identifier. 2014-03-30 16:12:30 +02:00
Gunnar Beutner fa11e5a97e Update example config. 
Refs #5878
 2014-03-28 16:32:15 +01:00
Gunnar Beutner 8958d2f69f Implement the "import" keyword. 
Refs #5869
 2014-03-28 11:22:36 +01:00
Gunnar Beutner c580632e90 Add check plugin for net-snmp extend checks. 
Fixes #5861
 2014-03-26 09:51:10 +01:00
Gunnar Beutner a2d6e90d06 Rename "none" time period to "never." 2014-03-25 10:08:28 +01:00
Michael Friedrich 1d32c5b2d3 Add --no-validate option and skip duplicate validation on (re)start. 
Fixes #5800
 2014-03-19 20:59:18 +01:00
Gunnar Beutner 700cc43770 Update documentation. 
Refs #5789
 2014-03-19 12:46:23 +01:00
Michael Friedrich ce737ff2f3 Change copyright header (again). 
Fixes #5424
 2014-03-19 11:42:47 +01:00