From f7ead9d0604648dc6d23942e0293b0cca2007b9a Mon Sep 17 00:00:00 2001
From: following <following@online.de>
Date: Thu, 25 Jul 2013 18:31:07 +0200
Subject: [PATCH] licensing update

- allow OKAPI instead of XML interface for OC code licensees
- refer to license.txt for information on third party components
---
 doc/license.txt                                     | 6 +++---
 htdocs/templates2/ocstyle/articles/DE/impressum.tpl | 7 ++++++-
 htdocs/templates2/ocstyle/articles/EN/impressum.tpl | 5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/license.txt b/doc/license.txt
index 39cf1434..dca1225b 100644
--- a/doc/license.txt
+++ b/doc/license.txt
@@ -39,9 +39,9 @@ Opencaching Deutschland.
 
 If you are using this source code to establish a geocache listing service
 or some sort of service which can be compared with it, you agree to 
-publish your geocaching data via XML Interface the same way and under the same
-(or less restrictive) conditions as opencaching.de does; see
-http://www.opencaching.de/doc/xml .
+publish your geocaching data via XML Interface and/or OKAPI the same way
+and under the same (or less restrictive) conditions as opencaching.de does;
+see http://www.opencaching.de/doc/xml and http://www.opencaching.de/okapi.
 
 
 A different license may apply to third party components being used.
diff --git a/htdocs/templates2/ocstyle/articles/DE/impressum.tpl b/htdocs/templates2/ocstyle/articles/DE/impressum.tpl
index 9143d969..fa8fd1c5 100644
--- a/htdocs/templates2/ocstyle/articles/DE/impressum.tpl
+++ b/htdocs/templates2/ocstyle/articles/DE/impressum.tpl
@@ -321,7 +321,12 @@
 		Wortlaut dieser Lizenz befindet sich 
 		<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/master/doc/license.txt">hier</a>. 
 		Dabei ist zu beachten, dass einige Bestandteile der Software von Drittanbietern 
-		stammen. Diese Bestandteile unterliegen m&ouml;glicherweise anderen Lizenzen.
+		stammen. Diese Bestandteile können anderen Lizenzen unterliegen.
+	</p>
+	<p>
+		Eine Aufstellung der Softwarebestandteile von Drittanbietern, die derzeit auf www.opencaching.de
+		verwendet werden, inklusive Lizenzbedingungen und weiterer Angaben gibt es
+		<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/stable/doc/license.txt">hier</a>.
 	</p>
 	<p>
 		Der Quellcode kann via <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a> 
diff --git a/htdocs/templates2/ocstyle/articles/EN/impressum.tpl b/htdocs/templates2/ocstyle/articles/EN/impressum.tpl
index a1d7d730..685bba08 100644
--- a/htdocs/templates2/ocstyle/articles/EN/impressum.tpl
+++ b/htdocs/templates2/ocstyle/articles/EN/impressum.tpl
@@ -279,6 +279,11 @@
 		Please note that some components of the software originate from third parties. These 
 		components may be subject to other licenses.
 	</p>
+	<p>
+		For a compilation of third party software components which are currently in use at
+		www.opencaching.de, including license conditions and other information, see
+		<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/stable/doc/license.txt">this document</a>.
+	</p>
 	<p>
 		The source code can be obtained from <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a>.
 	</p>