diff --git a/Netdisco/Changes b/Netdisco/Changes index 5338ca3c..d75dfaf3 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -24,7 +24,7 @@ [ENHANCEMENTS] * THANK YOUs - * Allow renumber of device to one of its alias IPs in netdisco-do + * [#197] Allow renumber of device to one of its alias IPs in netdisco-do * [#216] Ability to enter IP prefix in "Discover" form in web [BUG FIXES] diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm index 47085c1a..1fdb204e 100644 --- a/Netdisco/lib/App/Netdisco.pm +++ b/Netdisco/lib/App/Netdisco.pm @@ -287,13 +287,15 @@ Hunter (Arizona State U), Jethro Binks (U of Strathclyde, Glasgow), Jordi Guijarro (UAB.es), Sam Stickland (spacething.org), Stefan Radman (CTBTO.org), Clint Wise, Max Kosmach, and Bernhard Augenstein. -We probably forgot some names - sorry about that :-(. Deep gratitude also goes +We probably forgot some names - sorry about that :-(. + +Deep gratitude also goes to the authors and communities of all the other software that Netdisco is built upon. =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2012, 2013, 2014, 2015 by The Netdisco Developer Team. +This software is copyright (c) 2012-2015 by The Netdisco Developer Team. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod index ed088cd4..1c3f04b3 100644 --- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod +++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod @@ -268,7 +268,6 @@ code or HTML templates. For example: - tag: power_inventory label: 'Power Supply Inventory' category: Device - hidden: true columns: - {name: 'Name'} - {ps1_type: 'PS1 Type'} @@ -319,6 +318,12 @@ If not supplied, reports appear in a I category. Set to true to skip inclusion of this report from the Reports menu. +=head4 C (optional) + +The database "tag" used in C so that you can query another +database (even in another database server) and display the results in a +Netdisco report. + =head4 C (optional) If supplying code to munge the data, the columns returned from your database