This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/help-cmd in repository x2goclient. commit 50378fa01e6ebcbf77250c6b8231a5de00e388f3 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 22 23:47:02 2015 +0200 help.cpp: use new newline feature for some options. --- debian/changelog | 1 + src/help.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 786d9a8..1a2639b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -282,6 +282,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - help.cpp: don't let qCritical() add even more spaces or quotes around the help message. - help.cpp: add support for newlines within descriptions. + - help.cpp: use new newline feature for some options. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index d6ba5dd..fc920c6 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -103,7 +103,8 @@ help::params_t help::build_params () { } ADD_OPT ("--help-pack", "Shows available pack methods."); - ADD_OPT ("--debug", "Enables extensive debug output to the console. On Windows also enables PulseAudio logging to a file in the \".x2go/pulse\" in the USERPROFILE directory. The logs are not deleted when X2Go Client terminates."); + ADD_OPT ("--debug", "Enables extensive debug output to the console. On Windows also enables PulseAudio logging to a file in the \".x2go/pulse\" in the USERPROFILE directory." NEWLINE + "The logs are not deleted when X2Go Client terminates."); ADD_OPT ("--no-menu", "Hides menu bar."); ADD_OPT ("--no-session-edit", "Disables session editing."); ADD_OPT ("--maximize", "Starts maximized."); @@ -138,7 +139,12 @@ help::params_t help::build_params () { ADD_OPT ("--close-disconnect", "Automatically closes X2Go Client after a disconnect."); ADD_OPT ("--hide-foldersharing", "Hides all Folder-Sharing-related options."); ADD_OPT ("--broker-name=<name>", "Sets the broker name to display in X2Go Client. This parameter is optional."); - ADD_OPT ("--broker-url=<protocol>://[username@]<host>[:port]/path", "Sets the URL of the session broker. \"protocol\" must be one of \"http\", \"https\" or \"ssh\". If \"username@\" is provided, it will be pasted into the authorization dialog of X2Go Client. URL examples are: https://x2gobroker.org/cgi-bin/x2gobroker.cgi, ssh://user@x2gobroker.org:22/usr/lib/x2go/x2gobroker.pl"); + ADD_OPT ("--broker-url=<protocol>://[username@]<host>[:port]/path", "Sets the URL of the session broker." NEWLINE + "\"protocol\" must be one of \"http\", \"https\" or \"ssh\"." NEWLINE + "If \"username@\" is provided, it will be pasted into the authorization dialog of X2Go Client." NEWLINE + "URL examples are:" NEWLINE + " https://x2gobroker.org/cgi-bin/x2gobroker.cgi" NEWLINE + " ssh://user@x2gobroker.org:22/usr/lib/x2go/x2gobroker.pl"); ADD_OPT ("--broker-ssh-key=<path to key>", "Sets the path to an SSH key to use for authentication against an SSH session broker. The client's behavior is undefined if this flag is used for non-SSH session brokers."); ADD_OPT ("--broker-autologin", "Enables the use of the default SSH key or SSH agent for authentication against an SSH session broker. The client's behavior is undefined if this flag is used for non-SSH session brokers."); ADD_OPT ("--broker-noauth", "Does not ask for user credentials during session broker authentication. This can be useful if you are using an HTTP(S) session broker without authentication. If you run an HTTP(S) server without authentication, but with user-specific profiles, then put the user name into the broker URL (refer to --broker-url.) The user name then will be extracted from the broker URL and be sent to the session broker. The client's behavior is undefined if this flag is used f [...] -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git