@@ -, +, @@ --- xdocs/css/new-style.css | 7 +++ xdocs/css/style.css | 6 +++ xdocs/stylesheets/site_printable.vsl | 6 +++ xdocs/stylesheets/website-style.xsl | 4 ++ xdocs/usermanual/curl.xml | 56 +++++++++++------------ xdocs/usermanual/generating-dashboard.xml | 16 +++---- xdocs/usermanual/get-started.xml | 40 ++++++++-------- 7 files changed, 79 insertions(+), 56 deletions(-) --- a/xdocs/css/new-style.css +++ a/xdocs/css/new-style.css @@ -428,6 +428,13 @@ table { background-color: white; } +.placeholder { + font-style: italic; + font-weight: normal; + text-decoration-line: underline; + text-decoration-style: dashed; +} + @media screen and (max-width: 1000px) { .nav { width: 100%; --- a/xdocs/css/style.css +++ a/xdocs/css/style.css @@ -48,3 +48,9 @@ a[name]:hover:after{ .guimenuitem { font-style: italic; } + +.placeholder { + font-style: italic; + font-weight: bold; + color: darkgreen; +} --- a/xdocs/stylesheets/site_printable.vsl +++ a/xdocs/stylesheets/site_printable.vsl @@ -339,6 +339,8 @@ Contributed by $id.getAttributeValue("name") <$id.getAttributeValue("mail")&g #guimenuitem ($node) #elseif ($node.getName().equals("description")) #description ($node) +#elseif ($node.getName().equals("placeholder")) +#placeholder ($node) #else #outputTag($node) #runloop($node) @@ -370,6 +372,10 @@ Contributed by $id.getAttributeValue("name") <$id.getAttributeValue("mail")&g ## #end +#macro (placeholder $node) +#runloop($node)## +#end + #macro (menuchoice $items) #foreach ($item in $items.getChildren("guimenuitem"))#guimenuitem($item)#if ($foreach.hasNext) → #end#end --- a/xdocs/stylesheets/website-style.xsl +++ a/xdocs/stylesheets/website-style.xsl @@ -689,4 +689,8 @@ + + + + --- a/xdocs/usermanual/curl.xml +++ a/xdocs/usermanual/curl.xml @@ -55,15 +55,15 @@ Create a Test Plan From a cURL Command
-
-H, --header <header>
+
-H, --header header
Extra header to use when getting a web page.
-
-X, --request <command>
+
-X, --request command
Specifies a custom request method to use when communicating with the HTTP server.
--compressed
Request a compressed response using one of the algorithms curl supports, and return the uncompressed document.
-
-A, --user-agent <agent string>
+
-A, --user-agent agent string
Specify the User-Agent string to send to the HTTP server.
-
-b, --cookie <name=data>
+
-b, --cookie name=data
Pass the data to the HTTP server as a cookie.
-d and friends

Sending data via POST request

@@ -72,17 +72,17 @@ Create a Test Plan From a cURL Command separating '&' character. Thus, using '-d name=daniel -d skill=lousy' would generate a POST chunk that looks like 'name=daniel&skill=lousy'.

-
-d, --data <data>, --data-ascii <data>
+
-d, --data data, --data-ascii data
use @ to upload a file
-
--data-raw <data>gt;
+
--data-raw data
-
--data-raw <data>
+
--data-raw data
This posts data exactly as specified with no extra processing whatsoever. If you start the data with the character @, the rest should be a filename.
-
--data-raw <data>ta>
+
--data-raw data
This posts data, similar to the other --data options with the exception that this performs URL-encoding.
-
--data-raw <data>
+
--data-raw data
This posts data similarly to --data but without the special interpretation of the @ character.
@@ -91,13 +91,13 @@ Create a Test Plan From a cURL Command

This lets curl emulate a filled-in form in which a user has pressed the submit button.

-
-F, --form <name=content>
+
-F, --form name=content
use @ to upload a file
-
--form-string <name=content>
+
--form-string name=content
-
-u, --user <user:password >
+
-u, --user user:password
Specify user and password to use for server authentication.
--basic, --digest
Tells curl to use HTTP authentication.
@@ -105,35 +105,35 @@ Create a Test Plan From a cURL Command

Tells curl to use the specified client certificate file when getting a file with HTTPS

-
--cacert <CA certificate>
-
--capath <CA certificate directory>
-
--ciphers <list of ciphers>
+
--cacert CA certificate
+
--capath CA certificate directory
+
--ciphers list of ciphers
--cert-status
-
--cert-type <type>
+
--cert-type type
-G, --get
put the post data in the URL and use get to replace post.
--no-keepalive
Disables the use of keepalive messages on the TCP connection.
-
-e, --referer <URL>
+
-e, --referer URL
Sends the Referer Page information to the HTTP server.
-L, --location
If the server reports that the requested page has moved to a different location this option will make curl redo the request on the new place.
-i, --include
Include the HTTP-header in the output.
-
--connect-timeout <seconds>
+
--connect-timeout seconds
Maximum time in seconds that the connection to the server may take.
-
--keepalive-time <seconds>
+
--keepalive-time seconds
This option sets the time a connection needs to remain idle before sending keepalive probes and the time between individual keepalive probes.
-
-m, --max-time <seconds>
+
-m, --max-time seconds
Maximum time in seconds that you allow the whole operation to take.
-
-x, --proxy <[protocol://][user:password@]proxyhost[:port]>
+
-x, --proxy [protocol://][user:password@]proxyhost[:port]
Use the specified HTTP proxy. If the port number is not specified, it is assumed at port 1080.
-
-U, --proxy-user <user:password>
+
-U, --proxy-user user:password
Specify user and password to use for proxy authentication.
-k, --insecure
This option explicitly allows curl to perform insecure SSL connections and transfers.
@@ -141,19 +141,19 @@ Create a Test Plan From a cURL Command
When used, it disables all internal HTTP decoding of content or transfer encodings and instead makes them passed on unaltered,raw.
-I, --head
Fetch the HTTP-header only. HTTP-servers feature the method HEAD which this uses to get nothing but the header of a document.
-
--interface <name>
+
--interface name
Perform an operation using a specified interface. You can enter interface name, IP address or host name.
--proxy-ntlm/--proxy-negotiate
Tells curl to use HTTP BASIC/NTLM/Digest authentication when communicating with the given proxy.
-
--dns-servers <addresses>
+
--dns-servers addresses
Resolve host name over DOH.
-
--resolve <host:port:address>
+
--resolve host:port:address
Provide a custom address for a specific host and port pair.
-
--limit-rate <speed>
+
--limit-rate speed
Specify the maximum transfer rate you want curl to use.
-
--max-redirs <num>
+
--max-redirs num
Set maximum number of redirections which may be followed.
-
--noproxy <no-proxy-list>
+
--noproxy no-proxy-list
Comma-separated list of hosts which do not use a proxy, if one is specified.
--- a/xdocs/usermanual/generating-dashboard.xml +++ a/xdocs/usermanual/generating-dashboard.xml @@ -279,14 +279,14 @@ jmeter.save.saveservice.timestamp_format = ms

Specific graph properties must use the prefix: - jmeter.reportgenerator.graph.<graph_id>.property + jmeter.reportgenerator.graph.graph_id.property The name of the property will be mapped using camel case transformation and the matching method of the class will be called with the property value as argument.

E.g.: - jmeter.reportgenerator.graph.<graph_id>.property.set_granularity=150 + jmeter.reportgenerator.graph.graph_id.property.set_granularity=150 induces the call of the method setGranularity(150) on the instance of the graph.

@@ -332,7 +332,7 @@ jmeter.save.saveservice.timestamp_format = ms

Specific exporter properties must use the prefix - jmeter.reportgenerator.exporter.<exporter_id>.property + jmeter.reportgenerator.exporter.exporter_id.property

@@ -352,7 +352,7 @@ jmeter.save.saveservice.timestamp_format = ms Graph properties allow exporters to overwrite some graph data.
They must use the prefix: - jmeter.reportgenerator.exporter.<exporter_id>.graph_options.<graph_id> + jmeter.reportgenerator.exporter.exporter_id.graph_options.graph_id

Sets the minimum @@ -587,14 +587,14 @@ jmeter.reportgenerator.exporter.html.filters_only_sample_series=true

Use the following command: - jmeter -g <log file> -o <Path to output folder> + jmeter -g log file -o Path to output folder

Use the following command: - jmeter -n -t <test JMX file> -l <test log file> -e -o <Path to output folder> + jmeter -n -t test JMX file -l test log file -e -o Path to output folder

@@ -742,9 +742,9 @@ jmeter.reportgenerator.exporter.html.filters_only_sample_series=true by settings their properties in the user.properties file.
They must use the id prefix custom_: - jmeter.reportgenerator.graph.custom_<your_graph_name_id>.property.<your_option_name> + jmeter.reportgenerator.graph.custom_your_graph_name_id.property.your_option_name To specify that this graph is a customized one : - jmeter.reportgenerator.graph.custom_<your_graph_name_id>.classname=org.apache.jmeter.report.processor.graph.impl.CustomGraphConsumer + jmeter.reportgenerator.graph.custom_your_graph_name_id.classname=org.apache.jmeter.report.processor.graph.impl.CustomGraphConsumer

Sets the X axis name of the graph. --- a/xdocs/usermanual/get-started.xml +++ a/xdocs/usermanual/get-started.xml @@ -748,59 +748,59 @@ These are shown below.

print usage information and exit -v, --version print the version information and exit - -p, --propfile <argument> + -p, --propfile argument the jmeter property file to use - -q, --addprop <argument> + -q, --addprop argument additional JMeter property file(s) - -t, --testfile <argument> + -t, --testfile argument the jmeter test(.jmx) file to run - -l, --logfile <argument> + -l, --logfile argument the file to log samples to - -i, --jmeterlogconf <argument> + -i, --jmeterlogconf argument jmeter logging configuration file (log4j2.xml) - -j, --jmeterlogfile <argument> + -j, --jmeterlogfile argument jmeter run log file (jmeter.log) -n, --nongui run JMeter in nongui mode -s, --server run the JMeter server - -H, --proxyHost <argument> + -H, --proxyHost argument Set a proxy server for JMeter to use - -P, --proxyPort <argument> + -P, --proxyPort argument Set proxy server port for JMeter to use - -N, --nonProxyHosts <argument> + -N, --nonProxyHosts argument Set nonproxy host list (e.g. *.apache.org|localhost) - -u, --username <argument> + -u, --username argument Set username for proxy server that JMeter is to use - -a, --password <argument> + -a, --password argument Set password for proxy server that JMeter is to use - -J, --jmeterproperty <argument>=<value> + -J, --jmeterproperty argument=value Define additional JMeter properties - -G, --globalproperty <argument>=<value> + -G, --globalproperty argument=value Define Global properties (sent to servers) e.g. -Gport=123 or -Gglobal.properties - -D, --systemproperty <argument>=<value> + -D, --systemproperty argument=value Define additional system properties - -S, --systemPropertyFile <argument> + -S, --systemPropertyFile argument additional system property file(s) -f, --forceDeleteResultFile force delete existing results files and web report folder if present before starting the test - -L, --loglevel <argument>=<value> + -L, --loglevel argument=value [category=]level e.g. jorphan=INFO, jmeter.util=DEBUG or com.example.foo=WARN -r, --runremote Start remote servers (as defined in remote_hosts) - -R, --remotestart <argument> + -R, --remotestart argument Start these remote servers (overrides remote_hosts) - -d, --homedir <argument> + -d, --homedir argument the jmeter home directory to use -X, --remoteexit Exit the remote servers at end of test (CLI mode) - -g, --reportonly <argument> + -g, --reportonly argument generate report dashboard only, from a test results file -e, --reportatendofloadtests generate report dashboard after load test - -o, --reportoutputfolder <argument> + -o, --reportoutputfolder argument output folder for report dashboard

--