Merge pull request #6388 from thrasher-redhat/bug1311730

Merged by openshift-bot

Author: OpenShift Bot

broker-util/man/oo-admin-broker-auth.8

@@ -7,7 +7,7 @@
 .nf
 .fam C
 \fBoo-admin-broker-auth\fP [\fB-h\fP|\fB--help\fP] [\fB-t\fP|\fB--timeout\fP \fIinteger\fP] 
-[\fB--find-gears\fP] [\fB--verbose\fP] [\fB--dryrun\fP] [\fB--rekey-all\fP] [\fB--rekey\fP \fIuuid\fP]
+[\fB--find-gears\fP] [\fB--verbose\fP] [\fB--dryrun\fP] [\fB--rekey-all\fP] [\fB-r\fP|\fB--rekey\fP \fIuuid\fP]
 
 .fam T
 .fi
@@ -34,7 +34,7 @@ Print out gears with using Broker key authentication.
 \fB--dryrun\fP
 Show what would be done. Useful for finding discrepancies in Nodes reported by the Broker datastore and the message bus.
 .PP
-\fB--verbose\fP
+\fB-v\fP|\fB--verbose\fP
 Show debugging information 
 .SH EXAMPLE
 

broker-util/man/oo-admin-ctl-app.8

@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH oo-admin-ctl-app 8 "15 September 2014" "" ""
+.TH oo-admin-ctl-app 8 "20 May 2016" "" ""
 .SH NAME
 \fBoo-admin-ctl-app
 \fB
@@ -29,6 +29,9 @@ Login with OpenShift access. Required.
 .B
 \fB-a\fP|\fB--app\fP \fIapp_name\fP
 Application name, alphanumeric. Required.
+.PP
+\fB-n\fP|\fB--domain\fP domain
+Domain name.
 .TP
 .B
 \fB-c\fP|\fB--command\fP \fIcmd\fP
@@ -51,6 +54,9 @@ Alias to operate on.
 .B
 \fB-b\fP|\fB--bypass\fP
 Ignore all warnings.
+.PP
+\fB--multiplier\fP multiplier
+Multiplier factor to be set for the cartridge.
 .SH EXAMPLE
 
 $ \fBoo-admin-ctl-app\fP \fB-l\fP mylogin \fB-a\fP myappname \fB-c\fP status

broker-util/man/oo-admin-ctl-app.txt2man

@@ -18,6 +18,9 @@ OPTIONS
 
   -a|--app app_name  
     Application name, alphanumeric. Required.
+
+  -n|--domain domain
+    Domain name.
 
   -c|--command cmd  
     Command to envoke upon the application, available commands are: start,
@@ -36,6 +39,9 @@ OPTIONS
   -b|--bypass  
     Ignore all warnings.
 
+  --multiplier multiplier
+    Multiplier factor to be set for the cartridge.
+
 EXAMPLE
 
   $ oo-admin-ctl-app -l mylogin -a myappname -c status

broker-util/man/oo-admin-ctl-cartridge.8

@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH oo-admin-ctl-cartridge 8 "17 September 2014" "" ""
+.TH oo-admin-ctl-cartridge 8 "20 May 2016" "" ""
 .SH NAME
 \fBoo-admin-ctl-cartridge
 \fB
@@ -59,11 +59,11 @@ This is an administrative utility to manage cartridges.
 \fB-h\fP|\fB--help\fP
 Display a simple usage page.
 .PP
-\fB--dry-run\fP
+\fB-d\fP|\fB--dry-run\fP
 Display the results of running an operation, but do not make any changes
 to the database.
 .PP
-\fB--raw\fP
+\fB-r\fP|\fB--raw\fP
 When outputting cartridge information, display each manifest as JSON
 .PP
 \fB-a\fP|\fB--active\fP
@@ -78,26 +78,26 @@ A comma-delimited list of cartridge names. Used by the "delete" command.
 \fB--all\fP
 Display all information
 .PP
-\fB--ids\fP IDS
+\fB-i\fP|\fB--ids\fP IDS
 ID for a cartridge version to activate or deactivate (comma-delimited).
 .PP
 \fB--node\fP NODE
 With import-node, server-identity for a node to import from.
 .PP
-\fB--profile\fP PROFILES
+\fB-p\fP|\fB--profile\fP PROFILES
 With import-profile, profile to import from (may be comma-separated list).
 .PP
 \fB-u\fP|\fB--url\fP URL
 URL of a cartrige manifest to import.
 .PP
-\fB--broker\fP PATH
+\fB-b\fP|\fB--broker\fP PATH
 The path to the broker (default /var/www/openshift/broker/config/environment)
 .PP
-\fB--force\fP
+\fB-f\fP|\fB--force\fP
 By default, import and import-node will skip unchanged cartridges. Use this
 switch to force them to create a new version.
 .PP
-\fB--obsolete\fP
+\fB-o\fP|\fB--obsolete\fP
 By default, obsolete cartridges will not be activated. Use this switch to
 automatically update obsolete cartridges.
 .PP

broker-util/man/oo-admin-ctl-cartridge.txt2man

@@ -48,11 +48,11 @@ OPTIONS
   -h|--help
     Display a simple usage page.
 
-  --dry-run
+  -d|--dry-run
     Display the results of running an operation, but do not make any changes
     to the database.
 
-  --raw
+  -r|--raw
     When outputting cartridge information, display each manifest as JSON
 
   -a|--active
@@ -67,26 +67,26 @@ OPTIONS
   --all
     Display all information
 
-  --ids IDS
+  -i|--ids IDS
     ID for a cartridge version to activate or deactivate (comma-delimited).
 
   --node NODE
     With import-node, server-identity for a node to import from.
 
-  --profile PROFILES
+  -p|--profile PROFILES
     With import-profile, profile to import from (may be comma-separated list).
 
   -u|--url URL
     URL of a cartrige manifest to import.
 
-  --broker PATH
+  -b|--broker PATH
     The path to the broker (default /var/www/openshift/broker/config/environment)
 
-  --force
+  -f|--force
     By default, import and import-node will skip unchanged cartridges. Use this
     switch to force them to create a new version.
 
-  --obsolete
+  -o|--obsolete
     By default, obsolete cartridges will not be activated. Use this switch to
     automatically update obsolete cartridges.
 

broker-util/man/oo-app-info.8

@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH untitled  "07 November 2013" "" ""
+.TH untitled  "20 May 2016" "" ""
 .SH NAME
 \fBoo-app-info
 \fB
@@ -47,7 +47,7 @@ Comma-delimited list of Application or Gear uuids or regular expressions
 Additional:
 \fB--deleted\fP
 Look for deleted Applications
-\fB--raw\fP
+\fB-r\fP or \fB--raw\fP
 Print raw data structure without formatting.
 .RE
 .PP

broker-util/man/oo-app-info.txt2man

@@ -33,7 +33,7 @@ OPTIONS
   Additional:
     --deleted
       Look for deleted Applications
-    --raw
+    -r or --raw
       Print raw data structure without formatting.
 
 

broker-util/oo-admin-broker-auth

@@ -34,7 +34,8 @@ oo-admin-broker-auth OPTIONS
 Options:
 --rekey-all
     Rekey all Gears using Broker authentication tokens
---rekey [uuid]
+-r|--rekey [uuid]
+    Rekey an individual gear
 -t|--timeout [integer]
     How long to wait for MCollective Node discovery
 -v|--verbose

broker-util/oo-admin-ctl-cartridge

@@ -540,20 +540,20 @@ or names.
     options.command = command
   end
 
-  opts.on('--broker PATH', "The path to the broker",
+  opts.on('-b', '--broker PATH', "The path to the broker",
           " (default #{PATH})") do |path|
     options.broker = path
   end
 
-  opts.on('--raw', "Dump all cartridge information as JSON") do
+  opts.on('-r', '--raw', "Dump all cartridge information as JSON") do
     options.raw = true
   end
 
-  opts.on('--force', "Replace with new version even if unchanged") do
+  opts.on('-f', '--force', "Replace with new version even if unchanged") do
     options.force = true
   end
 
-  opts.on('--obsolete', "Force activation of obsolete cartridges") do
+  opts.on('-o', '--obsolete', "Force activation of obsolete cartridges") do
     options.obsolete = true
   end
 
@@ -565,7 +565,7 @@ or names.
     options.activate = true
   end
 
-  opts.on('--dry-run', "Show the results of the update without changing anything.") do
+  opts.on('-d', '--dry-run', "Show the results of the update without changing anything.") do
     options.dry_run = true
   end
 
@@ -581,7 +581,7 @@ or names.
     options.quiet = true
   end
 
-  opts.on('--ids IDS', "ID for a cartridge version to activate or deactivate (comma-delimited).") do |ids|
+  opts.on('-i', '--ids IDS', "ID for a cartridge version to activate or deactivate (comma-delimited).") do |ids|
     options.ids = ids.split(/[\, ]/)
   end
 

broker-util/oo-app-info

@@ -85,7 +85,7 @@ if $0 == __FILE__
     opts.separator ''
     opts.separator 'Additional:'
     opts.on('--deleted', 'Look for deleted Applications') { params[:deleted] = true }
-    opts.on('--raw', 'Print raw data structure without formatting.') { params[:raw] = true }
+    opts.on('r', '--raw', 'Print raw data structure without formatting.') { params[:raw] = true }
   end
   optparse.parse!