From d23e4b0fa5854b2b249c09e118a1bfea1fe59763 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Tue, 26 Jul 2016 16:00:36 +0200
Subject: [PATCH] Changed header and footer of screen output

---
 include/report | 9 +++++----
 lynis          | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/report b/include/report
index 2389053f..a2c23ef9 100644
--- a/include/report
+++ b/include/report
@@ -240,7 +240,7 @@
                 echo "================================================================================"
             fi
 
-            echo ""; echo ""
+            echo ""
         fi
 
     fi
@@ -249,13 +249,14 @@
     Report "hardening_index=${HPINDEX}"
 
     if [ ${QUIET} -eq 0 ]; then
-        echo "  ${PROGRAM_NAME} ${PROGRAM_VERSION}"
-        echo "  Auditing, hardening and compliance for Linux, Mac OS and Unix systems"
+        echo "  ${WHITE}${PROGRAM_NAME}${NORMAL} ${PROGRAM_VERSION}"
+        echo ""
+        echo "  Auditing, system hardening, and compliance for UNIX-based systems"
+        echo "  (Linux, macOS, BSD, and others)"
         echo ""
         echo "  ${PROGRAM_COPYRIGHT}"
         echo "  ${WHITE}${PROGRAM_EXTRAINFO}${NORMAL}"
         echo ""
-        echo ""
         echo "================================================================================"
     fi
 
diff --git a/lynis b/lynis
index f1471bff..0432d21d 100755
--- a/lynis
+++ b/lynis
@@ -40,11 +40,11 @@
     # Source, documentation and license
     PROGRAM_SOURCE="https://github.com/CISOfy/lynis"
     PROGRAM_WEBSITE="https://cisofy.com/lynis/"
-    PROGRAM_COPYRIGHT="Copyright 2007-2016 - ${PROGRAM_AUTHOR}, ${PROGRAM_WEBSITE}"
+    PROGRAM_COPYRIGHT="2007-2016, ${PROGRAM_AUTHOR} - ${PROGRAM_WEBSITE}"
     PROGRAM_LICENSE="${PROGRAM_NAME} comes with ABSOLUTELY NO WARRANTY. This is free software, and you are
   welcome to redistribute it under the terms of the GNU General Public License.
   See the LICENSE file for details about using this software."
-    PROGRAM_EXTRAINFO="Enterprise support and plugins available via CISOfy"
+    PROGRAM_EXTRAINFO="Enterprise support available (compliance, plugins, interface and tools)"
 
     # Version number of report files (when format changes in future)
     REPORT_version_major="1"; REPORT_version_minor="0"
@@ -258,7 +258,7 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta
 #
 
     if [ ${QUIET} -eq 0 ]; then
-        printf "\n${WHITE}[ ${PROGRAM_NAME} ${PROGRAM_VERSION} ]${NORMAL}\n\n################################################################################\n  ${PROGRAM_LICENSE}\n  ${PROGRAM_COPYRIGHT}\n  ${PROGRAM_EXTRAINFO}\n################################################################################\n\n"
+        printf "\n${WHITE}[ ${PROGRAM_NAME} ${PROGRAM_VERSION} ]${NORMAL}\n\n################################################################################\n  ${PROGRAM_LICENSE}\n\n  ${PROGRAM_COPYRIGHT}\n  ${PROGRAM_EXTRAINFO}\n################################################################################\n\n"
     fi
 
     if [ "${PROGRAM_RELEASE_TYPE}" = "beta" ]; then