[3513] improved extended version layouts

diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc
index 7711c8dea1702a410cef7c89a199f98ee5ca5be7..11d0e3efcb5af2d63ad51b1d8c768c7a2609eede 100644 (file)
--- a/src/bin/d2/d_controller.cc
+++ b/src/bin/d2/d_controller.cc
@@ -458,9 +458,9 @@ isc::dhcp::Daemon::getVersion(bool extended) {
     tmp << VERSION;
     if (extended) {
         tmp << std::endl << EXTENDED_VERSION << std::endl;
-        tmp << "linked with " << isc::log::Logger::getVersion() << std::endl;
-        tmp << "and " << isc::cryptolink::CryptoLink::getVersion()
-            << std::endl;
+        tmp << "linked with:" << std::endl;
+        tmp << isc::log::Logger::getVersion() << std::endl;
+        tmp << isc::cryptolink::CryptoLink::getVersion() << std::endl;
 #ifdef HAVE_MYSQL
         tmp << "database: MySQL";
 #else

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 8190388d39603379420f7cae7a734939c14a89e6..3f7a2d89378eb72a2f554b4dfe29374be21b3a30 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -2221,8 +2221,9 @@ Daemon::getVersion(bool extended) {
     tmp << VERSION;
     if (extended) {
         tmp << endl << EXTENDED_VERSION << endl;
-        tmp << "linked with " << Logger::getVersion() << endl;
-        tmp << "and " << CryptoLink::getVersion() << endl;
+        tmp << "linked with:" << endl;
+        tmp << Logger::getVersion() << endl;
+        tmp << CryptoLink::getVersion() << endl;
 #ifdef HAVE_MYSQL
         tmp << "database: MySQL";
 #else

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 1058dd6887b3c5cc5508540110c25ce2884236c7..ea819bf7d8849e79f66f5d0eb045b8abf213d03c 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -2768,8 +2768,9 @@ Daemon::getVersion(bool extended) {
     tmp << VERSION;
     if (extended) {
         tmp << endl << EXTENDED_VERSION << endl;
-        tmp << "linked with " << Logger::getVersion() << endl;
-        tmp << "and " << CryptoLink::getVersion() << endl;
+        tmp << "linked with:" << endl;
+        tmp << Logger::getVersion() << endl;
+        tmp << CryptoLink::getVersion() << endl;
 #ifdef HAVE_MYSQL
         tmp << "database: MySQL";
 #else