Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / console / conio.h

diff --git a/bacula/src/console/conio.h b/bacula/src/console/conio.h
index 57296af6a7c999822302ff483f2608bf8102bee9..c00985079e1e9033b5d094236f1a1ad42a621aa5 100644 (file)
--- a/bacula/src/console/conio.h
+++ b/bacula/src/console/conio.h
@@ -1,17 +1,21 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 
 #ifndef __CONIO_H