diff --git a/help/Makefile b/help/Makefile
index 4417e945ef2a7eb56b43d10fc6e3e671e8c92caa..37b137559ed2da2ba616414422bb7873c2a10bf9 100644
--- a/help/Makefile
+++ b/help/Makefile
@@ -43,14 +43,14 @@ hex2bit hex2int hex2oct hex2str hexstring if ifpresent import in \
inconc infinity inout int2bit int2char int2enum int2float int2hex int2oct \
int2str int2unichar integer interleave isbound ischosen ispresent isvalue kill killed \
label language length lengthof log log2str map match message mixed mod \
-modifies module modulepar mtc noblock none not not4b nowait null objid \
+modifies module modulepar mtc noblock none not not4b now nowait null objid \
oct2bit oct2char oct2hex oct2int oct2str oct2unichar octetstring of omit on \
operators optional or or4b out override param pass pattern permutation \
-port public private procedure raise read receive record recursive refers regexp rem remove_bom repeat \
+port public private procedure raise read realtime receive record recursive refers regexp rem remove_bom repeat \
replace reply return rnd running runs select self send sender set setencode setstate setverdict \
signature sizeof start stop str2bit str2float str2hex \
str2int str2oct subset substr superset system template testcase testcasename \
-timeout timer to trigger true type unichar2char unichar2int unichar2oct union universal unmap \
+timeout timer timestamp to trigger true type unichar2char unichar2int unichar2oct union universal unmap \
value valueof var variant verdicttype while with xor xor4b profiler))
IMAGE_FILES := $(addprefix images/, $(addsuffix .jpg, ao left right up)) images/titan_transparent.gif
diff --git a/help/info/not4b.html b/help/info/not4b.html
index 37518e5a57d4baf0184470a7baac0fa2b94132e8..ef1aa69d065be5ac59899275f16a47be8efb47b0 100644
--- a/help/info/not4b.html
+++ b/help/info/not4b.html
@@ -28,7 +28,7 @@
<td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
<td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
<td><a href="not.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
- <td><a href="nowait.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ <td><a href="now.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
</tr>
</table>
<p><br clear="all">
diff --git a/help/info/now.html b/help/info/now.html
new file mode 100644
index 0000000000000000000000000000000000000000..3f5d12bf2f4eb74ce5a266535fd4bd3473e858e5
--- /dev/null
+++ b/help/info/now.html
@@ -0,0 +1,60 @@
+<!--
+ Copyright (c) 2000-2018 Ericsson Telecom AB
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+
+ Contributors:
+ Baranyi, Botond
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en-us">
+<title>now</title>
+</head>
+<body bgcolor="#DAD3C5" vlink="#0094D2" link="#003258">
+<table align="left" border="0" cellspacing="0" cellpadding="0" valign=top>
+ <tr>
+ <td width=105 height=40><a href="https://projects.eclipse.org/projects/tools.titan"><img src="../images/titan_transparent.gif" border=0 width=105 height=40 align="left" alt="Titan"></a></td>
+ </tr>
+</table>
+<table border="0" align="right" cellpadding="0" cellspacing="0">
+ <tr>
+ <td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
+ <td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
+ <td><a href="not4b.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="nowait.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ </tr>
+</table>
+<p><br clear="all">
+</p>
+<hr>
+<h1>now</h1>
+<hr align="left" width="75%">
+<p>A float expression that returns the current value of the test system clock (the amount of seconds since the start of the current test case's execution).
+<p>This keyword requires the compiler option '-I' to be set, otherwise it is treated as an identifier.
+<hr align="left" width="50%">
+<p>Related keyword:</p>
+<ul>
+ <li><a href="timestamp.html"><b><font face="Courier New" color="#003258" size="4">timestamp</font></b></a></li>
+</ul>
+<hr align="left" width="50%">
+<div align="center">
+<center>
+<table border="0" width="90%" bgcolor="#FFB599" cellpadding="4">
+ <tr>
+ <td width="100%">
+ <h3 align="center"><font face="Courier New" color="#003258" size="5"><b>now</b></font></h3>
+ </td>
+ </tr>
+</table>
+</center>
+</div>
+<hr align="left" width="50%">
+<p>Example:
+<p><font face="Courier New">var float v_myTime := now;</font><br><br>
+Variable v_myTime now contains the current test system time.</p>
+</body>
+</html>
diff --git a/help/info/nowait.html b/help/info/nowait.html
index b707f499acdeb7471c504f86a704f30ab4f6ae8c..da82a37f3adc794c09bd47190277a9df5d1a280e 100644
--- a/help/info/nowait.html
+++ b/help/info/nowait.html
@@ -27,7 +27,7 @@
<tr>
<td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
<td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
- <td><a href="not4b.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="now.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
<td><a href="null.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
</tr>
</table>
diff --git a/help/info/read.html b/help/info/read.html
index 4054c73882c277dec2a99e5d51e0a314731c9e8b..7f380eaabf0f13d66851a76cdbfe66727741838c 100644
--- a/help/info/read.html
+++ b/help/info/read.html
@@ -29,7 +29,7 @@
<td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
<td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
<td><a href="raise.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
- <td><a href="receive.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ <td><a href="realtime.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
</tr>
</table>
<p><br clear="all">
diff --git a/help/info/realtime.html b/help/info/realtime.html
new file mode 100644
index 0000000000000000000000000000000000000000..4b41cab036ce6e91287a359a49df5f3d25f48cce
--- /dev/null
+++ b/help/info/realtime.html
@@ -0,0 +1,62 @@
+<!--
+ Copyright (c) 2000-2018 Ericsson Telecom AB
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+
+ Contributors:
+ Baranyi, Botond
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en-us">
+<title>realtime</title>
+</head>
+<body bgcolor="#DAD3C5" vlink="#0094D2" link="#003258">
+<table align="left" border="0" cellspacing="0" cellpadding="0" valign=top>
+ <tr>
+ <td width=105 height=40><a href="https://projects.eclipse.org/projects/tools.titan"><img src="../images/titan_transparent.gif" border=0 width=105 height=40 align="left" alt="Titan"></a></td>
+ </tr>
+</table>
+<table border="0" align="right" cellpadding="0" cellspacing="0">
+ <tr>
+ <td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
+ <td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
+ <td><a href="read.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="receive.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ </tr>
+</table>
+<p><br clear="all">
+</p>
+<hr>
+<h1>realtime</h1>
+<hr align="left" width="75%">
+<p>This keyword is used in port type definitions. It indicates that operations on that port can have timestamp redirects.
+<p>This keyword requires the compiler option '-I' to be set, otherwise it is treated as an identifier.
+<p>Related keywords:</p>
+<ul>
+ <li><a href="port.html"><b><font face="Courier New" color="#003258" size="4">port</font></b></a></li>
+ <li><a href="timestamp.html"><b><font face="Courier New" color="#003258" size="4">timestamp</font></b></a></li>
+</ul>
+<hr align="left" width="50%">
+<div align="center">
+<center>
+<table border="0" width="90%" bgcolor="#FFB599" cellpadding="4">
+ <tr>
+ <td width="100%">
+ <h3 align="center">... <font face="Courier New" color="#003258" size="5"><b>realtime</b></font> ...</h3>
+ </td>
+ </tr>
+</table>
+</center>
+</div>
+<hr align="left" width="50%">
+<p>Example:
+<p><font face="Courier New">type port MyPort message realtime {<br>
+ inout integer<br>
+}</font><br><br>
+Communication operations (i.e. send, receive, etc) on ports of type MyPort can have their timestamps stored in a float variable.</p>
+</body>
+</html>
diff --git a/help/info/receive.html b/help/info/receive.html
index 721b41cd237eb448a9f15c4ff7f81e64132cb638..15476f017a602b9524d8db1b8a2b404457f3be1c 100644
--- a/help/info/receive.html
+++ b/help/info/receive.html
@@ -29,7 +29,7 @@
<tr>
<td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
<td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
- <td><a href="read.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="realtime.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
<td><a href="record.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
</tr>
</table>
diff --git a/help/info/timer.html b/help/info/timer.html
index 1b1a311333f46dd6a1a6abbe2a5ac5db4e6cfec2..df06c047315b6928966ffb64de023346f10bb52f 100644
--- a/help/info/timer.html
+++ b/help/info/timer.html
@@ -29,7 +29,7 @@
<td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
<td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
<td><a href="timeout.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
- <td><a href="to.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ <td><a href="timestamp.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
</tr>
</table>
<p><br clear="all">
diff --git a/help/info/timestamp.html b/help/info/timestamp.html
new file mode 100644
index 0000000000000000000000000000000000000000..9a68d71b7c3183c3a262080802b5cfca2a63946f
--- /dev/null
+++ b/help/info/timestamp.html
@@ -0,0 +1,71 @@
+<!--
+ Copyright (c) 2000-2018 Ericsson Telecom AB
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+
+ Contributors:
+ Baranyi, Botond
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en-us">
+<title>timestamp</title>
+</head>
+<body bgcolor="#DAD3C5" vlink="#0094D2" link="#003258">
+<table align="left" border="0" cellspacing="0" cellpadding="0" valign=top>
+ <tr>
+ <td width=105 height=40><a href="https://projects.eclipse.org/projects/tools.titan"><img src="../images/titan_transparent.gif" border=0 width=105 height=40 align="left" alt="Titan"></a></td>
+ </tr>
+</table>
+<table border="0" align="right" cellpadding="0" cellspacing="0">
+ <tr>
+ <td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
+ <td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
+ <td><a href="timer.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="to.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ </tr>
+</table>
+<p><br clear="all">
+</p>
+<hr>
+<h1>timestamp</h1>
+<hr align="left" width="75%">
+<p>The keyword is only used in port operations to store the current test system time at operation completion. Timestamps can only be stored if the port the operation is performed on has the <a href="realtime.html"><font face="Courier New" color="#003258" size="4">realtime</font></a> option set.
+<p>This keyword requires the compiler option '-I' to be set, otherwise it is treated as an identifier.
+<hr align="left" width="50%">
+<p>Related keyword:</p>
+<ul>
+ <li><a href="realtime.html"><b><font face="Courier New" color="#003258" size="4">realtime</font></b></a></li>
+ <li><a href="receive.html"><b><font face="Courier New" color="#003258" size="4">receive</font></b></a></li>
+ <li><a href="trigger.html"><b><font face="Courier New" color="#003258" size="4">trigger</font></b></a></li>
+ <li><a href="getcall.html"><b><font face="Courier New" color="#003258" size="4">getcall</font></b></a></li>
+ <li><a href="getreply.html"><b><font face="Courier New" color="#003258" size="4">getreply</font></b></a></li>
+ <li><a href="catch.html"><b><font face="Courier New" color="#003258" size="4">catch</font></b></a></li>
+ <li><a href="check.html"><b><font face="Courier New" color="#003258" size="4">check</font></b></a></li>
+ <li><a href="send.html"><b><font face="Courier New" color="#003258" size="4">send</font></b></a></li>
+ <li><a href="call.html"><b><font face="Courier New" color="#003258" size="4">call</font></b></a></li>
+ <li><a href="reply.html"><b><font face="Courier New" color="#003258" size="4">reply</font></b></a></li>
+ <li><a href="raise.html"><b><font face="Courier New" color="#003258" size="4">raise</font></b></a></li>
+</ul>
+<hr align="left" width="50%">
+<div align="center">
+<center>
+<table border="0" width="90%" bgcolor="#FFB599" cellpadding="4">
+ <tr>
+ <td width="100%">
+ <h3 align="center"><font face="Courier New" color="#003258" size="5"><b>timestamp</b></font> variable_reference</h3>
+ </td>
+ </tr>
+</table>
+</center>
+</div>
+<hr align="left" width="50%">
+<p>Example:
+<p><font face="Courier New">var float v_sendTime;<br>
+myPort.send(myMessage) -> timestamp v_sendTime;<br><br></font>
+The timestamp of the send operation was stored in variable v_sendTime.</p>
+</body>
+</html>
diff --git a/help/info/to.html b/help/info/to.html
index 30e550d156ffe9d629acedd35b3f79f3dc3c584c..51aa2bfe069312274af6cb885d0c444e1db11712 100644
--- a/help/info/to.html
+++ b/help/info/to.html
@@ -27,7 +27,7 @@
<tr>
<td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
<td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
- <td><a href="timer.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="timestamp.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
<td><a href="trigger.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
</tr>
</table>
diff --git a/help/titan_index.html b/help/titan_index.html
index a186e0d825977236fc4d225a94c7ec7c3db7d49a..f0527b9695214f0ab204a8dfb86ef386affb9b0a 100644
--- a/help/titan_index.html
+++ b/help/titan_index.html
@@ -241,9 +241,9 @@
<td width="17%"><a href="info/none.html">none</a></td>
<td width="17%"><a href="info/not.html">not</a></td>
<td width="17%"><a href="info/not4b.html">not4b</a></td>
+ <td width="17%"><a href="info/now.html">now</a></td>
<td width="17%"><a href="info/nowait.html">nowait</a></td>
<td width="17%"><a href="info/null.html">null</a></td>
- <td width="17%"> </td>
</tr>
<tr>
<td width="17%"><a name="o"></a><a href="info/objid.html">objid</a></td>
@@ -293,29 +293,29 @@
<tr>
<td width="17%"><a name="r"></a><a href="info/raise.html">raise</a></td>
<td width="17%"><a href="info/read.html">read</a></td>
+ <td width="17%"><a href="info/realtime.html">realtime</a></td>
<td width="17%"><a href="info/receive.html">receive</a></td>
<td width="17%"><a href="info/record.html">record</a></td>
<td width="17%"><a href="info/recursive.html">recursive</a></td>
- <td width="17%"><a href="info/refers.html">refers</a></td>
- <td width="17%"><a href="info/regexp.html">regexp</a></td>
+ <td width="17%"><a href="info/refers.html">refers</a></td>
</tr>
<tr>
+ <td width="17%"><a href="info/regexp.html">regexp</a></td>
<td width="17%"><a href="info/rem.html">rem</a></td>
<td width="17%"><a href="info/remove_bom.html">remove_bom</a></td>
<td width="17%"><a href="info/repeat.html">repeat</a></td>
<td width="17%"><a href="info/replace.html">replace</a></td>
<td width="17%"><a href="info/reply.html">reply</a></td>
<td width="17%"><a href="info/return.html">return</a></td>
- <td width="17%"><a href="info/rnd.html">rnd</a></td>
</tr>
<tr>
+ <td width="17%"><a href="info/rnd.html">rnd</a></td>
<td width="17%"><a href="info/running.html">running</a></td>
<td width="17%"><a href="info/runs.html">runs</a></td>
<td width="17%"> </td>
<td width="17%"> </td>
<td width="17%"> </td>
<td width="17%"> </td>
- <td width="17%"> </td>
</tr>
<tr>
<td width="17%"><a href="info/select.html">select</a></td>
@@ -350,17 +350,17 @@
<td width="17%"><a href="info/testcasename.html">testcasename</a></td>
<td width="17%"><a href="info/timeout.html">timeout</a></td>
<td width="17%"><a href="info/timer.html">timer</a></td>
+ <td width="17%"><a href="info/timestamp.html">timestamp</a></td>
<td width="17%"><a href="info/to.html">to</a></td>
- <td width="17%"><a href="info/trigger.html">trigger</a></td>
</tr>
<tr>
+ <td width="17%"><a href="info/trigger.html">trigger</a></td>
<td width="17%"><a href="info/true.html">true</a></td>
<td width="17%"><a href="info/type.html">type</a></td>
<td width="17%"> </td>
<td width="17%"> </td>
<td width="17%"> </td>
<td width="17%"> </td>
- <td width="17%"> </td>
</tr>
<tr>
<td width="17%"><a href="info/unichar2char.html">unichar2char</a></td>
diff --git a/usrguide/apiguide/2-test_ports.adoc b/usrguide/apiguide/2-test_ports.adoc
index 6ee69af224bfb9ea2170159d0c02c02ecaec7938..1a1425d2d016f92fa1136c6020bb000182ddacfd 100644
--- a/usrguide/apiguide/2-test_ports.adoc
+++ b/usrguide/apiguide/2-test_ports.adoc
@@ -925,7 +925,7 @@ The member functions `incoming_message`, `incoming_call`, `incoming_reply` and `
The value given to this parameter will be the one stored in the variable referenced in the timestamp redirect, if the operation has a timestamp redirect (otherwise the value is ignored).
-It is recommended that this parameter be set to the current test system time, which can be querried with `TTCN_Runtime::now()`, or to a float variable that was set to the current test system time earier in the function.
+It is recommended that this parameter be set to the current test system time, which can be queried with `TTCN_Runtime::now()`, or to a float variable that was set to the current test system time earier in the function.
Examples:
[source]
@@ -952,7 +952,7 @@ The value pointed to by this parameter will be the one stored in the variable re
If it does not have a timestamp redirect, then this pointer parameter will be `NULL`. Because of this, the parameter must always have a null pointer check before it is assigned a value.
-It is recommended that the value pointed to by the parameter be set to the current test system time, which can be querried with `TTCN_Runtime::now()`.
+It is recommended that the value pointed to by the parameter be set to the current test system time, which can be queried with `TTCN_Runtime::now()`.
Example:
[source]