move vnstatd man page from section 1 to section 8

diff --git a/CHANGES b/CHANGES
index cdc76897d0227622d444e8057f4128bfd2e96a84..cc249d1a6d05f9f67ff5d8e1ea3f1bfa6275118f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@
  - Fixed
    - Daemon didn't fork() even when requested to with --daemon when started
      by PID 1 (issue seen at least in Docker containers)
+   - Move vnstatd man page from section 1 to section 8
 
 
 2.3 / 10-Jul-2019

diff --git a/Makefile.am b/Makefile.am
index 1a8f0a81cc6b3739991d927b064f087ccdca5012..3452317883617fd68a86384a16d2617e5c94151f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = .
 AM_CFLAGS = @CFLAG_EXTRAS@
 
-dist_man_MANS = man/vnstat.1 man/vnstat.conf.5 man/vnstatd.1 man/vnstati.1
+dist_man_MANS = man/vnstat.1 man/vnstat.conf.5 man/vnstatd.8 man/vnstati.1
 
 EXTRA_DIST = cfg examples UPGRADE CHANGES FAQ INSTALL_BSD UNINSTALL
 
@@ -139,6 +139,7 @@ release: distcheck
        ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
 
 install-data-hook: install-exec
+       if [ -f $(DESTDIR)$(man1dir)/vnstatd.1 ]; then rm -f $(DESTDIR)$(man1dir)/vnstatd.1; fi
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
 if IS_CROSSCOMPILED
        if [ ! -f $(DESTDIR)$(sysconfdir)/vnstat.conf ]; \

diff --git a/Makefile.in b/Makefile.in
index c61f2890521dd14af8c1c7dab5ea152914086b3c..40f0c1053567f88ad38986ae21e105303c12d9ec 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,7 +113,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 @HAVE_LIBGD_TRUE@am__EXEEXT_1 = vnstati$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
-       "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
+       "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+       "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 am__check_vnstat_SOURCES_DIST = tests/vnstat_tests.c \
        tests/vnstat_tests.h tests/common_tests.c tests/common_tests.h \
@@ -271,6 +272,7 @@ am__uninstall_files_from_dir = { \
   }
 man1dir = $(mandir)/man1
 man5dir = $(mandir)/man5
+man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(dist_man_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
@@ -629,7 +631,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = .
 AM_CFLAGS = @CFLAG_EXTRAS@
-dist_man_MANS = man/vnstat.1 man/vnstat.conf.5 man/vnstatd.1 man/vnstati.1
+dist_man_MANS = man/vnstat.1 man/vnstat.conf.5 man/vnstatd.8 man/vnstati.1
 EXTRA_DIST = cfg examples UPGRADE CHANGES FAQ INSTALL_BSD UNINSTALL
 vnstati_LDADD = @IMAGELIBS@
 vnstat_SOURCES = src/vnstat.c src/vnstat.h \
@@ -1577,6 +1579,49 @@ uninstall-man5:
        } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
              -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
        dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
+install-man8: $(dist_man_MANS)
+       @$(NORMAL_INSTALL)
+       @list1=''; \
+       list2='$(dist_man_MANS)'; \
+       test -n "$(man8dir)" \
+         && test -n "`echo $$list1$$list2`" \
+         || exit 0; \
+       echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+       $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+       { for i in $$list1; do echo "$$i"; done;  \
+       if test -n "$$list2"; then \
+         for i in $$list2; do echo "$$i"; done \
+           | sed -n '/\.8[a-z]*$$/p'; \
+       fi; \
+       } | while read p; do \
+         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; echo "$$p"; \
+       done | \
+       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+       sed 'N;N;s,\n, ,g' | { \
+       list=; while read file base inst; do \
+         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+         fi; \
+       done; \
+       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+       while read files; do \
+         test -z "$$files" || { \
+           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
+           $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+       done; }
+
+uninstall-man8:
+       @$(NORMAL_UNINSTALL)
+       @list=''; test -n "$(man8dir)" || exit 0; \
+       files=`{ for i in $$list; do echo "$$i"; done; \
+       l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+         sed -n '/\.8[a-z]*$$/p'; \
+       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+       dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -2042,7 +2087,7 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -2123,7 +2168,7 @@ install-info: install-info-recursive
 
 install-info-am:
 
-install-man: install-man1 install-man5
+install-man: install-man1 install-man5 install-man8
 
 install-pdf: install-pdf-recursive
 
@@ -2158,7 +2203,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-man \
        uninstall-sbinPROGRAMS
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-man: uninstall-man1 uninstall-man5
+uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 
 .MAKE: $(am__recursive_targets) check-am install-am install-data-am \
        install-strip uninstall-am
@@ -2176,15 +2221,16 @@ uninstall-man: uninstall-man1 uninstall-man5
        install-data-am install-data-hook install-dvi install-dvi-am \
        install-exec install-exec-am install-html install-html-am \
        install-info install-info-am install-man install-man1 \
-       install-man5 install-pdf install-pdf-am install-ps \
-       install-ps-am install-sbinPROGRAMS install-strip installcheck \
-       installcheck-am installcheck-binPROGRAMS \
+       install-man5 install-man8 install-pdf install-pdf-am \
+       install-ps install-ps-am install-sbinPROGRAMS install-strip \
+       installcheck installcheck-am installcheck-binPROGRAMS \
        installcheck-sbinPROGRAMS installdirs installdirs-am \
        maintainer-clean maintainer-clean-generic mostlyclean \
        mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
        recheck tags tags-am uninstall uninstall-am \
        uninstall-binPROGRAMS uninstall-hook uninstall-man \
-       uninstall-man1 uninstall-man5 uninstall-sbinPROGRAMS
+       uninstall-man1 uninstall-man5 uninstall-man8 \
+       uninstall-sbinPROGRAMS
 
 .PRECIOUS: Makefile
 
@@ -2227,6 +2273,7 @@ release: distcheck
        ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
 
 install-data-hook: install-exec
+       if [ -f $(DESTDIR)$(man1dir)/vnstatd.1 ]; then rm -f $(DESTDIR)$(man1dir)/vnstatd.1; fi
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
 @IS_CROSSCOMPILED_TRUE@        if [ ! -f $(DESTDIR)$(sysconfdir)/vnstat.conf ]; \
 @IS_CROSSCOMPILED_TRUE@        then cp -fv $(srcdir)/cfg/vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf; \

diff --git a/man/vnstat.1 b/man/vnstat.1
index 0b9f170f29706b395e549cd98832f2c86819a87b..151b2910af0a5aa1c124f1502a52446229f9cc0d 100644 (file)
--- a/man/vnstat.1
+++ b/man/vnstat.1
@@ -84,7 +84,7 @@ The implementation is divided into two commands. The purpose of the
 .B vnstat
 command is to provide an interface for querying the traffic information stored
 in the database whereas the daemon
-.BR vnstatd (1)
+.BR vnstatd (8)
 is responsible for data retrieval, caching and storage. Although the daemon
 process is constantly running as a service, it is actually spending most of its
 time sleeping between data updates.
@@ -460,7 +460,7 @@ Teemu Toivola <tst at iki dot fi>
 
 .SH "SEE ALSO"
 
-.BR vnstatd (1),
+.BR vnstatd (8),
 .BR vnstati (1),
 .BR vnstat.conf (5),
 .BR proc (5),

diff --git a/man/vnstat.conf.5 b/man/vnstat.conf.5
index 3ff0bc7f9305647a74a0ef5cfa5a00942923d0e9..10c8985692e81a41d0d2b92fbcf5c81c6f63ba3d 100644 (file)
--- a/man/vnstat.conf.5
+++ b/man/vnstat.conf.5
@@ -11,7 +11,7 @@ vnstat.conf \- vnStat configuration file
 .BR vnstat (1),
 .BR vnstati (1)
 and
-.BR vnstatd (1)
+.BR vnstatd (8)
 all use the same configuration file for configuration related settings.
 Some of the settings are common for all three programs. The file
 consists of keyword-argument pairs, one per line. Empty lines and
@@ -453,5 +453,5 @@ Teemu Toivola <tst at iki dot fi>
 
 .BR vnstat (1),
 .BR vnstati (1),
-.BR vnstatd (1),
+.BR vnstatd (8),
 .BR units (7)

diff --git a/man/vnstatd.1 b/man/vnstatd.8
similarity index 99%
rename from man/vnstatd.1
rename to man/vnstatd.8
index ffa0a5b93a3efb59d3aac5dd2fac443fd48dfc61..ae96bd241be0e3aa1e1a653c58c03220a77d478d 100644 (file)
--- a/man/vnstatd.1
+++ b/man/vnstatd.8
@@ -1,4 +1,4 @@
-.TH VNSTATD 1 "JULY 2019" "version 2.3" "User Manuals"
+.TH VNSTATD 8 "JULY 2019" "version 2.3" "User Manuals"
 .SH NAME
 vnstatd \- daemon based database updating for vnStat
 

diff --git a/man/vnstati.1 b/man/vnstati.1
index 3bd996e7bc18d5f0d2ab05f0fbe8f76a2338f083..55e6d430d6b33412daea9fed940d94588ca593a3 100644 (file)
--- a/man/vnstati.1
+++ b/man/vnstati.1
@@ -346,6 +346,6 @@ Teemu Toivola <tst at iki dot fi>
 .SH "SEE ALSO"
 
 .BR vnstat (1),
-.BR vnstatd (1),
+.BR vnstatd (8),
 .BR vnstat.conf (5),
 .BR units (7)