final preparations for version 2.6 release

CHANGES

@@ -1,12 +1,13 @@
-2.6 / <not released yet>
+2.6 / 20-Jan-2020
 
  - Fixed
    - --json and --xml didn't support having both mode and limit parameters
      defined at the same time as documented, broken since previous release
-   - Documentation was using a mix of "count" and "limit" for the option
-     of limiting the maximum number of shown entries in queries
-   - Summary image output would segmentation fault when database existed but
-     didn't yet contain any daily or monthly data for the selected interface
+   - Documentation was using a mix of "count" and "limit" for the option of
+     limiting the maximum number of shown entries in queries
+   - Summary image output would segmentation fault when the database existed
+     but didn't yet contain any daily or monthly data for the selected
+     interface
  - New
    - Add --limit as an alternative way for controlling the length of outputs
 

UPGRADE.md

@@ -1,7 +1,7 @@
 
 # New configuration settings
 
- * 2.4 - 2.5: (none)
+ * 2.4 - 2.6: (none)
 
  * 2.3: DatabaseWriteAheadLogging, DatabaseSynchronous
 

cfg/vnstat.conf

@@ -1,4 +1,4 @@
-# vnStat 2.5 config file
+# vnStat 2.6 config file
 ##
 
 # default interface (leave empty for automatic selection)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vnstat 2.6_beta1.
+# Generated by GNU Autoconf 2.69 for vnstat 2.6.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='vnstat'
 PACKAGE_TARNAME='vnstat'
-PACKAGE_VERSION='2.6_beta1'
-PACKAGE_STRING='vnstat 2.6_beta1'
+PACKAGE_VERSION='2.6'
+PACKAGE_STRING='vnstat 2.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vnstat 2.6_beta1 to adapt to many kinds of systems.
+\`configure' configures vnstat 2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vnstat 2.6_beta1:";;
+     short | recursive ) echo "Configuration of vnstat 2.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1488,7 +1488,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vnstat configure 2.6_beta1
+vnstat configure 2.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2083,7 +2083,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vnstat $as_me 2.6_beta1, which was
+It was created by vnstat $as_me 2.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2949,7 +2949,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='vnstat'
- VERSION='2.6_beta1'
+ VERSION='2.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6308,7 +6308,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vnstat $as_me 2.6_beta1, which was
+This file was extended by vnstat $as_me 2.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6374,7 +6374,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-vnstat config.status 2.6_beta1
+vnstat config.status 2.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([vnstat], [2.6_beta1])
+AC_INIT([vnstat], [2.6])
 AM_INIT_AUTOMAKE([foreign subdir-objects std-options -Wall -Werror])
 AM_MAINTAINER_MODE
 

man/vnstat.1

@@ -1,4 +1,4 @@
-.TH VNSTAT 1 "JANUARY 2020" "version 2.5" "User Manuals"
+.TH VNSTAT 1 "JANUARY 2020" "version 2.6" "User Manuals"
 .SH NAME
 vnstat \- a console-based network traffic monitor
 
@@ -233,7 +233,7 @@ field exists only as extra information.
 
 .TP
 .BI "--limit " limit
-Set the maximum number of entries in list outputs to
+Set the maximum number of shown entries in list outputs to
 .IR limit .
 Usage of
 .B "--limit"

man/vnstat.conf.5

@@ -1,4 +1,4 @@
-.TH VNSTAT.CONF 5 "JANUARY 2020" "version 2.5" "User Manuals"
+.TH VNSTAT.CONF 5 "JANUARY 2020" "version 2.6" "User Manuals"
 .SH NAME
 vnstat.conf \- vnStat configuration file
 

man/vnstatd.8

@@ -1,4 +1,4 @@
-.TH VNSTATD 8 "JANUARY 2020" "version 2.5" "User Manuals"
+.TH VNSTATD 8 "JANUARY 2020" "version 2.6" "User Manuals"
 .SH NAME
 vnstatd \- daemon based database updating for vnStat
 

man/vnstati.1

@@ -1,4 +1,4 @@
-.TH VNSTATI 1 "JANUARY 2020" "version 2.5" "User Manuals"
+.TH VNSTATI 1 "JANUARY 2020" "version 2.6" "User Manuals"
 .SH NAME
 vnstati \- png image output support for vnStat
 
@@ -195,7 +195,7 @@ when the merge syntax is used.
 
 .TP
 .BI "--limit " limit
-Set the maximum number of entries in list outputs to
+Set the maximum number of shown entries in list outputs to
 .IR limit .
 Usage of
 .B "--limit"