[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread noreply
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been 
updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread Zorba Build Bot
Validation queue succeeded - proposal merged!
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread Zorba Build Bot
Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread Paul J. Lucas
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been 
updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread Paul J. Lucas
Review: Approve


-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

2014-03-05 Thread Paul J. Lucas
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
More help message clean-up.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559

More help message clean-up.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/209559
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp	2014-03-04 03:22:16 +
+++ bin/zorbacmd_args.cpp	2014-03-05 23:41:53 +
@@ -78,30 +78,30 @@
 
 // b //
 
-HELP_OPT( "--base-uri" )
+HELP_OPT( "--base-uri " )
   "Set the base URI property of the static context.\n\n"
 
-HELP_OPT( "--boundary-space" )
-  "Set the boundary-space policy ('strip' or 'preserve') in the static context.\n\n"
+HELP_OPT( "--boundary-space {strip|preserve}" )
+  "Set the boundary-space policy in the static context.\n\n"
 
 HELP_OPT( "--byte-order-mark" )
   "Set the byte-order-mark for the serializer.\n\n"
 
 // c //
 
-HELP_OPT( "--classpath" )
-  "JVM classpath to be used by modules using Java implementations\n\n"
+HELP_OPT( "--classpath " )
+  "Set the JVM classpath to be used by modules using Java implementations.\n\n"
 
 HELP_OPT( "--compile-only" )
   "Only compile (don't execute).\n\n"
 
-HELP_OPT( "--compile-plan," )
+HELP_OPT( "--compile-plan" )
   "Do not execute the query; just compile it and save the execution plan in the file specified with the -o option.\n\n"
 
-HELP_OPT( "--construction-mode" )
-  "Set the construction mode ('strip' or 'preserve') in the static context.\n\n"
+HELP_OPT( "--construction-mode {strip|preserve}" )
+  "Set the construction mode in the static context.\n\n"
 
-HELP_OPT( "--context-item" )
+HELP_OPT( "--context-item " )
   "Set the context item to the XML document in a given file.\n\n"
 
 // d //
@@ -111,21 +111,21 @@
   "Launch the Zorba debugger server and connect to a DBGP-enabled debugger client.\n\n"
 #endif /* ZORBA_WITH_DEBUGGER */
 
-HELP_OPT( "--debug-file" )
+HELP_OPT( "--debug-file " )
   "Sets the file to write developer debugging information to.\n\n"
 
-HELP_OPT( "--debug-stream " )
+HELP_OPT( "--debug-stream {1|cout|stdout|2|cerr|stderr}" )
   "Sets the stream to write developer debugging information to.\n\n"
 
 #ifdef ZORBA_WITH_DEBUGGER
-HELP_OPT( "--debug-host, -h" )
-  "The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1\n\n"
+HELP_OPT( "--debug-host, -h " )
+  "The host where the DBGP-enabled debugger client listens for connections; default: 127.0.0.1.\n\n"
 
-HELP_OPT( "--debug-port, -p" )
-  "The port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028\n\n"
+HELP_OPT( "--debug-port, -p " )
+  "The port on which the DBGP-enabled debugger client listens for connections; defaults: 28028.\n\n"
 #endif /* ZORBA_WITH_DEBUGGER */
 
-HELP_OPT( "--default-collation" )
+HELP_OPT( "--default-collation " )
   "Add the given collation and set the value of the default collation in the static context to the given collation.\n\n"
 
 HELP_OPT( "--disable-http-resolution" )
@@ -139,8 +139,8 @@
 HELP_OPT( "--execute-plan" )
   "Do not compile the query; instead load the execution plan from the file specified by the -f -q options (or by any file specified without any other argument), and execute the loaded plan.\n\n"
 
-HELP_OPT( "--external-variable, -e" )
-  "Provide the value for a variable given a file (name=file) or a value (name:=value)\n\n"
+HELP_OPT( "--external-variable, -e {=file|:=}" )
+  "Set the value for an externsl variable.\n\n"
 
 // f //
 
@@ -149,7 +149,7 @@
 
 // h //
 
-HELP_OPT( "--help, -h" )
+HELP_OPT( "--help" )
   "Print this help message.\n\n"
 
 // i //
@@ -163,8 +163,8 @@
 HELP_OPT( "--inline-udf" )
   "Inline user-defined functions.\n\n"
 
-HELP_OPT( "--iterator-tree " )
-  "Print the iterator tree in in one of DOT, JSON, or XML formats.\n\n"
+HELP_OPT( "--iterator-tree {dot|json|xml}>" )
+  "Print the iterator tree in the given format.\n\n"
 
 // j //
 
@@ -176,7 +176,7 @@
 HELP_OPT( "--lib-module, -l" )
   "Query compiler option to treat the query as a library module. If this is set --compile-only option is also s