From 56f4f4465fb3d71116992d7cfa0308486f71f23c Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Sat, 21 Dec 2024 18:55:12 +0100
Subject: [PATCH 01/19] configure.ac: derive NUT_WEBSITE_BASE from PACKAGE_URL
 [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 configure.ac | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure.ac b/configure.ac
index f69bce4b19..1d58de5a52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,14 @@ AC_INIT([nut],
 dnl See docs/maintainer-guide.txt about releases - updating the version
 dnl above is a small part of the consistent ritual!
 
+dnl PACKAGE_URL="https://www.networkupstools.org/" for development iterations
+dnl or "https://www.networkupstools.org/historic/v1.2.3/index.html" for release
+dnl snapshots further set in stone. Either way, there should be a slash and
+dnl either a filename, or nothing. Adding a bogus filename and chopping it
+dnl off by `dirname` should do the trick.
+dnl NOTE: the resulting NUT_WEBSITE_BASE string does not end with a slash!
+NUT_WEBSITE_BASE="`dirname "${PACKAGE_URL}index.html"`"
+
 dnl Note: this refers to GITREV at the time of configure script running
 dnl primarily for better messaging in the script itself (also to render
 dnl the PDF documentation revision history via docs/docinfo.xml.in).
@@ -747,6 +755,8 @@ AS_IF([test x"${NUT_SOURCE_GITREV}" = x],
         [NUT_REPORT([configured version], [${PACKAGE_VERSION} ${NUT_SOURCE_GITREV_DEVREL}])],
         [NUT_REPORT([configured version], [${PACKAGE_VERSION} (${NUT_SOURCE_GITREV}) ${NUT_SOURCE_GITREV_DEVREL}])])
     ])
+NUT_REPORT([Documentation website base URL], [${NUT_WEBSITE_BASE}])
+AC_DEFINE_UNQUOTED([NUT_WEBSITE_BASE], "${NUT_WEBSITE_BASE}", [Documentation website base URL, no trailing slash])
 
 dnl Note: the compiler/pragma/attr methods below are custom for NUT codebase:
 NUT_COMPILER_FAMILY
@@ -4832,6 +4842,7 @@ AC_SUBST(NUT_SOURCE_GITREV)
 AC_SUBST(NUT_SOURCE_GITREV_IS_RELEASE)
 AC_SUBST(NUT_SOURCE_GITREV_SEMVER)
 AC_SUBST(NUT_SOURCE_GITREV_NUMERIC)
+AC_SUBST(NUT_WEBSITE_BASE)
 AC_SUBST(LIBSSL_CFLAGS)
 AC_SUBST(LIBSSL_LIBS)
 AC_SUBST(LIBSSL_LDFLAGS_RPATH)

From a46ddabc7548f60ae14406d9ecec943ba6b9daf9 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Sat, 21 Dec 2024 19:20:44 +0100
Subject: [PATCH 02/19] scripts/Solaris/*.xml.in: revise heading comments and
 documentation links [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 scripts/Solaris/nut-driver-enumerator.xml.in | 16 +++++++-----
 scripts/Solaris/nut-driver.xml.in            | 14 +++++-----
 scripts/Solaris/nut-monitor.xml.in           | 18 +++++++------
 scripts/Solaris/nut-server.xml.in            | 27 ++++++++++----------
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/scripts/Solaris/nut-driver-enumerator.xml.in b/scripts/Solaris/nut-driver-enumerator.xml.in
index f935b8c066..fc5097a410 100644
--- a/scripts/Solaris/nut-driver-enumerator.xml.in
+++ b/scripts/Solaris/nut-driver-enumerator.xml.in
@@ -2,14 +2,14 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
 #
-# Copyright 2016-2018 Jim Klimov
-# Template manifest for instantiated NUT drivers
+# Copyright 2016-2024 Jim Klimov
+# NDE (nut-driver-enumerator) manages definitions of instantiated NUT drivers
 #
 -->
 
 <service_bundle type='manifest' name='nut-driver-enumerator'>
 
-	<service name='system/power/nut-driver-enumerator' type='service' version='1.2'>
+	<service name='system/power/nut-driver-enumerator' type='service' version='2'>
 
 	<!--
 	  Wait for all local and usr filesystem to be mounted - project is
@@ -162,10 +162,12 @@
 					</loctext>
 				</common_name>
 				<documentation>
-					<manpage title='upsdrvsvcctl' section='8'
-					manpath='/usr/share/man' />
-					<manpage title='ups.conf' section='5'
-					manpath='/usr/share/man' />
+					<doc_link name='upsdrvsvcctl online'	uri='@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html' />
+					<manpage title='upsdrvsvcctl'		section='8' manpath='/usr/share/man' />
+					<doc_link name='ups.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/ups.conf.html' />
+					<manpage title='ups.conf'		section='5' manpath='/usr/share/man' />
+					<doc_link name='nut.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/nut.conf.html' />
+					<manpage title='nut.conf'		section='5' manpath='/usr/share/man' />
 				</documentation>
 			</template>
 		</instance>
diff --git a/scripts/Solaris/nut-driver.xml.in b/scripts/Solaris/nut-driver.xml.in
index fffd368db9..d5276b7092 100644
--- a/scripts/Solaris/nut-driver.xml.in
+++ b/scripts/Solaris/nut-driver.xml.in
@@ -2,14 +2,14 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
 #
-# Copyright 2016 - 2024 Jim Klimov
+# Copyright 2016-2024 Jim Klimov
 # Template manifest for instantiated NUT drivers
 #
 -->
 
 <service_bundle type='manifest' name='nut-driver'>
 
-	<service name='system/power/nut-driver' type='service' version='4'>
+	<service name='system/power/nut-driver' type='service' version='5'>
 
 	<!--
 	  Wait for all local and usr filesystem to be mounted - project is
@@ -127,10 +127,12 @@
 				</loctext>
 			</common_name>
 			<documentation>
-				<manpage title='upsdrvctl' section='8'
-				manpath='/usr/share/man' />
-				<manpage title='ups.conf' section='5'
-				manpath='/usr/share/man' />
+				<doc_link name='upsdrvsvcctl online'	uri='@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html' />
+				<manpage title='upsdrvsvcctl'		section='8' manpath='/usr/share/man' />
+				<doc_link name='ups.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/ups.conf.html' />
+				<manpage title='ups.conf'		section='5' manpath='/usr/share/man' />
+				<doc_link name='nut.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/nut.conf.html' />
+				<manpage title='nut.conf'		section='5' manpath='/usr/share/man' />
 			</documentation>
 		</template>
 	</service>
diff --git a/scripts/Solaris/nut-monitor.xml.in b/scripts/Solaris/nut-monitor.xml.in
index c3118d3557..fd5bed956b 100644
--- a/scripts/Solaris/nut-monitor.xml.in
+++ b/scripts/Solaris/nut-monitor.xml.in
@@ -2,14 +2,14 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
 #
-# Copyright 2016-2017 Jim Klimov
-# Service for NUT upsmon
+# Copyright 2016-2024 Jim Klimov
+# Service for NUT upsmon client (to drive OS shutdown when power is critical)
 #
 -->
 
 <service_bundle type='manifest' name='nut-monitor'>
 
-	<service name='system/power/nut-monitor' type='service' version='1'>
+	<service name='system/power/nut-monitor' type='service' version='2'>
 
 	<!--
 	  Configure a default instance for the service since it doesn't
@@ -112,14 +112,16 @@
 		<template>
 			<common_name>
 				<loctext xml:lang='C'>
-				NUT ups monitoring service
+				NUT UPS monitoring client service (to drive OS shutdown when power is critical)
 				</loctext>
 			</common_name>
 			<documentation>
-				<manpage title='upsmon' section='8'
-				manpath='/usr/share/man' />
-				<manpage title='upsmon.conf' section='5'
-				manpath='/usr/share/man' />
+				<doc_link name='upsmon online'		uri='@NUT_WEBSITE_BASE@/docs/man/upsmon.html' />
+				<manpage title='upsmon'			section='8' manpath='/usr/share/man' />
+				<doc_link name='upsmon.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/upsmon.conf.html' />
+				<manpage title='upsmon.conf'		section='5' manpath='/usr/share/man' />
+				<doc_link name='nut.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/nut.conf.html' />
+				<manpage title='nut.conf'		section='5' manpath='/usr/share/man' />
 			</documentation>
 		</template>
 	</service>
diff --git a/scripts/Solaris/nut-server.xml.in b/scripts/Solaris/nut-server.xml.in
index 00ff9aebea..2733293177 100644
--- a/scripts/Solaris/nut-server.xml.in
+++ b/scripts/Solaris/nut-server.xml.in
@@ -2,14 +2,15 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
 #
-# Copyright 2016-2022 Jim Klimov
-# Service for the upsd daemon (and drivers, if available)
+# Copyright 2016-2024 Jim Klimov
+# Service for the upsd daemon (note: drivers, if available, are
+# wrapped by service instances managed by nut-driver-enumerator)
 #
 -->
 
 <service_bundle type='manifest' name='nut-server'>
 
-	<service name='system/power/nut-server' type='service' version='2'>
+	<service name='system/power/nut-server' type='service' version='3'>
 
 	<!--
 	  Configure a default instance for the service since it doesn't
@@ -145,16 +146,16 @@
 				</loctext>
 			</common_name>
 			<documentation>
-				<manpage title='upsdrvctl' section='8'
-				manpath='/usr/share/man' />
-				<manpage title='upsd' section='8'
-				manpath='/usr/share/man' />
-				<manpage title='ups.conf' section='5'
-				manpath='/usr/share/man' />
-				<manpage title='upsd.conf' section='5'
-				manpath='/usr/share/man' />
-				<manpage title='upsd.users' section='5'
-				manpath='/usr/share/man' />
+				<doc_link name='upsd online'		uri='@NUT_WEBSITE_BASE@/docs/man/upsd.html' />
+				<manpage title='upsd'			section='8' manpath='/usr/share/man' />
+				<doc_link name='ups.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/ups.conf.html' />
+				<manpage title='ups.conf'		section='5' manpath='/usr/share/man' />
+				<doc_link name='upsd.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/upsd.conf.html' />
+				<manpage title='upsd.conf'		section='5' manpath='/usr/share/man' />
+				<doc_link name='upsd.users online'	uri='@NUT_WEBSITE_BASE@/docs/man/upsd.users.html' />
+				<manpage title='upsd.users'		section='5' manpath='/usr/share/man' />
+				<doc_link name='nut.conf online'	uri='@NUT_WEBSITE_BASE@/docs/man/nut.conf.html' />
+				<manpage title='nut.conf'		section='5' manpath='/usr/share/man' />
 			</documentation>
 		</template>
 	</service>

From 1a8c0f282d6b468d0fe823302b35136b052206f5 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Sat, 21 Dec 2024 20:10:15 +0100
Subject: [PATCH 03/19] scripts/systemd/nut* units: add documentation links
 [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 NEWS.adoc                                     | 31 +++++++++++--------
 configure.ac                                  |  2 ++
 ...driver-enumerator-daemon-activator.path.in |  9 ++++++
 ...ver-enumerator-daemon-activator.service.in |  9 ++++++
 .../nut-driver-enumerator-daemon.service.in   |  9 ++++++
 scripts/systemd/nut-driver-enumerator.path.in |  9 ++++++
 .../systemd/nut-driver-enumerator.service.in  |  9 ++++++
 scripts/systemd/nut-driver.target             |  7 +++++
 scripts/systemd/nut-driver@.service.in        |  7 +++++
 scripts/systemd/nut-monitor.service.in        |  7 +++++
 scripts/systemd/nut-server.service.in         | 11 +++++++
 scripts/systemd/nut.target                    |  7 +++++
 12 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/NEWS.adoc b/NEWS.adoc
index e64c4c49e2..7875f48fe0 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -86,19 +86,24 @@ https://github.com/networkupstools/nut/milestone/11
      in certain cases against high voltage transfer, we only fixed-up one of
      them. [#1245]
 
- - development iterations of NUT should now identify with not only the semantic
-   version of a preceding release, but with git-derived information about the
-   amount of iterations that followed (if available): the three-number "semver"
-   would be seen on release snapshots, while other builds would expose the
-   added components: one with the amount of commits on the main development
-   trunk since the preceding release which are ancestors of the built code
-   base, and in case of feature development branches -- another component
-   with the amount of commits unique to this branch (which are not part of
-   the development trunk). This allows to produce more relevant (monotonously
-   growing) version identifiers for packages and similar artifacts, with more
-   meaningful upgrades via development snapshots, eventually. A copy of the
-   current version information would be embedded into "dist" archives as a
-   `VERSION_DEFAULT` file. [#1949]
+ - SEMVER, know thyself!
+   * development iterations of NUT should now identify with not only the
+     semantic version of a preceding release, but with git-derived information
+     about the amount of iterations that followed (if available):
+     the three-number "semver" would be seen on release snapshots, while
+     other builds would expose the added components: one with the amount
+     of commits on the main development trunk since the preceding release
+     which are ancestors of the built code base, and in case of feature
+     development branches -- another component with the amount of commits
+     unique to this branch (which are not part of the development trunk yet).
+     This allows to produce more relevant (monotonously growing) version
+     identifiers for packages and similar artifacts, with more meaningful
+     upgrades via development snapshots, eventually. A copy of the current
+     version information would be embedded into "dist" archives as a
+     `VERSION_DEFAULT` file, among provisions for packager tuning. [#1949]
+   * SMF manifests and systemd units now refer to man pages and their online
+     variants under `NUT_WEBSITE_BASE` dependent on codebase maturity
+     (development or release snapshot). [issue #722, PR #2733]
 
  - the `upsnotify()` common code introduced in recent NUT releases (integrating
    with service management frameworks, etc.) was a bit cryptic when it reported
diff --git a/configure.ac b/configure.ac
index 1d58de5a52..c6672cba23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,8 @@ dnl either a filename, or nothing. Adding a bogus filename and chopping it
 dnl off by `dirname` should do the trick.
 dnl NOTE: the resulting NUT_WEBSITE_BASE string does not end with a slash!
 NUT_WEBSITE_BASE="`dirname "${PACKAGE_URL}index.html"`"
+dnl Fallback, no trailing slash!
+[ -n "${NUT_WEBSITE_BASE-}" ] || NUT_WEBSITE_BASE='https://www.networkupstools.org'
 
 dnl Note: this refers to GITREV at the time of configure script running
 dnl primarily for better messaging in the script itself (also to render
diff --git a/scripts/systemd/nut-driver-enumerator-daemon-activator.path.in b/scripts/systemd/nut-driver-enumerator-daemon-activator.path.in
index 02070bafba..7917d343e5 100644
--- a/scripts/systemd/nut-driver-enumerator-daemon-activator.path.in
+++ b/scripts/systemd/nut-driver-enumerator-daemon-activator.path.in
@@ -14,6 +14,15 @@ After=local-fs.target
 Before=nut-driver.target
 PartOf=nut.target
 
+Documentation=man:nut-driver-enumerator(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut-driver-enumerator.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:upsdrvsvcctl(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Path]
 PathModified=@CONFPATH@/ups.conf
 
diff --git a/scripts/systemd/nut-driver-enumerator-daemon-activator.service.in b/scripts/systemd/nut-driver-enumerator-daemon-activator.service.in
index 5e8eca32ff..33c190cf57 100644
--- a/scripts/systemd/nut-driver-enumerator-daemon-activator.service.in
+++ b/scripts/systemd/nut-driver-enumerator-daemon-activator.service.in
@@ -17,6 +17,15 @@ After=local-fs.target
 #Before=nut-driver.target
 #PartOf=nut.target
 
+Documentation=man:nut-driver-enumerator(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut-driver-enumerator.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:upsdrvsvcctl(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Service]
 ### Script needs privileges to restart units
 #User=@RUN_AS_USER@
diff --git a/scripts/systemd/nut-driver-enumerator-daemon.service.in b/scripts/systemd/nut-driver-enumerator-daemon.service.in
index 8dacea7384..6f5f4e0a78 100644
--- a/scripts/systemd/nut-driver-enumerator-daemon.service.in
+++ b/scripts/systemd/nut-driver-enumerator-daemon.service.in
@@ -16,6 +16,15 @@ After=local-fs.target
 Before=nut-driver.target
 PartOf=nut.target
 
+Documentation=man:nut-driver-enumerator(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut-driver-enumerator.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:upsdrvsvcctl(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Service]
 ### Script needs privileges to restart units
 #User=@RUN_AS_USER@
diff --git a/scripts/systemd/nut-driver-enumerator.path.in b/scripts/systemd/nut-driver-enumerator.path.in
index 35878e051d..826dccebc5 100644
--- a/scripts/systemd/nut-driver-enumerator.path.in
+++ b/scripts/systemd/nut-driver-enumerator.path.in
@@ -12,6 +12,15 @@ After=local-fs.target
 Before=nut-driver.target
 PartOf=nut.target
 
+Documentation=man:nut-driver-enumerator(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut-driver-enumerator.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:upsdrvsvcctl(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Path]
 PathModified=@CONFPATH@/ups.conf
 
diff --git a/scripts/systemd/nut-driver-enumerator.service.in b/scripts/systemd/nut-driver-enumerator.service.in
index 067b149d92..c28bf18817 100644
--- a/scripts/systemd/nut-driver-enumerator.service.in
+++ b/scripts/systemd/nut-driver-enumerator.service.in
@@ -14,6 +14,15 @@ After=local-fs.target
 Before=nut-driver.target
 PartOf=nut.target
 
+Documentation=man:nut-driver-enumerator(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut-driver-enumerator.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:upsdrvsvcctl(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Service]
 ### Script needs privileges to restart units
 #User=@RUN_AS_USER@
diff --git a/scripts/systemd/nut-driver.target b/scripts/systemd/nut-driver.target
index 95382674be..c22a593d68 100644
--- a/scripts/systemd/nut-driver.target
+++ b/scripts/systemd/nut-driver.target
@@ -10,5 +10,12 @@ After=local-fs.target
 # network.target
 PartOf=nut.target
 
+# TODO: Dedicated man pages?
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Install]
 WantedBy=nut.target
diff --git a/scripts/systemd/nut-driver@.service.in b/scripts/systemd/nut-driver@.service.in
index 5a0a7edb03..af94ae85bf 100644
--- a/scripts/systemd/nut-driver@.service.in
+++ b/scripts/systemd/nut-driver@.service.in
@@ -21,6 +21,13 @@ After=local-fs.target
 # Propagate stopping of the target:
 PartOf=nut-driver.target
 
+Documentation=man:upsdrvsvcctl(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsdrvsvcctl.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 # Note: The choice of "network.target" allows to schedule this unit
 # roughly when the network stack of this OS is ready (e.g. that the
 # subsequent `upsd` will have a `0.0.0.0` or a `localhost` to bind
diff --git a/scripts/systemd/nut-monitor.service.in b/scripts/systemd/nut-monitor.service.in
index 7b7316b4e1..e378080698 100644
--- a/scripts/systemd/nut-monitor.service.in
+++ b/scripts/systemd/nut-monitor.service.in
@@ -24,6 +24,13 @@ Wants=nut-server.service
 #   After=network-online.target
 PartOf=nut.target
 
+Documentation=man:upsmon(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsmon.html
+Documentation=man:upsmon.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsmon.conf.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Service]
 EnvironmentFile=-@CONFPATH@/nut.conf
 SyslogIdentifier=%N
diff --git a/scripts/systemd/nut-server.service.in b/scripts/systemd/nut-server.service.in
index 780a47beef..8b964b077c 100644
--- a/scripts/systemd/nut-server.service.in
+++ b/scripts/systemd/nut-server.service.in
@@ -25,6 +25,17 @@ Requires=network.target
 Before=nut-monitor.service
 PartOf=nut.target
 
+Documentation=man:upsd(8)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsd.html
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+Documentation=man:upsd.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsd.conf.html
+Documentation=man:upsd.users(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/upsd.users.html
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Service]
 # A busy server can be monitoring a lot of devices as well as replying
 # to many clients. The "infinity" definition is actually capped by OS
diff --git a/scripts/systemd/nut.target b/scripts/systemd/nut.target
index b8dce11e71..ed803e2ec0 100644
--- a/scripts/systemd/nut.target
+++ b/scripts/systemd/nut.target
@@ -10,5 +10,12 @@ After=local-fs.target nut-driver.target nut-server.service nut-monitor.service
 Wants=local-fs.target nut-driver.target nut-server.service nut-monitor.service
 # network.target
 
+# TODO: Dedicated man pages?
+Documentation=man:ups.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/ups.conf.html
+
+Documentation=man:nut.conf(5)
+Documentation=@NUT_WEBSITE_BASE@/docs/man/nut.conf.html
+
 [Install]
 WantedBy=multi-user.target

From a5dfaf50bcd965dace4ea1c2950fdb3bb538dbf6 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Sun, 22 Dec 2024 08:14:16 +0100
Subject: [PATCH 04/19] scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in:
 introduce *_setDocLink() to refer to specific driver man pages, provide
 systemd implementation [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 .../upsdrvsvcctl/nut-driver-enumerator.sh.in  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in b/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
index aee3d0b454..b131ddb632 100644
--- a/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
+++ b/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
@@ -172,6 +172,11 @@ if [ -z "${TIMEOUT_CMD+x}" ]; then
     fi
 fi
 
+# Should be populated by configure script during NUT build:
+NUT_WEBSITE_BASE='@NUT_WEBSITE_BASE@'
+# Fallback, no trailing slash!
+[ -n "${NUT_WEBSITE_BASE-}" ] || NUT_WEBSITE_BASE='https://www.networkupstools.org'
+
 # Cache needed bits of ups.conf to speed up later parsing. Note that these
 # data are needed for most operations, and populated by upslist_readFile()
 UPSCONF_DATA=""
@@ -195,6 +200,7 @@ hook_validInstanceSuffixName=""
 hook_getSavedDeviceName=""
 hook_findSavedDeviceName=""
 hook_setSavedDeviceName=""
+hook_setDocLink=""
 hook_getSavedMD5=""
 hook_setSavedMD5=""
 hook_restart_upsd=""
@@ -213,6 +219,7 @@ case "${SERVICE_FRAMEWORK-}" in
         hook_getSavedDeviceName="smf_getSavedDeviceName"
         hook_findSavedDeviceName="smf_findSavedDeviceName"
         hook_setSavedDeviceName="smf_setSavedDeviceName"
+        hook_setDocLink="smf_setDocLink"
         hook_getSavedMD5="smf_getSavedMD5"
         hook_setSavedMD5="smf_setSavedMD5"
         hook_restart_upsd="smf_restart_upsd"
@@ -230,6 +237,7 @@ case "${SERVICE_FRAMEWORK-}" in
         hook_getSavedDeviceName="systemd_getSavedDeviceName"
         hook_findSavedDeviceName="systemd_findSavedDeviceName"
         hook_setSavedDeviceName="systemd_setSavedDeviceName"
+        hook_setDocLink="systemd_setDocLink"
         hook_getSavedMD5="systemd_getSavedMD5"
         hook_setSavedMD5="systemd_setSavedMD5"
         hook_restart_upsd="systemd_restart_upsd"
@@ -247,6 +255,7 @@ case "${SERVICE_FRAMEWORK-}" in
         hook_getSavedDeviceName="selftest_NOOP"
         hook_findSavedDeviceName="selftest_NOOP"
         hook_setSavedDeviceName="selftest_NOOP"
+        hook_setDocLink="selftest_NOOP"
         hook_getSavedMD5="selftest_NOOP"
         hook_setSavedMD5="selftest_NOOP"
         hook_restart_upsd="selftest_NOOP"
@@ -739,6 +748,7 @@ smf_registerInstance() {
     smf_setSavedMD5 "$SVCINST" "`upsconf_getSection_MD5 "$DEVICE"`"
     # Save original device (config section) name to speed up some searches
     smf_setSavedDeviceName "$SVCINST" "$DEVICE"
+    smf_setDocLink "$SVCINST" "$DEVICE"
 
     /usr/sbin/svcadm refresh "${TARGET_FMRI}" || return
     if [ "$AUTO_START" = yes ] ; then
@@ -853,6 +863,17 @@ smf_setSavedDeviceName() {
     [ -n "$1" ] || return # No-op for global section
     smf_setSavedUniq "nut-driver:$1" "nut-driver-enumerator-generated-devicename" "DEVICE" astring "$2"
 }
+smf_setDocLink() {
+    # FIXME: experiment and implement
+    # Save device (config section) name $2 into service instance $1
+    [ -n "$1" ] || return # No-op for global section
+    __TARGET_FMRI="$1"
+    __DRV="`upsconf_getDriver "$2"`"
+#Documentation=man:${__DRV}(8)
+#Documentation=${NUT_WEBSITE_BASE}/docs/man/${__DRV}.html
+    unset __DRV
+    [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the device doc links">&2 ; return 1 ; }
+}
 smf_restart_upsd() {
     echo "Reloading or restarting NUT data server to make sure it knows new configuration..."
     /usr/sbin/svcadm enable "nut-server" 2>/dev/null
@@ -924,6 +945,7 @@ EOF
 
     systemd_setSavedMD5 "$SVCINST" "`upsconf_getSection_MD5 "$DEVICE"`"
     systemd_setSavedDeviceName "$SVCINST" "$DEVICE"
+    systemd_setDocLink "$SVCINST" "$DEVICE"
 
     if [ "$AUTO_START" = yes ] ; then
         systemd_refreshSupervizor || echo "WARNING: Somehow managed to fail systemd_refreshSupervizor()" >&2
@@ -994,6 +1016,20 @@ Environment='DEVICE="$2"'
 EOF
     [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the device name">&2 ; return 1 ; }
 }
+systemd_setDocLink() {
+    # Save device (config section) name $2 into service instance $1
+    [ -n "$1" ] || return # No-op for global section
+    PROPFILE="${SYSTEMD_CONFPATH}/nut-driver@$1.service.d/nut-driver-enumerator-generated-doclink.conf"
+    mkdir -p "${SYSTEMD_CONFPATH}/nut-driver@$1.service.d" && \
+    __DRV="`upsconf_getDriver "$2"`"
+    cat > "${PROPFILE}" << EOF
+[Unit]
+Documentation=man:${__DRV}(8)
+Documentation=${NUT_WEBSITE_BASE}/docs/man/${__DRV}.html
+EOF
+    unset __DRV
+    [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the device name">&2 ; return 1 ; }
+}
 systemd_setSavedMD5() {
     # Save checksum value $2 into service instance $1
     PROP="SECTION_CHECKSUM"

From 0f543e745e7830dac714e28592972319fae04888 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Sun, 22 Dec 2024 08:28:17 +0100
Subject: [PATCH 05/19] drivers/main.c: refer to local man (ifdef WITH_DOCS)
 and website page for the driver [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 drivers/blazer_ser.c | 1 -
 drivers/blazer_usb.c | 2 --
 drivers/main.c       | 7 +++++++
 drivers/nutdrv_qx.c  | 6 ++----
 drivers/usbhid-ups.c | 4 +---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/blazer_ser.c b/drivers/blazer_ser.c
index 8bdc2c423f..e33a455d24 100644
--- a/drivers/blazer_ser.c
+++ b/drivers/blazer_ser.c
@@ -106,7 +106,6 @@ ssize_t blazer_command(const char *cmd, char *buf, size_t buflen)
 
 void upsdrv_help(void)
 {
-	printf("Read The Fine Manual ('man 8 blazer_ser')\n");
 }
 
 
diff --git a/drivers/blazer_usb.c b/drivers/blazer_usb.c
index f2cf3432aa..826eb78176 100644
--- a/drivers/blazer_usb.c
+++ b/drivers/blazer_usb.c
@@ -579,8 +579,6 @@ void upsdrv_help(void)
 	}
 	printf("\n\n");
 #endif	/* TESTING */
-
-	printf("Read The Fine Manual ('man 8 blazer_usb')\n");
 }
 
 
diff --git a/drivers/main.c b/drivers/main.c
index f89142372c..973cc4e78a 100644
--- a/drivers/main.c
+++ b/drivers/main.c
@@ -292,6 +292,13 @@ static void help_msg(void)
 	}
 
 	upsdrv_help();
+
+	printf("\nFor more information please ");
+#if defined(WITH_DOCS) && WITH_DOCS
+	printf("Read The Fine Manual ('man %s') and/or ", progname);
+#endif
+	printf("see\n\t%s/docs/man/%s.html\n", NUT_WEBSITE_BASE, progname);
+	printf("Also check documentation and samples of ups.conf\n");
 }
 #endif /* DRIVERS_MAIN_WITHOUT_MAIN */
 
diff --git a/drivers/nutdrv_qx.c b/drivers/nutdrv_qx.c
index 3d6b7db654..e7874d8e28 100644
--- a/drivers/nutdrv_qx.c
+++ b/drivers/nutdrv_qx.c
@@ -2921,7 +2921,7 @@ void	upsdrv_help(void)
 			printf(", ");
 		printf("%s", usbsubdriver[i].name);
 	}
-	printf("\n\n");
+	printf("\n");
 # endif	/* QX_USB*/
 
 	/* Protocols are the first token from "name" field in
@@ -2944,10 +2944,8 @@ void	upsdrv_help(void)
 			printf(", ");
 		printf("%s", subdrv_name);
 	}
-	printf("\n\n");
+	printf("\n");
 #endif	/* TESTING */
-
-	printf("Read The Fine Manual ('man 8 nutdrv_qx')\n");
 }
 
 /* Adding flags/vars */
diff --git a/drivers/usbhid-ups.c b/drivers/usbhid-ups.c
index 3ec95d2bed..539f52c7e5 100644
--- a/drivers/usbhid-ups.c
+++ b/drivers/usbhid-ups.c
@@ -1025,9 +1025,7 @@ void upsdrv_help(void)
 			printf(", ");
 		printf("\"%s\"", subdriver_list[i]->name);
 	}
-	printf("\n\n");
-
-	printf("Read The Fine Manual ('man 8 usbhid-ups')\n");
+	printf("\n");
 }
 
 void upsdrv_makevartable(void)

From 26a20ba8bcdb2307f705111297cc34c500056462 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Mon, 23 Dec 2024 22:43:34 +0100
Subject: [PATCH 06/19] common/common.c, include/common.h, drivers/main.c:
 introduce suggest_doc_links() [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 NEWS.adoc        |  4 +++-
 common/common.c  | 37 +++++++++++++++++++++++++++++++++++++
 drivers/main.c   |  7 +------
 include/common.h |  7 +++++++
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/NEWS.adoc b/NEWS.adoc
index 7875f48fe0..a8be705969 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -103,7 +103,9 @@ https://github.com/networkupstools/nut/milestone/11
      `VERSION_DEFAULT` file, among provisions for packager tuning. [#1949]
    * SMF manifests and systemd units now refer to man pages and their online
      variants under `NUT_WEBSITE_BASE` dependent on codebase maturity
-     (development or release snapshot). [issue #722, PR #2733]
+     (development or release snapshot); many programs now display such
+     references in their command-line usage help, method `suggest_doc_links()`
+     was introduced for this purpose. [issue #722, PR #2733]
 
  - the `upsnotify()` common code introduced in recent NUT releases (integrating
    with service management frameworks, etc.) was a bit cryptic when it reported
diff --git a/common/common.c b/common/common.c
index b4f1b5456f..6572baab7d 100644
--- a/common/common.c
+++ b/common/common.c
@@ -659,6 +659,43 @@ int print_banner_once(const char *prog, int even_if_disabled)
 	return ret;
 }
 
+const char *suggest_doc_links(const char *progname, const char *progconf) {
+	static char	buf[LARGEBUF];
+
+	buf[0] = '\0';
+
+	if (progname) {
+		char	*s = NULL, buf2[LARGEBUF];
+		size_t	i, max = sizeof(buf2) - 1;
+
+		for (i = 0; progname[i] && i < max; i++) {
+			buf2[i] = tolower(progname[i]);
+		}
+		buf2[i] = '\0';
+		if ((s = strstr(buf2, ".exe")) && strcmp(buf2, "nut.exe"))
+			*s = '\0';
+
+		snprintf(buf, sizeof(buf),
+			"For more information please ");
+#if defined(WITH_DOCS) && WITH_DOCS
+		snprintfcat(buf, sizeof(buf),
+			"Read The Fine Manual ('man %s') and/or ",
+			buf2);
+#endif
+		snprintfcat(buf, sizeof(buf),
+			"see\n\t%s/docs/man/%s.html\n",
+			NUT_WEBSITE_BASE, buf2);
+	}
+
+	if (progconf)
+		snprintfcat(buf, sizeof(buf),
+			"%s check documentation and samples of %s\n",
+			progname ? "Also" : "Please",
+			progconf);
+
+	return buf;
+}
+
 /* enable writing upslog_with_errno() and upslogx() type messages to
    the syslog */
 void syslogbit_set(void)
diff --git a/drivers/main.c b/drivers/main.c
index 973cc4e78a..3c6f9152e2 100644
--- a/drivers/main.c
+++ b/drivers/main.c
@@ -293,12 +293,7 @@ static void help_msg(void)
 
 	upsdrv_help();
 
-	printf("\nFor more information please ");
-#if defined(WITH_DOCS) && WITH_DOCS
-	printf("Read The Fine Manual ('man %s') and/or ", progname);
-#endif
-	printf("see\n\t%s/docs/man/%s.html\n", NUT_WEBSITE_BASE, progname);
-	printf("Also check documentation and samples of ups.conf\n");
+	printf("\n%s", suggest_doc_links(progname, "ups.conf"));
 }
 #endif /* DRIVERS_MAIN_WITHOUT_MAIN */
 
diff --git a/include/common.h b/include/common.h
index 77b81934c3..c8ff6f7093 100644
--- a/include/common.h
+++ b/include/common.h
@@ -208,6 +208,13 @@ extern const char *UPS_VERSION;
  * have an end-of-line char of its own. */
 const char *describe_NUT_VERSION_once(void);
 
+/* Return a buffer with a (possibly multiline) string that can be printed
+ * as part of program help/usage message. Caller should not free() the buffer.
+ * Optional "progconf" allows to suggest config file(s) to study as well.
+ * NOTE: the string in buffer starts with text and ends with one EOL char.
+ */
+const char *suggest_doc_links(const char *progname, const char *progconf);
+
 /* Based on NUT_QUIET_INIT_BANNER envvar (present and empty or "true")
  * hide the NUT tool name+version banners; show them by default */
 int banner_is_disabled(void);

From 7489dae92b27052a2be05991bd0d193c64d5fd75 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Mon, 23 Dec 2024 21:33:03 +0100
Subject: [PATCH 07/19] server/sockdebug.c, server/pipedebug.c: refer to local
 man (ifdef WITH_DOCS) and website page for these tools [#722]

Reminder: both sources are built as `sockdebug` for different
platforms and share the man page.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 server/pipedebug.c | 3 +++
 server/sockdebug.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/server/pipedebug.c b/server/pipedebug.c
index 53007449ff..f306be8395 100644
--- a/server/pipedebug.c
+++ b/server/pipedebug.c
@@ -138,6 +138,9 @@ int main(int argc, char **argv)
 		fprintf(stderr, "usage: %s <pipe name>\n", prog);
 		fprintf(stderr, "       %s apcsmart-com1\n",
 			argv[0]);
+
+		fprintf(stderr, "\n%s", suggest_doc_links(prog, NULL));
+
 		exit(EXIT_SUCCESS);
 	}
 
diff --git a/server/sockdebug.c b/server/sockdebug.c
index 2f0679811d..2db400db4b 100644
--- a/server/sockdebug.c
+++ b/server/sockdebug.c
@@ -144,6 +144,9 @@ int main(int argc, char **argv)
 		fprintf(stderr, "  or   %s apcsmart-ttyS1\n",
 			argv[0]);
 		fprintf(stderr, "  for socket files placed in the standard location\n");
+
+		fprintf(stderr, "\n%s", suggest_doc_links(prog, NULL));
+
 		exit(EXIT_SUCCESS);
 	}
 

From 7eb964583f246a4b9a0a197a8f7360d94dd6d9b3 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Mon, 23 Dec 2024 21:34:54 +0100
Subject: [PATCH 08/19] server/upsd.c: refer to local man (ifdef WITH_DOCS) and
 website page for the data server [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 server/upsd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/upsd.c b/server/upsd.c
index 6a7f67a413..4f4c4b412f 100644
--- a/server/upsd.c
+++ b/server/upsd.c
@@ -1839,6 +1839,8 @@ static void help(const char *arg_progname)
 
 	nut_report_config_flags();
 
+	printf("\n%s", suggest_doc_links(progname, "ups.conf, upsd.conf and upsd.users"));
+
 	exit(EXIT_SUCCESS);
 }
 

From a6c6bff0dffcc0f69bd9d55157298225ad1a49fc Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Mon, 23 Dec 2024 23:42:50 +0100
Subject: [PATCH 09/19] drivers/main.c: move WIN32 var declarations up in
 main()

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 drivers/main.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/main.c b/drivers/main.c
index 3c6f9152e2..8afe6eb11b 100644
--- a/drivers/main.c
+++ b/drivers/main.c
@@ -1985,7 +1985,10 @@ int main(int argc, char **argv)
 	pid_t	oldpid = -1;
 #else
 /* FIXME: *actually* handle WIN32 builds too */
-	const char * cmd = NULL;
+	const char	*cmd = NULL;
+
+	const char	*drv_name;
+	char	*dot;
 #endif
 
 	const char optstring[] = "+a:s:kDFBd:hx:Lqr:u:g:Vi:c:"
@@ -2064,12 +2067,11 @@ int main(int argc, char **argv)
 	progname = xbasename(argv[0]);
 
 #ifdef WIN32
-	const char * drv_name;
 	drv_name = xbasename(argv[0]);
 	/* remove trailing .exe */
-	char * dot = strrchr(drv_name,'.');
-	if( dot != NULL ) {
-		if(strcasecmp(dot, ".exe") == 0 ) {
+	dot = strrchr(drv_name,'.');
+	if (dot != NULL) {
+		if (strcasecmp(dot, ".exe") == 0) {
 			progname = strdup(drv_name);
 			char * t = strrchr(progname,'.');
 			*t = 0;

From d6112a3fa732f0881c3759870d51f1dad7348886 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Mon, 23 Dec 2024 23:50:02 +0100
Subject: [PATCH 10/19] drivers/main.c: main(): avoid notification at exit
 after just showing help

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 drivers/main.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/main.c b/drivers/main.c
index 8afe6eb11b..23716c3385 100644
--- a/drivers/main.c
+++ b/drivers/main.c
@@ -130,7 +130,8 @@ static int nut_debug_level_protocol = -1;
 #ifndef DRIVERS_MAIN_WITHOUT_MAIN
 /* everything else */
 static char	*pidfn = NULL;
-static int	dump_data = 0; /* Store the update_count requested */
+static int	help_only = 0,
+		dump_data = 0; /* Store the update_count requested */
 #endif /* DRIVERS_MAIN_WITHOUT_MAIN */
 
 /* pre-declare some private methods used */
@@ -1814,7 +1815,7 @@ static void exit_cleanup(void)
 {
 	dstate_setinfo("driver.state", "cleanup.exit");
 
-	if (!dump_data) {
+	if (!dump_data && !help_only) {
 		upsnotify(NOTIFY_STATE_STOPPING, "exit_cleanup()");
 	}
 
@@ -2011,6 +2012,10 @@ int main(int argc, char **argv)
 			case 'd':
 				dump_data = atoi(optarg);
 				break;
+			case 'h':
+				/* Avoid notification at exit */
+				help_only = 1;
+				break;
 			default:
 				break;
 		}

From 1648070886064aa39ac53ae3877e052655641331 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 00:07:06 +0100
Subject: [PATCH 11/19] tools/nut-scanner/nut-scanner.c,
 tools/nut-scanner/Makefile.am: refer to local man (ifdef WITH_DOCS) and
 website page for this tool [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 tools/nut-scanner/Makefile.am   | 2 +-
 tools/nut-scanner/nut-scanner.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am
index e76a332297..e31fc6ded1 100644
--- a/tools/nut-scanner/Makefile.am
+++ b/tools/nut-scanner/Makefile.am
@@ -100,7 +100,7 @@ libnutscan_la_LDFLAGS += -version-info 2:6:0
 # copies of "nut_debug_level" making fun of our debug-logging attempts.
 # One solution to tackle if needed for those cases would be to make some
 # dynamic/shared libnutcommon (etc.)
-libnutscan_la_LDFLAGS += -export-symbols-regex '^(nutscan_|nut_debug_level|s_upsdebug|fatalx|fatal_with_errno|xcalloc|xbasename|snprintfcat|max_threads|curr_threads|nut_report_config_flags|upsdebugx_report_search_paths|nut_prepare_search_paths|print_banner_once)'
+libnutscan_la_LDFLAGS += -export-symbols-regex '^(nutscan_|nut_debug_level|s_upsdebug|fatalx|fatal_with_errno|xcalloc|xbasename|snprintfcat|max_threads|curr_threads|nut_report_config_flags|upsdebugx_report_search_paths|nut_prepare_search_paths|print_banner_once|suggest_doc_links)'
 libnutscan_la_CFLAGS = \
 			-I$(top_builddir)/clients -I$(top_srcdir)/clients \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
diff --git a/tools/nut-scanner/nut-scanner.c b/tools/nut-scanner/nut-scanner.c
index c0f56ae05e..439d4fc571 100644
--- a/tools/nut-scanner/nut-scanner.c
+++ b/tools/nut-scanner/nut-scanner.c
@@ -1154,6 +1154,8 @@ static void show_usage(const char *arg_progname)
 	printf("  -a, --available: Display available bus that can be scanned\n");
 	printf("  -q, --quiet: Display only scan result. No information on currently scanned bus is displayed.\n");
 	printf("  -D, --nut_debug_level: Raise the debugging level.  Use this multiple times to see more details.\n");
+
+	printf("\n%s", suggest_doc_links(arg_progname, "ups.conf"));
 }
 
 int main(int argc, char *argv[])

From e9afd6abace43515b84ea6f624b6b94672cd424b Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 00:16:26 +0100
Subject: [PATCH 12/19] tools/nutconf/nutconf-cli.cpp: refer to local man
 (ifdef WITH_DOCS) and website page for the nutconf tool [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 tools/nutconf/nutconf-cli.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/nutconf/nutconf-cli.cpp b/tools/nutconf/nutconf-cli.cpp
index f72aa7a7df..57ae97e21c 100644
--- a/tools/nutconf/nutconf-cli.cpp
+++ b/tools/nutconf/nutconf-cli.cpp
@@ -200,6 +200,11 @@ void Usage::print(const std::string & bin) {
 	for (size_t i = 0; i < sizeof(s_text) / sizeof(char *); ++i) {
 		std::cerr << s_text[i] << std::endl;
 	}
+
+	std::cerr
+		/* << std::endl // last line of s_text is blank */
+		<< suggest_doc_links(bin.c_str(), nullptr);
+		/* Method output brings its own endl */
 }
 
 

From 8c129faee2ad15d94d6ba79e327643dcd3451850 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 00:30:47 +0100
Subject: [PATCH 13/19] clients/upsc.c, clients/upscmd.c, clients/upsrw.c,
 clients/upslog.c, clients/upsmon.c, clients/upssched.c: refer to local man
 (ifdef WITH_DOCS) and website page for these tools [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 clients/upsc.c     | 2 ++
 clients/upscmd.c   | 2 ++
 clients/upslog.c   | 5 ++---
 clients/upsmon.c   | 2 ++
 clients/upsrw.c    | 2 ++
 clients/upssched.c | 2 ++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/clients/upsc.c b/clients/upsc.c
index d99d18085a..d2422944a2 100644
--- a/clients/upsc.c
+++ b/clients/upsc.c
@@ -62,6 +62,8 @@ static void usage(const char *prog)
 	printf("  -h         - display this help text\n");
 
 	nut_report_config_flags();
+
+	printf("\n%s", suggest_doc_links(prog, NULL));
 }
 
 static void printvar(const char *var)
diff --git a/clients/upscmd.c b/clients/upscmd.c
index 3745014906..c9a04e8071 100644
--- a/clients/upscmd.c
+++ b/clients/upscmd.c
@@ -68,6 +68,8 @@ static void usage(const char *prog)
 	printf("  [<value>]	Additional data for command - number of seconds, etc.\n");
 
 	nut_report_config_flags();
+
+	printf("\n%s", suggest_doc_links(prog, "upsd.users"));
 }
 
 static void print_cmd(char *cmdname)
diff --git a/clients/upslog.c b/clients/upslog.c
index f1d36b9fcc..33b8505822 100644
--- a/clients/upslog.c
+++ b/clients/upslog.c
@@ -176,11 +176,10 @@ static void help(const char *prog)
 	printf("format string defaults to:\n");
 	printf("%s\n", DEFAULT_LOGFORMAT);
 
-	printf("\n");
-	printf("See the upslog(8) man page for more information.\n");
-
 	nut_report_config_flags();
 
+	printf("\n%s", suggest_doc_links(prog, NULL));
+
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/clients/upsmon.c b/clients/upsmon.c
index 8c6a7876d2..786dc3b294 100644
--- a/clients/upsmon.c
+++ b/clients/upsmon.c
@@ -3021,6 +3021,8 @@ static void help(const char *arg_progname)
 
 	nut_report_config_flags();
 
+	printf("\n%s", suggest_doc_links(arg_progname, "upsmon.conf"));
+
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/clients/upsrw.c b/clients/upsrw.c
index 892e6825e3..e1de6d6343 100644
--- a/clients/upsrw.c
+++ b/clients/upsrw.c
@@ -69,6 +69,8 @@ static void usage(const char *prog)
 	printf("Call without -s to show all possible read/write variables (same as -l).\n");
 
 	nut_report_config_flags();
+
+	printf("\n%s", suggest_doc_links(prog, "upsd.users"));
 }
 
 static void clean_exit(void)
diff --git a/clients/upssched.c b/clients/upssched.c
index eb822f0cd2..d636af6bf1 100644
--- a/clients/upssched.c
+++ b/clients/upssched.c
@@ -1505,6 +1505,8 @@ static void help(const char *arg_progname)
 
 	nut_report_config_flags();
 
+	printf("\n%s", suggest_doc_links(arg_progname, "upsmon.conf"));
+
 	exit(EXIT_SUCCESS);
 }
 

From 32a84628bb436fff809ee0cc3713d4d47e102739 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 23:09:46 +0100
Subject: [PATCH 14/19] scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in: refer
 to local man and website pages for this tool [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in b/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
index b131ddb632..b07c5fd118 100644
--- a/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
+++ b/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
@@ -1768,6 +1768,11 @@ $0 --show-device-config-value DEV KEY [KEY...]
         If several keys or flags are requested, their values are reported
         one per line in the same order (including empty lines for missing
         values); any missing value yields a non-zero exit code.
+
+For more information please Read The Fine Manual ('man nut-driver-enumerator')
+and/or see
+        ${NUT_WEBSITE_BASE}/docs/man/nut-driver-enumerator.html
+Also check documentation of ups.conf and upsdrvsvcctl
 EOF
 }
 

From e770866cd77b8a947d2c3050b4df2f6e1dacdb70 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 23:16:07 +0100
Subject: [PATCH 15/19] scripts/upsdrvsvcctl/upsdrvsvcctl.in: refer to local
 man and website pages for this tool [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 scripts/upsdrvsvcctl/upsdrvsvcctl.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/upsdrvsvcctl/upsdrvsvcctl.in b/scripts/upsdrvsvcctl/upsdrvsvcctl.in
index 5079b764a7..6ca0a9bc1a 100755
--- a/scripts/upsdrvsvcctl/upsdrvsvcctl.in
+++ b/scripts/upsdrvsvcctl/upsdrvsvcctl.in
@@ -50,6 +50,11 @@ esac
 [ -n "${UPSDRVCTL-}" ] && export UPSDRVCTL || UPSDRVCTL='@SBINDIR@/upsdrvctl'
 PACKAGE_VERSION='@PACKAGE_VERSION@'
 
+# Should be populated by configure script during NUT build:
+NUT_WEBSITE_BASE='@NUT_WEBSITE_BASE@'
+# Fallback, no trailing slash!
+[ -n "${NUT_WEBSITE_BASE-}" ] || NUT_WEBSITE_BASE='https://www.networkupstools.org'
+
 usage() {
     # Note: version header differs from UPS_VERSION in binaries that
     # might also have the git-version suffixed during build time
@@ -112,6 +117,10 @@ usage: $0 [OPTIONS] status [<ups>]
 usage: $0 [OPTIONS] show-config [<ups>]
   show-config <ups>	output config section from ups.conf for device <ups>
   show-config   	...or all devices if no <ups> argument was passed
+
+For more information please Read The Fine Manual ('man upsdrvsvcctl') and/or see
+        ${NUT_WEBSITE_BASE}/docs/man/upsdrvsvcctl.html
+Also check documentation of nut-driver-enumerator and plain old upsdrvctl tools
 EOF
 }
 

From ecb20b81c8d19fe90e0a78024063c02e44df9a9b Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 23:25:37 +0100
Subject: [PATCH 16/19] drivers/upsdrvctl.c: refer to local man (ifdef
 WITH_DOCS) and website page for this tool [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 drivers/upsdrvctl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/upsdrvctl.c b/drivers/upsdrvctl.c
index e0662e3088..be5d1d86c1 100644
--- a/drivers/upsdrvctl.c
+++ b/drivers/upsdrvctl.c
@@ -1237,6 +1237,11 @@ static void help(const char *arg_progname)
 	printf("              		Fields: UPSNAME UPSDRV RUNNING PF_PID S_RESPONSIVE S_PID S_STATUS\n");
 	printf("              		(PF_* = according to PID file, if any; S_* = via socket protocol)\n");
 
+	printf("\n%s", suggest_doc_links(arg_progname, "ups.conf"));
+#if (defined(WITH_SOLARIS_SMF) && WITH_SOLARIS_SMF) || (defined(HAVE_SYSTEMD) && HAVE_SYSTEMD)
+	printf("NOTE: On this system you should prefer upsdrvsvcctl and nut-driver-enumerator\n");
+#endif
+
 	exit(EXIT_SUCCESS);
 }
 

From 449a658bad41b0a1096b49db56899fe24d83d06e Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Tue, 24 Dec 2024 23:57:18 +0100
Subject: [PATCH 17/19] common/common.c: suggest_doc_links(): do not
 preallocate buf2, ensure use of only basename of a program [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 common/common.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/common.c b/common/common.c
index 6572baab7d..a71cb70f1d 100644
--- a/common/common.c
+++ b/common/common.c
@@ -665,13 +665,13 @@ const char *suggest_doc_links(const char *progname, const char *progconf) {
 	buf[0] = '\0';
 
 	if (progname) {
-		char	*s = NULL, buf2[LARGEBUF];
-		size_t	i, max = sizeof(buf2) - 1;
+		char	*s = NULL, *buf2 = xstrdup(xbasename(progname));
+		size_t	i;
 
-		for (i = 0; progname[i] && i < max; i++) {
-			buf2[i] = tolower(progname[i]);
+		for (i = 0; buf2[i]; i++) {
+			buf2[i] = tolower(buf2[i]);
 		}
-		buf2[i] = '\0';
+
 		if ((s = strstr(buf2, ".exe")) && strcmp(buf2, "nut.exe"))
 			*s = '\0';
 
@@ -685,6 +685,8 @@ const char *suggest_doc_links(const char *progname, const char *progconf) {
 		snprintfcat(buf, sizeof(buf),
 			"see\n\t%s/docs/man/%s.html\n",
 			NUT_WEBSITE_BASE, buf2);
+
+		free(buf2);
 	}
 
 	if (progconf)

From c1e09d4a1f9868673bb457d0bcaeba418bf84a4d Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Wed, 25 Dec 2024 00:27:24 +0000
Subject: [PATCH 18/19] scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in:
 smf_setDocLink(): complete the proposed SMF implementation [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 .../upsdrvsvcctl/nut-driver-enumerator.sh.in  | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in b/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
index b07c5fd118..c842bb3962 100644
--- a/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
+++ b/scripts/upsdrvsvcctl/nut-driver-enumerator.sh.in
@@ -864,14 +864,40 @@ smf_setSavedDeviceName() {
     smf_setSavedUniq "nut-driver:$1" "nut-driver-enumerator-generated-devicename" "DEVICE" astring "$2"
 }
 smf_setDocLink() {
-    # FIXME: experiment and implement
-    # Save device (config section) name $2 into service instance $1
+    # Save documentation links for driver of device (config section) named $2
+    # into service instance $1
     [ -n "$1" ] || return # No-op for global section
-    __TARGET_FMRI="$1"
+    __TARGET_FMRI="nut-driver:$1"
     __DRV="`upsconf_getDriver "$2"`"
-#Documentation=man:${__DRV}(8)
-#Documentation=${NUT_WEBSITE_BASE}/docs/man/${__DRV}.html
-    unset __DRV
+
+### Sample:
+#tm_common_name                                           template
+#tm_common_name/C                                         ustring  "physical network interface autoconfiguration"
+#tm_doc_Network_Auto-Magic_OpenSolaris_Project_Page       template
+#tm_doc_Network_Auto-Magic_OpenSolaris_Project_Page/name  astring  "Network Auto-Magic OpenSolaris Project Page"
+#tm_doc_Network_Auto-Magic_OpenSolaris_Project_Page/uri   astring  http://hub.opensolaris.org/bin/view/Project+nwam/
+#tm_man_nwamd8                                            template
+#tm_man_nwamd8/manpath                                    astring  /usr/share/man
+#tm_man_nwamd8/section                                    astring  8
+#tm_man_nwamd8/title                                      astring  nwamd
+
+    __PG="tm_doc_${__DRV}_Page"
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" delprop "${__PG}" 2>/dev/null || true
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" addpg "${__PG}" template && \
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" setprop "${__PG}/name" = "astring" "${__DRV} online" && \
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" setprop "${__PG}/uri" = "astring" "${NUT_WEBSITE_BASE}/docs/man/${__DRV}.html"
+    [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the service property group ${__PG} for online docs">&2 ; return 1 ; }
+
+    # FIXME: Pass resolved $mandir if known
+    __PG="tm_man_${__DRV}8"
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" delprop "${__PG}" 2>/dev/null || true
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" addpg "${__PG}" template && \
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" setprop "${__PG}/manpath" = "astring" "/usr/share/man" && \
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" setprop "${__PG}/section" = "astring" "8" && \
+    /usr/sbin/svccfg -s "${__TARGET_FMRI}" setprop "${__PG}/titke" = "astring" "${__DRV}"
+    [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the service property group ${__PG} for local docs">&2 ; return 1 ; }
+
+    unset __DRV __PG __TARGET_FMRI
     [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the device doc links">&2 ; return 1 ; }
 }
 smf_restart_upsd() {
@@ -1017,7 +1043,8 @@ EOF
     [ $? = 0 ] && echo "OK" || { echo "FAILED to stash the device name">&2 ; return 1 ; }
 }
 systemd_setDocLink() {
-    # Save device (config section) name $2 into service instance $1
+    # Save documentation links for driver of device (config section) named $2
+    # into service instance $1
     [ -n "$1" ] || return # No-op for global section
     PROPFILE="${SYSTEMD_CONFPATH}/nut-driver@$1.service.d/nut-driver-enumerator-generated-doclink.conf"
     mkdir -p "${SYSTEMD_CONFPATH}/nut-driver@$1.service.d" && \

From 54b3a7cb35e115fc5c9ced9b1558b1ad73a32667 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jimklimov+nut@gmail.com>
Date: Wed, 25 Dec 2024 02:21:54 +0100
Subject: [PATCH 19/19] scripts/Windows/wininit.c: refer to local man (ifdef
 WITH_DOCS) and website page for nut.exe wrapper [#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
---
 scripts/Windows/wininit.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/Windows/wininit.c b/scripts/Windows/wininit.c
index 527a87e831..ecffa80b7b 100644
--- a/scripts/Windows/wininit.c
+++ b/scripts/Windows/wininit.c
@@ -1,4 +1,4 @@
-/* wininit.c - MS Windows service which replace the init script
+/* wininit.c - MS Windows service which replaces the init script
                (compiled as "nut.exe")
 
    Copyright (C)
@@ -722,6 +722,11 @@ static void help(const char *arg_progname)
 	printf("    -D	Raise debug verbosity (passed to launched NUT programs)\n");
 	printf("    -V	Display NUT version and exit\n");
 	printf("    -h	Display this help and exit\n");	/* also /? but be hush about the one slash */
+
+	printf("\n%s", suggest_doc_links(
+		"nut.exe" /*arg_progname*/,
+		"nut.conf, ups.conf, upsmon.conf, upsd.conf and upsd.users"
+		));
 }
 
 int main(int argc, char **argv)