From 94c92486d4993a9fed72e3e62fd79ef031e14c69 Mon Sep 17 00:00:00 2001
From: Miciah Masters <miciah.masters@gmail.com>
Date: Sun, 11 Oct 2015 01:17:16 -0400
Subject: [PATCH] oo-admin-ctl-district-elaborate-on-node-identity

Fix usage information to tell the reader that a node's server identity is
its hostname.  Also, mention that regex matching is supported, and fix
a typo in the -r/--region flag description.

This commit fixes bug 1140766.
---
 broker-util/oo-admin-ctl-district | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/broker-util/oo-admin-ctl-district b/broker-util/oo-admin-ctl-district
index 3679b73a2f0..52fd9e36a20 100755
--- a/broker-util/oo-admin-ctl-district
+++ b/broker-util/oo-admin-ctl-district
@@ -26,11 +26,12 @@ Options:
 -p|--node_profile <gear_size>
     Only required for create
 -i|--server_identity
-    Node server identity (required) (may be a comma-separated list)
+    Node server identity (i.e., its hostname; also may be
+    a comma-separated list or a regex enclosed in slashes) (required)
 -a|--available
     On add-node, add all available nodes with the right profile
 -r|--region <region_name>
-    Region name of the server identitiy.
+    Region name of the server identity.
     Only valid for add-node (optional) and set-region
 -z|--zone <zone_name>
     Zone within the region. Only valid when region is specified