[#1636] Ported 1263/1619 fixes

diff --git a/configure.ac b/configure.ac
index a5883b0a031339d07edb4871a4440b0d7e0748b9..428c43cd5071c517dd5afde99ee29a6a6e702d4a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -178,10 +178,10 @@ AC_COMPILE_IFELSE(
     [AC_LANG_PROGRAM(
         [#include <chrono>
         #include <type_traits>]
-       [static_assert(!std::is_same<
+        [static_assert(!std::is_same<
                            std::chrono::system_clock::duration,
-                          std::chrono::steady_clock::duration
-                                   >::value, "");])],
+                           std::chrono::steady_clock::duration
+                                    >::value, "");])],
     [AC_MSG_RESULT(yes)],
     [AC_MSG_RESULT(no)
     AC_DEFINE([CHRONO_SAME_DURATION], [1],

diff --git a/doc/devel/doc.dox b/doc/devel/doc.dox
index ade95e4712d06511b918db98bbad6f41b94e65f3..b2a80aa7bb8b0f6dbaa126a428859e55085c687f 100644 (file)
--- a/doc/devel/doc.dox
+++ b/doc/devel/doc.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -36,9 +36,9 @@ unless you alter description of existing commands or add a new one.
 There are several steps needed to document a new API command:
 
  1. Configure sources with ./configure --enable-generate-docs
- 1. Copy doc/sphinx/api/_template.json to appropriate name.
+ 1. Copy src/shared/api/_template.json to appropriate name.
  2. Remove comments from it and fill in the actual content.
- 3. Update api_files variable in doc/sphinx/Makefile.am
+ 3. Update api_files.mk file in src/share/api/Makefile.am
  4. make html will generate multi-page html.
  5. make singlehtml will generate a single page html.
 

diff --git a/src/bin/admin/.gitignore b/src/bin/admin/.gitignore
index d938490cde044a4d16d21a93b358d536647e30c3..1f1c6f76312d430df7bdccaf9540d04cce622164 100644 (file)
--- a/src/bin/admin/.gitignore
+++ b/src/bin/admin/.gitignore
@@ -1,2 +1 @@
 /kea-admin
-/kea-admin.8

diff --git a/src/bin/agent/.gitignore b/src/bin/agent/.gitignore
index ee386ea737cbb71b45f6f65ebd4d0fbd5a11c59e..56d3c6083ca70306976e6539d163626ffb561588 100644 (file)
--- a/src/bin/agent/.gitignore
+++ b/src/bin/agent/.gitignore
@@ -1,3 +1,2 @@
 /kea-ctrl-agent
-/kea-ctrl-agent.8
 /agent_parser.report

diff --git a/src/bin/d2/.gitignore b/src/bin/d2/.gitignore
index c8d6f90644d9651ba58bee60f5813e79832aa65a..514eb9e8d472a8e93f81aac9f7bd3ccb10b1f219 100644 (file)
--- a/src/bin/d2/.gitignore
+++ b/src/bin/d2/.gitignore
@@ -1,3 +1,2 @@
 /kea-dhcp-ddns
-/kea-dhcp-ddns.8
 /d2_parser.report

diff --git a/src/bin/dhcp4/.gitignore b/src/bin/dhcp4/.gitignore
index 770611fd32b9cfb186a8011d0f9646d49473ba67..5d7552bb3e76dc780d06db597230752f855de0ca 100644 (file)
--- a/src/bin/dhcp4/.gitignore
+++ b/src/bin/dhcp4/.gitignore
@@ -1,3 +1,2 @@
 /kea-dhcp4
-/kea-dhcp4.8
 /dhcp4_parser.report

diff --git a/src/bin/dhcp6/.gitignore b/src/bin/dhcp6/.gitignore
index 075b3500ef15292159e69ace4997ee0a0bebbf9e..57ff3a861ec8d222c8b6fc641b88d33b4fcb6e4d 100644 (file)
--- a/src/bin/dhcp6/.gitignore
+++ b/src/bin/dhcp6/.gitignore
@@ -1,3 +1,2 @@
 /kea-dhcp6
-/kea-dhcp6.8
 /dhcp6_parser.report

diff --git a/src/bin/keactrl/.gitignore b/src/bin/keactrl/.gitignore
index b9e2f92dca6cfdfb96a19dbfa105295ae5f97bf4..ec9313b11b77f284d767881a15bc44571f4a993f 100644 (file)
--- a/src/bin/keactrl/.gitignore
+++ b/src/bin/keactrl/.gitignore
@@ -5,4 +5,3 @@
 /kea-ctrl-agent.conf
 /kea-netconf.conf
 /keactrl.conf
-/keactrl.8

diff --git a/src/bin/lfc/.gitignore b/src/bin/lfc/.gitignore
index a64e4394bce103d8dc307021b24b28e916bb5442..f488c3d6af708625ae29dad2f6bfb9d2a51412f7 100644 (file)
--- a/src/bin/lfc/.gitignore
+++ b/src/bin/lfc/.gitignore
@@ -1,2 +1 @@
 /kea-lfc
-/kea-lfc.8

diff --git a/src/bin/netconf/.gitignore b/src/bin/netconf/.gitignore
index c95ab298fcc61668f4196b632235038f665e731f..2611a2f9cf854d1a3ed4942552288790731f6397 100644 (file)
--- a/src/bin/netconf/.gitignore
+++ b/src/bin/netconf/.gitignore
@@ -1,3 +1,2 @@
 /kea-netconf
-/kea-netconf.8
 /netconf_parser.report

diff --git a/src/bin/perfdhcp/.gitignore b/src/bin/perfdhcp/.gitignore
index bdb5d378bbf75c5909742993bd51050ff28a4268..1a8375a158878f74e8dcdcf36f96097dafde4bde 100644 (file)
--- a/src/bin/perfdhcp/.gitignore
+++ b/src/bin/perfdhcp/.gitignore
@@ -1,3 +1 @@
 /perfdhcp
-/perfdhcp.1
-/perfdhcp.8

diff --git a/src/bin/shell/.gitignore b/src/bin/shell/.gitignore
index 126c4f2891255200175dda00e2ed8c4954e3a668..a6d94aaea69386a54e1626736a9680c7bf9f7ce1 100644 (file)
--- a/src/bin/shell/.gitignore
+++ b/src/bin/shell/.gitignore
@@ -1,3 +1,2 @@
 kea-shell
-kea-shell.8
 *.pyc

diff --git a/src/bin/shell/tests/shell_process_tests.sh.in b/src/bin/shell/tests/shell_process_tests.sh.in
index cc1955045ed09945be5a41c50f5164243a985d4f..c7106d1ea5f125204c427a58ace4e3625c7773e2 100644 (file)
--- a/src/bin/shell/tests/shell_process_tests.sh.in
+++ b/src/bin/shell/tests/shell_process_tests.sh.in
@@ -119,7 +119,7 @@ shell_command_test() {
     # Check the exit code
     if [ "${shell_exit_code}" -ne 0 ]; then
         echo "ERROR:" \
-        "kea-shell returned ${shell_exit_code} exit code,  expected 0."
+        "kea-shell returned ${shell_exit_code} exit code, expected 0."
     else
         echo "kea-shell returned ${shell_exit_code} exit code as expected."
     fi