diff --git a/usrguide/apiguide/2-test_ports.adoc b/usrguide/apiguide/2-test_ports.adoc
index 0a2fe8f21a209ce37a737e82ae9e9bf6d629286a..c7215da49726f91913d538ac1bd3986078ba81ed 100644
--- a/usrguide/apiguide/2-test_ports.adoc
+++ b/usrguide/apiguide/2-test_ports.adoc
@@ -1034,5 +1034,5 @@ if (timestamp_redirect != NULL) {
 }
 ----
 
-Note: Because of this extra parameter, adding or removing the `realtime` clause from a port will cause already-written C++ code for the port to no longer compile. In these cases the new parameters must be manually added or removed from the mentioned functions, or the user-written code copied to newly-generated test port skeletons.
+NOTE: Because of this extra parameter, adding or removing the `realtime` clause from a port will cause already-written C++ code for the port to no longer compile. In these cases the new parameters must be manually added or removed from the mentioned functions, or the user-written code copied to newly-generated test port skeletons.
 
diff --git a/usrguide/apiguide/5-mapping_ttcn3_data_types_to_c++_constructs.adoc b/usrguide/apiguide/5-mapping_ttcn3_data_types_to_c++_constructs.adoc
index cdaf603bb4fe82c49e7f746d5652d45f2c370efd..fd6ad54cf410625988f3711760291d4ecd5d7239 100644
--- a/usrguide/apiguide/5-mapping_ttcn3_data_types_to_c++_constructs.adoc
+++ b/usrguide/apiguide/5-mapping_ttcn3_data_types_to_c++_constructs.adoc
@@ -388,7 +388,7 @@ Using the value of an unbound `BITSTRING` variable for anything will cause dynam
 
 The {cpp} class `BITSTRING_ELEMENT` is the equivalent of the TTCN-3 `bitstring`’s element type (the result of indexing a `bitstring` value). The class does not store the actual bit, only a reference to the original `BITSTRING` object, an index value and a bound flag.
 
-Note: changing the value of the `BITSTRING_ELEMENT` (through the assignment operator) changes the referenced bit in the original `bitstring` object.
+NOTE: changing the value of the `BITSTRING_ELEMENT` (through the assignment operator) changes the referenced bit in the original `bitstring` object.
 
 The class `BITSTRING_ELEMENT` has the following public member functions:
 
@@ -499,7 +499,7 @@ Using the value of an unbound `HEXSTRING` variable for anything will cause a dyn
 
 The {cpp} class `HEXSTRING_ELEMENT` is the equivalent of the TTCN-3 `hexstring`’s element type (the result of indexing a `hexstring` value). The class does not store the actual hexadecimal digit (nibble), only a reference to the original HEXSTRING object, an index value and a bound flag.
 
-Note: changing the value of the `HEXSTRING_ELEMENT` (through the assignment operator) changes the referenced nibble in the original `hexstring` object.
+NOTE: changing the value of the `HEXSTRING_ELEMENT` (through the assignment operator) changes the referenced nibble in the original `hexstring` object.
 
 The class `HEXSTRING_ELEMENT` has the following public member functions:
 
@@ -614,7 +614,7 @@ Using the value of an unbound `OCTETSTRING` variable for anything will cause dyn
 
 The {cpp} class `OCTETSTRING_ELEMENT` is the equivalent of the TTCN-3 `octetstring`’s element type (the result of indexing an `octetstring` value). The class does not store the actual octet, only a reference to the original OCTETSTRING object, an index value and a bound flag.
 
-Note: changing the value of the OCTETSTRING_ELEMENT (through the assignment operator) changes the referenced octet in the original `octetstring` object.
+NOTE: changing the value of the OCTETSTRING_ELEMENT (through the assignment operator) changes the referenced octet in the original `octetstring` object.
 
 The class `OCTETSTRING_ELEMENT` has the following public member functions:
 
@@ -757,7 +757,7 @@ CHARSTRING operator+(const char* string_value,
 
 The {cpp} class `CHARSTRING_ELEMENT` is the equivalent of the TTCN-3 `charstring`’s element type (the result of indexing a `charstring` value). The class does not store the actual character, only a reference to the original CHARSTRING object, an index value and a bound flag.
 
-Note: changing the value of the `CHARSTRING_ELEMENT` (through the assignment operator) changes the referenced character in the original `charstring` object.
+NOTE: changing the value of the `CHARSTRING_ELEMENT` (through the assignment operator) changes the referenced character in the original `charstring` object.
 
 The class `CHARSTRING_ELEMENT` has the following public member functions:
 
@@ -941,7 +941,7 @@ UNIVERSAL_CHARSTRING operator+(const char* string_value,
 
 The {cpp} class `UNIVERSAL_CHARSTRING_ELEMENT` is the equivalent of the TTCN-3 `universal charstring`’s element type (the result of indexing a `universal charstring` value). The class does not store the actual character, only a reference to the original `UNIVERSAL_CHARSTRING` object, an index value and a bound flag.
 
-Note: changing the value of the `UNIVERSAL_CHARSTRING_ELEMENT` (through the assignment operator) changes the referenced character in the original `universal charstring` object.
+NOTE: changing the value of the `UNIVERSAL_CHARSTRING_ELEMENT` (through the assignment operator) changes the referenced character in the original `universal charstring` object.
 
 The class `UNIVERSAL_CHARSTRING_ELEMENT` has the following public member functions:
 
diff --git a/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc b/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc
index 96b2bcd56ee5a085e773ca8366cdb1bacd65d114..396419ab2e41321f25854c56a3ab483c259144b5 100644
--- a/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc
+++ b/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc
@@ -425,7 +425,7 @@ Using the value of an unbound `TitanBitString` variable for anything will cause
 
 The Java class `TitanBitString_Element` is the equivalent of the TTCN-3 `bitstring`’s element type (the result of indexing a `bitstring` value). The class does not store the actual bit, only a reference to the original `TitanBitString` object, an index value and a bound flag.
 
-Note: changing the value of the `TitanBitString_Element` (through the assignment operator) changes the referenced bit in the original `bitstring` object.
+NOTE: changing the value of the `TitanBitString_Element` (through the assignment operator) changes the referenced bit in the original `bitstring` object.
 
 The class `TitanBitString_Element` has the following public member functions:
 
@@ -537,7 +537,7 @@ Using the value of an unbound `TitanHexString` variable for anything will cause
 
 The Java class `TitanHexString_Element` is the equivalent of the TTCN-3 `hexstring`’s element type (the result of indexing a `hexstring` value). The class does not store the actual hexadecimal digit (nibble), only a reference to the original TitanHexString object, an index value and a bound flag.
 
-Note: changing the value of the `TitanHexString_Element` (through the assignment operator) changes the referenced nibble in the original `hexstring` object.
+NOTE: changing the value of the `TitanHexString_Element` (through the assignment operator) changes the referenced nibble in the original `hexstring` object.
 
 The class `TitanHexString_Element` has the following public member functions:
 
@@ -646,7 +646,7 @@ Using the value of an unbound `TitanOctetString` variable for anything will caus
 
 The Java class `TitanOctetString_Element` is the equivalent of the TTCN-3 `octetstring`’s element type (the result of indexing an `octetstring` value). The class does not store the actual octet, only a reference to the original TitanOctetString object, an index value and a bound flag.
 
-Note: changing the value of the TitanOctetString_Element (through the assignment operator) changes the referenced octet in the original `octetstring` object.
+NOTE: changing the value of the TitanOctetString_Element (through the assignment operator) changes the referenced octet in the original `octetstring` object.
 
 The class `TitanOctetString_Element` has the following public member functions:
 
@@ -777,7 +777,7 @@ TitanCharString operator_concatenate(final String stringValue, final TitanCharSt
 
 The Java class `TitanCharString_Element` is the equivalent of the TTCN-3 `charstring`’s element type (the result of indexing a `charstring` value). The class does not store the actual character, only a reference to the original TitanCharString object, an index value and a bound flag.
 
-Note: changing the value of the `TitanCharString_Element` (through the assignment operator) changes the referenced character in the original `charstring` object.
+NOTE: changing the value of the `TitanCharString_Element` (through the assignment operator) changes the referenced character in the original `charstring` object.
 
 The class `TitanCharString_Element` has the following public member functions:
 
@@ -954,7 +954,7 @@ TitanUniversalCharString operator_concatenate(final String stringValue, final Ti
 
 The Java class `TitanUniversalCharString_Element` is the equivalent of the TTCN-3 `universal charstring`’s element type (the result of indexing a `universal charstring` value). The class does not store the actual character, only a reference to the original `TitanUniversalCharString` object, an index value and a bound flag.
 
-Note: changing the value of the `TitanUniversalCharString_Element` (through the assignment operator) changes the referenced character in the original `universal charstring` object.
+NOTE: changing the value of the `TitanUniversalCharString_Element` (through the assignment operator) changes the referenced character in the original `universal charstring` object.
 
 The class `TitanUniversalCharString_Element` has the following public member functions:
 
diff --git a/usrguide/java_referenceguide/9-test_ports.adoc b/usrguide/java_referenceguide/9-test_ports.adoc
index ad2af8cf4f9f534c12560de3fef6668adca3402b..53052abc13a9adde57f9ddce0c48138f928f7636 100644
--- a/usrguide/java_referenceguide/9-test_ports.adoc
+++ b/usrguide/java_referenceguide/9-test_ports.adoc
@@ -663,4 +663,4 @@ if (timestamp_redirect != null) {
 }
 ----
 
-Note: Because of this extra parameter, adding or removing the `realtime` clause from a port will cause already-written Java code for the port to no longer compile. In these cases the new parameters must be manually added or removed from the mentioned functions.
+NOTE: Because of this extra parameter, adding or removing the `realtime` clause from a port will cause already-written Java code for the port to no longer compile. In these cases the new parameters must be manually added or removed from the mentioned functions.
diff --git a/usrguide/referenceguide/10-code_coverage_of_ttcn-3_modules.adoc b/usrguide/referenceguide/10-code_coverage_of_ttcn-3_modules.adoc
index 680872f2da8c2e27d25e8c3ba8d22e929174e560..d6a05b2cbea93d3537b824e2431919431408bdf4 100644
--- a/usrguide/referenceguide/10-code_coverage_of_ttcn-3_modules.adoc
+++ b/usrguide/referenceguide/10-code_coverage_of_ttcn-3_modules.adoc
@@ -1,6 +1,6 @@
 = Code Coverage of TTCN-3 Modules
 
-Note: the feature described here is deprecated; please use instead the coverage tool described in <<4-ttcn3_language_extensions.adoc#profiling-and-code-coverage, Profiling and code coverage>>.
+NOTE: the feature described here is deprecated; please use instead the coverage tool described in <<4-ttcn3_language_extensions.adoc#profiling-and-code-coverage, Profiling and code coverage>>.
 
 The TTCN-3 compiler is able to instrument the generated C/{cpp} code for a set of TTCN-3 modules (= or files) to generate code coverage information during runtime. To enable this feature the `-K file` option needs to be used. For convenience this option is available for `ttcn3_makefilegen` as well. It’s possible to generate code coverage information only for a given set of TTCN-3 modules listed on the command line. In that case the set of files in `file` needs to be a subset of the files listed on the command line. If `file` contains a file which is not listed on the command line an error will be issued.
 
diff --git a/usrguide/referenceguide/4-ttcn3_language_extensions.adoc b/usrguide/referenceguide/4-ttcn3_language_extensions.adoc
index 7eed1ee55469b3ffcb57e7a6a6d158917c4af651..21eba4c51837ba6f40c4e4fe5e3f50b4fdb0b26a 100644
--- a/usrguide/referenceguide/4-ttcn3_language_extensions.adoc
+++ b/usrguide/referenceguide/4-ttcn3_language_extensions.adoc
@@ -9022,7 +9022,7 @@ var MyClass3 my_object := MyClass3.create(3, "abc", ?);
 log(my_object); // result: MyClass3: { MyClass2: { num := 3, str := "abc" }, temp := ? }
 ----
 
-Note: Even though every class automatically extends the built-in class `object`, if it has no superclass specified, this class does not appear in the log.
+NOTE: Even though every class automatically extends the built-in class `object`, if it has no superclass specified, this class does not appear in the log.
 
 * Two object references are only equal, if they both refer to the same object, or if they are both `null`. Two separate objects with equal members are not equal with each other.