This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 0200576 Some markup changes to timeShift doc
0200576 is described below
commit 02005769ab6b079e461505d2f6256303f5e84060
Author: Felix Schumacher <[email protected]>
AuthorDate: Sat Sep 18 12:56:06 2021 +0200
Some markup changes to timeShift doc
---
xdocs/usermanual/functions.xml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/xdocs/usermanual/functions.xml b/xdocs/usermanual/functions.xml
index e3667ac..9bd0e3c 100644
--- a/xdocs/usermanual/functions.xml
+++ b/xdocs/usermanual/functions.xml
@@ -1580,11 +1580,13 @@ returns:
If omitted, the function uses milliseconds since epoch format.
</property>
<property name="Date to shift" required="No">
- Indicate the date in the format set by the parameter 'Format' to shift
- If omitted, the date is set to now
+ Indicate the date in the format set by the parameter
<code>Format</code> to shift.
+ If omitted, the date is set to <em>now</em>.
</property>
<property name="value to shift" required="No">
- Indicate the specified amount of seconds, minutes, hours or days to
shift according to a textual representation of a duration such as PnDTnHnMn.nS.
See
https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html#parse-java.lang.CharSequence-
+ Indicate the specified amount of seconds, minutes, hours or days to
shift according to a textual
+ representation of a duration such as <code>PnDTnHnMn.nS</code>. See
+ <a
href="https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html#parse-java.lang.CharSequence-";>Duration#parse(CharSequence)</a>
<ul>
<li><code>PT20.345S</code> parses as 20.345 seconds</li>
<li><code>PT15M</code> parses as 15 minutes</li>
@@ -1594,9 +1596,10 @@ returns:
</ul>
</property>
<property name="Locale to use for format" required="No">
- The string format of a locale. The language code must be lowercase.
The country code must be uppercase. The separator must be an underscore. ex:
en_EN
- See
http://www.oracle.com/technetwork/java/javase/javase7locales-334809.html
- If omitted, by default the function use the ApacheJMeter locale one.
+ The string format of a locale. The language code must be lowercase.
The country code must be uppercase.
+ The separator must be an underscore (<code>_</code>). For example
<code>en_EN</code>
+ See <a
href="http://www.oracle.com/technetwork/java/javase/javase7locales-334809.html";>supported
locales on Java 7</a>.
+ If omitted, by default the function uses the current locale from the
JVM.
</property>
<property name="Name of variable" required="No">The name of the
variable to set.</property>
</properties>
