[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-24-g0508492

[X2Go dev team]

The branch, master has been updated
       via  0508492c750ad6adbd036c7da9681f1f0d8bf0d0 (commit)
      from  a965d2bf9d5de13c0e29036078f5b4646a67cd1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0508492c750ad6adbd036c7da9681f1f0d8bf0d0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 21 16:09:24 2013 +0100

    Update man page for --broker-url. Explain the syntax of <URL>.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    1 +
 man/man1/x2goclient.1 |   10 ++++++++++
 2 files changed, 11 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ef36c0f..d7a8cd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
       installed (self-signed) SSL certificate chains for https (SSL)
       session broker connections. (Fixes: #311).
     - Update man page for new --tray-icon cmdline option.
+    - Update man page for --broker-url. Explain the syntax of <URL>.
     - Properly handle (=expand) the "~" character in key filenames. (Brought to
       attention by Eldamir on IRC. Thanks!).
     - Expand tilde operator for all other file paths handed over to X2Go Client
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index 3a76d50..e77c82a 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -109,6 +109,16 @@ In case you want to retrieve \fBx2goclient\fR session profiles from an X2Go Sess
 .TP
 \*(T<\fB\-\-broker-url=<URL>\fR\*(T>
 Specify the <URL> of the X2Go Session Broker. X2Go Client can access http:// and ssh:// style URLs.
+
+Syntax of <URL> for HTTP brokerage:
+
+http(s)://<user>:<password>@<hostname>:<port>/path/to/broker 
+
+Syntax of <URL> for  SSH brokerage:
+
+ssh://<user>:<password>@<hostname>:<port>/usr/bin/x2gobroker (or any executable that
+provides the broker via SSH).
+
 .TP
 \*(T<\fB\-\-broker-cacertfile=</path/to/cafile.crt>\fR\*(T>
 Specify a special (self-signed) root-CACert file that shall get used when connecting to an X2Go Session Broker via https (SSL).


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).