From 63d428c0e1e62edd4be9029322f18a7757718c5c Mon Sep 17 00:00:00 2001 From: Tyler Christiansen Date: Mon, 28 Oct 2013 12:01:36 -0700 Subject: [PATCH 1/2] Revert "update copyright notice" after discussion with Paul This reverts commit 774233327e3b300011b7a6fdcbef3a375f34b8b8. --- CHANGELOG | 4 +++- addhost.php | 11 +++++------ adduser.php | 11 +++++------ alerts.php | 13 ++++++------- billing-calculate.php | 13 ++++++------- check-errors.php | 13 ++++++------- check-services.php | 13 ++++++------- delhost.php | 11 +++++------ discovery.php | 13 ++++++------- generate-iplist.php | 13 ++++++------- irc.php | 13 ++++++------- poll-billing.php | 13 ++++++------- poll-device.php | 13 ++++++------- poller.php | 13 ++++++------- renamehost.php | 11 +++++------ snmptrap.php | 13 ++++++------- syslog.php | 13 ++++++------- 17 files changed, 95 insertions(+), 109 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d775e121b..5bdf8fb18 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1 +1,3 @@ -See the commit log at https://github.com/librenms/librenms/commits/master for details. +Please check http://www.observium.org/wiki/Changelog for an up to date changelog. + +You can also browse the subversion repository commit logs for more granular updates. \ No newline at end of file diff --git a/addhost.php b/addhost.php index 0689d7299..67b859d2e 100755 --- a/addhost.php +++ b/addhost.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/adduser.php b/adduser.php index d70ade3e1..18c41d8dd 100755 --- a/adduser.php +++ b/adduser.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/alerts.php b/alerts.php index 52723fdb7..6886d9ccf 100755 --- a/alerts.php +++ b/alerts.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage alerts + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/billing-calculate.php b/billing-calculate.php index 0d09609bd..d1f21abae 100755 --- a/billing-calculate.php +++ b/billing-calculate.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage billing + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/check-errors.php b/check-errors.php index 22052e581..0a430bfed 100755 --- a/check-errors.php +++ b/check-errors.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage alerts + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/check-services.php b/check-services.php index 8c3539ad2..2f6f33ab6 100755 --- a/check-services.php +++ b/check-services.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage services + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/delhost.php b/delhost.php index ee3d2b360..2c21d01f7 100755 --- a/delhost.php +++ b/delhost.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/discovery.php b/discovery.php index c2aaad204..459659145 100755 --- a/discovery.php +++ b/discovery.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage discovery + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/generate-iplist.php b/generate-iplist.php index 805b9d98c..a4b324fc3 100755 --- a/generate-iplist.php +++ b/generate-iplist.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage discovery + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/irc.php b/irc.php index d1cbe47de..1b50aa3b7 100755 --- a/irc.php +++ b/irc.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage ircbot + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/poll-billing.php b/poll-billing.php index f838e2829..5b70ac552 100755 --- a/poll-billing.php +++ b/poll-billing.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage billing + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/poll-device.php b/poll-device.php index 96ea6f243..6ddda4056 100755 --- a/poll-device.php +++ b/poll-device.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage poller + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/poller.php b/poller.php index 55b09636d..91dd17296 100755 --- a/poller.php +++ b/poller.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage poller + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/renamehost.php b/renamehost.php index 5d7daa110..1178be36a 100755 --- a/renamehost.php +++ b/renamehost.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/snmptrap.php b/snmptrap.php index a7a29877e..049da4c7c 100755 --- a/snmptrap.php +++ b/snmptrap.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage snmptraps + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ diff --git a/syslog.php b/syslog.php index e6736154f..5ef8c5b10 100755 --- a/syslog.php +++ b/syslog.php @@ -2,15 +2,14 @@ - * @copyright (C) 2006 - 2012 Adam Armstrong (as Observium) - * @copyright (C) 2013 LibreNMS Group + * @package observium + * @subpackage syslog + * @author Adam Armstrong + * @copyright (C) 2006 - 2012 Adam Armstrong * */ From 3f78fb2629d3eb040d6a08f470777dc22c8e953d Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Tue, 29 Oct 2013 05:27:15 +1000 Subject: [PATCH 2/2] Update participation section --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 790533db2..eba305074 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,16 @@ See `INSTALL.md` for details. Contributing ------------ -Clone the repo and file bug reports and pull requests here. -Join the [librenms-project][1] mailing list to post questions and suggestions. +You can participate in the project by: +- Joining the [librenms-project][1] mailing list to post questions and + suggestions. +- Cloning the [repo][2] and filing bug reports and pull requests on github. +- Talking to us on [Twitter][3] or [IRC][4]. +- Improving the [wiki][5]. [1]: https://groups.google.com/forum/#!forum/librenms-project "LibreNMS" +[2]: https://github.com/librenms/librenms +[3]: https://twitter.com/librenms +[4]: irc://irc.freenode.net/##librenms +[5]: https://github.com/librenms/librenms/wiki +