Commit f06482ca authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/3.4' into 3.5

parents 405f2c7d b57ac109
......@@ -77,18 +77,18 @@
\li In the \uicontrol {The device's host name or IP address} field,
enter the host name or IP address of the device.
This value will be available in the variable \c %{CurrentDevice:HostAddress}.
This value will be available in the variable \c %{Device:HostAddress}.
\li In the \uicontrol {The username to log into the device} field,
enter the username to log into the device and run the
application as.
This value will be available in the variable \c %{CurrentDevice:UserName}.
This value will be available in the variable \c %{Device:UserName}.
\li In the \uicontrol {The authentication type} field, select whether
to use \uicontrol Password or \uicontrol Key authentication, and enter
the user's password or the file that contains the user's
private key.
The latter will be available in the variable \c %{CurrentDevice:PrivateKeyFile}.
The latter will be available in the variable \c %{Device:PrivateKeyFile}.
\li Click \uicontrol {Next} to create the connection.
......@@ -96,7 +96,7 @@
All of these parameters can be edited later, as well as additional ones that the
wizard does not show because there are sensible default values. One of these is
the SSH port number, which is available in the variable \c %{CurrentDevice:SshPort}.
the SSH port number, which is available in the variable \c %{Device:SshPort}.
\li Select \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run}
......
Subproject commit 9309633cb821643be1366f6c87ec31b55e26be09
Subproject commit 0832785797f5db4e2f23833e08be0c023b6c9cc2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment