--- b/net-mgmt/cacti/Makefile	
+++ b/net-mgmt/cacti/Makefile	
@@ -1,5 +1,5 @@ 
 PORTNAME=	cacti
-PORTVERSION=	1.2.16
+PORTVERSION=	1.2.17
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/ \
 		ftp://ftpmirror.uk/freebsd-ports/cacti/
--- b/net-mgmt/cacti/distinfo	
+++ b/net-mgmt/cacti/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1607087619
-SHA256 (cacti-1.2.16.tar.gz) = 347553a6331b1b26e634a30d649dda2cc81c727d0afa695d06358de358a8918e
-SIZE (cacti-1.2.16.tar.gz) = 29197220
+TIMESTAMP = 1622481522
+SHA256 (cacti-1.2.17.tar.gz) = faedc552599067a73ac4c5899c8421f81b097f131a7a25c7a1b332439f8d3f79
+SIZE (cacti-1.2.17.tar.gz) = 38344112
--- b/net-mgmt/cacti/files/patch-lib_installer.php	
+++ b/net-mgmt/cacti/files/patch-lib_installer.php	
@@ -1,9 +1,9 @@ 
---- lib/installer.php.orig	2019-09-29 18:36:29 UTC
-+++ lib/installer.php
-@@ -3226,7 +3226,7 @@ class Installer implements JsonSerializable {
- 		global $config;
+--- lib/installer.php.orig	2021-06-01 00:15:30.652736000 +0000
++++ lib/installer.php	2021-06-01 00:16:32.509002000 +0000
+@@ -3404,7 +3404,7 @@
  
  		$page_nr = 1;
+ 		$total_rows = 500;
 -		$logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
 +		$logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
  
--- b/net-mgmt/cacti/pkg-plist	
+++ b/net-mgmt/cacti/pkg-plist	
@@ -40,6 +40,7 @@ 
 %%CACTIDIR%%/cli/audit_database.php
 %%CACTIDIR%%/cli/convert_tables.php
 %%CACTIDIR%%/cli/copy_user.php
+%%CACTIDIR%%/cli/fix_mediumint.php
 %%CACTIDIR%%/cli/host_update_template.php
 %%CACTIDIR%%/cli/import_package.php
 %%CACTIDIR%%/cli/import_template.php
@@ -53,6 +54,7 @@ 
 %%CACTIDIR%%/cli/poller_reindex_hosts.php
 %%CACTIDIR%%/cli/poller_replicate.php
 %%CACTIDIR%%/cli/rebuild_poller_cache.php
+%%CACTIDIR%%/cli/refresh_csrf.php
 %%CACTIDIR%%/cli/remove_device.php
 %%CACTIDIR%%/cli/remove_graphs.php
 %%CACTIDIR%%/cli/removespikes.php
@@ -80,6 +82,7 @@ 
 %%CACTIDIR%%/docs/Aggregate-Templates.html
 %%CACTIDIR%%/docs/Aggregates.html
 %%CACTIDIR%%/docs/Automation-Networks.html
+%%CACTIDIR%%/docs/Boost.html
 %%CACTIDIR%%/docs/CDEFs.html
 %%CACTIDIR%%/docs/Cacti-Github.css
 %%CACTIDIR%%/docs/Color-Templates.html
@@ -109,17 +112,22 @@ 
 %%CACTIDIR%%/docs/Graph-Templates.html
 %%CACTIDIR%%/docs/Graph-a-Single-SNMP-OID.html
 %%CACTIDIR%%/docs/Graphs.html
-%%CACTIDIR%%/docs/How-To-Data-Query-Templates.html
+%%CACTIDIR%%/docs/How-To-Create-Data-Input-Method.html
+%%CACTIDIR%%/docs/How-To-Data-Queries.html
 %%CACTIDIR%%/docs/How-To-Determine-Template-Version.html
+%%CACTIDIR%%/docs/How-To-Existing-SNMP-Data-Queries.html
+%%CACTIDIR%%/docs/How-To-New-SNMP-Data-Queries.html
 %%CACTIDIR%%/docs/How-To-SSH-Tunnels.html
+%%CACTIDIR%%/docs/How-To-Script-Data-Queries.html
 %%CACTIDIR%%/docs/How-To-Setup-Remote-Pollers.html
+%%CACTIDIR%%/docs/How-To-Work-With-Templates.html
 %%CACTIDIR%%/docs/How-to-Graph-Your-Network.html
-%%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html
 %%CACTIDIR%%/docs/Import-Template.html
 %%CACTIDIR%%/docs/Install-Under-CentOS_LAMP.html
 %%CACTIDIR%%/docs/Install-Under-CentOS_LEMP.html
 %%CACTIDIR%%/docs/Installing-Under-Ubuntu-Debian.html
 %%CACTIDIR%%/docs/Installing-Under-Windows.html
+%%CACTIDIR%%/docs/Known-Issues.html
 %%CACTIDIR%%/docs/Navigating-The-User-Interface.html
 %%CACTIDIR%%/docs/PHP-Script-Server.html
 %%CACTIDIR%%/docs/Plugin-Creating-Plugins.html
@@ -129,14 +137,26 @@ 
 %%CACTIDIR%%/docs/Plugin-Reference.html
 %%CACTIDIR%%/docs/Plugins.html
 %%CACTIDIR%%/docs/Principles-of-Operation.html
-%%CACTIDIR%%/docs/RRDTool-Specific-Features.html
 %%CACTIDIR%%/docs/RRDproxy.html
+%%CACTIDIR%%/docs/RRDtool-Specific-Features.html
 %%CACTIDIR%%/docs/Requirements.html
-%%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html
-%%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html
 %%CACTIDIR%%/docs/SNMP-Options.html
-%%CACTIDIR%%/docs/Script-Data-Query-Walkthrough.html
+%%CACTIDIR%%/docs/Settings-Auth-Basic.html
 %%CACTIDIR%%/docs/Settings-Auth-LDAP.html
+%%CACTIDIR%%/docs/Settings-Auth-Local.html
+%%CACTIDIR%%/docs/Settings-Auth.html
+%%CACTIDIR%%/docs/Settings-Data.html
+%%CACTIDIR%%/docs/Settings-Device-Defaults.html
+%%CACTIDIR%%/docs/Settings-Domains.html
+%%CACTIDIR%%/docs/Settings-General.html
+%%CACTIDIR%%/docs/Settings-Mail-Reporting-DNS.html
+%%CACTIDIR%%/docs/Settings-Paths.html
+%%CACTIDIR%%/docs/Settings-Performance.html
+%%CACTIDIR%%/docs/Settings-Poller.html
+%%CACTIDIR%%/docs/Settings-Spikes.html
+%%CACTIDIR%%/docs/Settings-Users-Groups-Domains.html
+%%CACTIDIR%%/docs/Settings-Visual.html
+%%CACTIDIR%%/docs/Settings.html
 %%CACTIDIR%%/docs/Sites.html
 %%CACTIDIR%%/docs/Spikekill.html
 %%CACTIDIR%%/docs/Spine.html
@@ -163,9 +183,10 @@ 
 %%CACTIDIR%%/docs/Version-Specific-Release-Notes.html
 %%CACTIDIR%%/docs/Viewing-Graphs.html
 %%CACTIDIR%%/docs/audit_schema.sql
-%%CACTIDIR%%/docs/images/Add_Device_screen.png
-%%CACTIDIR%%/docs/images/Device_console_windows.JPG
-%%CACTIDIR%%/docs/images/add_device_button.png
+%%CACTIDIR%%/docs/images/add-device-button.png
+%%CACTIDIR%%/docs/images/add-device-screen.png
+%%CACTIDIR%%/docs/images/add-device-site.png
+%%CACTIDIR%%/docs/images/add-site.png
 %%CACTIDIR%%/docs/images/aggregate-templates-edit1.png
 %%CACTIDIR%%/docs/images/aggregate-templates-edit2.png
 %%CACTIDIR%%/docs/images/aggregate-templates-edit3.png
@@ -177,6 +198,8 @@ 
 %%CACTIDIR%%/docs/images/automation-device-templates-edit1.png
 %%CACTIDIR%%/docs/images/automation-device-templates.png
 %%CACTIDIR%%/docs/images/automation-devices.png
+%%CACTIDIR%%/docs/images/automation-discovered-devices-dropdown.png
+%%CACTIDIR%%/docs/images/automation-flow3.png
 %%CACTIDIR%%/docs/images/automation-graph-rules-edit1.png
 %%CACTIDIR%%/docs/images/automation-graph-rules-edit2.png
 %%CACTIDIR%%/docs/images/automation-graph-rules-edit3.png
@@ -197,28 +220,18 @@ 
 %%CACTIDIR%%/docs/images/automation-tree-rules-edit3.png
 %%CACTIDIR%%/docs/images/automation-tree-rules-edit4.png
 %%CACTIDIR%%/docs/images/automation-tree-rules.png
+%%CACTIDIR%%/docs/images/boost-settings.png
+%%CACTIDIR%%/docs/images/boost-status1.png
+%%CACTIDIR%%/docs/images/boost-status2.png
 %%CACTIDIR%%/docs/images/cacti-page-layout.png
-%%CACTIDIR%%/docs/images/cacti-tree-view-page.png
-%%CACTIDIR%%/docs/images/cacti_add_device_site.JPG
-%%CACTIDIR%%/docs/images/cacti_add_sites.JPG
-%%CACTIDIR%%/docs/images/cacti_automation_flow3.JPG
-%%CACTIDIR%%/docs/images/cacti_default_tree.png
-%%CACTIDIR%%/docs/images/cacti_device_datasource.JPG
-%%CACTIDIR%%/docs/images/cacti_graph_managment.JPG
-%%CACTIDIR%%/docs/images/cacti_graph_managment_graph.JPG
-%%CACTIDIR%%/docs/images/cacti_graph_template_options.JPG
-%%CACTIDIR%%/docs/images/cacti_remote_poller_setup.JPG
-%%CACTIDIR%%/docs/images/cacti_sites_automation.JPG
-%%CACTIDIR%%/docs/images/cacti_sites_page.png
-%%CACTIDIR%%/docs/images/cacti_system_utilities.JPG
-%%CACTIDIR%%/docs/images/cacti_thold_enable.JPG
-%%CACTIDIR%%/docs/images/cacti_thold_plugin_install.JPG
-%%CACTIDIR%%/docs/images/cacti_trees_screen.png
 %%CACTIDIR%%/docs/images/cdef-01.preview.png
+%%CACTIDIR%%/docs/images/cdefs-default-example.png
+%%CACTIDIR%%/docs/images/cdefs-default.png
 %%CACTIDIR%%/docs/images/cdefs-edit1.png
 %%CACTIDIR%%/docs/images/cdefs-edit2.png
 %%CACTIDIR%%/docs/images/cdefs-edit3.png
 %%CACTIDIR%%/docs/images/cdefs.png
+%%CACTIDIR%%/docs/images/change-log-sysutils.png
 %%CACTIDIR%%/docs/images/color-templates-edit1.png
 %%CACTIDIR%%/docs/images/color-templates-edit2.png
 %%CACTIDIR%%/docs/images/color-templates.png
@@ -228,6 +241,7 @@ 
 %%CACTIDIR%%/docs/images/data-collectors-edit-main.png
 %%CACTIDIR%%/docs/images/data-collectors-edit-remote1.png
 %%CACTIDIR%%/docs/images/data-collectors-edit-remote2.png
+%%CACTIDIR%%/docs/images/data-collectors-remote-setup.png
 %%CACTIDIR%%/docs/images/data-collectors.png
 %%CACTIDIR%%/docs/images/data-debug.png
 %%CACTIDIR%%/docs/images/data-debug1.png
@@ -235,9 +249,6 @@ 
 %%CACTIDIR%%/docs/images/data-debug3.png
 %%CACTIDIR%%/docs/images/data-debug4.png
 %%CACTIDIR%%/docs/images/data-input-method-and-query.png
-%%CACTIDIR%%/docs/images/data-input-methods-edit1.png
-%%CACTIDIR%%/docs/images/data-input-methods-edit2.png
-%%CACTIDIR%%/docs/images/data-input-methods-edit3.png
 %%CACTIDIR%%/docs/images/data-input-methods.png
 %%CACTIDIR%%/docs/images/data-queries-edit1.png
 %%CACTIDIR%%/docs/images/data-queries-edit2.png
@@ -248,15 +259,20 @@ 
 %%CACTIDIR%%/docs/images/data-source-title-example1.png
 %%CACTIDIR%%/docs/images/data-source-title-example2.png
 %%CACTIDIR%%/docs/images/data-source-title-template.png
+%%CACTIDIR%%/docs/images/data-sources-per-device.png
 %%CACTIDIR%%/docs/images/data-template.png
 %%CACTIDIR%%/docs/images/data-templates-copy.png
 %%CACTIDIR%%/docs/images/data-templates-new.png
 %%CACTIDIR%%/docs/images/data-templates-new1.png
 %%CACTIDIR%%/docs/images/data-templates-new2.png
+%%CACTIDIR%%/docs/images/data-templates-new3.png
 %%CACTIDIR%%/docs/images/data-templates-view-edit1.png
 %%CACTIDIR%%/docs/images/data-templates-view-edit2.png
 %%CACTIDIR%%/docs/images/data-templates-view.png
 %%CACTIDIR%%/docs/images/data-templates.png
+%%CACTIDIR%%/docs/images/datasource-template-create.png
+%%CACTIDIR%%/docs/images/datasource-template.png
+%%CACTIDIR%%/docs/images/datasource-template2.png
 %%CACTIDIR%%/docs/images/dc-01.preview.png
 %%CACTIDIR%%/docs/images/dev-01.preview.png
 %%CACTIDIR%%/docs/images/dev-02.preview.png
@@ -270,7 +286,7 @@ 
 %%CACTIDIR%%/docs/images/dev-30.png
 %%CACTIDIR%%/docs/images/dev-31.preview.png
 %%CACTIDIR%%/docs/images/dev-dev-10.preview.png
-%%CACTIDIR%%/docs/images/dev-dev-11_0.preview.png
+%%CACTIDIR%%/docs/images/dev-dev-11-0.preview.png
 %%CACTIDIR%%/docs/images/dev-dev-12.preview.png
 %%CACTIDIR%%/docs/images/dev-dev-13.png
 %%CACTIDIR%%/docs/images/dev-dev-14.png
@@ -286,12 +302,11 @@ 
 %%CACTIDIR%%/docs/images/dev-dq-26.preview.png
 %%CACTIDIR%%/docs/images/dev-dt-01.preview.png
 %%CACTIDIR%%/docs/images/dev-dt-02.preview.png
-%%CACTIDIR%%/docs/images/dev-dt-03.png
 %%CACTIDIR%%/docs/images/dev-dt-04.preview.png
 %%CACTIDIR%%/docs/images/dev-dt-05.png
 %%CACTIDIR%%/docs/images/dev-gt-01.preview.png
 %%CACTIDIR%%/docs/images/dev-gt-02.png
-%%CACTIDIR%%/docs/images/dev-gt-04_0.preview.png
+%%CACTIDIR%%/docs/images/dev-gt-04-0.preview.png
 %%CACTIDIR%%/docs/images/dev-gt-05.preview.png
 %%CACTIDIR%%/docs/images/dev-gt-06.preview.png
 %%CACTIDIR%%/docs/images/dev-gt-07.png
@@ -302,6 +317,8 @@ 
 %%CACTIDIR%%/docs/images/dev-gt-12.png
 %%CACTIDIR%%/docs/images/dev-gt-13.png
 %%CACTIDIR%%/docs/images/dev-gt-14.preview.png
+%%CACTIDIR%%/docs/images/device-console-window.png
+%%CACTIDIR%%/docs/images/device-datasource.png
 %%CACTIDIR%%/docs/images/device-template-add.png
 %%CACTIDIR%%/docs/images/device-template-new-dqs.png
 %%CACTIDIR%%/docs/images/device-template-new-gt.png
@@ -328,6 +345,7 @@ 
 %%CACTIDIR%%/docs/images/dim-add14.preview.png
 %%CACTIDIR%%/docs/images/dim-add15.preview.png
 %%CACTIDIR%%/docs/images/dim-add16.preview.png
+%%CACTIDIR%%/docs/images/discovered-device-add-menu.png
 %%CACTIDIR%%/docs/images/dq-01.preview.png
 %%CACTIDIR%%/docs/images/dq-02.preview.png
 %%CACTIDIR%%/docs/images/dq-03.preview.png
@@ -350,10 +368,16 @@ 
 %%CACTIDIR%%/docs/images/external-links-example1.png
 %%CACTIDIR%%/docs/images/external-links.png
 %%CACTIDIR%%/docs/images/gm-01.preview.png
+%%CACTIDIR%%/docs/images/gprint-presets-default.png
 %%CACTIDIR%%/docs/images/gprint-presets-edit.png
 %%CACTIDIR%%/docs/images/gprint-presets.png
 %%CACTIDIR%%/docs/images/graph-01.png
 %%CACTIDIR%%/docs/images/graph-10.png
+%%CACTIDIR%%/docs/images/graph-management-graph.png
+%%CACTIDIR%%/docs/images/graph-management.png
+%%CACTIDIR%%/docs/images/graph-template-options.png
+%%CACTIDIR%%/docs/images/graph-template-options1.png
+%%CACTIDIR%%/docs/images/graph-template-options2.png
 %%CACTIDIR%%/docs/images/graph-template.png
 %%CACTIDIR%%/docs/images/graph-templates-edit1.png
 %%CACTIDIR%%/docs/images/graph-templates-edit2.png
@@ -365,16 +389,26 @@ 
 %%CACTIDIR%%/docs/images/graph-templates-item1s.png
 %%CACTIDIR%%/docs/images/graph-templates-item2.png
 %%CACTIDIR%%/docs/images/graph-templates-item2s.png
-%%CACTIDIR%%/docs/images/graph-templates-item3.png
-%%CACTIDIR%%/docs/images/graph-templates-item3s.png
-%%CACTIDIR%%/docs/images/graph-templates-item4.png
-%%CACTIDIR%%/docs/images/graph-templates-item4s.png
 %%CACTIDIR%%/docs/images/graph-templates-new1.png
 %%CACTIDIR%%/docs/images/graph-templates-new2.png
-%%CACTIDIR%%/docs/images/graph-templates-new3.png
 %%CACTIDIR%%/docs/images/graph-templates.png
 %%CACTIDIR%%/docs/images/graph-templates1.png
 %%CACTIDIR%%/docs/images/graph-tree.png
+%%CACTIDIR%%/docs/images/graph-variables-data-source-title.png
+%%CACTIDIR%%/docs/images/graph-variables-graph-template.png
+%%CACTIDIR%%/docs/images/graph-variables-suggested-names.png
+%%CACTIDIR%%/docs/images/graph-view-action-icons.png
+%%CACTIDIR%%/docs/images/graph-view-alternate-mode.png
+%%CACTIDIR%%/docs/images/graph-view-classic-mode.png
+%%CACTIDIR%%/docs/images/graph-view-filter-sub-panel.png
+%%CACTIDIR%%/docs/images/graph-view-zoom-context-menu.png
+%%CACTIDIR%%/docs/images/graphs-edit-nontemplate-configuration.png
+%%CACTIDIR%%/docs/images/graphs-edit-nontemplate.png
+%%CACTIDIR%%/docs/images/graphs-edit.png
+%%CACTIDIR%%/docs/images/graphs-new-generic-oid-alpha.png
+%%CACTIDIR%%/docs/images/graphs-new-generic-oid.png
+%%CACTIDIR%%/docs/images/graphs-new.png
+%%CACTIDIR%%/docs/images/graphs.png
 %%CACTIDIR%%/docs/images/gt-01.preview.png
 %%CACTIDIR%%/docs/images/gt-02.preview.png
 %%CACTIDIR%%/docs/images/gt-03.preview.png
@@ -383,40 +417,45 @@ 
 %%CACTIDIR%%/docs/images/gt-06.preview.png
 %%CACTIDIR%%/docs/images/gt-10.preview.png
 %%CACTIDIR%%/docs/images/gt-11.preview.png
+%%CACTIDIR%%/docs/images/import-template-preview.png
 %%CACTIDIR%%/docs/images/import-template.png
-%%CACTIDIR%%/docs/images/logo.png
-%%CACTIDIR%%/docs/images/new_device.png
-%%CACTIDIR%%/docs/images/new_graphs.png
-%%CACTIDIR%%/docs/images/patch_creation_branch.png
-%%CACTIDIR%%/docs/images/patch_creation_clone.png
-%%CACTIDIR%%/docs/images/patch_creation_pull_request_1.png
-%%CACTIDIR%%/docs/images/patch_creation_pull_request_2.png
-%%CACTIDIR%%/docs/images/patch_creation_pull_request_3.png
+%%CACTIDIR%%/docs/images/ldap-settings.png
+%%CACTIDIR%%/docs/images/logo.svg
+%%CACTIDIR%%/docs/images/navigation-console.png
+%%CACTIDIR%%/docs/images/navigation-layout-subpanel.png
+%%CACTIDIR%%/docs/images/navigation-layout.png
+%%CACTIDIR%%/docs/images/new-device.png
+%%CACTIDIR%%/docs/images/new-graphs.png
+%%CACTIDIR%%/docs/images/patch-creation-branch.png
+%%CACTIDIR%%/docs/images/patch-creation-clone.png
+%%CACTIDIR%%/docs/images/patch-creation-pull-request-1.png
+%%CACTIDIR%%/docs/images/patch-creation-pull-request-2.png
+%%CACTIDIR%%/docs/images/patch-creation-pull-request-3.png
 %%CACTIDIR%%/docs/images/plugins-dependencies.png
 %%CACTIDIR%%/docs/images/plugins-uninstall.png
 %%CACTIDIR%%/docs/images/plugins.png
-%%CACTIDIR%%/docs/images/principles_of_operation.png
+%%CACTIDIR%%/docs/images/principles-of-operation.png
 %%CACTIDIR%%/docs/images/r-dev1.png
 %%CACTIDIR%%/docs/images/r-dev2.png
 %%CACTIDIR%%/docs/images/r-dev3.png
 %%CACTIDIR%%/docs/images/r-dev4.png
-%%CACTIDIR%%/docs/images/r-dim1_0.png
+%%CACTIDIR%%/docs/images/r-dim1-0.png
 %%CACTIDIR%%/docs/images/r-dim2.png
 %%CACTIDIR%%/docs/images/r-dim3.png
 %%CACTIDIR%%/docs/images/r-dim4.png
 %%CACTIDIR%%/docs/images/r-dim5.png
-%%CACTIDIR%%/docs/images/r-dim6_0.png
+%%CACTIDIR%%/docs/images/r-dim6-0.png
 %%CACTIDIR%%/docs/images/r-dq-1.png
-%%CACTIDIR%%/docs/images/r-dq-dev1_0.png
+%%CACTIDIR%%/docs/images/r-dq-dev1-0.png
 %%CACTIDIR%%/docs/images/r-dq-dev2.png
 %%CACTIDIR%%/docs/images/r-dq-dev3.png
 %%CACTIDIR%%/docs/images/r-dq-dt1.png
 %%CACTIDIR%%/docs/images/r-dq-dt2.png
 %%CACTIDIR%%/docs/images/r-dq-dt3.png
-%%CACTIDIR%%/docs/images/r-dq1_0.png
+%%CACTIDIR%%/docs/images/r-dq1-0.png
 %%CACTIDIR%%/docs/images/r-dq2.png
+%%CACTIDIR%%/docs/images/r-dq3-0.png
 %%CACTIDIR%%/docs/images/r-dq3.png
-%%CACTIDIR%%/docs/images/r-dq3_0.png
 %%CACTIDIR%%/docs/images/r-dq4.png
 %%CACTIDIR%%/docs/images/r-dq5.png
 %%CACTIDIR%%/docs/images/r-dq6.png
@@ -430,17 +469,61 @@ 
 %%CACTIDIR%%/docs/images/r-gt4.png
 %%CACTIDIR%%/docs/images/r-gt5.png
 %%CACTIDIR%%/docs/images/r-gt6.png
-%%CACTIDIR%%/docs/images/router_ping_graph.png
-%%CACTIDIR%%/docs/images/snmp_dqw_table1.png
-%%CACTIDIR%%/docs/images/snmp_dqw_table2.png
-%%CACTIDIR%%/docs/images/snmp_dqw_table3.png
+%%CACTIDIR%%/docs/images/router-ping-graph.png
+%%CACTIDIR%%/docs/images/rrd-autoclean.png
+%%CACTIDIR%%/docs/images/settings-auth-basic.png
+%%CACTIDIR%%/docs/images/settings-auth-common.png
+%%CACTIDIR%%/docs/images/settings-auth-local-complexity.png
+%%CACTIDIR%%/docs/images/settings-auth-local-locking.png
+%%CACTIDIR%%/docs/images/settings-boost-image-cache.png
+%%CACTIDIR%%/docs/images/settings-boost-ondemand.png
+%%CACTIDIR%%/docs/images/settings-data-local.png
+%%CACTIDIR%%/docs/images/settings-data-proxy.png
+%%CACTIDIR%%/docs/images/settings-data-source-statistics.png
+%%CACTIDIR%%/docs/images/settings-device-defaults-availability.png
+%%CACTIDIR%%/docs/images/settings-device-defaults-general.png
+%%CACTIDIR%%/docs/images/settings-device-defaults-snmp-defaults-v1v2.png
+%%CACTIDIR%%/docs/images/settings-device-defaults-snmp-defaults-v3.png
+%%CACTIDIR%%/docs/images/settings-device-defaults-updown.png
+%%CACTIDIR%%/docs/images/settings-domains.png
+%%CACTIDIR%%/docs/images/settings-general-automation.png
+%%CACTIDIR%%/docs/images/settings-general-graph-template-defaults.png
+%%CACTIDIR%%/docs/images/settings-general-i18n.png
+%%CACTIDIR%%/docs/images/settings-general-log-settings.png
+%%CACTIDIR%%/docs/images/settings-general-other-settings.png
+%%CACTIDIR%%/docs/images/settings-general-site-security.png
+%%CACTIDIR%%/docs/images/settings-mrd-dns-options.png
+%%CACTIDIR%%/docs/images/settings-mrd-php-mail.png
+%%CACTIDIR%%/docs/images/settings-mrd-report-presets.png
+%%CACTIDIR%%/docs/images/settings-mrd-sendmail.png
+%%CACTIDIR%%/docs/images/settings-mrd-smtp.png
+%%CACTIDIR%%/docs/images/settings-mrd-urls.png
+%%CACTIDIR%%/docs/images/settings-paths-alternate.png
+%%CACTIDIR%%/docs/images/settings-paths-logging.png
+%%CACTIDIR%%/docs/images/settings-paths-required.png
+%%CACTIDIR%%/docs/images/settings-paths-rrd-cleaner.png
+%%CACTIDIR%%/docs/images/settings-poller-background.png
+%%CACTIDIR%%/docs/images/settings-poller-data-collector.png
+%%CACTIDIR%%/docs/images/settings-poller-general.png
+%%CACTIDIR%%/docs/images/settings-poller-spine.png
+%%CACTIDIR%%/docs/images/settings-spikekill-batch.png
+%%CACTIDIR%%/docs/images/settings-spikekill.png
+%%CACTIDIR%%/docs/images/settings-visual-1.png
+%%CACTIDIR%%/docs/images/settings-visual-2.png
+%%CACTIDIR%%/docs/images/settings-visual-3.png
+%%CACTIDIR%%/docs/images/settings-visual-4.png
+%%CACTIDIR%%/docs/images/site-automation.png
+%%CACTIDIR%%/docs/images/sites.png
+%%CACTIDIR%%/docs/images/snmp-dqw-table1.png
+%%CACTIDIR%%/docs/images/snmp-dqw-table2.png
+%%CACTIDIR%%/docs/images/snmp-dqw-table3.png
 %%CACTIDIR%%/docs/images/spikekill.gif
+%%CACTIDIR%%/docs/images/spine-debug-gui.png
+%%CACTIDIR%%/docs/images/spine-parameters.png
 %%CACTIDIR%%/docs/images/system-utilities-boost1.png
 %%CACTIDIR%%/docs/images/system-utilities-boost2.png
-%%CACTIDIR%%/docs/images/system-utilities-main1.png
-%%CACTIDIR%%/docs/images/system-utilities-main2.png
-%%CACTIDIR%%/docs/images/system-utilities-main3.png
-%%CACTIDIR%%/docs/images/system-utilities-main4.png
+%%CACTIDIR%%/docs/images/system-utilities-db.png
+%%CACTIDIR%%/docs/images/system-utilities-poller.png
 %%CACTIDIR%%/docs/images/system-utilities-rrdcleaner.png
 %%CACTIDIR%%/docs/images/system-utilities-viewagentcache.png
 %%CACTIDIR%%/docs/images/system-utilities-viewagentlog.png
@@ -449,7 +532,14 @@ 
 %%CACTIDIR%%/docs/images/system-utilities-viewdqcache.png
 %%CACTIDIR%%/docs/images/system-utilities-viewpcache.png
 %%CACTIDIR%%/docs/images/system-utilities-viewulog.png
-%%CACTIDIR%%/docs/images/tree_options.png
+%%CACTIDIR%%/docs/images/system-utilities.png
+%%CACTIDIR%%/docs/images/thold-enable.png
+%%CACTIDIR%%/docs/images/thold-install.png
+%%CACTIDIR%%/docs/images/tree-options-sorting.png
+%%CACTIDIR%%/docs/images/tree-options.png
+%%CACTIDIR%%/docs/images/tree-view-page.png
+%%CACTIDIR%%/docs/images/tree-view.png
+%%CACTIDIR%%/docs/images/trees.png
 %%CACTIDIR%%/docs/images/user-domains-edit1.png
 %%CACTIDIR%%/docs/images/user-domains-edit2.png
 %%CACTIDIR%%/docs/images/user-domains.png
@@ -479,6 +569,8 @@ 
 %%CACTIDIR%%/docs/images/users-settings1.png
 %%CACTIDIR%%/docs/images/users-settings2.png
 %%CACTIDIR%%/docs/images/users-settings3.png
+%%CACTIDIR%%/docs/images/vdefs-default-example.png
+%%CACTIDIR%%/docs/images/vdefs-default.png
 %%CACTIDIR%%/docs/images/vdefs-edit1.png
 %%CACTIDIR%%/docs/images/vdefs-edit2.png
 %%CACTIDIR%%/docs/images/vdefs-edit3.png
@@ -2440,7 +2532,7 @@ 
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery-ui-timepicker-zh-CN.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery-ui-timepicker-zh-TW.js
 %%CACTIDIR%%/include/js/LC_MESSAGES/jquery.ui.datepicker-af.js
-%%CACTIDIR%%/include/js/c3.js
+%%CACTIDIR%%/include/js/billboard.js
 %%CACTIDIR%%/include/js/d3.js
 %%CACTIDIR%%/include/js/dygraph-combined.js
 %%CACTIDIR%%/include/js/index.php
@@ -2468,7 +2560,7 @@ 
 %%CACTIDIR%%/include/plugins.php
 %%CACTIDIR%%/include/realtime.js
 %%CACTIDIR%%/include/session.php
-%%CACTIDIR%%/include/themes/classic/c3.css
+%%CACTIDIR%%/include/themes/classic/billboard.css
 %%CACTIDIR%%/include/themes/classic/default/32px.png
 %%CACTIDIR%%/include/themes/classic/default/40px.png
 %%CACTIDIR%%/include/themes/classic/default/index.php
@@ -2519,7 +2611,7 @@ 
 %%CACTIDIR%%/include/themes/classic/main.js
 %%CACTIDIR%%/include/themes/classic/pace.css
 %%CACTIDIR%%/include/themes/classic/rrdtheme.php
-%%CACTIDIR%%/include/themes/dark/c3.css
+%%CACTIDIR%%/include/themes/dark/billboard.css
 %%CACTIDIR%%/include/themes/dark/default/32px.png
 %%CACTIDIR%%/include/themes/dark/default/40px.png
 %%CACTIDIR%%/include/themes/dark/default/index.php
@@ -2573,7 +2665,59 @@ 
 %%CACTIDIR%%/include/themes/dark/pace.css
 %%CACTIDIR%%/include/themes/dark/rrdtheme.php
 %%CACTIDIR%%/include/themes/index.php
-%%CACTIDIR%%/include/themes/modern/c3.css
+%%CACTIDIR%%/include/themes/midwinter/billboard.css
+%%CACTIDIR%%/include/themes/midwinter/colors.css
+%%CACTIDIR%%/include/themes/midwinter/default/32px.png
+%%CACTIDIR%%/include/themes/midwinter/default/40px.png
+%%CACTIDIR%%/include/themes/midwinter/default/index.php
+%%CACTIDIR%%/include/themes/midwinter/default/style.css
+%%CACTIDIR%%/include/themes/midwinter/default/style.min.css
+%%CACTIDIR%%/include/themes/midwinter/default/throbber.gif
+%%CACTIDIR%%/include/themes/midwinter/images/128/bar-alpha.png
+%%CACTIDIR%%/include/themes/midwinter/images/128/bar.png
+%%CACTIDIR%%/include/themes/midwinter/images/128/map.png
+%%CACTIDIR%%/include/themes/midwinter/images/bar-alpha.png
+%%CACTIDIR%%/include/themes/midwinter/images/bar-opacity.png
+%%CACTIDIR%%/include/themes/midwinter/images/bar-pointer.png
+%%CACTIDIR%%/include/themes/midwinter/images/bar.png
+%%CACTIDIR%%/include/themes/midwinter/images/cacti_logo.gif
+%%CACTIDIR%%/include/themes/midwinter/images/cacti_logo.svg
+%%CACTIDIR%%/include/themes/midwinter/images/favicon.ico
+%%CACTIDIR%%/include/themes/midwinter/images/favicon.png
+%%CACTIDIR%%/include/themes/midwinter/images/index.php
+%%CACTIDIR%%/include/themes/midwinter/images/logotype-a.png
+%%CACTIDIR%%/include/themes/midwinter/images/logotype-b.png
+%%CACTIDIR%%/include/themes/midwinter/images/map-opacity.png
+%%CACTIDIR%%/include/themes/midwinter/images/map-pointer.png
+%%CACTIDIR%%/include/themes/midwinter/images/map.png
+%%CACTIDIR%%/include/themes/midwinter/images/preview-opacity.png
+%%CACTIDIR%%/include/themes/midwinter/images/tab_list.gif
+%%CACTIDIR%%/include/themes/midwinter/images/tab_preview.gif
+%%CACTIDIR%%/include/themes/midwinter/images/tab_tree.gif
+%%CACTIDIR%%/include/themes/midwinter/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-bg_glass_65_ffffff_1x400.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-bg_glass_75_dadada_1x400.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-bg_glass_75_e6e6e6_1x400.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-bg_glass_95_fef1ec_1x400.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-colorpicker.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-icons_222222_256x240.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-icons_2e83ff_256x240.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-icons_454545_256x240.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-icons_888888_256x240.png
+%%CACTIDIR%%/include/themes/midwinter/images/ui-icons_cd0a0a_256x240.png
+%%CACTIDIR%%/include/themes/midwinter/index.php
+%%CACTIDIR%%/include/themes/midwinter/jquery-ui.css
+%%CACTIDIR%%/include/themes/midwinter/jquery.colorpicker.css
+%%CACTIDIR%%/include/themes/midwinter/jquery.multiselect.css
+%%CACTIDIR%%/include/themes/midwinter/jquery.multiselect.filter.css
+%%CACTIDIR%%/include/themes/midwinter/jquery.timepicker.css
+%%CACTIDIR%%/include/themes/midwinter/jquery.zoom.css
+%%CACTIDIR%%/include/themes/midwinter/main.css
+%%CACTIDIR%%/include/themes/midwinter/main.js
+%%CACTIDIR%%/include/themes/midwinter/pace.css
+%%CACTIDIR%%/include/themes/midwinter/rrdtheme.php
+%%CACTIDIR%%/include/themes/modern/billboard.css
 %%CACTIDIR%%/include/themes/modern/default/32px.png
 %%CACTIDIR%%/include/themes/modern/default/40px.png
 %%CACTIDIR%%/include/themes/modern/default/index.php
@@ -2624,7 +2768,7 @@ 
 %%CACTIDIR%%/include/themes/modern/main.js
 %%CACTIDIR%%/include/themes/modern/pace.css
 %%CACTIDIR%%/include/themes/modern/rrdtheme.php
-%%CACTIDIR%%/include/themes/paper-plane/c3.css
+%%CACTIDIR%%/include/themes/paper-plane/billboard.css
 %%CACTIDIR%%/include/themes/paper-plane/default/32px.png
 %%CACTIDIR%%/include/themes/paper-plane/default/40px.png
 %%CACTIDIR%%/include/themes/paper-plane/default/index.php
@@ -2675,7 +2819,7 @@ 
 %%CACTIDIR%%/include/themes/paper-plane/main.js
 %%CACTIDIR%%/include/themes/paper-plane/pace.css
 %%CACTIDIR%%/include/themes/paper-plane/rrdtheme.php
-%%CACTIDIR%%/include/themes/paw/c3.css
+%%CACTIDIR%%/include/themes/paw/billboard.css
 %%CACTIDIR%%/include/themes/paw/default/32px.png
 %%CACTIDIR%%/include/themes/paw/default/40px.png
 %%CACTIDIR%%/include/themes/paw/default/index.php
@@ -2726,7 +2870,7 @@ 
 %%CACTIDIR%%/include/themes/paw/main.js
 %%CACTIDIR%%/include/themes/paw/pace.css
 %%CACTIDIR%%/include/themes/paw/rrdtheme.php
-%%CACTIDIR%%/include/themes/sunrise/c3.css
+%%CACTIDIR%%/include/themes/sunrise/billboard.css
 %%CACTIDIR%%/include/themes/sunrise/default/32px.png
 %%CACTIDIR%%/include/themes/sunrise/default/40px.png
 %%CACTIDIR%%/include/themes/sunrise/default/index.php
@@ -3755,6 +3899,7 @@ 
 %%CACTIDIR%%/install/upgrades/1_2_11.php
 %%CACTIDIR%%/install/upgrades/1_2_14.php
 %%CACTIDIR%%/install/upgrades/1_2_15.php
+%%CACTIDIR%%/install/upgrades/1_2_17.php
 %%CACTIDIR%%/install/upgrades/1_2_2.php
 %%CACTIDIR%%/install/upgrades/1_2_3.php
 %%CACTIDIR%%/install/upgrades/1_2_5.php