Updated license headers to latest GENIVI license policy. Fixed further LRT Scan findings. Renamed and cleanup further files.

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

21 files changed, 213 insertions, 53 deletions

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d670614..9eee003 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,17 +1,19 @@
 #######
-# Dlt - Diagnostic Log and Trace
 # @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
 #
-# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel <alexander.aw.wenzel@bmw.de>
-# 
-# Contributions are licensed to the GENIVI Alliance under one or more
-# Contribution License Agreements.
-# 
 # 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 file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
 # @licence end@
-########
+#######
 
 if(WITH_DOC)
     find_package(Doxygen)
@@ -27,8 +29,8 @@ if(WITH_DOC)
 		COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals 
 		COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals/images 
 		COMMAND cp ${CMAKE_SOURCE_DIR}/doc/images/* ${CMAKE_BINARY_DIR}/doc/manuals/images 
-  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/INSTALL.html ${CMAKE_SOURCE_DIR}/INSTALL.txt 
-  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/README.html ${CMAKE_SOURCE_DIR}/README.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/INSTALL.html ${CMAKE_SOURCE_DIR}/INSTALL
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/README.html ${CMAKE_SOURCE_DIR}/README
   		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/ReleaseNotes.html ${CMAKE_SOURCE_DIR}/ReleaseNotes.txt 
   		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_user_manual.html ${CMAKE_SOURCE_DIR}/doc/dlt_user_manual.txt 
   		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_cheatsheet.html ${CMAKE_SOURCE_DIR}/doc/dlt_cheatsheet.txt 
diff --git a/doc/dlt-convert.1 b/doc/dlt-convert.1
index 90f7d33..2431d39 100644
--- a/doc/dlt-convert.1
+++ b/doc/dlt-convert.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dlt-convert
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/12/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "DLT\-CONVERT" "1" "10/12/2012" "\ \&" "\ \&"
+.TH "DLT\-CONVERT" "1" "05/12/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -95,31 +95,26 @@ Follow dlt file while file is increasing\&.
 .PP
 Start DLT daemon in background mode
 .RS 4
-
 \fBdlt\-daemon \-d\fR
 .RE
 .PP
 Start DLT daemon with own configuration
 .RS 4
-
 \fBdlt\-daemon \-c ~/my\-dlt\-configuration\&.cfg\fR
 .RE
 .PP
 Convert DLT file into ASCII
 .RS 4
-
 \fBdlt\-convert \-a mylog\&.dlt\fR
 .RE
 .PP
 Cut a specific range, e\&.g\&. from message 1 to message 3 from a file called log\&.dlt and store the result to a file called newlog\&.dlt
 .RS 4
-
 \fBdlt\-convert \-b 1 \-e 3 \-o newlog\&.dlt log\&.dlt\fR
 .RE
 .PP
 Paste two dlt files log1\&.dlt and log2\&.dlt to a new file called newlog\&.dlt
 .RS 4
-
 \fBdlt\-convert \-o newlog\&.dlt log1\&.dlt log2\&.dlt\fR
 .RE
 .SH "EXIT STATUS"
@@ -128,6 +123,9 @@ Non zero is returned in case of failure\&.
 .SH "AUTHOR"
 .sp
 Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de)
+.SH "COPYRIGHT"
+.sp
+Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&.
 .SH "RESOURCES"
 .sp
 Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace
diff --git a/doc/dlt-convert.1.txt b/doc/dlt-convert.1.txt
index 37d4886..17ff71e 100644
--- a/doc/dlt-convert.1.txt
+++ b/doc/dlt-convert.1.txt
@@ -76,6 +76,10 @@ AUTHOR
 ------
 Alexander Wenzel (alexander.aw.wenzel (at) bmw.de)
 
+COPYRIGHT
+---------
+Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <http://mozilla.org/MPL/2.0/>.
+
 RESOURCES
 ---------
 Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1
index 44dbb00..b668f9c 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dlt-daemon
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/12/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "DLT\-DAEMON" "1" "10/12/2012" "\ \&" "\ \&"
+.TH "DLT\-DAEMON" "1" "05/12/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,13 +55,11 @@ Load an alternative configuration file\&. By default the configuration file /etc
 .PP
 Start DLT daemon in background mode
 .RS 4
-
 \fBdlt\-daemon \-d\fR
 .RE
 .PP
 Start DLT daemon with own configuration
 .RS 4
-
 \fBdlt\-daemon \-c ~/my\-dlt\-configuration\&.cfg\fR
 .RE
 .SH "EXIT STATUS"
@@ -70,6 +68,9 @@ Non zero is returned in case of failure\&.
 .SH "AUTHOR"
 .sp
 Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de)
+.SH "COPYRIGHT"
+.sp
+Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&.
 .SH "RESOURCES"
 .sp
 Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace
diff --git a/doc/dlt-daemon.1.txt b/doc/dlt-daemon.1.txt
index 69159a7..5b3d306 100644
--- a/doc/dlt-daemon.1.txt
+++ b/doc/dlt-daemon.1.txt
@@ -45,6 +45,10 @@ AUTHOR
 ------
 Alexander Wenzel (alexander.aw.wenzel (at) bmw.de)
 
+COPYRIGHT
+---------
+Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <http://mozilla.org/MPL/2.0/>.
+
 RESOURCES
 ---------
 Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
diff --git a/doc/dlt-receive.1 b/doc/dlt-receive.1
index 4a80d94..9efbbca 100644
--- a/doc/dlt-receive.1
+++ b/doc/dlt-receive.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dlt-receive
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/12/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "DLT\-RECEIVE" "1" "10/12/2012" "\ \&" "\ \&"
+.TH "DLT\-RECEIVE" "1" "05/12/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -108,6 +108,9 @@ Non zero is returned in case of failure\&.
 .SH "AUTHOR"
 .sp
 Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de)
+.SH "COPYRIGHT"
+.sp
+Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&.
 .SH "RESOURCES"
 .sp
 Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace
diff --git a/doc/dlt-receive.1.txt b/doc/dlt-receive.1.txt
index 440ac2b..1c9e8be 100644
--- a/doc/dlt-receive.1.txt
+++ b/doc/dlt-receive.1.txt
@@ -65,6 +65,10 @@ AUTHOR
 ------
 Alexander Wenzel (alexander.aw.wenzel (at) bmw.de)
 
+COPYRIGHT
+---------
+Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <http://mozilla.org/MPL/2.0/>.
+
 RESOURCES
 ---------
 Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
diff --git a/doc/dlt-system.1 b/doc/dlt-system.1
index faef769..951f366 100644
--- a/doc/dlt-system.1
+++ b/doc/dlt-system.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dlt-system
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/12/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "DLT\-SYSTEM" "1" "10/12/2012" "\ \&" "\ \&"
+.TH "DLT\-SYSTEM" "1" "05/12/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -60,6 +60,9 @@ Non zero is returned in case of failure\&.
 .SH "AUTHOR"
 .sp
 Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de)
+.SH "COPYRIGHT"
+.sp
+Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&.
 .SH "RESOURCES"
 .sp
 Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace
diff --git a/doc/dlt-system.1.txt b/doc/dlt-system.1.txt
index 81d8033..6b26b6b 100644
--- a/doc/dlt-system.1.txt
+++ b/doc/dlt-system.1.txt
@@ -43,6 +43,10 @@ AUTHOR
 ------
 Alexander Wenzel (alexander.aw.wenzel (at) bmw.de)
 
+COPYRIGHT
+---------
+Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <http://mozilla.org/MPL/2.0/>.
+
 RESOURCES
 ---------
 Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
diff --git a/doc/dlt-system.conf.5 b/doc/dlt-system.conf.5
index 2f100ff..91442ec 100644
--- a/doc/dlt-system.conf.5
+++ b/doc/dlt-system.conf.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dlt-system.conf
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/12/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "DLT\-SYSTEM\&.CONF" "5" "10/12/2012" "\ \&" "\ \&"
+.TH "DLT\-SYSTEM\&.CONF" "5" "05/12/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/doc/dlt.conf.5 b/doc/dlt.conf.5
index 99cd507..62ca224 100644
--- a/doc/dlt.conf.5
+++ b/doc/dlt.conf.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: dlt.conf
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/12/2015
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "DLT\&.CONF" "5" "10/12/2012" "\ \&" "\ \&"
+.TH "DLT\&.CONF" "5" "05/12/2015" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -311,13 +311,11 @@ Absolute path to file storing version information \- if disabled the DLT version
 .PP
 Start DLT daemon in background mode
 .RS 4
-
 \fBdlt\-daemon \-d\fR
 .RE
 .PP
 Start DLT daemon with own configuration
 .RS 4
-
 \fBdlt\-daemon \-c ~/my\-dlt\-configuration\&.cfg\fR
 .RE
 .SH "AUTHOR"
diff --git a/doc/dlt_book.txt b/doc/dlt_book.txt
index e883b57..af05a94 100644
--- a/doc/dlt_book.txt
+++ b/doc/dlt_book.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 DLT Documentation
 =================
 Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
@@ -14,9 +29,9 @@ Information
 
 :leveloffset: 1
 
-include::../README.txt[]
+include::../README[]
 
-include::../INSTALL.txt[]
+include::../INSTALL[]
 
 include::../ReleaseNotes.txt[]
 
diff --git a/doc/dlt_cheatsheet.txt b/doc/dlt_cheatsheet.txt
index 906378b..3d50ce4 100644
--- a/doc/dlt_cheatsheet.txt
+++ b/doc/dlt_cheatsheet.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 DLT Cheatsheet
 ==============
 Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
diff --git a/doc/dlt_design_specification.txt b/doc/dlt_design_specification.txt
index 0fc0cda..8cc0dde 100644
--- a/doc/dlt_design_specification.txt
+++ b/doc/dlt_design_specification.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 DLT Design Specification
 ========================
 Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
diff --git a/doc/dlt_extended_network_trace.txt b/doc/dlt_extended_network_trace.txt
index dd45a91..1277e9c 100644
--- a/doc/dlt_extended_network_trace.txt
+++ b/doc/dlt_extended_network_trace.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 Extended Network Trace
 ======================
 Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 
diff --git a/doc/dlt_filetransfer.txt b/doc/dlt_filetransfer.txt
index 27124ae..1dadd92 100644
--- a/doc/dlt_filetransfer.txt
+++ b/doc/dlt_filetransfer.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 DLT Filetransfer
 ================
 Christian Muck <Christian.Muck@bmw.de>
diff --git a/doc/dlt_howto_debug.txt b/doc/dlt_howto_debug.txt
index 7d0d8e6..95eb020 100644
--- a/doc/dlt_howto_debug.txt
+++ b/doc/dlt_howto_debug.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 How To - Debug DLT Daemon
 =========================
 Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 
diff --git a/doc/dlt_user_manual.txt b/doc/dlt_user_manual.txt
index 54773e9..e8abcfa 100644
--- a/doc/dlt_user_manual.txt
+++ b/doc/dlt_user_manual.txt
@@ -1,3 +1,18 @@
+////
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+////
+
 DLT User Manual
 ===============
 Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
@@ -260,7 +275,7 @@ Two types of DLT user interfaces are provided to applications. The first interfa
 
 The doxygen documentation of the dlt-daemon contains more informations about functional/macro based interfaces.
 
-See INSTALL.txt how to generate doxygen documentation.
+See INSTALL file how to generate doxygen documentation.
 
 === DLT macro interface
 The DLT macro interface provides a very easy to use interface. It is very easy to log a flexible size of parameters into a single log in a single source code line.
diff --git a/doc/doxygen.cfg.cmake b/doc/doxygen.cfg.cmake
index d5f44d0..d2ecc6f 100755
--- a/doc/doxygen.cfg.cmake
+++ b/doc/doxygen.cfg.cmake
@@ -1,3 +1,20 @@
+#######
+# @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+# @licence end@
+#######
+
 # Doxyfile 1.5.8
 
 # This file describes the settings to be used by the documentation system
diff --git a/doc/extended_network_trace_doxygen.cfg.cmake b/doc/extended_network_trace_doxygen.cfg.cmake
index b7f997f..275820e 100755
--- a/doc/extended_network_trace_doxygen.cfg.cmake
+++ b/doc/extended_network_trace_doxygen.cfg.cmake
@@ -1,3 +1,20 @@
+#######
+# @licence make begin@
+# SPDX license identifier: MPL-2.0
+#
+# Copyright (C) 2011-2015, BMW AG"
+#
+# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License (MPL), v. 2.0.
+# If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# For further information see http://www.genivi.org/.
+# @licence end@
+#######
+
 # Doxyfile 1.5.8
 
 # This file describes the settings to be used by the documentation system
diff --git a/doc/mainpage.h b/doc/mainpage.h
index 757c727..749ca81 100644
--- a/doc/mainpage.h
+++ b/doc/mainpage.h
@@ -1,27 +1,27 @@
-/**
+/*
  * @licence app begin@
- * Copyright (C) 2012  BMW AG
+ * SPDX license identifier: MPL-2.0
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * Copyright (C) 2011-2015, BMW AG"
  *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
+ * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
  *
- * \copyright
  * 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 file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * For further information see http://www.genivi.org/.
  * @licence end@
  */
- 
+
 /*!
 \mainpage
 
+\author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+\copyright Copyright © 2015 BMW AG. \n
+License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+
 \par More information
 can be found at http://projects.genivi.org/diagnostic-log-trace/ \n