From fbac9cd49e4bbd1672420342290771326064c7b2 Mon Sep 17 00:00:00 2001
From: Kristof Szabados <Kristof.Szabados@ericsson.com>
Date: Wed, 20 Nov 2019 19:09:11 +0100
Subject: [PATCH] updated

Signed-off-by: Kristof Szabados <Kristof.Szabados@ericsson.com>
---
 usrguide/java_referenceguide/11-encoding_and_decoding.adoc    | 4 +++-
 .../2-ttcn-3_limitations_in_this_version.adoc                 | 1 -
 usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc | 4 +++-
 usrguide/java_referenceguide/9-test_ports.adoc                | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/usrguide/java_referenceguide/11-encoding_and_decoding.adoc b/usrguide/java_referenceguide/11-encoding_and_decoding.adoc
index 5f815f6b7..00a5b578a 100644
--- a/usrguide/java_referenceguide/11-encoding_and_decoding.adoc
+++ b/usrguide/java_referenceguide/11-encoding_and_decoding.adoc
@@ -303,4 +303,6 @@ XML encoding and decoding is not yet supported on the Java side.
 
 == JSON
 
-JSON encoding and decoding is not yet supported on the Java side.
+JSON encoding and decoding is not yet fully supported on the Java side.
+
+Semantic checks for checking that the JSON attribute is used consistently is available, but code generation and runtime support is still missing.
diff --git a/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc b/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc
index 4c01ffae1..b87633ae4 100644
--- a/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc
+++ b/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc
@@ -12,6 +12,5 @@ When applicable, the relevant clause of the standard text (<<14-references.adoc#
 * Additionally the `@profiler.start`, `@profiler.stop`, `string2ttcn` TITAN extensions are also not yet supported on the Java side.
 * The `@profiler.running` TITAN extension is also not supported.
 * Concatenating template strings is not yet supported on the Java side.
-* Type compatibility is not yet supported on the Java side.footnote:[except record of/set of types for certain element types, see section 4.32.2]
 
 WARNING: The current version of the Java side of the Test Executor is just a prototype version. Please note that there might still be some changes in some of its APIs.
diff --git a/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc b/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc
index 9c9482049..0087e9437 100644
--- a/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc
+++ b/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc
@@ -55,7 +55,9 @@ The XML Encoder and Decoder is not yet supported on the Java side.
 
 == JSON Encoder and Decoder
 
-The XML Encoder and Decoder is not yet supported on the Java side.
+The JSON Encoder and Decoder is not yet fully supported on the Java side.
+
+Semantic checks for checking that the JSON attribute is used consistently is available, but code generation and runtime support is still missing.
 
 == OER Encoder and Decoder
 
diff --git a/usrguide/java_referenceguide/9-test_ports.adoc b/usrguide/java_referenceguide/9-test_ports.adoc
index a9e35ed0d..ad2af8cf4 100644
--- a/usrguide/java_referenceguide/9-test_ports.adoc
+++ b/usrguide/java_referenceguide/9-test_ports.adoc
@@ -402,7 +402,7 @@ The following table shows the relation between the direction of the message type
 
 === Additional Functions and Attributes
 
-Any kind of attributes or member functions may be added to the Test Port. A selectable channel, which you communicate on, is almost always necessary. Names not interfering with the identifiers generated by the Java code generator can be used in the java file (for example, the names containing one underscore character). Avoid using static variables because you may get confused when more than one instances of the Test Port run simultaneously. Any kind of software libraries may be used in the Test Port as well.
+Any kind of attributes or member functions may be added to the Test Port. A selectable channel, which you communicate on, is almost always necessary. Names not interfering with the identifiers generated by the Java code generator can be used in the java file (for example, the names containing one underscore character). Avoid using static variables because it can be very confusing when more than one instances of the Test Port run simultaneously. Any kind of software libraries may be used in the Test Port as well.
 
 In addition, the following `protected` attributes of ancestor classes are available:
 
-- 
GitLab