summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/CMakeLists.txt42
-rw-r--r--doc/dlt-daemon.12
-rw-r--r--doc/dlt-receive.12
-rw-r--r--doc/dlt-system.12
-rw-r--r--doc/dlt-system.conf.52
-rw-r--r--doc/dlt.conf.52
6 files changed, 15 insertions, 37 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 062fed1..fbcccb9 100755
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,38 +1,16 @@
#######
# Dlt - Diagnostic Log and Trace
# @licence make begin@
- #
- # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
- #
- # This program is free software; you can redistribute it and/or modify it under the terms of the
- # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
- # Public License, version 2.1, for more details.
- #
- # You should have received a copy of the GNU Lesser General Public License, version 2.1, along
- # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- #
- # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may
- # also be applicable to programs even in cases in which the program is not a library in the technical sense.
- #
- # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may
- # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to
- # license your linked modules under the GNU Lesser General Public License, version 2.1, you
- # may use the program under the following exception.
- #
- # As a special exception, the copyright holders of DLT give you permission to combine DLT
- # with software programs or libraries that are released under any license unless such a combination is not
- # permitted by the license of such a software program or library. You may copy and distribute such a
- # system following the terms of the GNU Lesser General Public License, version 2.1, including this
- # special exception, for DLT and the licenses of the other code concerned.
- #
- # Note that people who make modified versions of DLT are not obligated to grant this special exception
- # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License,
- # version 2.1, gives permission to release a modified version without this exception; this exception
- # also makes it possible to release a modified version which carries forward this exception.
- #
- # @licence end@
+#
+# 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/.
+# @licence end@
########
if(WITH_DOC)
diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1
index ee324cf..b63c291 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -1,4 +1,4 @@
-.TH dlt-daemon 1 "March 2, 2012" "version 2.5.1" "USER COMMANDS"
+.TH dlt-daemon 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS"
.SH NAME
dlt-daemon \- DLT daemon for logging and tracing purpose
.SH SYNOPSIS
diff --git a/doc/dlt-receive.1 b/doc/dlt-receive.1
index 9602bfc..31d3208 100644
--- a/doc/dlt-receive.1
+++ b/doc/dlt-receive.1
@@ -1,4 +1,4 @@
-.TH dlt-receive 1 "March 2, 2012" "version 2.5.1" "USER COMMANDS"
+.TH dlt-receive 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS"
.SH NAME
dlt-receive \- Console based client for DLT Logging
.SH SYNOPSIS
diff --git a/doc/dlt-system.1 b/doc/dlt-system.1
index 14630e9..20e5d1b 100644
--- a/doc/dlt-system.1
+++ b/doc/dlt-system.1
@@ -1,4 +1,4 @@
-.TH dlt-system 1 "March 2, 2012" "version 2.5.1" "USER COMMANDS"
+.TH dlt-system 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS"
.SH NAME
dlt-system \- DLT system logging process
.SH SYNOPSIS
diff --git a/doc/dlt-system.conf.5 b/doc/dlt-system.conf.5
index 8671d2c..576baeb 100644
--- a/doc/dlt-system.conf.5
+++ b/doc/dlt-system.conf.5
@@ -1,4 +1,4 @@
-.TH dlt-system.conf 5 "March 2, 2012" "version 2.5.1" "USER COMMANDS"
+.TH dlt-system.conf 5 "March 2, 2012" "version 2.5.2" "USER COMMANDS"
.SH NAME
dlt-system.conf \- DLT system process configuration file
.SH DESCRIPTION
diff --git a/doc/dlt.conf.5 b/doc/dlt.conf.5
index 9ffaf0e..fcb9b5a 100644
--- a/doc/dlt.conf.5
+++ b/doc/dlt.conf.5
@@ -1,4 +1,4 @@
-.TH dlt.conf 5 "March 2, 2012" "version 2.5.1" "USER COMMANDS"
+.TH dlt.conf 5 "March 2, 2012" "version 2.5.2" "USER COMMANDS"
.SH NAME
dlt.conf \- DLT daemon configuration file
.SH DESCRIPTION