[2840] typos and docs update before release

diff --git a/configure.ac b/configure.ac
index b1d665f7d8482df486c9407a773edf940a7f533b..797d7ddaa833ba1e555a87ace798a5144f83a949 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -850,16 +850,6 @@ if test "${pgsql_ssl}" = "yes"; then
     AC_DEFINE([HAVE_PGSQL_SSL], [1], [PostgreSQL was built with OpenSSL support])
 fi
 
-cql_config="no"
-AC_ARG_WITH([cql],
-  [AS_HELP_STRING([--with-cql[[=PATH]]],
-    [path to pkg-config or the Cassandra CQL 'cql_config' script (deprecated)])],
-  [cql_config="$withval"])
-
-if test "${cql_config}" != "no" ; then
-    AC_MSG_ERROR([$CQL_CONFIG Cassandra is no longer supported])
-fi
-
 # Check for log4cplus
 DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=
 log4cplus_path="yes"

diff --git a/platforms.rst b/platforms.rst
index 6958dd810fd31ecd67a811d8e267b2ea39f25dfa..926e3c394a5c61cf4c5254f70592766467072d62 100644 (file)
--- a/platforms.rst
+++ b/platforms.rst
@@ -20,7 +20,7 @@ Regularly Tested Platforms
 Kea is officially supported on Alpine, CentOS, Fedora, Ubuntu, Debian,
 and FreeBSD systems. Kea-|release| builds have been tested on:
 
-* Alpine — 3.14, 3.15, 3.16
+* Alpine — 3.14, 3.15, 3.16, 3.17
 * CentOS — 7
 * Debian — 10, 11
 * Fedora — 36

diff --git a/src/lib/cc/command_interpreter.cc b/src/lib/cc/command_interpreter.cc
index 1bdd329d19dba74e1479682db14f6b10b36cb8c0..be7048e7db5752816d0433b17866f7ae7d12ef15 100644 (file)
--- a/src/lib/cc/command_interpreter.cc
+++ b/src/lib/cc/command_interpreter.cc
@@ -220,7 +220,7 @@ parseCommandWithArgs(ConstElementPtr& arg, ConstElementPtr command) {
     // Arguments must be a map.
     if (arg->getType() != Element::map) {
         isc_throw(CtrlChannelError,
-                  "invalid command '" << command_name << "': expected "
+                  "invalid command '" << command_name << "': expected '"
                   << CONTROL_ARGUMENTS << "' to be a map, got "
                   << Element::typeToName(arg->getType()) << " instead");
     }

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index d6784e13aede5e1f3c2ba2adddcc5bc700245f4b..b0b60b6651b00a0868f8da35e263523af14e0208 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -5091,7 +5091,7 @@ UPDATE schema_version
 
 -- This line starts the schema upgrade to version 16.
 
--- Add relay and remote id colums to DHCPv4 leases.
+-- Add relay and remote id columns to DHCPv4 leases.
 --
 -- Note: these columns are only used for indexes, in particular they are
 -- not exported by lease4 dump as values are also in the user context 

diff --git a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
index 05e0396162ee4d09dad516b066da86dd3ec803c8..fe89202c760bd83a26d9867acbdd3b05716ccb07 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
@@ -54,7 +54,7 @@ fi
 mysql "$@" <<EOF
 -- This line starts the schema upgrade to version 16.
 
--- Add relay and remote id colums to DHCPv4 leases.
+-- Add relay and remote id columns to DHCPv4 leases.
 --
 -- Note: these columns are only used for indexes, in particular they are
 -- not exported by lease4 dump as values are also in the user context 

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index e4d3f531551a3d6e57aee3374f64c22faa7ed001..f172b5169c2b6dbb22eefd36b2e5de840c57911c 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -5651,7 +5651,7 @@ UPDATE schema_version
 
 -- This line starts the schema upgrade to version 15.
 
--- Add relay and remote id colums to DHCPv4 leases.
+-- Add relay and remote id columns to DHCPv4 leases.
 --
 -- Note: these columns are only used for indexes, in particular they are
 -- not exported by lease4 dump as values are also in the user context 

diff --git a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
index 2681e6c579c690895af8661c4d1a0f272ad41366..420e07f5b42efdf46536f68effaf12f0148d12e0 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_014_to_015.sh.in
@@ -38,7 +38,7 @@ START TRANSACTION;
 
 -- This line starts the schema upgrade to version 15.
 
--- Add relay and remote id colums to DHCPv4 leases.
+-- Add relay and remote id columns to DHCPv4 leases.
 --
 -- Note: these columns are only used for indexes, in particular they are
 -- not exported by lease4 dump as values are also in the user context