desktop/source/app/cmdlinehelp.cxx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
New commits: commit 0fe8175429ef0ee4cfeea718f99f375fb112496f Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Thu May 23 12:58:39 2019 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Fri May 24 16:44:18 2019 +0200 Fix documented 'soffice --accept' parameter syntax The parameter value for '--accept' is no UNO-Url, but uses a similar syntax. This was wrongly changed in commit d78f29ab3f40 ("tdf#100836 "Starting the LibreOffice Software With Parameters" help update"). So this changes the parameter value back to {accept-string}, documents its syntax and adds some common examples. Includes commit a82eed1e8ad3 ("Fix typo in help: 'urb' => 'urp") (cherry picked from commit a82eed1e8ad3819fda34c26df035cd5472eeec5b) Reviewed-on: https://gerrit.libreoffice.org/72859 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins (cherry picked from commit a4066c770fec13af06a65a268c306a1f706f2cf0) Change-Id: If8159b1d982c54e3dca6d27a1c400d2450ff2d1e Reviewed-on: https://gerrit.libreoffice.org/72882 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 0dbbe41dd660..91cd00a6216e 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -96,12 +96,16 @@ namespace desktop " --safe-mode Starts in a safe mode, i.e. starts temporarily with a\n" " fresh user profile and helps to restore a broken\n" " configuration.\n" - " --accept={UNO-URL} Specifies an UNO-URL connect-string to create an UNO\n" + " --accept={connect-string} Specifies a UNO connect-string to create a UNO\n" " acceptor through which other programs can connect to\n" - " access the API. UNO-URL is string the such kind\n" - " uno:connection-type,params;protocol-name,params;ObjectName.\n" - " --unaccept={UNO-URL} Closes an acceptor that was created with --accept. Use\n" - " --unaccept=all to close all open acceptors.\n" + " access the API. Note that API access allows execution\n" + " of arbitrary commands.\n" + " The syntax of the {connect-string} is:\n" + " connection-type,params;protocol-name,params\n" + " e.g. pipe,name={some name};urp\n" + " or socket,host=localhost,port=54321;urp\n" + " --unaccept={connect-string} Closes an acceptor that was created with\n" + " --accept. Use --unaccept=all to close all acceptors.\n" " --language={lang} Uses specified language, if language is not selected\n" " yet for UI. The lang is a tag of the language in IETF\n" " language tag.\n\n" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
