nut: some cleanup

[unleashed-userland.git] / components / sysutils / nut / patches / 07-man.patch

We change (8) to (1m), [8] to [1m] in docs/man/*.txt and
8 to 1m in docs/man/Makefile.am. 'man1m_MANS' should be changed
to 'man_MANS' or 'man1_MANS'. In any case I couldn't make automake
install manpages in man1m direcotry. Manual review is necessary.

diff -ur nut-2.7.4/docs/man8/al175.txt nut-2.7.4/docs/man/al175.txt
--- nut-2.7.4/docs/man8/al175.txt       2016-12-29 13:17:35.423625828 +0300
+++ nut-2.7.4/docs/man/al175.txt        2016-12-29 13:29:28.530131396 +0300
@@ -1,5 +1,5 @@
-AL175(8)
-========
+AL175(1m)
+=========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 *al175* driver. For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -31,7 +31,7 @@
 
 INSTANT COMMANDS
 ----------------
-This driver supports some extra commands (see linkman:upscmd[8]):
+This driver supports some extra commands (see linkman:upscmd[1m]):
 
 *test.battery.start*::
 Start a battery test.
@@ -66,7 +66,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/apcsmart-old.txt nut-2.7.4/docs/man/apcsmart-old.txt
--- nut-2.7.4/docs/man8/apcsmart-old.txt        2016-12-29 13:17:35.423719009 +0300
+++ nut-2.7.4/docs/man/apcsmart-old.txt 2016-12-29 13:29:28.531377702 +0300
@@ -1,5 +1,5 @@
-APCSMART-OLD(8)
-===============
+APCSMART-OLD(1m)
+================
 
 NAME  
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 apcsmart-old driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -96,7 +96,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/apcsmart.txt nut-2.7.4/docs/man/apcsmart.txt
--- nut-2.7.4/docs/man8/apcsmart.txt    2016-12-29 13:17:35.423829679 +0300
+++ nut-2.7.4/docs/man/apcsmart.txt     2016-12-29 13:29:28.535649044 +0300
@@ -1,5 +1,5 @@
-APCSMART(8)
-===========
+APCSMART(1m)
+============
 
 NAME  
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 apcsmart driver. For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 
 SUPPORTED HARDWARE
@@ -64,7 +64,7 @@
     Several Microsol serial models sold in Brazil have been rebranded as APC
     Back-UPS, and the model numbers tend to start with "BZ". If you have one
     of these "Nobreaks", they will not work with the *apcsmart* driver - please
-    see the linkman:solis[8] driver instead.
+    see the linkman:solis[1m] driver instead.
 +
 --
 .Example models:
@@ -375,8 +375,8 @@
 SEE ALSO
 --------
 
-linkman:nutupsdrv[8], linkman:ups.conf[5], linkman:usbhid-ups[8],
-linkman:solis[8]
+linkman:nutupsdrv[1m], linkman:ups.conf[5], linkman:usbhid-ups[1m],
+linkman:solis[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/apcupsd-ups.txt nut-2.7.4/docs/man/apcupsd-ups.txt
--- nut-2.7.4/docs/man8/apcupsd-ups.txt 2016-12-29 13:17:35.423918808 +0300
+++ nut-2.7.4/docs/man/apcupsd-ups.txt  2016-12-29 13:29:28.536948124 +0300
@@ -1,5 +1,5 @@
-APCUPSD-UPS(8)
-==============
+APCUPSD-UPS(1m)
+===============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the specific features of the
 *apcupsd-ups* driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 DESCRIPTION
 -----------
@@ -46,7 +46,7 @@
 converted to seconds (please file a bug if you notice a mismatch in units).
 
 [width="50%",cols="m,m",options="header"]
-|===============================
+|================================
 | apcupsd variable | NUT variable(s)
 | BCHARGE          | battery.charge
 | MBATTCHG         | battery.charge.low
@@ -81,7 +81,7 @@
 | ITEMP            | ups.temperature
 | STESTI           | ups.test.interval
 | SELFTEST         | ups.test.result
-|===============================
+|================================
 
 LIMITATIONS
 -----------
@@ -98,7 +98,7 @@
 --------
 
 linkman:ups.conf[5],
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet Resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/asem.txt nut-2.7.4/docs/man/asem.txt
--- nut-2.7.4/docs/man8/asem.txt        2016-12-29 13:17:35.424122119 +0300
+++ nut-2.7.4/docs/man/asem.txt 2016-12-29 13:29:28.537960521 +0300
@@ -1,5 +1,5 @@
-ASEM(8)
-=======
+ASEM(1m)
+========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 *asem* driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -72,7 +72,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/bcmxcp_usb.txt nut-2.7.4/docs/man/bcmxcp_usb.txt
--- nut-2.7.4/docs/man8/bcmxcp_usb.txt  2016-12-29 13:17:35.424321542 +0300
+++ nut-2.7.4/docs/man/bcmxcp_usb.txt   2016-12-29 13:29:28.539204382 +0300
@@ -1,5 +1,5 @@
-BCMXCP_USB(8)
-=============
+BCMXCP_USB(1m)
+==============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 bcmxcp_usb driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 This driver is a variant of the serial driver bcmxcp and uses the same core code.
 
 SUPPORTED HARDWARE
@@ -100,7 +100,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/bcmxcp.txt nut-2.7.4/docs/man/bcmxcp.txt
--- nut-2.7.4/docs/man8/bcmxcp.txt      2016-12-29 13:17:35.424212742 +0300
+++ nut-2.7.4/docs/man/bcmxcp.txt       2016-12-29 13:29:28.540287204 +0300
@@ -1,5 +1,5 @@
-BCMXCP(8)
-=========
+BCMXCP(1m)
+==========
 
 NAME
 ----
@@ -10,13 +10,13 @@
 ----
 This man page only documents the hardware-specific features of the
 bcmxcp driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
 This driver should recognize all serial BCM/XCP-compatible UPSes.  It has
 been developed and tested on Powerware PW5115 and PW9120 hardware. If your UPS
-has a USB connection, you may also consult the linkman:bcmxcp_usb[8] driver
+has a USB connection, you may also consult the linkman:bcmxcp_usb[1m] driver
 documentation.
 
 EXTRA ARGUMENTS
@@ -77,11 +77,11 @@
 --------
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 The USB BCM/XCP driver:
 ~~~~~~~~~~~~~~~~~~~~~~~
-linkman:bcmxcp_usb[8]
+linkman:bcmxcp_usb[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/belkin.txt nut-2.7.4/docs/man/belkin.txt
--- nut-2.7.4/docs/man8/belkin.txt      2016-12-29 13:17:35.424433790 +0300
+++ nut-2.7.4/docs/man/belkin.txt       2016-12-29 13:29:28.541109992 +0300
@@ -1,5 +1,5 @@
-BELKIN(8)
-=========
+BELKIN(1m)
+==========
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 belkin driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -42,7 +42,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/belkinunv.txt nut-2.7.4/docs/man/belkinunv.txt
--- nut-2.7.4/docs/man8/belkinunv.txt   2016-12-29 13:17:35.424530826 +0300
+++ nut-2.7.4/docs/man/belkinunv.txt    2016-12-29 13:29:28.544582177 +0300
@@ -1,5 +1,5 @@
-BELKINUNV(8)
-============
+BELKINUNV(1m)
+=============
 
 NAME
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 belkin driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -22,8 +22,8 @@
 The Trust UPS and older Belkin units are not supported by this driver,
 and neither are the Belkin Home Office models (F6H500-SER and so
 forth). However, some Belkin models, such as the Regulator Pro, are
-supported by the linkman:belkin[8] driver, and the Home Office models
-are supported using the linkman:genericups[8] driver with
+supported by the linkman:belkin[1m] driver, and the Home Office models
+are supported using the linkman:genericups[1m] driver with
 `upstype=7`.
 
 SOFT SHUTDOWN WORKAROUND
@@ -44,7 +44,7 @@
 This is meant to be used in a shutdown script as follows: during a
 shutdown, after all filesystems have been remounted read-only, and
 just before the system would normally be halted: check /etc/killpower
-(or similar) to see if this shutdown was caused by linkman:upsmon[8],
+(or similar) to see if this shutdown was caused by linkman:upsmon[1m],
 and if yes, call *belkinunv -x wait*. If AC power comes back on,
 *belkinunv* exits, and things should be arranged so that the
 system reboots in this case. If AC power does not come back on, the
@@ -69,7 +69,7 @@
 
 OPTIONS
 -------
-See also linkman:nutupsdrv[8] for generic options. Never use the
+See also linkman:nutupsdrv[1m] for generic options. Never use the
 *-k* option with this driver; it does not work properly.
 
 *-x wait*[='level']::
@@ -310,7 +310,7 @@
 
 When used normally, *belkinunv* forks into the background and its
 diagnostics are the same as for all NUT drivers, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 When used with the *-x wait* option, the exit status is normally
 *0*. If the *-x nohang* option has also been specified, an exit
@@ -328,7 +328,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/bestfcom.txt nut-2.7.4/docs/man/bestfcom.txt
--- nut-2.7.4/docs/man8/bestfcom.txt    2016-12-29 13:17:35.424620818 +0300
+++ nut-2.7.4/docs/man/bestfcom.txt     2016-12-29 13:29:28.545292962 +0300
@@ -1,5 +1,5 @@
-BESTFCOM(8)
-===========
+BESTFCOM(1m)
+============
 
 NAME
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 bestfcom driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -38,7 +38,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/bestfortress.txt nut-2.7.4/docs/man/bestfortress.txt
--- nut-2.7.4/docs/man8/bestfortress.txt        2016-12-29 13:17:35.424708084 +0300
+++ nut-2.7.4/docs/man/bestfortress.txt 2016-12-29 13:29:28.546009692 +0300
@@ -1,5 +1,5 @@
-BESTFORTRESS(8)
-===============
+BESTFORTRESS(1m)
+================
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 bestfortress driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -38,11 +38,11 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 The newer Best Power drivers:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-linkman:bestups[8], linkman:bestuferrups[8], linkman:bestfcom[8]
+linkman:bestups[1m], linkman:bestuferrups[1m], linkman:bestfcom[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/bestuferrups.txt nut-2.7.4/docs/man/bestuferrups.txt
--- nut-2.7.4/docs/man8/bestuferrups.txt        2016-12-29 13:17:35.424811553 +0300
+++ nut-2.7.4/docs/man/bestuferrups.txt 2016-12-29 13:29:28.546598499 +0300
@@ -1,5 +1,5 @@
-BESTUFERRUPS(8)
-===============
+BESTUFERRUPS(1m)
+================
 
 NAME
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 bestuferrups driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -35,7 +35,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/bestups.txt nut-2.7.4/docs/man/bestups.txt
--- nut-2.7.4/docs/man8/bestups.txt     2016-12-29 13:17:35.424919172 +0300
+++ nut-2.7.4/docs/man/bestups.txt      2016-12-29 13:29:28.548077554 +0300
@@ -1,5 +1,5 @@
-BESTUPS(8)
-==========
+BESTUPS(1m)
+===========
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 bestups driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -49,7 +49,7 @@
 +
 For example, the SOLA 610 700VA UPS (with a 24V battery) reports the
 single cell voltage (about 2.27V when fully charged). In this particular
-case you can set `battvoltmult = 12` in linkman:ups.conf[8] to fix this.
+case you can set `battvoltmult = 12` in linkman:ups.conf[1m] to fix this.
 
 *ID=*'string'::
 
@@ -99,7 +99,7 @@
 yet actually have a nominal voltage slightly below that.  This leads to
 things such as the perpetual 98.7% charge on the author's Fortress 750,
 even when it's been charging for weeks.  You can use `nombattvolt=` in 
-linkman:ups.conf[8] to fix this.
+linkman:ups.conf[1m] to fix this.
 
 AUTHOR
 ------
@@ -110,7 +110,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/blazer_ser.txt nut-2.7.4/docs/man/blazer_ser.txt
--- nut-2.7.4/docs/man8/blazer_ser.txt  2016-12-29 13:17:35.425130173 +0300
+++ nut-2.7.4/docs/man/blazer_ser.txt   2016-12-29 13:29:28.548439823 +0300
@@ -1,5 +1,5 @@
-BLAZER_SER(8)
-=============
+BLAZER_SER(1m)
+==============
 :blazer_usb!:
 
 NAME
diff -ur nut-2.7.4/docs/man8/blazer_usb.txt nut-2.7.4/docs/man/blazer_usb.txt
--- nut-2.7.4/docs/man8/blazer_usb.txt  2016-12-29 13:17:35.425225116 +0300
+++ nut-2.7.4/docs/man/blazer_usb.txt   2016-12-29 13:29:28.548735040 +0300
@@ -1,5 +1,5 @@
-BLAZER_USB(8)
-=============
+BLAZER_USB(1m)
+==============
 :blazer_usb:
 
 NAME
diff -ur nut-2.7.4/docs/man8/blazer-common.txt nut-2.7.4/docs/man/blazer-common.txt
--- nut-2.7.4/docs/man8/blazer-common.txt       2016-12-29 13:17:35.425012261 +0300
+++ nut-2.7.4/docs/man/blazer-common.txt        2016-12-29 13:17:50.885000542 +0300
@@ -2,7 +2,7 @@
 ----
 This man page only documents the hardware-specific features of the
 blazer driver. For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 
 SUPPORTED HARDWARE
@@ -166,7 +166,7 @@
 UPS COMMANDS
 ------------
 
-This driver supports some instant commands (see linkman:upscmd[8]):
+This driver supports some instant commands (see linkman:upscmd[1m]):
 
 *beeper.toggle*::
 
@@ -304,12 +304,12 @@
 --------
 
 ifdef::blazer_usb[]
-linkman:blazer_ser[8],
+linkman:blazer_ser[1m],
 endif::blazer_usb[]
 ifndef::blazer_usb[]
-linkman:blazer_usb[8],
+linkman:blazer_usb[1m],
 endif::blazer_usb[]
-linkman:nutupsdrv[8], linkman:upsc[8], linkman:upscmd[8], linkman:upsrw[8]
+linkman:nutupsdrv[1m], linkman:upsc[1m], linkman:upscmd[1m], linkman:upsrw[1m]
 
 
 Internet Resources:
diff -ur nut-2.7.4/docs/man8/clone.txt nut-2.7.4/docs/man/clone.txt
--- nut-2.7.4/docs/man8/clone.txt       2016-12-29 13:17:35.425311830 +0300
+++ nut-2.7.4/docs/man/clone.txt        2016-12-29 13:29:28.549970867 +0300
@@ -1,5 +1,5 @@
-CLONE(8)
-========
+CLONE(1m)
+=========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the specific features of the
 clone driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 DESCRIPTION
 -----------
@@ -108,7 +108,7 @@
 linkman:upscmd[1],
 linkman:upsrw[1],
 linkman:ups.conf[5],
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet Resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/dummy-ups.txt nut-2.7.4/docs/man/dummy-ups.txt
--- nut-2.7.4/docs/man8/dummy-ups.txt   2016-12-29 13:17:35.425402282 +0300
+++ nut-2.7.4/docs/man/dummy-ups.txt    2016-12-29 13:29:28.551672933 +0300
@@ -1,5 +1,5 @@
-DUMMY-UPS(8)
-============
+DUMMY-UPS(1m)
+=============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the specific features of the
 dummy-ups driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 DESCRIPTION
 -----------
@@ -19,7 +19,7 @@
 Dummy Mode
 ~~~~~~~~~~
 
-*dummy-ups* looks like a standard device driver to linkman:upsd[8] and 
+*dummy-ups* looks like a standard device driver to linkman:upsd[1m] and 
 allows one to change any value for testing purposes.  It is both interactive,
 controllable through the linkman:upsrw[1] and linkman:upscmd[1] commands (or
 equivalent graphical tool), and batchable through script files. It can be
@@ -54,7 +54,7 @@
                desc = "dummy-ups in dummy mode"
 
 This file is generally named "something.dev". It contains a list of all
-valid data and associated values, and has the same format as an linkman:upsc[8]
+valid data and associated values, and has the same format as an linkman:upsc[1m]
 dump (<varname>: <value>). So you can easily create definition
 files from an existing UPS using "upsc > file.dev".
 It can also be empty, in which case only a basic set of data is available:
@@ -146,7 +146,7 @@
 linkman:upscmd[1],
 linkman:upsrw[1],
 linkman:ups.conf[5],
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet Resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/etapro.txt nut-2.7.4/docs/man/etapro.txt
--- nut-2.7.4/docs/man8/etapro.txt      2016-12-29 13:17:35.425489237 +0300
+++ nut-2.7.4/docs/man/etapro.txt       2016-12-29 13:29:28.552222685 +0300
@@ -1,5 +1,5 @@
-ETAPRO(8)
-=========
+ETAPRO(1m)
+==========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 etapro driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -28,7 +28,7 @@
 --------
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/everups.txt nut-2.7.4/docs/man/everups.txt
--- nut-2.7.4/docs/man8/everups.txt     2016-12-29 13:17:35.425603341 +0300
+++ nut-2.7.4/docs/man/everups.txt      2016-12-29 13:29:28.552810296 +0300
@@ -1,5 +1,5 @@
-EVERUPS(8)
-==========
+EVERUPS(1m)
+===========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 everups driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -37,7 +37,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/gamatronic.txt nut-2.7.4/docs/man/gamatronic.txt
--- nut-2.7.4/docs/man8/gamatronic.txt  2016-12-29 13:17:35.425790328 +0300
+++ nut-2.7.4/docs/man/gamatronic.txt   2016-12-29 13:29:28.553402785 +0300
@@ -1,5 +1,5 @@
-GAMATRONIC(8)
-=============
+GAMATRONIC(1m)
+==============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 gamatronic driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -31,7 +31,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/genericups.txt nut-2.7.4/docs/man/genericups.txt
--- nut-2.7.4/docs/man8/genericups.txt  2016-12-29 13:17:35.426003873 +0300
+++ nut-2.7.4/docs/man/genericups.txt   2016-12-29 13:29:28.558257388 +0300
@@ -1,5 +1,5 @@
-GENERICUPS(8)
-=============
+GENERICUPS(1m)
+==============
 
 NAME
 ----
@@ -8,7 +8,7 @@
 NOTE
 ----
 This man page only documents the specific features of the genericups 
-driver.  For information about the core driver, see linkman:nutupsdrv[8].
+driver.  For information about the core driver, see linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -364,8 +364,8 @@
 may not be able to sense this in software.
 
 Most contact-closure UPSes will not power down the load if the line power 
-is present.  This can create a race when using slave linkman:upsmon[8] 
-systems.  See the linkman:upsmon[8] man page for more information.
+is present.  This can create a race when using slave linkman:upsmon[1m] 
+systems.  See the linkman:upsmon[1m] man page for more information.
 
 The solution to both of these problems is to upgrade to a smart protocol 
 UPS of some kind that allows detection and proper load cycling on command.
@@ -375,7 +375,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/hosts.conf.txt nut-2.7.4/docs/man/hosts.conf.txt
--- nut-2.7.4/docs/man8/hosts.conf.txt  2016-12-29 13:17:35.426176100 +0300
+++ nut-2.7.4/docs/man/hosts.conf.txt   2016-12-29 13:17:50.887929115 +0300
@@ -9,8 +9,8 @@
 DESCRIPTION
 -----------
 
-The CGI programs (linkman:upsset.cgi[8], linkman:upsstats.cgi[8],
-linkman:upsimage.cgi[8]) use this file to determine if they are allowed to
+The CGI programs (linkman:upsset.cgi[1m], linkman:upsstats.cgi[1m],
+linkman:upsimage.cgi[1m]) use this file to determine if they are allowed to
 talk to a host.  This keeps random visitors from using your web server
 to annoy others by creating outgoing connections.
 
@@ -32,7 +32,7 @@
 SEE ALSO
 --------
 
-linkman:upsset.cgi[8], linkman:upsstats.cgi[8], linkman:upsimage.cgi[8]
+linkman:upsset.cgi[1m], linkman:upsstats.cgi[1m], linkman:upsimage.cgi[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/index.txt nut-2.7.4/docs/man/index.txt
--- nut-2.7.4/docs/man8/index.txt       2016-12-29 13:17:35.426344631 +0300
+++ nut-2.7.4/docs/man/index.txt        2016-12-29 13:17:50.888345484 +0300
@@ -22,94 +22,94 @@
 Daemons
 ~~~~~~~
 
-- linkman:upsd[8]
-- linkman:upsmon[8]
-- linkman:upssched[8]
-- linkman:upslog[8]
+- linkman:upsd[1m]
+- linkman:upsmon[1m]
+- linkman:upssched[1m]
+- linkman:upslog[1m]
 
 Clients commands
 ~~~~~~~~~~~~~~~~
 
-- linkman:upsc[8]
-- linkman:upscmd[8]
-- linkman:upsrw[8]
+- linkman:upsc[1m]
+- linkman:upscmd[1m]
+- linkman:upsrw[1m]
 
 Configuration commands
 ~~~~~~~~~~~~~~~~~~~~~~
 
-- linkman:nut-scanner[8]
+- linkman:nut-scanner[1m]
  
 CGI programs
 ~~~~~~~~~~~~
 
-- linkman:upsimage.cgi[8]
-- linkman:upsset.cgi[8]
-- linkman:upsstats.cgi[8]
+- linkman:upsimage.cgi[1m]
+- linkman:upsset.cgi[1m]
+- linkman:upsstats.cgi[1m]
 
 [[Drivers]]
 Drivers
 ~~~~~~~
 
-- linkman:upsdrvctl[8]
+- linkman:upsdrvctl[1m]
 
-- linkman:al175[8]
-- linkman:apcsmart[8]
-- linkman:apcupsd-ups[8]
-- linkman:asem[8]
-- linkman:bcmxcp[8]
-- linkman:bcmxcp_usb[8]
-- linkman:belkin[8]
-- linkman:belkinunv[8]
-- linkman:bestfcom[8]
-- linkman:bestfortress[8]
-- linkman:bestuferrups[8]
-- linkman:bestups[8]
-- linkman:blazer_ser[8]
-- linkman:blazer_usb[8]
-- linkman:clone[8]
-- linkman:dummy-ups[8]
-- linkman:etapro[8]
-- linkman:everups[8]
-- linkman:gamatronic[8]
-- linkman:genericups[8]
-- linkman:isbmex[8]
-- linkman:ivtscd[8]
-- linkman:liebert[8]
-- linkman:liebert-esp2[8]
-- linkman:macosx-ups[8]
-- linkman:masterguard[8]
-- linkman:metasys[8]
-- linkman:mge-shut[8]
-- linkman:mge-utalk[8]
-- linkman:microdowell[8]
-- linkman:netxml-ups[8]
-- linkman:nutdrv_atcl_usb[8]
-- linkman:nutdrv_qx[8]
-- linkman:nutupsdrv[8]
-- linkman:oneac[8]
-- linkman:optiups[8]
-- linkman:powercom[8]
-- linkman:powerman-pdu[8]
-- linkman:powerpanel[8]
-- linkman:rhino[8]
-- linkman:richcomm_usb[8]
-- linkman:safenet[8]
-- linkman:snmp-ups[8]
-- linkman:solis[8]
-- linkman:tripplite[8]
-- linkman:tripplitesu[8]
-- linkman:tripplite_usb[8]
-- linkman:usbhid-ups[8]
-- linkman:upscode2[8]
-- linkman:victronups[8]
+- linkman:al175[1m]
+- linkman:apcsmart[1m]
+- linkman:apcupsd-ups[1m]
+- linkman:asem[1m]
+- linkman:bcmxcp[1m]
+- linkman:bcmxcp_usb[1m]
+- linkman:belkin[1m]
+- linkman:belkinunv[1m]
+- linkman:bestfcom[1m]
+- linkman:bestfortress[1m]
+- linkman:bestuferrups[1m]
+- linkman:bestups[1m]
+- linkman:blazer_ser[1m]
+- linkman:blazer_usb[1m]
+- linkman:clone[1m]
+- linkman:dummy-ups[1m]
+- linkman:etapro[1m]
+- linkman:everups[1m]
+- linkman:gamatronic[1m]
+- linkman:genericups[1m]
+- linkman:isbmex[1m]
+- linkman:ivtscd[1m]
+- linkman:liebert[1m]
+- linkman:liebert-esp2[1m]
+- linkman:macosx-ups[1m]
+- linkman:masterguard[1m]
+- linkman:metasys[1m]
+- linkman:mge-shut[1m]
+- linkman:mge-utalk[1m]
+- linkman:microdowell[1m]
+- linkman:netxml-ups[1m]
+- linkman:nutdrv_atcl_usb[1m]
+- linkman:nutdrv_qx[1m]
+- linkman:nutupsdrv[1m]
+- linkman:oneac[1m]
+- linkman:optiups[1m]
+- linkman:powercom[1m]
+- linkman:powerman-pdu[1m]
+- linkman:powerpanel[1m]
+- linkman:rhino[1m]
+- linkman:richcomm_usb[1m]
+- linkman:safenet[1m]
+- linkman:snmp-ups[1m]
+- linkman:solis[1m]
+- linkman:tripplite[1m]
+- linkman:tripplitesu[1m]
+- linkman:tripplite_usb[1m]
+- linkman:usbhid-ups[1m]
+- linkman:upscode2[1m]
+- linkman:victronups[1m]
 
 [[Developer_man]]
 Developer manual pages
 ----------------------
 
 - linkman:libupsclient-config[1]
-- linkman:nut-recorder[8]
-- linkman:skel[8]
+- linkman:nut-recorder[1m]
+- linkman:skel[1m]
 
 [[devclient]]
 Client library
diff -ur nut-2.7.4/docs/man8/isbmex.txt nut-2.7.4/docs/man/isbmex.txt
--- nut-2.7.4/docs/man8/isbmex.txt      2016-12-29 13:17:35.426514850 +0300
+++ nut-2.7.4/docs/man/isbmex.txt       2016-12-29 13:29:28.559374554 +0300
@@ -1,5 +1,5 @@
-ISBMEX(8)
-=========
+ISBMEX(1m)
+==========
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 isbmex driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -32,7 +32,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/ivtscd.txt nut-2.7.4/docs/man/ivtscd.txt
--- nut-2.7.4/docs/man8/ivtscd.txt      2016-12-29 13:17:35.426688508 +0300
+++ nut-2.7.4/docs/man/ivtscd.txt       2016-12-29 13:29:28.560414783 +0300
@@ -1,5 +1,5 @@
-IVTSCD(8)
-=========
+IVTSCD(1m)
+==========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 *ivtscd* driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 DESCRIPTION
 -----------
@@ -27,7 +27,7 @@
 --------
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/libnutclient_tcp.txt nut-2.7.4/docs/man/libnutclient_tcp.txt
--- nut-2.7.4/docs/man8/libnutclient_tcp.txt    2016-12-29 13:17:35.427711837 +0300
+++ nut-2.7.4/docs/man/libnutclient_tcp.txt     2016-12-29 13:17:50.889427775 +0300
@@ -26,7 +26,7 @@
 DESCRIPTION
 -----------
 
-These functions allow to manage connections to linkman:upsd[8] using NUT TCP protocol.
+These functions allow to manage connections to linkman:upsd[1m] using NUT TCP protocol.
 
 The *nutclient_tcp_create_client()* function create the 'NUTCLIENT_TCP_t' context and
 intend to connect to upsd at 'host' and 'port'. The context must be freed by 'nutclient_destroy()'
diff -ur nut-2.7.4/docs/man8/libnutclient.txt nut-2.7.4/docs/man/libnutclient.txt
--- nut-2.7.4/docs/man8/libnutclient.txt        2016-12-29 13:17:35.426864954 +0300
+++ nut-2.7.4/docs/man/libnutclient.txt 2016-12-29 13:17:50.889750804 +0300
@@ -19,7 +19,7 @@
 
 The Network UPS Tools (NUT) *nutclient* library provides a number of
 useful functions for programs to use when communicating with
-linkman:upsd[8]. It provides high-level representation of NUT data
+linkman:upsd[1m]. It provides high-level representation of NUT data
 through client connection, devices, variables and commands.
 Unlike linkman:upsclient[3], all low-level protocol details are
 hidden.
diff -ur nut-2.7.4/docs/man8/liebert-esp2.txt nut-2.7.4/docs/man/liebert-esp2.txt
--- nut-2.7.4/docs/man8/liebert-esp2.txt        2016-12-29 13:17:35.428250751 +0300
+++ nut-2.7.4/docs/man/liebert-esp2.txt 2016-12-29 13:29:28.561390835 +0300
@@ -1,5 +1,5 @@
-LIEBERT-ESP2(8)
-==============
+LIEBERT-ESP2(1m)
+===============
 
 NAME  
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 liebert-esp2 driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -33,7 +33,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/liebert.txt nut-2.7.4/docs/man/liebert.txt
--- nut-2.7.4/docs/man8/liebert.txt     2016-12-29 13:17:35.428399389 +0300
+++ nut-2.7.4/docs/man/liebert.txt      2016-12-29 13:29:28.562443820 +0300
@@ -1,5 +1,5 @@
-LIEBERT(8)
-==========
+LIEBERT(1m)
+===========
 
 NAME
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 liebert driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -42,7 +42,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/macosx-ups.txt nut-2.7.4/docs/man/macosx-ups.txt
--- nut-2.7.4/docs/man8/macosx-ups.txt  2016-12-29 13:17:35.428589036 +0300
+++ nut-2.7.4/docs/man/macosx-ups.txt   2016-12-29 13:29:28.564170848 +0300
@@ -1,5 +1,5 @@
-MACOSX-UPS(8)
-=============
+MACOSX-UPS(1m)
+==============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 *macosx-ups* driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -46,7 +46,7 @@
 This driver is a monitoring-only driver, and cannot shut down an UPS on its
 own. However, this should not be a problem in practice: it is monitoring the
 built-in Mac OS X UPS driver, which has configuration options for several
-shutdown scenarios. Consult the Energy Saver control panel or *pmset*(8) for
+shutdown scenarios. Consult the Energy Saver control panel or *pmset*(1m) for
 more information.
 
 The default distribution of *apcupsd* installs a kernel extension which
@@ -58,7 +58,7 @@
 provided by the built-in Mac OS X driver. In particular, voltages other than
 the battery voltage, as well as current and frequency, are typically not
 shown. It may be possible to monitor these values with *apcupsd* (for APC
-hardware only) or linkman:usbhid-ups[8].
+hardware only) or linkman:usbhid-ups[1m].
 
 AUTHORS
 -------
@@ -67,11 +67,11 @@
 SEE ALSO
 --------
 
-linkman:usbhid-ups[8], *pmset*(8), *regex*(3)
+linkman:usbhid-ups[1m], *pmset*(1m), *regex*(3)
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/masterguard.txt nut-2.7.4/docs/man/masterguard.txt
--- nut-2.7.4/docs/man8/masterguard.txt 2016-12-29 13:17:35.428750993 +0300
+++ nut-2.7.4/docs/man/masterguard.txt  2016-12-29 13:29:28.565131251 +0300
@@ -1,5 +1,5 @@
-MASTERGUARD(8)
-==============
+MASTERGUARD(1m)
+===============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 masterguard driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -30,7 +30,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/metasys.txt nut-2.7.4/docs/man/metasys.txt
--- nut-2.7.4/docs/man8/metasys.txt     2016-12-29 13:17:35.428904835 +0300
+++ nut-2.7.4/docs/man/metasys.txt      2016-12-29 13:29:28.565902281 +0300
@@ -1,5 +1,5 @@
-METASYS(8)
-==========
+METASYS(1m)
+===========
 
 NAME  
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 metasys driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -56,7 +56,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/mge-shut.txt nut-2.7.4/docs/man/mge-shut.txt
--- nut-2.7.4/docs/man8/mge-shut.txt    2016-12-29 13:17:35.429071940 +0300
+++ nut-2.7.4/docs/man/mge-shut.txt     2016-12-29 13:29:28.567011432 +0300
@@ -1,5 +1,5 @@
-MGE-SHUT(8) 
-===========
+MGE-SHUT(1m) 
+============
 
 NAME
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 mge-shut driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -33,7 +33,7 @@
 
 *lowbatt*='num'::
 Set the low battery warning threshold at which shutdown is initiated by
-linkman:upsmon[8].
+linkman:upsmon[1m].
 +
 The factory default value is 30 (in percent), and can be settable depending on
 the exact model.
@@ -90,7 +90,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/mge-utalk.txt nut-2.7.4/docs/man/mge-utalk.txt
--- nut-2.7.4/docs/man8/mge-utalk.txt   2016-12-29 13:17:35.429230328 +0300
+++ nut-2.7.4/docs/man/mge-utalk.txt    2016-12-29 13:29:28.568107216 +0300
@@ -1,5 +1,5 @@
-MGE-UTALK(8) 
-============
+MGE-UTALK(1m) 
+=============
 
 NAME
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 mge-utalk driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -43,7 +43,7 @@
 
 *lowbatt*='num'::
 Set the low battery warning threshold at which shutdown is initiated by
-linkman:upsmon[8].
+linkman:upsmon[1m].
 +
 The factory default value is 30 (in percent), and can be settable depending on
 the exact model.
@@ -91,7 +91,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/microdowell.txt nut-2.7.4/docs/man/microdowell.txt
--- nut-2.7.4/docs/man8/microdowell.txt 2016-12-29 13:17:35.429389824 +0300
+++ nut-2.7.4/docs/man/microdowell.txt  2016-12-29 13:29:28.568738780 +0300
@@ -1,5 +1,5 @@
-MICRODOWELL(8)
-==============
+MICRODOWELL(1m)
+===============
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 Microdowell driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -33,7 +33,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/netxml-ups.txt nut-2.7.4/docs/man/netxml-ups.txt
--- nut-2.7.4/docs/man8/netxml-ups.txt  2016-12-29 13:17:35.429541470 +0300
+++ nut-2.7.4/docs/man/netxml-ups.txt   2016-12-29 13:29:28.569940433 +0300
@@ -1,5 +1,5 @@
-netxml-ups(8)
-=============
+netxml-ups(1m)
+==============
 
 NAME  
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 netxml-ups driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -27,7 +27,7 @@
  * ePDU Monitored (newer version). 
 
 Older models, such as SNMP card (Ref 66062 and Ref 66045), use the SNMP
-protocol and should use the linkman:snmp-ups[8] driver with the "mibs=mge"
+protocol and should use the linkman:snmp-ups[1m] driver with the "mibs=mge"
 parameter.
 
 EXTRA ARGUMENTS
@@ -40,7 +40,7 @@
 Don't change this value unless you know exactly what you're doing.
 
 This value *must never* be higher than half the MAXAGE value specified in
-linkman:upsd.conf[5], otherwise you run the risk that linkman:upsd[8] declares
+linkman:upsd.conf[5], otherwise you run the risk that linkman:upsd[1m] declares
 the driver stale while it is waiting for a connection to timeout.
 
 *subscribe*::
@@ -80,7 +80,7 @@
 443 for https) it may be omitted.
 
 In order not to overload older NMCs by polling them too frequently, it is
-recommended to increase the "pollinterval" (see linkman:nutupsdrv[8]) and
+recommended to increase the "pollinterval" (see linkman:nutupsdrv[1m]) and
 linkman:ups.conf[5]) to at least 5 seconds.
 
 KNOWN ISSUES
@@ -100,7 +100,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/nut-ipmipsu.txt nut-2.7.4/docs/man/nut-ipmipsu.txt
--- nut-2.7.4/docs/man8/nut-ipmipsu.txt 2016-12-29 13:17:35.429717330 +0300
+++ nut-2.7.4/docs/man/nut-ipmipsu.txt  2016-12-29 13:29:28.571414641 +0300
@@ -1,5 +1,5 @@
-NUT-IPMIPSU(8) 
-==============
+NUT-IPMIPSU(1m) 
+===============
 
 NAME
 ----
@@ -18,7 +18,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 nut-ipmipsu driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -106,7 +106,7 @@
 --------
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/nut-recorder.txt nut-2.7.4/docs/man/nut-recorder.txt
--- nut-2.7.4/docs/man8/nut-recorder.txt        2016-12-29 13:17:35.429887448 +0300
+++ nut-2.7.4/docs/man/nut-recorder.txt 2016-12-29 13:29:28.572266022 +0300
@@ -1,5 +1,5 @@
-NUT-RECORDER(8)
-===============
+NUT-RECORDER(1m)
+================
 
 
 NAME
@@ -16,7 +16,7 @@
 power failures, or any other value changes) from upsd, and dump it in a .seq
 format.
 
-The .seq file can then be used by the linkman:dummy-ups[8] driver
+The .seq file can then be used by the linkman:dummy-ups[1m] driver
 to replay the sequence.
 
 OPTIONS
@@ -65,7 +65,7 @@
 SEE ALSO
 --------
 
-linkman:dummy-ups[8]
+linkman:dummy-ups[1m]
 
 INTERNET RESOURCES
 ------------------
diff -ur nut-2.7.4/docs/man8/nut-scanner.txt nut-2.7.4/docs/man/nut-scanner.txt
--- nut-2.7.4/docs/man8/nut-scanner.txt 2016-12-29 13:17:35.430034123 +0300
+++ nut-2.7.4/docs/man/nut-scanner.txt  2016-12-29 13:29:28.574514802 +0300
@@ -1,5 +1,5 @@
-NUT-SCANNER(8)
-==============
+NUT-SCANNER(1m)
+===============
 
 
 NAME
diff -ur nut-2.7.4/docs/man8/nut.conf.txt nut-2.7.4/docs/man/nut.conf.txt
--- nut-2.7.4/docs/man8/nut.conf.txt    2016-12-29 13:17:35.430161610 +0300
+++ nut-2.7.4/docs/man/nut.conf.txt     2016-12-29 13:17:50.894780083 +0300
@@ -54,12 +54,12 @@
 the MODE should be set to netclient.
 
 *UPSD_OPTIONS*::
-Optional.  Set upsd specific options. See linkman:upsd[8] for more
+Optional.  Set upsd specific options. See linkman:upsd[1m] for more
 details.  It is ignored when 'MODE' above indicates that no upsd
 should be running.
 
 *UPSMON_OPTIONS*::
-Optional.  Set upsmon specific options. See linkman:upsmon[8] for
+Optional.  Set upsmon specific options. See linkman:upsmon[1m] for
 more details.  It is ignored when 'MODE' above indicates that no
 upsmon should be running.
 
diff -ur nut-2.7.4/docs/man8/nutdrv_atcl_usb.txt nut-2.7.4/docs/man/nutdrv_atcl_usb.txt
--- nut-2.7.4/docs/man8/nutdrv_atcl_usb.txt     2016-12-29 13:17:35.430299950 +0300
+++ nut-2.7.4/docs/man/nutdrv_atcl_usb.txt      2016-12-29 13:29:28.575387223 +0300
@@ -1,5 +1,5 @@
-NUTDRV_ATCL_USB(8)
-==================
+NUTDRV_ATCL_USB(1m)
+===================
 
 NAME
 ----
@@ -8,7 +8,7 @@
 NOTE
 ----
 This man page only documents the specific features of the nutdrv_atcl_usb 
-driver.  For information about the core driver, see linkman:nutupsdrv[8].
+driver.  For information about the core driver, see linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -18,9 +18,9 @@
 chip, and for hardware manufactured by Kanji and Plexus, the microcontroller
 appears to emulate a traditional contact-closure interface. This translates
 into only three states in ups.status: *OL*, *OB* and *OB LB* (similar to
-linkman:genericups[8]), with no other dynamic status values reported. Note that
+linkman:genericups[1m]), with no other dynamic status values reported. Note that
 these USB identifiers (including the iManufacturer string) have also been seen
-on devices that are supported by the `fuji` subdriver of linkman:nutdrv_qx[8].
+on devices that are supported by the `fuji` subdriver of linkman:nutdrv_qx[1m].
 
 EXTRA ARGUMENTS
 ---------------
@@ -31,7 +31,7 @@
 In case your iManufacturer (Vendor) string does not exactly match
 +ATCL FOR UPS+, you may provide an alternate string here. Note that a more
 likely case is that your device is handled by another driver for +0001:0000+
-devices, such as linkman:nutdrv_qx[8].
+devices, such as linkman:nutdrv_qx[1m].
 
 BUGS
 ----
@@ -45,8 +45,8 @@
 clean up).
 
 Most contact-closure UPSes will not power down the load if the line power 
-is present. This can create a race when using slave linkman:upsmon[8] systems.
-See the linkman:upsmon[8] man page for more information. The solution to this
+is present. This can create a race when using slave linkman:upsmon[1m] systems.
+See the linkman:upsmon[1m] man page for more information. The solution to this
 problem is to upgrade to a smart protocol UPS of some kind that allows
 detection and proper load cycling on command.
 
@@ -59,15 +59,15 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 The generic serial driver:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-linkman:genericups[8]
+linkman:genericups[1m]
 
 The Qx driver:
 ~~~~~~~~~~~~~~
-linkman:nutdrv_qx[8] (`fuji` subdriver)
+linkman:nutdrv_qx[1m] (`fuji` subdriver)
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/nutdrv_qx.txt nut-2.7.4/docs/man/nutdrv_qx.txt
--- nut-2.7.4/docs/man8/nutdrv_qx.txt   2016-12-29 13:17:35.430482574 +0300
+++ nut-2.7.4/docs/man/nutdrv_qx.txt    2016-12-29 13:29:28.582919216 +0300
@@ -1,5 +1,5 @@
-NUTDRV_QX(8)
-============
+NUTDRV_QX(1m)
+=============
 
 NAME
 ----
@@ -11,7 +11,7 @@
 ----
 
 This man page only documents the hardware-specific features of the *nutdrv_qx* driver.
-For information about the core driver, see linkman:nutupsdrv[8].
+For information about the core driver, see linkman:nutupsdrv[1m].
 
 
 SUPPORTED HARDWARE
@@ -38,14 +38,14 @@
 +
 Note that a value below 3 minutes, may cause earlier firmware versions to not switch on automatically, so it defaults to 3 minutes (i.e. 180 seconds).
 +
-This option provides a default value for *ups.delay.start* that will then be used by the driver in the automatic shutdown sequence (i.e. calling the driver with the *-k* option, calling linkman:upsdrvctl[8] with the *shutdown* option or when the +FSD+ flag is set and linkman:upsmon[8] enters its shutdown sequence): however you can change this value `on the fly' for the actual session, only for the use with instant commands, setting *ups.delay.start* with linkman:upsrw[8].
+This option provides a default value for *ups.delay.start* that will then be used by the driver in the automatic shutdown sequence (i.e. calling the driver with the *-k* option, calling linkman:upsdrvctl[1m] with the *shutdown* option or when the +FSD+ flag is set and linkman:upsmon[1m] enters its shutdown sequence): however you can change this value `on the fly' for the actual session, only for the use with instant commands, setting *ups.delay.start* with linkman:upsrw[1m].
 
 *offdelay =* 'value'::
 Time to wait before shutting down the UPS (seconds).
 This value is truncated to units of 6 seconds (less than 60 seconds) or 60 seconds (more than 60 seconds).
 Defaults to 30 seconds.
 +
-This option provides a default value for *ups.delay.shutdown* that will then be used by the driver in the automatic shutdown sequence (i.e. calling the driver with the *-k* option, calling linkman:upsdrvctl[8] with the *shutdown* option or when the +FSD+ flag is set and linkman:upsmon[8] enters its shutdown sequence): however you can change this value `on the fly' for the actual session, only for the use with instant commands, setting *ups.delay.shutdown* with linkman:upsrw[8].
+This option provides a default value for *ups.delay.shutdown* that will then be used by the driver in the automatic shutdown sequence (i.e. calling the driver with the *-k* option, calling linkman:upsdrvctl[1m] with the *shutdown* option or when the +FSD+ flag is set and linkman:upsmon[1m] enters its shutdown sequence): however you can change this value `on the fly' for the actual session, only for the use with instant commands, setting *ups.delay.shutdown* with linkman:upsrw[1m].
 
 *stayoff*::
 If you set stayoff in linkman:ups.conf[5] when FSD arises the UPS will call a *shutdown.stayoff* shutting down after *ups.delay.shutdown* seconds and won't return (see <<_known_problems,KNOWN PROBLEMS>>), otherwise (standard behaviour) the UPS will call *shutdown.return* shutting down after *ups.delay.shutdown* seconds and then turn on after *ups.delay.start* seconds (if mains meanwhile returned).
@@ -349,7 +349,7 @@
 UPS COMMANDS
 ------------
 
-This driver supports some instant commands (see linkman:upscmd[8]):
+This driver supports some instant commands (see linkman:upscmd[1m]):
 
 *beeper.toggle*::
 Toggle the UPS beeper.
@@ -536,7 +536,7 @@
 *battnumb*::
 This option has been renamed to *battery_number*.
 
-The following options are no longer supported by this driver, you can now change them more conveniently `on the fly' calling linkman:upsrw[8] with the appropriate NUT variable - provided that your UPS supports them.
+The following options are no longer supported by this driver, you can now change them more conveniently `on the fly' calling linkman:upsrw[1m] with the appropriate NUT variable - provided that your UPS supports them.
 
 [horizontal]
 *battpacks*:: -> *battery.packs*
@@ -660,7 +660,7 @@
 
 .UPS Warnings for 'voltronic' UPSes
 [cols="5>,95",options="autowidth,header",frame="topbot",grid="rows",align="center",caption=""]
-|====
+|=====
 |#     |Corresponding Warning
 |1     |Battery disconnected
 |2     |Neutral not connected
@@ -721,7 +721,7 @@
 |57    |Abnormal warning on input phase angle
 |58    |Warning!! Cover of maintain switch is open
 |62    |EEPROM operation error
-|====
+|=====
 
 
 AUTHORS
@@ -738,15 +738,15 @@
 SEE ALSO
 --------
 
-linkman:blazer_ser[8],
-linkman:blazer_usb[8],
-linkman:nutupsdrv[8],
+linkman:blazer_ser[1m],
+linkman:blazer_usb[1m],
+linkman:nutupsdrv[1m],
 linkman:ups.conf[5],
-linkman:upsc[8],
-linkman:upscmd[8],
-linkman:upsdrvctl[8],
-linkman:upsmon[8],
-linkman:upsrw[8]
+linkman:upsc[1m],
+linkman:upscmd[1m],
+linkman:upsdrvctl[1m],
+linkman:upsmon[1m],
+linkman:upsrw[1m]
 
 
 Internet Resources:
diff -ur nut-2.7.4/docs/man8/nutscan.txt nut-2.7.4/docs/man/nutscan.txt
--- nut-2.7.4/docs/man8/nutscan.txt     2016-12-29 13:17:35.430612497 +0300
+++ nut-2.7.4/docs/man/nutscan.txt      2016-12-29 13:17:50.896326263 +0300
@@ -10,7 +10,7 @@
 -----------
 
 The Network UPS Tools (NUT) *nutscan* library provides the same discovery
-related features that are also offered by linkman:nut-scanner[8].
+related features that are also offered by linkman:nut-scanner[1m].
 
 It enables the discovery of supported NUT devices (USB, SNMP, Eaton XML/HTTP
 and IPMI) and NUT servers (using Avahi, or the classic connection method).
@@ -49,7 +49,7 @@
 
 SEE ALSO
 --------
-linkman:nut-scanner[8],
+linkman:nut-scanner[1m],
 linkman:nutscan_scan_usb[3], linkman:nutscan_scan_snmp[3],
 linkman:nutscan_scan_xml_http[3], linkman:nutscan_scan_nut[3],
 linkman:nutscan_scan_avahi[3], linkman:nutscan_scan_ipmi[3],
diff -ur nut-2.7.4/docs/man8/nutupsdrv.txt nut-2.7.4/docs/man/nutupsdrv.txt
--- nut-2.7.4/docs/man8/nutupsdrv.txt   2016-12-29 13:17:35.432911930 +0300
+++ nut-2.7.4/docs/man/nutupsdrv.txt    2016-12-29 13:29:28.584991108 +0300
@@ -1,5 +1,5 @@
-NUTUPSDRV(8)
-============
+NUTUPSDRV(1m)
+=============
 
 NAME  
 ----
@@ -23,7 +23,7 @@
 For information on the specific drivers, see their individual man pages.
 
 UPS drivers provide a communication channel between the physical UPS
-hardware and the linkman:upsd[8] server.  The driver is responsible for
+hardware and the linkman:upsd[1m] server.  The driver is responsible for
 translating the native protocol of the UPS to the common format used by
 the rest of this package.
 
@@ -39,7 +39,7 @@
 attached must be turned off to ensure a proper reboot when power returns.
 
 NOTE: You probably don't want to use any of these options directly.  You
-should use linkman:upsdrvctl[8] to control your drivers, and
+should use linkman:upsdrvctl[1m] to control your drivers, and
 linkman:ups.conf[5] to configure them.  The rest of this manual describes
 options and parameters that generally are not needed by normal users.
 
@@ -117,14 +117,14 @@
 -----------
 
 Information about the startup process is printed to stdout.  Additional
-messages after that point are available in the syslog.  After linkman:upsd[8]
-starts, the UPS clients such as linkman:upsc[8] can be used to query the status
+messages after that point are available in the syslog.  After linkman:upsd[1m]
+starts, the UPS clients such as linkman:upsc[1m] can be used to query the status
 of an UPS.
 
 PROGRAM CONTROL
 ---------------
 
-You should always use linkman:upsdrvctl[8] to control the drivers.  While
+You should always use linkman:upsdrvctl[1m] to control the drivers.  While
 drivers can be started by hand for testing purposes, it is not recommended for
 production use.
 
@@ -144,62 +144,62 @@
 --------
 
 Server:
-linkman:upsd[8]
+linkman:upsd[1m]
 
 Clients:
-linkman:upsc[8], linkman:upscmd[8],
-linkman:upsrw[8], linkman:upslog[8], linkman:upsmon[8]
+linkman:upsc[1m], linkman:upscmd[1m],
+linkman:upsrw[1m], linkman:upslog[1m], linkman:upsmon[1m]
 
 CGI programs:
-linkman:upsset.cgi[8], linkman:upsstats.cgi[8], linkman:upsimage.cgi[8]
+linkman:upsset.cgi[1m], linkman:upsstats.cgi[1m], linkman:upsimage.cgi[1m]
 
 Driver control:
-linkman:upsdrvctl[8]
+linkman:upsdrvctl[1m]
 
 Drivers:
-linkman:al175[8]
-linkman:apcsmart[8],
-linkman:bcmxcp[8],
-linkman:bcmxcp_usb[8],
-linkman:belkin[8],
-linkman:belkinunv[8],
-linkman:bestfcom[8],
-linkman:bestuferrups[8],
-linkman:bestups[8],
-linkman:blazer_ser[8],
-linkman:blazer_usb[8],
-linkman:cyberpower[8],
-linkman:dummy-ups[8],
-linkman:etapro[8],
-linkman:everups[8],
-linkman:gamatronic[8],
-linkman:genericups[8],
-linkman:isbmex[8],
-linkman:liebert[8],
-linkman:masterguard[8],
-linkman:metasys[8],
-linkman:mge-shut[8],
-linkman:mge-utalk[8],
-linkman:mge-xml[8],
-linkman:newmge-shut[8],
-linkman:nitram[8],
-linkman:nutdrv_qx[8],
-linkman:oneac[8],
-linkman:optiups[8],
-linkman:powercom[8],
-linkman:powerman-pdu[8],
-linkman:powerpanel[8],
-linkman:rhino[8],
-linkman:richcomm_usb[8],
-linkman:safenet[8],
-linkman:snmp-ups[8],
-linkman:solis[8],
-linkman:tripplite[8],
-linkman:tripplitesu[8],
-linkman:tripplite_usb[8],
-linkman:usbhid-ups[8],
-linkman:upscode2[8],
-linkman:victronups[8]
+linkman:al175[1m]
+linkman:apcsmart[1m],
+linkman:bcmxcp[1m],
+linkman:bcmxcp_usb[1m],
+linkman:belkin[1m],
+linkman:belkinunv[1m],
+linkman:bestfcom[1m],
+linkman:bestuferrups[1m],
+linkman:bestups[1m],
+linkman:blazer_ser[1m],
+linkman:blazer_usb[1m],
+linkman:cyberpower[1m],
+linkman:dummy-ups[1m],
+linkman:etapro[1m],
+linkman:everups[1m],
+linkman:gamatronic[1m],
+linkman:genericups[1m],
+linkman:isbmex[1m],
+linkman:liebert[1m],
+linkman:masterguard[1m],
+linkman:metasys[1m],
+linkman:mge-shut[1m],
+linkman:mge-utalk[1m],
+linkman:mge-xml[1m],
+linkman:newmge-shut[1m],
+linkman:nitram[1m],
+linkman:nutdrv_qx[1m],
+linkman:oneac[1m],
+linkman:optiups[1m],
+linkman:powercom[1m],
+linkman:powerman-pdu[1m],
+linkman:powerpanel[1m],
+linkman:rhino[1m],
+linkman:richcomm_usb[1m],
+linkman:safenet[1m],
+linkman:snmp-ups[1m],
+linkman:solis[1m],
+linkman:tripplite[1m],
+linkman:tripplitesu[1m],
+linkman:tripplite_usb[1m],
+linkman:usbhid-ups[1m],
+linkman:upscode2[1m],
+linkman:victronups[1m]
 
 Internet resources:
 The NUT (Network UPS Tools) home page: http://www.networkupstools.org/
diff -ur nut-2.7.4/docs/man8/oneac.txt nut-2.7.4/docs/man/oneac.txt
--- nut-2.7.4/docs/man8/oneac.txt       2016-12-29 13:17:35.433058857 +0300
+++ nut-2.7.4/docs/man/oneac.txt        2016-12-29 13:29:28.586387019 +0300
@@ -1,5 +1,5 @@
-ONEAC(8)
-========
+ONEAC(1m)
+=========
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 oneac driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -24,7 +24,7 @@
  - OB (early 2000's on, big cabinet, DB-25 std., interface slot)
 
 If your UPS is equipped with the Basic Interface card, use the
-linkman:genericups[8] driver.
+linkman:genericups[1m] driver.
 
 EXTRA ARGUMENTS
 ---------------
@@ -40,7 +40,7 @@
 INSTANT COMMANDS
 ----------------
 This driver supports the following Instant Commands.
-(See linkman:upscmd[8])
+(See linkman:upscmd[1m])
 
 All UPS units
 ~~~~~~~~~~~~~
@@ -97,7 +97,7 @@
 
 Writable Variables
 ------------------
-See linkman:upsrw[8] to see what variables are writable for the UPS.
+See linkman:upsrw[1m] to see what variables are writable for the UPS.
 
 NOTE: If your UPS supports writing battery.runtime.low, the new set value
 is to be entered in minutes (up to 99) but the reported value is reported
@@ -118,7 +118,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/optiups.txt nut-2.7.4/docs/man/optiups.txt
--- nut-2.7.4/docs/man8/optiups.txt     2016-12-29 13:17:35.433215048 +0300
+++ nut-2.7.4/docs/man/optiups.txt      2016-12-29 13:29:28.587425446 +0300
@@ -1,5 +1,5 @@
-OPTIUPS(8)
-==========
+OPTIUPS(1m)
+===========
 
 NAME  
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 optiups driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -85,7 +85,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/powercom.txt nut-2.7.4/docs/man/powercom.txt
--- nut-2.7.4/docs/man8/powercom.txt    2016-12-29 13:17:35.433381858 +0300
+++ nut-2.7.4/docs/man/powercom.txt     2016-12-29 13:29:28.589529951 +0300
@@ -1,5 +1,5 @@
-POWERCOM(8)
-===========
+POWERCOM(1m)
+============
 
 NAME  
 ----
@@ -10,14 +10,14 @@
 ----
 This man page only documents the hardware-specific features of the
 powercom driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
 This driver supports many similar kinds of serial UPS hardware (as well as a
 few USB UPS models with USB-to-serial adapters).  The most common ones are the
 Trust 425/625, Powercom, and Advice Partner/King PR750.  Others using the same
-protocol may also work. For USB connections, you might need linkman:usbhid-ups[8].
+protocol may also work. For USB connections, you might need linkman:usbhid-ups[1m].
 
 For more specific guidance on which driver is applicable for a USB connection,
 see the NUT Hardware Compatibility List (HCL).
@@ -204,7 +204,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/powerman-pdu.txt nut-2.7.4/docs/man/powerman-pdu.txt
--- nut-2.7.4/docs/man8/powerman-pdu.txt        2016-12-29 13:17:35.433512301 +0300
+++ nut-2.7.4/docs/man/powerman-pdu.txt 2016-12-29 13:29:28.590517030 +0300
@@ -1,5 +1,5 @@
-POWERMAN-PDU(8) 
-===============
+POWERMAN-PDU(1m) 
+================
 
 NAME
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 powerman-pdu driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -38,7 +38,7 @@
 
 UPS COMMANDS
 ------------
-The following instant commands (see linkman:upscmd[8]) are available for each
+The following instant commands (see linkman:upscmd[1m]) are available for each
 outlet of the PDU, with *X* standing for the outlet number:
 
 *outlet.X.load.on*::
@@ -78,7 +78,7 @@
 --------
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/powerpanel.txt nut-2.7.4/docs/man/powerpanel.txt
--- nut-2.7.4/docs/man8/powerpanel.txt  2016-12-29 13:17:35.433655044 +0300
+++ nut-2.7.4/docs/man/powerpanel.txt   2016-12-29 13:29:28.592172468 +0300
@@ -1,5 +1,5 @@
-POWERPANEL(8)
-=============
+POWERPANEL(1m)
+==============
 
 NAME
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 powerpanel driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -48,7 +48,7 @@
 VARIABLES
 ---------
 Depending on the type of your UPS unit, some of the following variables may
-be changed with linkman:upsrw[8]. If the driver can't read a variable from the
+be changed with linkman:upsrw[1m]. If the driver can't read a variable from the
 UPS, it will not be made available.
 
 *input.transfer.high*::
@@ -131,7 +131,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/rhino.txt nut-2.7.4/docs/man/rhino.txt
--- nut-2.7.4/docs/man8/rhino.txt       2016-12-29 13:17:35.433816915 +0300
+++ nut-2.7.4/docs/man/rhino.txt        2016-12-29 13:29:28.592908890 +0300
@@ -1,5 +1,5 @@
-RHINO(8)
-========
+RHINO(1m)
+=========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 rhino driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -52,7 +52,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/richcomm_usb.txt nut-2.7.4/docs/man/richcomm_usb.txt
--- nut-2.7.4/docs/man8/richcomm_usb.txt        2016-12-29 13:17:35.433965994 +0300
+++ nut-2.7.4/docs/man/richcomm_usb.txt 2016-12-29 13:29:28.593569123 +0300
@@ -1,5 +1,5 @@
-RICHCOMM_USB(8)
-===============
+RICHCOMM_USB(1m)
+================
 
 NAME
 ----
@@ -9,7 +9,7 @@
 NOTE
 ----
 This man page only documents the specific features of the richcomm_usb 
-driver.  For information about the core driver, see linkman:nutupsdrv[8].
+driver.  For information about the core driver, see linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -17,13 +17,13 @@
 used to upgrade an existing (RS-232) contact closure UPS interface to USB.
 As such, all the limitations of the underlying contact closure interface
 apply.  This means that you will only get the essentials in ups.status: OL,
-OB, and LB.  See also linkman:genericups[8].
+OB, and LB.  See also linkman:genericups[1m].
 
 BUGS
 ----
 Most contact-closure UPSes will not power down the load if the line power 
-is present.  This can create a race when using slave linkman:upsmon[8] 
-systems.  See the linkman:upsmon[8] man page for more information.
+is present.  This can create a race when using slave linkman:upsmon[1m] 
+systems.  See the linkman:upsmon[1m] man page for more information.
 
 The solution to both of these problems is to upgrade to a smart protocol 
 UPS of some kind that allows detection and proper load cycling on command.
@@ -39,11 +39,11 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 The generic serial driver:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
-linkman:genericups[8]
+linkman:genericups[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/riello_ser.txt nut-2.7.4/docs/man/riello_ser.txt
--- nut-2.7.4/docs/man8/riello_ser.txt  2016-12-29 13:17:35.434121970 +0300
+++ nut-2.7.4/docs/man/riello_ser.txt   2016-12-29 13:29:28.594173338 +0300
@@ -1,5 +1,5 @@
-RIELLO_SER(8) 
-===========
+RIELLO_SER(1m) 
+============
 
 NAME
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 riello_ser driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -36,7 +36,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/riello_usb.txt nut-2.7.4/docs/man/riello_usb.txt
--- nut-2.7.4/docs/man8/riello_usb.txt  2016-12-29 13:17:35.434292534 +0300
+++ nut-2.7.4/docs/man/riello_usb.txt   2016-12-29 13:29:28.594748421 +0300
@@ -1,5 +1,5 @@
-RIELLO_USB(8) 
-===========
+RIELLO_USB(1m) 
+============
 
 NAME
 ----
@@ -15,7 +15,7 @@
 
 NOTE: This man page only documents the hardware-specific features of the
 riello_usb driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -35,7 +35,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/safenet.txt nut-2.7.4/docs/man/safenet.txt
--- nut-2.7.4/docs/man8/safenet.txt     2016-12-29 13:17:35.434462089 +0300
+++ nut-2.7.4/docs/man/safenet.txt      2016-12-29 13:29:28.595896460 +0300
@@ -1,5 +1,5 @@
-SAFENET(8)
-==========
+SAFENET(1m)
+===========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 safenet driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -40,7 +40,7 @@
 
 UPSCMD
 ------
-This driver supports some instant commands (see linkman:upscmd[8]):
+This driver supports some instant commands (see linkman:upscmd[1m]):
 
 *test.battery.start*::
 Start UPS self test
@@ -94,7 +94,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/skel.txt nut-2.7.4/docs/man/skel.txt
--- nut-2.7.4/docs/man8/skel.txt        2016-12-29 13:17:35.434611918 +0300
+++ nut-2.7.4/docs/man/skel.txt 2016-12-29 13:29:28.597210692 +0300
@@ -1,5 +1,5 @@
-SKEL(8)
-=======
+SKEL(1m)
+========
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 *skel* driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 //////////////////////////////////////////
 The following lines are comments.
@@ -26,7 +26,7 @@
 
 In the "NAME" section, you must follow the format above, including separating
 the driver name from its description by "-". This is to ensure that the
-apropos(8) database is properly rebuilt.
+apropos(1m) database is properly rebuilt.
 //////////////////////////////////////////
 
 SUPPORTED HARDWARE
@@ -114,7 +114,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/snmp-ups.txt nut-2.7.4/docs/man/snmp-ups.txt
--- nut-2.7.4/docs/man8/snmp-ups.txt    2016-12-29 13:17:35.434771758 +0300
+++ nut-2.7.4/docs/man/snmp-ups.txt     2016-12-29 13:29:28.599039082 +0300
@@ -1,5 +1,5 @@
-snmp-ups(8)
-===========
+snmp-ups(1m)
+============
 
 NAME
 ----
@@ -10,7 +10,7 @@
 ----
 This man page only documents the hardware-specific features of the
 snmp-ups driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -172,7 +172,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 NUT SNMP Protocols Library
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/solis.txt nut-2.7.4/docs/man/solis.txt
--- nut-2.7.4/docs/man8/solis.txt       2016-12-29 13:17:35.434945489 +0300
+++ nut-2.7.4/docs/man/solis.txt        2016-12-29 13:29:28.599863473 +0300
@@ -1,5 +1,5 @@
-SOLIS(8)
-========
+SOLIS(1m)
+=========
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 solis driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -62,7 +62,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/tripplite_usb.txt nut-2.7.4/docs/man/tripplite_usb.txt
--- nut-2.7.4/docs/man8/tripplite_usb.txt       2016-12-29 13:17:35.435236763 +0300
+++ nut-2.7.4/docs/man/tripplite_usb.txt        2016-12-29 13:29:28.601747700 +0300
@@ -1,5 +1,5 @@
-TRIPPLITE_USB(8)
-================
+TRIPPLITE_USB(1m)
+=================
 
 
 NAME
@@ -18,11 +18,11 @@
 HID-class devices, but are not true HID Power-Device Class devices.  So far,
 the devices supported by tripplite_usb have product ID 0001, and the newer
 units (such as those with "LCD" in the model name) with product ID 2001 require
-the linkman:usbhid-ups[8] driver instead.  Please report success or failure to
+the linkman:usbhid-ups[1m] driver instead.  Please report success or failure to
 the nut-upsuser mailing list.  A key piece of information is the protocol
 number, returned in `ups.debug.0`.  Also, be sure to turn on debugging ('-DDD')
 for more informative log messages.  If your Tripp Lite UPS uses a serial port,
-you may wish to investigate the linkman:tripplite[8] or linkman:tripplite_su[8]
+you may wish to investigate the linkman:tripplite[1m] or linkman:tripplite_su[1m]
 driver.
 
 This driver has been tested with the following models:
@@ -47,7 +47,7 @@
 On the other hand, if the web page for your UPS on the Tripp-Lite website says
 "HID-compliant USB port also enables direct integration with built-in power
 management and auto-shutdown features of Windows and MAC OS X", then you should
-use the linkman:usbhid-ups[8] driver instead.
+use the linkman:usbhid-ups[1m] driver instead.
 
 EXTRA ARGUMENTS
 ---------------
@@ -72,7 +72,7 @@
 *bus*::
 
 This regular expression is used to match the USB bus (as seen in
-`/proc/bus/usb/devices` or lsusb(8); including leading zeroes).
+`/proc/bus/usb/devices` or lsusb(1m); including leading zeroes).
 
 *product*::
 
@@ -81,7 +81,7 @@
 system, and you want to be sure that you shut them down in the correct order.
 
 NOTE: This regex is matched against the full USB product string as seen in
-lsusb(8). The `ups.model` in the linkman:upsc[1] output only lists the name after
+lsusb(1m). The `ups.model` in the linkman:upsc[1] output only lists the name after
 `TRIPP LITE`, so to match a SMART2200RMXL2U, you could use the regex
 `.*SMART2200.*`.
 
@@ -105,18 +105,18 @@
 *ups.delay.shutdown*::
 
 This variable is the same as the 'offdelay' setting, but it can be changed at
-runtime by linkman:upsrw[8].
+runtime by linkman:upsrw[1m].
 
 *ups.id*::
 
 Some SMARTPRO models feature an ID that can be set and retrieved. If your UPS
-supports this feature, this variable will be listed in the output of linkman:upsrw[8].
+supports this feature, this variable will be listed in the output of linkman:upsrw[1m].
 
 *outlet.1.switch*::
 
 Some Tripp Lite units have a switchable outlet (usually outlet #1) which can be
 turned on and off by writing '1' or '0', respectively, to `outlet.1.switch`
-with linkman:upsrw[8].
+with linkman:upsrw[1m].
 If your unit has multiple switchable outlets, substitute the outlet number for
 '1' in the variable name. Be sure to test this first - there is no other way to
 be certain that the number used by the driver matches the label on the unit.
@@ -137,7 +137,7 @@
 For instance, you can easily monitor an OMNIVS1000 and a SMART1500RM2U at the
 same time, since they have different USB Product ID strings. If you have two
 SMART1500RM2U units, you would have to find which USB bus number each unit is
-on (via lsusb(8)), which may result in ambiguities if the available USB ports
+on (via lsusb(1m)), which may result in ambiguities if the available USB ports
 are on the same bus.
 
 Some of the SMART*2U models have an ID number, but because this ID is not
@@ -147,7 +147,7 @@
 
 AUTHOR
 ------
-Written by Charles Lepple, based on the linkman:tripplite[8] driver by Rickard E. (Rik)
+Written by Charles Lepple, based on the linkman:tripplite[1m] driver by Rickard E. (Rik)
 Faith and Nicholas Kain. Please do not email the authors directly - use the
 nut-upsdev mailing list.
 
@@ -159,15 +159,15 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Other drivers for Tripp-Lite hardware:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-linkman:tripplite[8], linkman:tripplitesu[8], linkman:usbhid-ups[8]
+linkman:tripplite[1m], linkman:tripplitesu[1m], linkman:usbhid-ups[1m]
 
 Other tools:
 ~~~~~~~~~~~~
-regex(7), lsusb(8)
+regex(7), lsusb(1m)
 
 
 INTERNET RESOURCES
diff -ur nut-2.7.4/docs/man8/tripplite.txt nut-2.7.4/docs/man/tripplite.txt
--- nut-2.7.4/docs/man8/tripplite.txt   2016-12-29 13:17:35.435088013 +0300
+++ nut-2.7.4/docs/man/tripplite.txt    2016-12-29 13:29:28.602507536 +0300
@@ -1,5 +1,5 @@
-TRIPPLITE(8)
-============
+TRIPPLITE(1m)
+=============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 tripplite driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -49,11 +49,11 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Other drivers for Tripp-Lite hardware:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-linkman:tripplitesu[8], linkman:tripplite_usb[8], linkman:usbhid-ups[8]
+linkman:tripplitesu[1m], linkman:tripplite_usb[1m], linkman:usbhid-ups[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/tripplitesu.txt nut-2.7.4/docs/man/tripplitesu.txt
--- nut-2.7.4/docs/man8/tripplitesu.txt 2016-12-29 13:17:35.435363921 +0300
+++ nut-2.7.4/docs/man/tripplitesu.txt  2016-12-29 13:29:28.603177000 +0300
@@ -1,5 +1,5 @@
-TRIPPLITESU(8)
-==============
+TRIPPLITESU(1m)
+===============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 tripplitesu driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -22,7 +22,7 @@
 
 *lowbatt*='num'::
 Set the low battery warning threshold in percent at which shutdown is
-initiated by linkman:upsmon[8].  By default, the UPS may not report low battery
+initiated by linkman:upsmon[1m].  By default, the UPS may not report low battery
 until there are only a few seconds left.  Common values are around 25--30.
 
 AUTHOR
@@ -34,11 +34,11 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Other drivers for Tripp-Lite hardware:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-linkman:tripplite[8], linkman:tripplite_usb[8], linkman:usbhid-ups[8]
+linkman:tripplite[1m], linkman:tripplite_usb[1m], linkman:usbhid-ups[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/ups.conf.txt nut-2.7.4/docs/man/ups.conf.txt
--- nut-2.7.4/docs/man8/ups.conf.txt    2016-12-29 13:17:35.435510730 +0300
+++ nut-2.7.4/docs/man/ups.conf.txt     2016-12-29 13:17:50.904944003 +0300
@@ -8,8 +8,8 @@
 DESCRIPTION
 -----------
 
-This file is read by the driver controller linkman:upsdrvctl[8], the UPS drivers
-that use the common core (see linkman:nutupsdrv[8], and linkman:upsd[8]).  The
+This file is read by the driver controller linkman:upsdrvctl[1m], the UPS drivers
+that use the common core (see linkman:nutupsdrv[1m], and linkman:upsd[1m]).  The
 file begins with global directives, and then each UPS has a section which
 contains a number of directives that set parameters for that UPS.
 
@@ -35,7 +35,7 @@
                sdtype = 2
                desc = "Database server UPS"
 
-In this case, the linkman:apcsmart[8] driver will receive variables called
+In this case, the linkman:apcsmart[1m] driver will receive variables called
 "cable" and "sdtype" which have special meanings.  See the man pages of
 your driver(s) to learn which variables are supported and what they do.
 
@@ -111,7 +111,7 @@
 
 Required.  This specifies which program will be monitoring this UPS.  You
 need to specify the one that is compatible with your hardware.  See
-linkman:nutupsdrv[8] for more information on drivers in general and pointers to the
+linkman:nutupsdrv[1m] for more information on drivers in general and pointers to the
 man pages of specific drivers.
 
 *port*::
@@ -217,19 +217,19 @@
 INTEGRATION
 -----------
 
-linkman:upsdrvctl[8] uses this file to start and stop the drivers.
+linkman:upsdrvctl[1m] uses this file to start and stop the drivers.
 
 The drivers themselves also obtain configuration data from this file.
 Each driver looks up its section and uses that to configure itself.
 
-linkman:upsd[8] learns about which UPSes are installed on this system by
+linkman:upsd[1m] learns about which UPSes are installed on this system by
 reading this file.  If this system is called "doghouse" and you have
 defined a UPS in your *ups.conf* called "snoopy", then you can monitor it
-from linkman:upsc[8] or similar as "snoopy@doghouse".
+from linkman:upsc[1m] or similar as "snoopy@doghouse".
 
 SEE ALSO
 --------
-linkman:upsd[8], linkman:nutupsdrv[8], linkman:upsdrvctl[8]
+linkman:upsd[1m], linkman:nutupsdrv[1m], linkman:upsdrvctl[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsc.txt nut-2.7.4/docs/man/upsc.txt
--- nut-2.7.4/docs/man8/upsc.txt        2016-12-29 13:17:35.435649917 +0300
+++ nut-2.7.4/docs/man/upsc.txt 2016-12-29 13:29:28.604463781 +0300
@@ -1,5 +1,5 @@
-UPSC(8)
-=======
+UPSC(1m)
+========
 
 
 NAME
@@ -31,7 +31,7 @@
 *-L* 'host'::
 
   As above, list all UPS names configured at 'host', including their description
-  provided by the remote upsd(8) from ups.conf(5). The hostname defaults to
+  provided by the remote upsd(1m) from ups.conf(5). The hostname defaults to
   "localhost".  You may optionally add a colon and a port number to override the
   default port.
 
@@ -54,7 +54,7 @@
 --------
 
 To list all variables on an UPS named "myups" on a host
-called "mybox", with upsd(8) running on port 1234:
+called "mybox", with upsd(1m) running on port 1234:
 
     $ upsc myups@mybox:1234
     battery.charge: 100.0
@@ -98,7 +98,7 @@
 upsc will either print a list of UPS names, a list of all supported variables
 and their values on the UPS, or an error message.  If you receive an error,
 make sure you have specified a valid UPS on the command line, that
-linkman:upsd[8] is really running on the other host and that no firewalls are
+linkman:upsd[1m] is really running on the other host and that no firewalls are
 blocking you.
 
 HISTORY
@@ -111,7 +111,7 @@
 SEE ALSO
 --------
 
-linkman:upsd[8]
+linkman:upsd[1m]
 
 INTERNET RESOURCES
 ------------------
diff -ur nut-2.7.4/docs/man8/upscli_fd.txt nut-2.7.4/docs/man/upscli_fd.txt
--- nut-2.7.4/docs/man8/upscli_fd.txt   2016-12-29 13:17:35.436332329 +0300
+++ nut-2.7.4/docs/man/upscli_fd.txt    2016-12-29 13:17:50.905628962 +0300
@@ -20,7 +20,7 @@
 `UPSCONN_t` state structure and returns the value of the file descriptor
 for that connection, if any.
 
-This may be useful for determining if the connection to linkman:upsd[8]
+This may be useful for determining if the connection to linkman:upsd[1m]
 has been lost.
 
 RETURN VALUE
diff -ur nut-2.7.4/docs/man8/upscli_get.txt nut-2.7.4/docs/man/upscli_get.txt
--- nut-2.7.4/docs/man8/upscli_get.txt  2016-12-29 13:17:35.436495522 +0300
+++ nut-2.7.4/docs/man/upscli_get.txt   2016-12-29 13:17:50.905954859 +0300
@@ -18,7 +18,7 @@
 The *upscli_get()* function takes the pointer 'ups' to a
 `UPSCONN_t` state structure, and the pointer 'query' to an array of
 'numq' query elements.  It builds a properly-formatted request from
-those elements and transmits it to linkman:upsd[8].
+those elements and transmits it to linkman:upsd[1m].
 
 Upon success, the response will be split into separate components.  A
 pointer to those components will be returned in 'answer'.  The
@@ -70,7 +70,7 @@
 ERROR CHECKING
 --------------
 This function will check your query against the response from
-linkman:upsd[8].  For example, if you send "VAR" "su700" "ups.status", it
+linkman:upsd[1m].  For example, if you send "VAR" "su700" "ups.status", it
 will expect to see those at the beginning of the response. 
 
 If the results from *upsd* do not pass this case-insensitive test
diff -ur nut-2.7.4/docs/man8/upscli_list_next.txt nut-2.7.4/docs/man/upscli_list_next.txt
--- nut-2.7.4/docs/man8/upscli_list_next.txt    2016-12-29 13:17:35.436869447 +0300
+++ nut-2.7.4/docs/man/upscli_list_next.txt     2016-12-29 13:17:50.906269877 +0300
@@ -42,13 +42,13 @@
 -----------------
 
 The contents of 'numa' and 'answer' work just like a call to
-linkman:upscli_get[3].  The values returned by linkman:upsd[8] are identical to
+linkman:upscli_get[3].  The values returned by linkman:upsd[1m] are identical to
 a single item request, so this is not surprising.
 
 ERROR CHECKING
 --------------
 
-This function checks the response from linkman:upsd[8] against your query.
+This function checks the response from linkman:upsd[1m] against your query.
 If the response is not part of the list you have requested, it will
 return an error code.
 
diff -ur nut-2.7.4/docs/man8/upscli_list_start.txt nut-2.7.4/docs/man/upscli_list_start.txt
--- nut-2.7.4/docs/man8/upscli_list_start.txt   2016-12-29 13:17:35.437047992 +0300
+++ nut-2.7.4/docs/man/upscli_list_start.txt    2016-12-29 13:17:50.906621559 +0300
@@ -19,7 +19,7 @@
 The *upscli_list_start()* function takes the pointer 'ups' to a
 `UPSCONN_t` state structure, and the pointer 'query' to an array of
 'numq' query elements.  It builds a properly-formatted request from
-those elements and transmits it to linkman:upsd[8].
+those elements and transmits it to linkman:upsd[1m].
 
 Upon success, the caller must call linkman:upscli_list_next[3] to retrieve
 the elements of the list.  Failure to retrieve the list will most likely
@@ -60,7 +60,7 @@
 ERROR CHECKING
 --------------
 
-This function checks the response from linkman:upsd[8] against your query.
+This function checks the response from linkman:upsd[1m] against your query.
 If it is not starting a list, or is starting the wrong type of list, it
 will return an error code.
 
diff -ur nut-2.7.4/docs/man8/upscli_readline.txt nut-2.7.4/docs/man/upscli_readline.txt
--- nut-2.7.4/docs/man8/upscli_readline.txt     2016-12-29 13:17:35.437222291 +0300
+++ nut-2.7.4/docs/man/upscli_readline.txt      2016-12-29 13:17:50.906928732 +0300
@@ -21,7 +21,7 @@
 'buf'.
 
 Some parsing of the string occurs during reception.  In particular,
-ERR messages from linkman:upsd[8] are detected and will cause this
+ERR messages from linkman:upsd[1m] are detected and will cause this
 function to return -1.
 
 RETURN VALUE
diff -ur nut-2.7.4/docs/man8/upscli_upserror.txt nut-2.7.4/docs/man/upscli_upserror.txt
--- nut-2.7.4/docs/man8/upscli_upserror.txt     2016-12-29 13:17:35.438262172 +0300
+++ nut-2.7.4/docs/man/upscli_upserror.txt      2016-12-29 13:17:50.907230619 +0300
@@ -22,7 +22,7 @@
 
 This is typically used to check for certain error values like
 `UPSCLI_ERR_UNKCOMMAND`.  That specific error can be used for detecting
-older versions of linkman:upsd[8] which might not support a given command.
+older versions of linkman:upsd[1m] which might not support a given command.
 
 Some error messages have additional meanings, so you should use
 linkman:upscli_strerror[3] to obtain readable error messages.
diff -ur nut-2.7.4/docs/man8/upsclient.txt nut-2.7.4/docs/man/upsclient.txt
--- nut-2.7.4/docs/man8/upsclient.txt   2016-12-29 13:17:35.438529740 +0300
+++ nut-2.7.4/docs/man/upsclient.txt    2016-12-29 13:17:50.907552070 +0300
@@ -11,7 +11,7 @@
 
 The Network UPS Tools (NUT) *upsclient* library provides a number of
 useful functions for programs to use when communicating with
-linkman:upsd[8].  Many of the low-level socket and protocol details are
+linkman:upsd[1m].  Many of the low-level socket and protocol details are
 handled automatically when using this interface.
 
 State is maintained across calls in an opaque structure called `UPSCONN_t`.
@@ -47,7 +47,7 @@
 linkman:upscli_list_start[3] to get it started, then call
 linkman:upscli_list_next[3] for each element.
 
-Raw lines of text may be sent to linkman:upsd[8] with
+Raw lines of text may be sent to linkman:upsd[1m] with
 linkman:upscli_sendline[3].  Reading raw lines is possible with
 linkman:upscli_readline[3].  Client programs are expected to format these
 lines according to the protocol, as no checking will be performed before
diff -ur nut-2.7.4/docs/man8/upscmd.txt nut-2.7.4/docs/man/upscmd.txt
--- nut-2.7.4/docs/man8/upscmd.txt      2016-12-29 13:17:35.438667485 +0300
+++ nut-2.7.4/docs/man/upscmd.txt       2016-12-29 13:29:28.605636903 +0300
@@ -1,5 +1,5 @@
-UPSCMD(8)
-=========
+UPSCMD(1m)
+==========
 
 NAME
 ----
@@ -63,7 +63,7 @@
 DANGEROUS COMMANDS
 ------------------
 
-Some drivers like linkman:apcsmart[8] have built-in paranoia for the
+Some drivers like linkman:apcsmart[1m] have built-in paranoia for the
 dangerous commands like `load.off`.  To make them actually turn off the
 load, you will have to send the command twice within a short window.
 That is, you will have to send it once, then send it again after 3
@@ -92,7 +92,7 @@
 
 SEE ALSO
 --------
-linkman:upsd[8], linkman:upsrw[8]
+linkman:upsd[1m], linkman:upsrw[1m]
 
 INTERNET RESOURCES
 ------------------
diff -ur nut-2.7.4/docs/man8/upscode2.txt nut-2.7.4/docs/man/upscode2.txt
--- nut-2.7.4/docs/man8/upscode2.txt    2016-12-29 13:17:35.438763790 +0300
+++ nut-2.7.4/docs/man/upscode2.txt     2016-12-29 13:29:28.606755092 +0300
@@ -1,5 +1,5 @@
-UPSCODE2(8)
-===========
+UPSCODE2(1m)
+============
 
 NAME
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the
 upscode2 driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -92,7 +92,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsd.conf.txt nut-2.7.4/docs/man/upsd.conf.txt
--- nut-2.7.4/docs/man8/upsd.conf.txt   2016-12-29 13:17:35.438870101 +0300
+++ nut-2.7.4/docs/man/upsd.conf.txt    2016-12-29 13:17:50.908643827 +0300
@@ -98,7 +98,7 @@
 SEE ALSO
 --------
 
-linkman:upsd[8], linkman:nutupsdrv[8], linkman:upsd.users[5]
+linkman:upsd[1m], linkman:nutupsdrv[1m], linkman:upsd.users[5]
 
 INTERNET RESOURCES
 ------------------
diff -ur nut-2.7.4/docs/man8/upsd.txt nut-2.7.4/docs/man/upsd.txt
--- nut-2.7.4/docs/man8/upsd.txt        2016-12-29 13:17:35.438999969 +0300
+++ nut-2.7.4/docs/man/upsd.txt 2016-12-29 13:29:28.608418958 +0300
@@ -1,5 +1,5 @@
-UPSD(8)
-=======
+UPSD(1m)
+========
 
 NAME
 ----
@@ -23,14 +23,14 @@
 such as starting tests, or setting values.
 
 Communication between *upsd* and clients is handled on a TCP port.
-Configuration details for this port are described in linkman:upsd.conf[8].
+Configuration details for this port are described in linkman:upsd.conf[1m].
 
 This program is essential, and must be running at all times to actually
 make any use out of the drivers and clients.
 
 Controls in the configuration files allow you to limit access to the
 server, but you should also use a firewall for extra protection.  Client
-processes such as linkman:upsmon[8] trust *upsd* for status information about
+processes such as linkman:upsmon[1m] trust *upsd* for status information about
 the UPS hardware, so keep it secure.
 
 OPTIONS
@@ -55,8 +55,8 @@
 can use this to create a "jail" for greater security.
 +
 You must coordinate this with your drivers, as upsd must be able to find
-the state path within 'directory'.  See linkman:upsdrvctl[8] and
-linkman:nutupsdrv[8].
+the state path within 'directory'.  See linkman:upsdrvctl[1m] and
+linkman:nutupsdrv[1m].
 
 *-u* 'user'::
 Switch to user 'user' after startup if started as root.  This
@@ -136,24 +136,24 @@
 
 Clients:
 ~~~~~~~~
-linkman:upsc[8], linkman:upscmd[8],
-linkman:upsrw[8], linkman:upslog[8], linkman:upsmon[8]
+linkman:upsc[1m], linkman:upscmd[1m],
+linkman:upsrw[1m], linkman:upslog[1m], linkman:upsmon[1m]
 
 CGI programs:
 ~~~~~~~~~~~~~
-linkman:upsset.cgi[8], linkman:upsstats.cgi[8], linkman:upsimage.cgi[8]
+linkman:upsset.cgi[1m], linkman:upsstats.cgi[1m], linkman:upsimage.cgi[1m]
 
 Drivers:
 ~~~~~~~~
-linkman:nutupsdrv[8],
-linkman:apcsmart[8], linkman:belkin[8], linkman:belkinunv[8],
-linkman:bestuferrups[8], linkman:bestups[8],
-linkman:cyberpower[8], linkman:energizerups[8], linkman:etapro[8],
-linkman:everups[8], linkman:genericups[8],
-linkman:isbmex[8], linkman:liebert[8], linkman:masterguard[8],
-linkman:mge-shut[8], linkman:mge-utalk[8], linkman:oneac[8],
-linkman:powercom[8], linkman:safenet[8], linkman:snmp-ups[8],
-linkman:tripplite[8], linkman:tripplitesu[8], linkman:victronups[8], 
+linkman:nutupsdrv[1m],
+linkman:apcsmart[1m], linkman:belkin[1m], linkman:belkinunv[1m],
+linkman:bestuferrups[1m], linkman:bestups[1m],
+linkman:cyberpower[1m], linkman:energizerups[1m], linkman:etapro[1m],
+linkman:everups[1m], linkman:genericups[1m],
+linkman:isbmex[1m], linkman:liebert[1m], linkman:masterguard[1m],
+linkman:mge-shut[1m], linkman:mge-utalk[1m], linkman:oneac[1m],
+linkman:powercom[1m], linkman:safenet[1m], linkman:snmp-ups[1m],
+linkman:tripplite[1m], linkman:tripplitesu[1m], linkman:victronups[1m], 
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsd.users.txt nut-2.7.4/docs/man/upsd.users.txt
--- nut-2.7.4/docs/man8/upsd.users.txt  2016-12-29 13:17:35.439092409 +0300
+++ nut-2.7.4/docs/man/upsd.users.txt   2016-12-29 13:17:50.909367949 +0300
@@ -82,7 +82,7 @@
 SEE ALSO
 --------
 
-linkman:upsd[8], linkman:upsd.conf[5]
+linkman:upsd[1m], linkman:upsd.conf[5]
 
 INTERNET RESOURCES
 ------------------
diff -ur nut-2.7.4/docs/man8/upsdrvctl.txt nut-2.7.4/docs/man/upsdrvctl.txt
--- nut-2.7.4/docs/man8/upsdrvctl.txt   2016-12-29 13:17:35.439199999 +0300
+++ nut-2.7.4/docs/man/upsdrvctl.txt    2016-12-29 13:29:28.609530460 +0300
@@ -1,5 +1,5 @@
-UPSDRVCTL(8) 
-============
+UPSDRVCTL(1m) 
+=============
 
 NAME
 ----
@@ -95,7 +95,7 @@
 
 SEE ALSO
 --------
-linkman:nutupsdrv[8], linkman:upsd[8], linkman:ups.conf[5]
+linkman:nutupsdrv[1m], linkman:upsd[1m], linkman:ups.conf[5]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsimage.cgi.txt nut-2.7.4/docs/man/upsimage.cgi.txt
--- nut-2.7.4/docs/man8/upsimage.cgi.txt        2016-12-29 13:17:35.439298713 +0300
+++ nut-2.7.4/docs/man/upsimage.cgi.txt 2016-12-29 13:29:28.610175806 +0300
@@ -1,5 +1,5 @@
-UPSIMAGE.CGI(8)
-===============
+UPSIMAGE.CGI(1m)
+================
 
 NAME
 ----
@@ -19,7 +19,7 @@
 -----------
 
 *upsimage.cgi* generates the graphical bars that make up the right side
-of the page generated by linkman:upsstats.cgi[8].  These represent the
+of the page generated by linkman:upsstats.cgi[1m].  These represent the
 current battery charge, utility voltage, and UPS load where available.
 
 The images are in PNG format, and are created by linking to Boutell's
@@ -28,7 +28,7 @@
 ACCESS CONTROL
 --------------
 
-upsstats will only talk to linkman:upsd[8] servers that have been defined
+upsstats will only talk to linkman:upsd[1m] servers that have been defined
 in your linkman:hosts.conf[5].  If it complains about "Access to that host
 is not authorized", check that file first.
 
@@ -40,7 +40,7 @@
 SEE ALSO
 --------
 
-linkman:upsd[8], linkman:upsstats.cgi[8]
+linkman:upsd[1m], linkman:upsstats.cgi[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upslog.txt nut-2.7.4/docs/man/upslog.txt
--- nut-2.7.4/docs/man8/upslog.txt      2016-12-29 13:17:35.439406509 +0300
+++ nut-2.7.4/docs/man/upslog.txt       2016-12-29 13:29:28.611664773 +0300
@@ -1,5 +1,5 @@
-UPSLOG(8)
-=========
+UPSLOG(1m)
+==========
 
 NAME
 ----
@@ -108,12 +108,12 @@
 
 Server:
 ~~~~~~~
-linkman:upsd[8]
+linkman:upsd[1m]
 
 Clients:
 ~~~~~~~~
-linkman:upsc[8], linkman:upscmd[8],
-linkman:upsrw[8], linkman:upsmon[8], linkman:upssched[8]
+linkman:upsc[1m], linkman:upscmd[1m],
+linkman:upsrw[1m], linkman:upsmon[1m], linkman:upssched[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsmon.conf.txt nut-2.7.4/docs/man/upsmon.conf.txt
--- nut-2.7.4/docs/man8/upsmon.conf.txt 2016-12-29 13:17:35.439525236 +0300
+++ nut-2.7.4/docs/man/upsmon.conf.txt  2016-12-29 13:17:50.910857674 +0300
@@ -9,7 +9,7 @@
 DESCRIPTION
 -----------
 
-This file's primary job is to define the systems that linkman:upsmon[8]
+This file's primary job is to define the systems that linkman:upsmon[1m]
 will monitor and to tell it how to shut down the system when necessary.
 It will contain passwords, so keep it secure.  Ideally, only the upsmon
 process should be able to read it.
@@ -94,7 +94,7 @@
 subdirectory for more information and ideas on how to use this
 feature.
 +
-Also see the section on "power values" in linkman:upsmon[8].
+Also see the section on "power values" in linkman:upsmon[1m].
 
 *MONITOR* 'system' 'powervalue' 'username' 'password' 'type'::
 
@@ -114,7 +114,7 @@
  - "su700@mybox" means a UPS called "su700" on a system called "mybox".
 This is the normal form.
  - "fenton@bigbox:5678" is a UPS called "fenton" on a system called
-"bigbox" which runs linkman:upsd[8] on port "5678".
+"bigbox" which runs linkman:upsd[1m] on port "5678".
 
 'powervalue' is an integer representing the number of power supplies
 that the UPS feeds on this system.  Most normal computers have one power
@@ -138,8 +138,8 @@
                password  = blah
                upsmon master #  (or slave)
 
-The 'type' refers to the relationship with linkman:upsd[8].  It can
-be either "master" or "slave".  See linkman:upsmon[8] for more information
+The 'type' refers to the relationship with linkman:upsd[1m].  It can
+be either "master" or "slave".  See linkman:upsmon[1m] for more information
 on the meaning of these modes.  The mode you pick here also goes in
 the `upsd.users` file, as seen in the example above.
 
@@ -158,7 +158,7 @@
 argument.  The environment string NOTIFYTYPE will contain the type
 string of whatever caused this event to happen.
 +
-If you need to use linkman:upssched[8], then you must make it your
+If you need to use linkman:upssched[1m], then you must make it your
 NOTIFYCMD by listing it here.
 +
 Note that this is only called for NOTIFY events that have EXEC set with
@@ -238,7 +238,7 @@
 
 *POLLFREQ* 'seconds'::
 
-Normally upsmon polls the linkman:upsd[8] server every 5 seconds.  If this
+Normally upsmon polls the linkman:upsd[1m] server every 5 seconds.  If this
 is flooding your network with activity, you can make it higher.  You can
 also make it lower to get faster updates in some cases.
 +
@@ -382,7 +382,7 @@
 
 SEE ALSO
 --------
-linkman:upsmon[8], linkman:upsd[8], linkman:nutupsdrv[8].
+linkman:upsmon[1m], linkman:upsd[1m], linkman:nutupsdrv[1m].
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsmon.txt nut-2.7.4/docs/man/upsmon.txt
--- nut-2.7.4/docs/man8/upsmon.txt      2016-12-29 13:17:35.439639304 +0300
+++ nut-2.7.4/docs/man/upsmon.txt       2016-12-29 13:29:28.616014894 +0300
@@ -1,5 +1,5 @@
-UPSMON(8)
-=========
+UPSMON(1m)
+==========
 
 NAME
 ----
@@ -55,7 +55,7 @@
 will make upsmon exit with `EXIT_FAILURE`.  
 +
 You can test for a successful exit from `upsmon -K` in your shutdown
-scripts to know when to call linkman:upsdrvctl[8] to shut down the UPS.
+scripts to know when to call linkman:upsdrvctl[1m] to shut down the UPS.
 
 *-p*::
 Run privileged all the time.  Normally upsmon will split into two
@@ -86,7 +86,7 @@
 
        MONITOR 'system' 'powervalue' 'username' 'password' 'type'
 
-The 'system' refers to a linkman:upsd[8] server, in the form
+The 'system' refers to a linkman:upsd[1m] server, in the form
 +upsname[@hostname[:port]]+.  The default hostname is "localhost".  Some
 examples follow:
 
@@ -94,7 +94,7 @@
 This is the normal form.
 
  - "fenton@bigbox:5678" is a UPS called "fenton" on a system called 
-"bigbox" which runs linkman:upsd[8] on port "5678".
+"bigbox" which runs linkman:upsd[1m] on port "5678".
 
 The 'powervalue' refers to how many power supplies on this system are
 being driven this UPS.  This is typically set to 1, but see the section
@@ -274,7 +274,7 @@
 UPS TYPES
 ---------
 
-*upsmon* and linkman:upsd[8] don't always run on the same system.  When they
+*upsmon* and linkman:upsd[1m] don't always run on the same system.  When they
 do, any UPSes that are directly attached to the upsmon host should be
 monitored in "master" mode.  This makes upsmon take charge of that
 equipment, and it will wait for slaves to disconnect before shutting
@@ -286,12 +286,12 @@
 it about the state of the UPS.  When that UPS goes critical (on battery
 and low battery), it immediately invokes the local shutdown command.  This
 needs to happen quickly.  Once it disconnects from the distant
-linkman:upsd[8] server, the master upsmon will start its own shutdown
+linkman:upsd[1m] server, the master upsmon will start its own shutdown
 process.  Your slaves must all shut down before the master turns off the
 power or filesystem damage may result.
 
 upsmon deals with slaves that get wedged, hang, or otherwise fail to 
-disconnect from linkman:upsd[8] in a timely manner with the HOSTSYNC
+disconnect from linkman:upsd[1m] in a timely manner with the HOSTSYNC
 timer.  During a shutdown situation, the master upsmon will give up after
 this interval and it will shut down anyway.  This keeps the master from
 sitting there forever (which would endanger that host) if a slave should
@@ -307,7 +307,7 @@
 
 For those rare situations where the shutdown process can't be completed
 between the time that low battery is signalled and the UPS actually powers
-off the load, use the linkman:upssched[8] helper program.  You can use it
+off the load, use the linkman:upssched[1m] helper program.  You can use it
 along with upsmon to schedule a shutdown based on the "on battery" event.
 upssched can then come back to upsmon to initiate the shutdown once it has
 run on battery too long.
@@ -374,12 +374,12 @@
 You can manually invoke this mode on the master upsmon by starting another
 copy with `-c fsd`.  This is useful when you want to initiate a shutdown
 before the critical stage through some external means, such as
-linkman:upssched[8].
+linkman:upssched[1m].
 
 DEAD UPSES
 ----------
 
-In the event that upsmon can't reach linkman:upsd[8], it declares that UPS
+In the event that upsmon can't reach linkman:upsd[1m], it declares that UPS
 "dead" after some interval controlled by DEADTIME in the
 linkman:upsmon.conf[5].  If this happens while that UPS was last known to be
 on battery, it is assumed to have gone critical and no longer contributes
@@ -394,7 +394,7 @@
 
 upsmon usually gives up root powers for the process that does most of
 the work, including handling signals like SIGHUP to reload the configuration
-file.  This means your linkman:upsmon.conf[8] file must be readable by
+file.  This means your linkman:upsmon.conf[1m] file must be readable by
 the non-root account that upsmon switches to.
 
 If you want reloads to work, upsmon must run as some user that has
@@ -402,7 +402,7 @@
 user just for this purpose, as making the file readable by "nobody"
 (the default user) would be a bad idea.
 
-See the RUN_AS_USER section in linkman:upsmon.conf[8] for more on this topic.
+See the RUN_AS_USER section in linkman:upsmon.conf[1m] for more on this topic.
 
 Additionally, you can't change the SHUTDOWNCMD or POWERDOWNFLAG
 definitions with a reload due to the split-process model.  If you change
@@ -433,16 +433,16 @@
 
 Server:
 ~~~~~~~
-linkman:upsd[8]
+linkman:upsd[1m]
 
 Clients:
 ~~~~~~~~
-linkman:upsc[8], linkman:upscmd[8],
-linkman:upsrw[8], linkman:upsmon[8]
+linkman:upsc[1m], linkman:upscmd[1m],
+linkman:upsrw[1m], linkman:upsmon[1m]
 
 CGI programs:
 ~~~~~~~~~~~~~
-linkman:upsset.cgi[8], linkman:upsstats.cgi[8], linkman:upsimage.cgi[8]
+linkman:upsset.cgi[1m], linkman:upsstats.cgi[1m], linkman:upsimage.cgi[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsrw.txt nut-2.7.4/docs/man/upsrw.txt
--- nut-2.7.4/docs/man8/upsrw.txt       2016-12-29 13:17:35.439737471 +0300
+++ nut-2.7.4/docs/man/upsrw.txt        2016-12-29 13:29:28.617206172 +0300
@@ -1,5 +1,5 @@
-UPSRW(8)
-========
+UPSRW(1m)
+=========
 
 NAME
 ----
@@ -19,7 +19,7 @@
 -----------
 
 *upsrw* allows you to view and change the read/write variables inside your UPS.
-It sends commands via the server linkman:upsd[8] to your driver, which
+It sends commands via the server linkman:upsd[1m] to your driver, which
 configures the hardware for you.
 
 The list of variables that allow you to change their values is based on
@@ -101,7 +101,7 @@
 
 SEE ALSO
 --------
-linkman:upsd[8], linkman:upscmd[8]
+linkman:upsd[1m], linkman:upscmd[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upssched.conf.txt nut-2.7.4/docs/man/upssched.conf.txt
--- nut-2.7.4/docs/man8/upssched.conf.txt       2016-12-29 13:17:35.439837498 +0300
+++ nut-2.7.4/docs/man/upssched.conf.txt        2016-12-29 13:17:50.912127533 +0300
@@ -9,8 +9,8 @@
 DESCRIPTION
 -----------
 
-This file controls the operations of linkman:upssched[8], the timer-based
-helper program for linkman:upsmon[8].
+This file controls the operations of linkman:upssched[1m], the timer-based
+helper program for linkman:upsmon[1m].
 
 CONFIGURATION DIRECTIVES
 ------------------------
@@ -31,8 +31,8 @@
 your OS ignores the permissions on a FIFO, then you MUST put this in a
 protected directory!
 
-NOTE: by default, linkman:upsmon[8] will run upssched as whatever user
-you have defined with RUN_AS_USER in linkman:upsmon.conf[8].  Make sure
+NOTE: by default, linkman:upsmon[1m] will run upssched as whatever user
+you have defined with RUN_AS_USER in linkman:upsmon.conf[1m].  Make sure
 that user can create files and write to files in the path you use for
 PIPEFN and LOCKFN.
 
@@ -98,12 +98,12 @@
 'upsname' for the current event will be used.
 
 For a complete list of 'notifytype' possible values, refer to the section
-NOTIFY EVENTS in linkman:upsmon[8].
+NOTIFY EVENTS in linkman:upsmon[1m].
 
 SEE ALSO
 --------
 
-linkman:upssched[8], linkman:upsmon[8]
+linkman:upssched[1m], linkman:upsmon[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upssched.txt nut-2.7.4/docs/man/upssched.txt
--- nut-2.7.4/docs/man8/upssched.txt    2016-12-29 13:17:35.439925101 +0300
+++ nut-2.7.4/docs/man/upssched.txt     2016-12-29 13:29:28.618443605 +0300
@@ -1,5 +1,5 @@
-UPSSCHED(8)
-===========
+UPSSCHED(1m)
+============
 
 NAME
 ----
@@ -10,14 +10,14 @@
 --------
 *upssched*
 
-NOTE: *upssched* should be run from linkman:upsmon[8] via the NOTIFYCMD.
+NOTE: *upssched* should be run from linkman:upsmon[1m] via the NOTIFYCMD.
 You should never run it directly during normal operations.
 
 DESCRIPTION
 -----------
 
 *upssched* was created to allow users to execute programs at times
-relative to events being monitored by linkman:upsmon[8].  The original
+relative to events being monitored by linkman:upsmon[1m].  The original
 purpose was to allow for a shutdown to occur after some fixed period
 on battery, but there are other uses that are possible.
 
@@ -42,7 +42,7 @@
        NOTIFYFLAG ONBATT SYSLOG+EXEC
        NOTIFYFLAG LOWBATT SYSLOG+EXEC
 
-For a full list of notify flags, see the linkman:upsmon[8] documentation.
+For a full list of notify flags, see the linkman:upsmon[1m] documentation.
 
 CONFIGURATION
 -------------
@@ -64,7 +64,7 @@
 
 If your UPS goes on and off battery frequently, you can use this program
 to reduce the number of pager messages that are sent out.  Rather than
-sending pages directly from linkman:upsmon[8], use a short timer here.
+sending pages directly from linkman:upsmon[1m], use a short timer here.
 If the timer triggers with the UPS still on battery, then send the page.
 If the power returns before then, the timer can be cancelled and no page 
 is necessary.
@@ -108,7 +108,7 @@
 SEE ALSO
 --------
 
-linkman:upsmon[8]
+linkman:upsmon[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsset.cgi.txt nut-2.7.4/docs/man/upsset.cgi.txt
--- nut-2.7.4/docs/man8/upsset.cgi.txt  2016-12-29 13:17:35.440014391 +0300
+++ nut-2.7.4/docs/man/upsset.cgi.txt   2016-12-29 13:29:28.619524960 +0300
@@ -1,5 +1,5 @@
-UPSSET.CGI(8)
-=============
+UPSSET.CGI(1m)
+==============
 
 NAME
 ----
@@ -38,7 +38,7 @@
 nothing to do on this page.
 
 Setting values in read/write variables can also be done from the command 
-line with linkman:upsrw[8].
+line with linkman:upsrw[1m].
 
 INSTANT COMMANDS
 ----------------
@@ -65,13 +65,13 @@
 but not 15 seconds again.
 
 You can also invoke instant commands from the command line with
-linkman:upscmd[8].
+linkman:upscmd[1m].
 
 ACCESS CONTROL
 --------------
 
-upsset will only talk to linkman:upsd[8] servers that have been defined
-in your linkman:hosts.conf[8].  If it complains about "Access to that host
+upsset will only talk to linkman:upsd[1m] servers that have been defined
+in your linkman:hosts.conf[1m].  If it complains about "Access to that host
 is not authorized", check your hosts.conf first.
 
 SECURITY
@@ -79,7 +79,7 @@
 
 upsset will not run until you convince it that your CGI directory has
 been secured.  This is due to the possibility of someone using upsset
-to try password combinations against your linkman:upsd[8] server.
+to try password combinations against your linkman:upsd[1m] server.
 
 See the example `upsset.conf` file for more information on how you do this.
 The short explanation is--if you can't lock it down, don't try to run it.
diff -ur nut-2.7.4/docs/man8/upsset.conf.txt nut-2.7.4/docs/man/upsset.conf.txt
--- nut-2.7.4/docs/man8/upsset.conf.txt 2016-12-29 13:17:35.440112746 +0300
+++ nut-2.7.4/docs/man/upsset.conf.txt  2016-12-29 13:17:50.913149909 +0300
@@ -9,18 +9,18 @@
 DESCRIPTION
 -----------
 
-This file only does one job--it lets you convince linkman:upsset.cgi[8]
+This file only does one job--it lets you convince linkman:upsset.cgi[1m]
 that your system's CGI directory is secure.  The program will not run
 until this file has been properly defined.
 
 SECURITY REQUIREMENTS
 ---------------------
 
-linkman:upsset.cgi[8] allows you to try login name and password combinations.
+linkman:upsset.cgi[1m] allows you to try login name and password combinations.
 There is no rate limiting, as the program shuts down between every request.
 Such is the nature of CGI programs.
 
-Normally, attackers would not be able to access your linkman:upsd[8] server
+Normally, attackers would not be able to access your linkman:upsd[1m] server
 directly as it would be protected by the LISTEN directives in
 your linkman:upsd.conf[5] file, tcp-wrappers (if available when NUT was built),
 and hopefully local firewall settings in your OS.
@@ -55,7 +55,7 @@
 
 SEE ALSO
 --------
-linkman:upsset.cgi[8]
+linkman:upsset.cgi[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsstats.cgi.txt nut-2.7.4/docs/man/upsstats.cgi.txt
--- nut-2.7.4/docs/man8/upsstats.cgi.txt        2016-12-29 13:17:35.440204038 +0300
+++ nut-2.7.4/docs/man/upsstats.cgi.txt 2016-12-29 13:29:28.620302753 +0300
@@ -1,5 +1,5 @@
-UPSSTATS.CGI(8)
-===============
+UPSSTATS.CGI(1m)
+================
 
 NAME
 ----
@@ -23,14 +23,14 @@
 from UPS hardware.  It can repeat sections of those template files to
 monitor several UPSes simultaneously, or focus on a single UPS.
 
-These templates can also include references to linkman:upsimage.cgi[8]
+These templates can also include references to linkman:upsimage.cgi[1m]
 for graphical displays of battery charge levels, voltage readings, and
 the UPS load.
 
 ACCESS CONTROL
 --------------
 
-upsstats will only talk to linkman:upsd[8] servers that have been defined
+upsstats will only talk to linkman:upsd[1m] servers that have been defined
 in your linkman:hosts.conf[5].  If it complains that "Access to that host
 is not authorized", check that file first.
 
@@ -55,7 +55,7 @@
 SEE ALSO
 --------
 
-linkman:upsimage.cgi[8]
+linkman:upsimage.cgi[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/upsstats.html.txt nut-2.7.4/docs/man/upsstats.html.txt
--- nut-2.7.4/docs/man8/upsstats.html.txt       2016-12-29 13:17:35.440292541 +0300
+++ nut-2.7.4/docs/man/upsstats.html.txt        2016-12-29 13:17:50.913831035 +0300
@@ -9,7 +9,7 @@
 DESCRIPTION
 -----------
 
-This file is used by linkman:upsstats.cgi[8] to generate status pages.
+This file is used by linkman:upsstats.cgi[1m] to generate status pages.
 Certain commands are recognized, and will be replaced with various
 status elements on the fly.
 
@@ -108,7 +108,7 @@
 current UPS.  This is only useful within a FOREACHUPS block.
 
 *@IMG* 'varname' ['extra']*@*::
-Insert an IMG SRC to linkman:upsimage.cgi[8] for one of these
+Insert an IMG SRC to linkman:upsimage.cgi[1m] for one of these
 status variables:
 
        battery.charge;; Battery charge - a percentage
@@ -221,14 +221,14 @@
 OTHER TEMPLATES
 ---------------
 
-linkman:upsstats.cgi[8] will also open a file called `upsstats-single.html`
+linkman:upsstats.cgi[1m] will also open a file called `upsstats-single.html`
 if you call it with "host=" set in the URL.  That file uses the same
 rules and techniques documented here.
 
 SEE ALSO
 --------
 
-linkman:upsstats.cgi[8], linkman:upsimage.cgi[8]
+linkman:upsstats.cgi[1m], linkman:upsimage.cgi[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/usbhid-ups.txt nut-2.7.4/docs/man/usbhid-ups.txt
--- nut-2.7.4/docs/man8/usbhid-ups.txt  2016-12-29 13:17:35.440382577 +0300
+++ nut-2.7.4/docs/man/usbhid-ups.txt   2016-12-29 13:29:28.622719509 +0300
@@ -1,5 +1,5 @@
-USBHID-UPS(8) 
-=============
+USBHID-UPS(1m) 
+===============
 
 NAME
 ----
@@ -11,7 +11,7 @@
 
 This man page only documents the hardware-specific features of the
 usbhid-ups driver.  For information about the core driver, see
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 This driver, formerly called 'newhidups', replaces the legacy 'hidups' driver,
 which only supported Linux systems.
@@ -214,7 +214,7 @@
 
 The core driver
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources
 ~~~~~~~~~~~~~~~~~~
diff -ur nut-2.7.4/docs/man8/victronups.txt nut-2.7.4/docs/man/victronups.txt
--- nut-2.7.4/docs/man8/victronups.txt  2016-12-29 13:17:35.440469505 +0300
+++ nut-2.7.4/docs/man/victronups.txt   2016-12-29 13:29:28.623466787 +0300
@@ -1,5 +1,5 @@
-VICTRONUPS(8)
-=============
+VICTRONUPS(1m)
+==============
 
 NAME  
 ----
@@ -9,7 +9,7 @@
 ----
 This man page only documents the hardware-specific features of the the
 victronups driver.  For information about the core driver, see  
-linkman:nutupsdrv[8].
+linkman:nutupsdrv[1m].
 
 SUPPORTED HARDWARE
 ------------------
@@ -53,7 +53,7 @@
 
 The core driver:
 ~~~~~~~~~~~~~~~~
-linkman:nutupsdrv[8]
+linkman:nutupsdrv[1m]
 
 Internet resources:
 ~~~~~~~~~~~~~~~~~~~
--- nut-2.7.4/docs/man/Makefile.am.~2~  2016-12-29 14:19:30.511405768 +0300
+++ nut-2.7.4/docs/man/Makefile.am      2016-12-29 14:21:34.444133222 +0300
@@ -54,18 +54,18 @@
 
 if WITH_MANS
 MAN_CLIENT_PAGES = \
-       nutupsdrv.8 \
-       upsc.8 \
-       upscmd.8 \
-       upsd.8 \
-       upsdrvctl.8 \
-       upslog.8 \
-       upsmon.8 \
-       upsrw.8 \
-       upssched.8
+       nutupsdrv.1m \
+       upsc.1m \
+       upscmd.1m \
+       upsd.1m \
+       upsdrvctl.1m \
+       upslog.1m \
+       upsmon.1m \
+       upsrw.1m \
+       upssched.1m
 endif
 
-man8_MANS = $(MAN_CLIENT_PAGES)
+man_MANS = $(MAN_CLIENT_PAGES)
 
 HTML_CLIENT_MANS = \
        nutupsdrv.html \
@@ -81,10 +81,10 @@
 SRC_TOOL_PAGES = nut-scanner.txt nut-recorder.txt
 
 if WITH_MANS
-MAN_TOOL_PAGES = nut-scanner.8 nut-recorder.8
+MAN_TOOL_PAGES = nut-scanner.1m nut-recorder.1m
 endif
 
-man8_MANS += $(MAN_TOOL_PAGES)
+man_MANS += $(MAN_TOOL_PAGES)
 
 HTML_TOOL_MANS = nut-scanner.html nut-recorder.html
 
@@ -103,16 +103,16 @@
        upsset.conf.5 \
        upsstats.html.5
 
-MAN8_CGI_PAGES = \
-       upsset.cgi.8 \
-       upsstats.cgi.8 \
-       upsimage.cgi.8
+MAN1m_CGI_PAGES = \
+       upsset.cgi.1m \
+       upsstats.cgi.1m \
+       upsimage.cgi.1m
 endif
 
 if WITH_CGI
  man5_MANS += $(MAN5_CGI_PAGES)
 
- man8_MANS += $(MAN8_CGI_PAGES)
+ man_MANS += $(MAN1m_CGI_PAGES)
 endif
 
 HTML_CGI_MANS = \
@@ -250,7 +250,7 @@
  man3_MANS = $(MAN3_DEV_PAGES)
 
 if !WITH_PKG_CONFIG
- man1_MANS = $(MAN1_DEV_PAGES)
+ man_MANS += $(MAN1_DEV_PAGES)
 endif
 # WITH_DEV
 endif
@@ -305,7 +305,7 @@
 
 # (--with-drivers=...)
 if SOME_DRIVERS
- man8_MANS += $(DRIVER_MAN_LIST)
+ man_MANS += $(DRIVER_MAN_LIST)
 
 else
 
@@ -355,50 +355,50 @@
 
 if WITH_MANS
 MAN_SERIAL_PAGES = \
-       al175.8 \
-       apcsmart.8      \
-       apcsmart-old.8  \
-       bcmxcp.8        \
-       belkin.8        \
-       belkinunv.8     \
-       bestfortress.8  \
-       bestuferrups.8  \
-       bestups.8       \
-       bestfcom.8      \
-       blazer_ser.8    \
-       clone.8 \
-       dummy-ups.8     \
-       etapro.8        \
-       everups.8       \
-       gamatronic.8    \
-       genericups.8    \
-       isbmex.8        \
-       ivtscd.8        \
-       liebert.8       \
-       liebert-esp2.8  \
-       masterguard.8   \
-       metasys.8       \
-       mge-shut.8      \
-       mge-utalk.8     \
-       nutdrv_qx.8     \
-       oneac.8         \
-       microdowell.8   \
-       optiups.8       \
-       powercom.8      \
-       powerpanel.8    \
-       rhino.8         \
-       riello_ser.8    \
-       safenet.8       \
-       solis.8         \
-       tripplite.8     \
-       tripplitesu.8   \
-       upscode2.8      \
-       victronups.8    \
-       apcupsd-ups.8
+       al175.1m        \
+       apcsmart.1m     \
+       apcsmart-old.1m \
+       bcmxcp.1m       \
+       belkin.1m       \
+       belkinunv.1m    \
+       bestfortress.1m \
+       bestuferrups.1m \
+       bestups.1m      \
+       bestfcom.1m     \
+       blazer_ser.1m   \
+       clone.1m \
+       dummy-ups.1m    \
+       etapro.1m       \
+       everups.1m      \
+       gamatronic.1m   \
+       genericups.1m   \
+       isbmex.1m       \
+       ivtscd.1m       \
+       liebert.1m      \
+       liebert-esp2.1m \
+       masterguard.1m  \
+       metasys.1m      \
+       mge-shut.1m     \
+       mge-utalk.1m    \
+       nutdrv_qx.1m    \
+       oneac.1m                \
+       microdowell.1m  \
+       optiups.1m      \
+       powercom.1m     \
+       powerpanel.1m   \
+       rhino.1m                \
+       riello_ser.1m   \
+       safenet.1m      \
+       solis.1m                \
+       tripplite.1m    \
+       tripplitesu.1m  \
+       upscode2.1m     \
+       victronups.1m   \
+       apcupsd-ups.1m
 endif
 
 if WITH_SERIAL
-  man8_MANS +=  $(MAN_SERIAL_PAGES)
+  man_MANS +=  $(MAN_SERIAL_PAGES)
 endif
 
 HTML_SERIAL_MANS = \
@@ -446,11 +446,11 @@
 # (--with-snmp)
 SRC_SNMP_PAGES = snmp-ups.txt
 if WITH_MANS
-MAN_SNMP_PAGES = snmp-ups.8
+MAN_SNMP_PAGES = snmp-ups.1m
 endif
 
 if WITH_SNMP
-  man8_MANS += $(MAN_SNMP_PAGES)
+  man_MANS += $(MAN_SNMP_PAGES)
 endif
 
 HTML_SNMP_MANS = snmp-ups.html
@@ -469,18 +469,18 @@
 
 if WITH_MANS
 MAN_USB_LIBUSB_PAGES = \
-       bcmxcp_usb.8 \
-       blazer_usb.8 \
-       nutdrv_atcl_usb.8 \
-       nutdrv_qx.8     \
-       richcomm_usb.8 \
-       riello_usb.8    \
-       tripplite_usb.8 \
-       usbhid-ups.8
+       bcmxcp_usb.1m \
+       blazer_usb.1m \
+       nutdrv_atcl_usb.1m \
+       nutdrv_qx.1m    \
+       richcomm_usb.1m \
+       riello_usb.1m   \
+       tripplite_usb.1m \
+       usbhid-ups.1m
 endif
 
 if WITH_USB
- man8_MANS += $(MAN_USB_LIBUSB_PAGES)
+ man_MANS += $(MAN_USB_LIBUSB_PAGES)
 endif
 
 HTML_USB_LIBUSB_MANS = \
@@ -496,11 +496,11 @@
 # (--with-neon)
 SRC_NETXML_PAGES = netxml-ups.txt
 if WITH_MANS
-MAN_NETXML_PAGES = netxml-ups.8
+MAN_NETXML_PAGES = netxml-ups.1m
 endif
 
 if WITH_NEON
-   man8_MANS += $(MAN_NETXML_PAGES)
+   man_MANS += $(MAN_NETXML_PAGES)
 endif
 
 HTML_NETXML_MANS = netxml-ups.html
@@ -508,11 +508,11 @@
 # (--with-powerman)
 SRC_POWERMAN_PAGES = powerman-pdu.txt
 if WITH_MANS
-MAN_POWERMAN_PAGES = powerman-pdu.8
+MAN_POWERMAN_PAGES = powerman-pdu.1m
 endif
 
 if WITH_LIBPOWERMAN
-   man8_MANS += $(MAN_POWERMAN_PAGES)
+   man_MANS += $(MAN_POWERMAN_PAGES)
 endif
 
 HTML_POWERMAN_MANS = powerman-pdu.html
@@ -520,33 +520,33 @@
 # (--with-ipmi)
 SRC_IPMIPSU_PAGES = nut-ipmipsu.txt
 if WITH_MANS
-MAN_IPMIPSU_PAGES = nut-ipmipsu.8
+MAN_IPMIPSU_PAGES = nut-ipmipsu.1m
 endif
 
 if WITH_IPMI
-   man8_MANS += $(MAN_IPMIPSU_PAGES)
+   man_MANS += $(MAN_IPMIPSU_PAGES)
 endif
 
 HTML_IPMIPSU_MANS = nut-ipmipsu.html
 
 SRC_MACOSX_PAGES = macosx-ups.txt
 if WITH_MANS
-MAN_MACOSX_PAGES = macosx-ups.8
+MAN_MACOSX_PAGES = macosx-ups.1m
 endif
 
 if WITH_MACOSX
-   man8_MANS += $(MAN_MACOSX_PAGES)
+   man_MANS += $(MAN_MACOSX_PAGES)
 endif
 
 HTML_MACOSX_MANS = macosx-ups.html
 
 SRC_LINUX_I2C_PAGES = asem.txt
 if WITH_MANS
-MAN_LINUX_I2C_PAGES = asem.8
+MAN_LINUX_I2C_PAGES = asem.1m
 endif
 
 if WITH_LINUX_I2C
-   man8_MANS += $(LINUX_I2C_PAGES)
+   man_MANS += $(LINUX_I2C_PAGES)
 endif
 
 HTML_LINUX_I2C_MANS = asem.html
@@ -561,7 +561,7 @@
        $(MAN_CLIENT_PAGES) \
        $(MAN_TOOL_PAGES) \
        $(MAN5_CGI_PAGES) \
-       $(MAN8_CGI_PAGES) \
+       $(MAN1m_CGI_PAGES) \
        $(MAN1_DEV_PAGES) \
        $(MAN3_DEV_PAGES) \
        $(MAN_SERIAL_PAGES) \
@@ -621,7 +621,7 @@
 
 CLEANFILES = *.xml *.html
 
-SUFFIXES = .txt .html .1 .3 .5 .8
+SUFFIXES = .txt .html .1 .3 .5 .1m
 
 if HAVE_ASCIIDOC
 
@@ -649,7 +649,7 @@
 .txt.5:
        $(A2X) $(A2X_MANPAGE_OPTS) $<
 
-.txt.8:
+.txt.1m:
        $(A2X) $(A2X_MANPAGE_OPTS) $<
 
 else !HAVE_ASCIIDOC
@@ -690,7 +690,7 @@
                exit 1; \
        fi
 
-.txt.8:
+.txt.1m:
        @if [ -r "$@" ]; then \
                echo "Not (re)building $@ manual page, since 'asciidoc', 'xmllint' or 'xsltproc' were not found." ; \
        else \