You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2017/09/19 16:29:28 UTC

[geode] branch develop updated: GEODE-2818 Document gfsh aliases (#775)

This is an automated email from the ASF dual-hosted git repository.

kmiller pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1d3478e  GEODE-2818 Document gfsh aliases (#775)
1d3478e is described below

commit 1d3478e84ca079db6ae02d812133d3afa02bdfa3
Author: Karen Miller <ka...@users.noreply.github.com>
AuthorDate: Tue Sep 19 09:29:26 2017 -0700

    GEODE-2818 Document gfsh aliases (#775)
    
    - option for group extended to groups
     - option for member extended to members
     - option for jar extended to jars
---
 .../deploying_application_jars.html.md.erb         | 12 ++---
 .../gfsh_config_troubleshooting.html.md.erb        |  2 +-
 .../persisting_configurations.html.md.erb          | 14 +++---
 .../cluster_config/using_member_groups.html.md.erb |  2 +-
 .../gfsh/command-pages/alter.html.md.erb           | 19 ++++----
 .../gfsh/command-pages/change.html.md.erb          |  2 +-
 .../gfsh/command-pages/close.html.md.erb           | 13 +++---
 .../gfsh/command-pages/compact.html.md.erb         |  4 +-
 .../gfsh/command-pages/create.html.md.erb          | 53 +++++++++++-----------
 .../gfsh/command-pages/deploy.html.md.erb          | 16 +++----
 .../gfsh/command-pages/destroy.html.md.erb         | 24 +++++-----
 .../gfsh/command-pages/execute.html.md.erb         |  9 ++--
 .../gfsh/command-pages/export.html.md.erb          | 22 ++++-----
 .../gfsh/command-pages/gc.html.md.erb              |  6 +--
 .../gfsh/command-pages/list.html.md.erb            | 39 ++++++++--------
 .../gfsh/command-pages/netstat.html.md.erb         |  8 ++--
 .../gfsh/command-pages/pause.html.md.erb           |  8 ++--
 .../gfsh/command-pages/resume.html.md.erb          | 10 ++--
 .../gfsh/command-pages/show.html.md.erb            |  6 +--
 .../gfsh/command-pages/start.html.md.erb           | 35 +++++++-------
 .../gfsh/command-pages/status.html.md.erb          | 28 ++++++------
 .../gfsh/command-pages/stop.html.md.erb            | 27 +++++------
 .../gfsh/command-pages/undeploy.html.md.erb        | 16 +++----
 23 files changed, 191 insertions(+), 184 deletions(-)

diff --git a/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb b/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
index 185b1e1..3c34cff 100644
--- a/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
+++ b/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
@@ -22,15 +22,15 @@ You can dynamically deploy your application JAR files to specific members or to
 To deploy and undeploy application JAR files in <%=vars.product_name_long%>, use the `gfsh` `deploy` or `undeploy` command. You can deploy a single JAR or multiple JARs (by either specifying the JAR filenames or by specifying a directory that contains the JAR files), and you can also target the deployment to a member group or multiple member group. For example, after connecting to the distributed system where you want to deploy the JARs, you could type at the `gfsh` prompt:
 
 ``` pre
-gfsh> deploy --jar=group1_functions.jar
+gfsh> deploy --jars=group1_functions.jar
 ```
 
 This command deploys the `group1_functions.jar` file to all members in the distributed system.
 
-To deploy the JAR file to a subset of members, use the `--group` argument. For example:
+To deploy the JAR file to a subset of members, use the `--groups` argument. For example:
 
 ``` pre
-gfsh> deploy --jar=group1_functions.jar --group=MemberGroup1
+gfsh> deploy --jars=group1_functions.jar --groups=MemberGroup1
 ```
 
 In the example it is assumed that you have already defined the member group that you want to use when starting up your members. See [Configuring and Running a Cluster](../chapter_overview.html#concept_lrh_gyq_s4) for more information on how to define member groups and add a member to a group.
@@ -52,13 +52,13 @@ gfsh> undeploy
 To undeploy a specific JAR file:
 
 ``` pre
-gfsh> undeploy --jar=group1_functions.jar
+gfsh> undeploy --jars=group1_functions.jar
 ```
 
 To target a specific member group when undeploying all JAR files:
 
 ``` pre
-gfsh> undeploy --group=MemberGroup1
+gfsh> undeploy --groups=MemberGroup1
 ```
 
 Only JAR files that have been previously deployed on members in the MemberGroup1 group will be undeployed.
@@ -72,7 +72,7 @@ gfsh> list deployed
 To see a list of all deployed JARs in a specific member group:
 
 ``` pre
-gfsh> list deployed --group=MemberGroup1
+gfsh> list deployed --groups=MemberGroup1
 ```
 
 Sample output:
diff --git a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
index c02c222..0243245 100644
--- a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
@@ -33,7 +33,7 @@ For configurations that apply to all members of a cluster, the locator creates a
 <!-- -->
 
 **Group-level configuration**  
-When you specify the `--group` parameter in a `gfsh` command, (for example, `start server` or `create region`) the locator writes the configurations for each group in a subdirectory with the same name as the group. When you start a server that specifies one or more group names, the server receives both the cluster-level configurations and the configurations from all groups specified. This subdirectory contains:
+When you specify the `--groups` parameter in a `gfsh` command, (for example, `start server` or `create region`) the locator writes the configurations for each group in a subdirectory with the same name as the group. When you start a server that specifies one or more group names, the server receives both the cluster-level configurations and the configurations from all groups specified. This subdirectory contains:
 
 -   `<group-name>.xml` -- A <%=vars.product_name%> `cache.xml` file containing configurations common to all members of the group
 -   `<group-name>.properties` -- A <%=vars.product_name%> `gemfire.properties` file containing properties common to all members of the group
diff --git a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
index c6fa0cc..37f3478 100644
--- a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
+++ b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
@@ -76,7 +76,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
 4.  Start <%=vars.product_name_long%> servers using the commands in the following example:
 
     ``` pre
-    gfsh>start server --name=server1 --group=group1
+    gfsh>start server --name=server1 --groups=group1
     Starting a <%=vars.product_name%> Server in /Users/username/my_geode/server1...
     .....
     Server in /Users/username/my_geode/server1 on 192.0.2.0[40404] as server1
@@ -92,7 +92,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
     Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
 
-    gfsh>start server --name=server2 --group=group1 --server-port=40405
+    gfsh>start server --name=server2 --groups=group1 --server-port=40405
     Starting a <%=vars.product_name%> Server in /Users/username/my_geode/server2...
     .....
     Server in /Users/username/my_geode/server2 on 192.0.2.0[40405] as server2
@@ -130,7 +130,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
 5.  Create some regions using the commands in the following example:
 
     ``` pre
-    gfsh>create region --name=region1 --group=group1 --type=REPLICATE
+    gfsh>create region --name=region1 --groups=group1 --type=REPLICATE
     Member  | Status
     ------- | --------------------------------------
     server2 | Region "/region1" created on "server2"
@@ -149,14 +149,14 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
 6.  Deploy jar files. Use the `gfsh deploy` command to deploy application jar files to all members or to a specified group of members. The following example deploys the `mx4j-3.0.1.jar` and `mx4j.jar` files from the distribution. (Note: This is only an example, you do not need to deploy these files to use the Cluster Configuration Service. Alternately, you can use any two jar files for this demonstration.)
 
     ``` pre
-    gfsh>deploy --group=group1 --jar=/lib/mail.jar
-    Post substitution: deploy --group=group1 --jar=/Users/username/Apache_Geode_1.0.0_Linux/lib/mx4j-3.0.1.jar
+    gfsh>deploy --groups=group1 --jars=/lib/mail.jar
+    Post substitution: deploy --groups=group1 --jars=/Users/username/Apache_Geode_1.0.0_Linux/lib/mx4j-3.0.1.jar
     Member  |    Deployed JAR    | Deployed JAR Location
     ------- | ------------------ | -------------------------------------------------------
     server1 | mx4j-3.0.1.jar     | /Users/username/my_geode/server1/vf.gf#mx4j-3.0.1.jar#1
     server2 | mx4j-3.0.1.jar     | /Users/username/my_geode/server2/vf.gf#mx4j-3.0.1.jar#1
 
-    gfsh>deploy --jar=/lib/mx4j.jar
+    gfsh>deploy --jars=/lib/mx4j.jar
     Post substitution: deploy --jar=/Users/username/Apache_Geode_1.0.0_Linux/lib/ra.jar
     Member  | Deployed JAR | Deployed JAR Location
     ------- | ------------ | -----------------------------------------------
@@ -265,7 +265,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
 15. Start another server that references `group1`:
 
     ``` pre
-    gfsh>start server --name=server5 --group=group1 --server-port=40415
+    gfsh>start server --name=server5 --groups=group1 --server-port=40415
     Starting a <%=vars.product_name%> Server in /Users/username/new_geode/server5...
     .....
     Server in /Users/username/new_geode/server2 on 192.0.2.0[40415] as server5
diff --git a/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb b/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
index 8bf7a4c..9f54585 100644
--- a/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
+++ b/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
@@ -35,7 +35,7 @@ You define group names in the `groups` property of your member's `gemfire.proper
 **Note:**
 Any roles defined in the currently existing `roles` property will now be considered a group. If you wish to add membership roles to your distributed system, you should add them as member groups in the `groups` property. The `roles` property has been deprecated in favor of using the `groups` property.
 
-To add a member to a group, add the name of a member group to the `gemfire.properties` file of the member prior to startup or you can start up a member in `gfsh` and pass in the `--group` argument at startup time.
+To add a member to a group, add the name of a member group to the `gemfire.properties` file of the member prior to startup or you can start up a member in `gfsh` and pass in the `--groups` argument at startup time.
 
 A single member can belong to more than one group.
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/alter.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/alter.html.md.erb
index cbe44b8..e2780e9 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/alter.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/alter.html.md.erb
@@ -149,7 +149,7 @@ Alters the configuration of a region.
 **Syntax:**
 
 ``` pre
-alter region --name=value [--group=value(,value)*]
+alter region --name=value [--groups=value(,value)*]
     [--entry-idle-time-expiration(=value)?]
     [--entry-idle-time-expiration-action(=value)?]
     [--entry-time-to-live-expiration(=value)?]
@@ -283,7 +283,7 @@ Select one of the following expiration actions:
 <td> </td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-group</span></td>
+<td><span class="keyword parmname">\-\-groups</span></td>
 <td>Group(s) of members where the region will be altered.</td>
 <td> </td>
 </tr>
@@ -389,7 +389,8 @@ For more information on these configuration properties, see [cache.xml](../../..
 **Syntax:**
 
 ``` pre
-alter runtime [--member=value] [--group=value] [--archive-disk-space-limit=value]
+alter runtime [--members=value(,value)*] [--groups=value(,value)*]
+    [--archive-disk-space-limit=value]
     [--archive-file-size-limit=value] [--log-disk-space-limit=value]
     [--log-file-size-limit=value] [--log-level=value]
     [--statistic-archive-file=value] [--statistic-sample-rate=value]
@@ -415,13 +416,13 @@ alter runtime [--member=value] [--group=value] [--archive-disk-space-limit=value
 </thead>
 <tbody>
 <tr class="odd">
-<td><span class="keyword parmname">\-\-member</span></td>
-<td>Name or ID of the member whose configuration is to be altered at runtime. If you do not specify this parameter, the configuration properties are modified for all cluster members using the cluster configuration service.</td>
+<td><span class="keyword parmname">\-\-members</span></td>
+<td>Name or ID of the member(s) whose configuration is to be altered at runtime. If you do not specify this parameter, the configuration properties are modified for all cluster members using the cluster configuration service.</td>
 <td>If not specified, all members using the cluster configuration service</td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-group</span></td>
-<td>Name of the group whose members's runtime configuration is to be altered. If you do not specify this parameter, the configuration properties are modified for all cluster members using the cluster configuration service.</td>
+<td><span class="keyword parmname">\-\-groups</span></td>
+<td>Name of the group(s) whose members's runtime configuration is to be altered. If you do not specify this parameter, the configuration properties are modified for all cluster members using the cluster configuration service.</td>
 <td>If not specified, all members using the cluster configuration service</td>
 </tr>
 <tr class="odd">
@@ -498,13 +499,13 @@ Valid values are: `ALL`, `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`, `FATAL`, `OF
 **Example Commands:**
 
 ``` pre
-alter runtime --member=server1 --loglevel=WARN --enable-statistics=true
+alter runtime --members=server1 --loglevel=WARN --enable-statistics=true
 ```
 
 **Sample Output:**
 
 ``` pre
-gfsh>alter runtime --member=server1 --loglevel=WARN --enable-statistics=true
+gfsh>alter runtime --members=server1 --loglevel=WARN --enable-statistics=true
 Runtime configuration altered successfully for the following member(s)
 192.0.2.0(server1:240)<v1>:64871
 ```
diff --git a/geode-docs/tools_modules/gfsh/command-pages/change.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/change.html.md.erb
index 92a8696..81d4fc8 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/change.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/change.html.md.erb
@@ -27,7 +27,7 @@ Changes the logging level on specified members.
 **Syntax:**
 
 ``` pre
-change loglevel --loglevel=value [--members=value(nullvalue)*] [--groups=value(nullvalue)*]
+change loglevel --loglevel=value [--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 <a id="topic_E74ED23CB60342538B2175C326E7D758__table_2277A2CE8F6E4731B45FEFA2B1366DB6"></a>
diff --git a/geode-docs/tools_modules/gfsh/command-pages/close.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/close.html.md.erb
index f892464..fe47ca4 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/close.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/close.html.md.erb
@@ -38,7 +38,8 @@ Attempts to close a durable client. The client must be disconnected for this com
 **Syntax:**
 
 ``` pre
-close durable-client --durable-client-id=value [--member=value] [--group=value]
+close durable-client --durable-client-id=value [--members=value(,value)*]
+[--groups=value(,value)*]
 ```
 
 <a id="topic_4125AAAB9FE44CD787166E48B694C41D__table_618C978BA2B442A9A979243B50856885"></a>
@@ -46,8 +47,8 @@ close durable-client --durable-client-id=value [--member=value] [--group=value]
 | Name                                                       | Description                                                            |
 |------------------------------------------------------------|------------------------------------------------------------------------|
 | \\-\\-durable-client-id  | *Required.* The ID of the durable client.                              |
-| \\-\\-member             | Name or ID of the member for which the durable client is to be closed. |
-| \\-\\-group              | Group of members for which the durable client is to be closed.         |
+| \\-\\-members            | Name or ID of the member(s) for which the durable client is to be closed. |
+| \\-\\-groups             | Group(s) of members for which the durable client is to be closed.         |
 
 <span class="tablecap">Table 1. Close Durable-Client Parameters</span>
 
@@ -93,7 +94,7 @@ Closes the durable continuous query (CQ) registered by the durable client and dr
 
 ``` pre
 close durable-cq --durable-client-id=value --durable-cq-name=value 
-[--member=value] [--group=value]
+[--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 <a id="topic_1BC15B3132BA480DB227921A9B3ABDD1__table_CEFFFECABBDF4DC4A37E8861422EEB5C"></a>
@@ -102,8 +103,8 @@ close durable-cq --durable-client-id=value --durable-cq-name=value
 |-----------------------------------------------------------|------------------------------------------------------------------------------------------------------|
 | \\-\\-durable-client-id | Required. The ID of the durable client.                                                              |
 | \\-\\-durable-cq-name   | Required. Name of the CQ to be closed.                                                               |
-| \\-\\-member            | Name or ID of the member for which the durable client is registered and the durable CQ to be closed. |
-| \\-\\-group             | Group of members for which the durable client is registered and the durable CQ to be closed.         |
+| \\-\\-members           | Name or ID of the member(s) for which the durable client is registered and the durable CQ to be closed. |
+| \\-\\-groups            | Group(s) of members for which the durable client is registered and the durable CQ to be closed.      |
 
 <span class="tablecap">Table 2. Close Durable-CQ Parameters</span>
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/compact.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/compact.html.md.erb
index 54f1141..400103d 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/compact.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/compact.html.md.erb
@@ -44,7 +44,7 @@ See [Running Compaction on Disk Store Log Files](../../../managing/disk_storage/
 **Syntax:**
 
 ``` pre
-compact disk-store --name=value [--group=value(,value)*]
+compact disk-store --name=value [--groups=value(,value)*]
 ```
 
 <a id="topic_F113C95C076F424E9AA8AC4F1F6324CC__table_7039256EA2014AE5BFAB63697FF35AB6"></a>
@@ -52,7 +52,7 @@ compact disk-store --name=value [--group=value(,value)*]
 | Name                                          | Description                                                                                                                  |
 |-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-name</span>  | *Required.* Name of the disk store to be compacted.                                                                          |
-| <span class="keyword parmname">\\-\\-group</span> | Group(s) of members that perform disk compaction. If no group is specified, then the disk store is compacted by all members. |
+| <span class="keyword parmname">\\-\\-groups</span> | Group(s) of members that perform disk compaction. If no group is specified, then the disk store is compacted by all members. |
 
 <span class="tablecap">Table 1. Compact Disk-Store Parameters</span>
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
index edad5f0..25ce6a0 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
@@ -64,7 +64,7 @@ See [Configuring Multi-Site (WAN) Event Queues](../../../developing/events/confi
 **Syntax:**
 
 ``` pre
-create async-event-queue --id=value --listener=value [--group=value(nullvalue)*]
+create async-event-queue --id=value --listener=value [--groups=value(,value)*]
     [--parallel(=value)?] [--enable-batch-conflation(=value)?] [--batch-size=value]
     [--batch-time-interval=value] [--persistent(=value)?] [--disk-store=value]
     [--disk-synchronous(=value)?] [--max-queue-memory=value]
@@ -95,8 +95,8 @@ create async-event-queue --id=value --listener=value [--group=value(nullvalue)*]
 <td> </td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-group</span></td>
-<td>The queue is created on all members of this group. If you do not specify a group the queue is created on all members.</td>
+<td><span class="keyword parmname">\-\-groups</span></td>
+<td>The queue is created on all members of the group(s). If you do not specify a group, the queue is created on all members.</td>
 <td> </td>
 </tr>
 <tr class="odd">
@@ -196,15 +196,15 @@ See also [define index](define.html) and [clear defined indexes](clear.html).
 **Syntax:**
 
 ``` pre
-create defined indexes [--member=value] [--group=value]
+create defined indexes [--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 **Parameters, create defined indexes:**
 
 | Name                                           | Description                                                        | Default |
 |------------------------------------------------|--------------------------------------------------------------------|---------|
-| <span class="keyword parmname">\\-\\-member</span> | Name/Id of the member on which index will be created.              |         |
-| <span class="keyword parmname">\\-\\-group</span>  | The index will be created on all the members in this member group. |         |
+| <span class="keyword parmname">\\-\\-members</span> | Name/Id of the member(s) on which index will be created.              |         |
+| <span class="keyword parmname">\\-\\-groups</span>  | The index will be created on all the members in the member group(s). |         |
 
 
 **Example Commands:**
@@ -243,7 +243,8 @@ See [Disk Storage](../../../managing/disk_storage/chapter_overview.html)
 ``` pre
 create disk-store --name=value --dir=value(,value)* [--allow-force-compaction(=value)?] 
 [--auto-compact(=value)?] [--compaction-threshold=value] [--max-oplog-size=value]
-[--queue-size=value] [--time-interval=value] [--write-buffer-size=value] [--group=value(,value)*] 
+[--queue-size=value] [--time-interval=value] [--write-buffer-size=value]
+[--groups=value(,value)*]
 [--disk-usage-warning-percentage=value] [--disk-usage-critical-percentage=value]
 ```
 
@@ -308,8 +309,8 @@ If the specified directory does not exist, the command will create the directory
 <td>1000</td>
 </tr>
 <tr class="odd">
-<td><span class="keyword parmname"> --group</span></td>
-<td>The name of a group of distributed system members. The disk store is created on all members of this group. If no group is specified, the disk store is created on all members.</td>
+<td><span class="keyword parmname"> --groups</span></td>
+<td>The disk store is created on all members of the group(s). If no group is specified, the disk store is created on all members.</td>
 <td> </td>
 </tr>
 <tr class="even">
@@ -358,7 +359,7 @@ See [Gateway Receivers](../../../topologies_and_comm/topology_concepts/multisite
 **Syntax:**
 
 ``` pre
-create gateway-receiver [--group=value(,value)*] [--member=value(,value)*] 
+create gateway-receiver [--groups=value(,value)*] [--members=value(,value)*] 
   [--manual-start=value] [--start-port=value] [--end-port=value] [--bind-address=value] 
   [--maximum-time-between-pings=value] [--socket-buffer-size=value]
   [--gateway-transport-filter=value(,value)*]
@@ -381,13 +382,13 @@ create gateway-receiver [--group=value(,value)*] [--member=value(,value)*]
 </thead>
 <tbody>
 <tr class="odd">
-<td><span class="keyword parmname">\-\-group</span></td>
-<td>Gateway receivers are created on the members of this group.</td>
+<td><span class="keyword parmname">\-\-groups</span></td>
+<td>Gateway receivers are created on the members of the group(s).</td>
 <td> </td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-member</span></td>
-<td>Name of the distributed system member on which to create the gateway receiver.</td>
+<td><span class="keyword parmname">\-\-members</span></td>
+<td>Name of the distributed system member(s) on which to create the gateway receiver.</td>
 <td> </td>
 </tr>
 <tr class="odd">
@@ -433,13 +434,13 @@ create gateway-receiver [--group=value(,value)*] [--member=value(,value)*]
 **Example Commands:**
 
 ``` pre
-gfsh>create gateway-receiver --member=server1
+gfsh>create gateway-receiver --members=server1
 ```
 
 **Sample Output:**
 
 ``` pre
-gfsh>create gateway-receiver --member=server1
+gfsh>create gateway-receiver --members=server1
 Member  | Status
 ------- | ---------------------------------------------------------------------------
 server1 | GatewayReceiver created on member "server1" and will listen on the port "0"
@@ -460,7 +461,7 @@ The gateway sender configuration for a specific sender `id` must be identical on
 
 ``` pre
 create gateway-sender --id=value --remote-distributed-system-id=value 
-   [--group=value(,value)*] [--member=value(,value)*] [--parallel=value] 
+   [--groups=value(,value)*] [--members=value(,value)*] [--parallel=value] 
    [--manual-start=value] [--socket-buffer-size=value] [--socket-read-timeout=value] 
    [--enable-batch-conflation=value] [--batch-size=value] [--batch-time-interval=value]
    [--enable-persistence=value] [--disk-store-name=value] [--disk-synchronous=value] 
@@ -496,13 +497,13 @@ create gateway-sender --id=value --remote-distributed-system-id=value
 <td> </td>
 </tr>
 <tr class="odd">
-<td><span class="keyword parmname">\-\-group</span></td>
-<td>Gateway senders are created on the members of this group.</td>
+<td><span class="keyword parmname">\-\-groups</span></td>
+<td>Gateway senders are created on the members of the group(s).</td>
 <td> </td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-member</span></td>
-<td>Name of the distributed system member on which to create the gateway sender.</td>
+<td><span class="keyword parmname">\-\-members</span></td>
+<td>Name of the distributed system member(s) on which to create the gateway sender.</td>
 <td> </td>
 </tr>
 <tr class="odd">
@@ -624,7 +625,7 @@ See [Working with Indexes](../../../developing/query_index/query_index.html).
 
 ``` pre
 create index --name=value --expression=value --region=value 
-[--member=value] [--type=value] [--group=value]
+[--members=value(,value)*] [--type=value] [--groups=value(,value)*]
 ```
 
 **Parameters: create index:**
@@ -634,9 +635,9 @@ create index --name=value --expression=value --region=value
 | <span class="keyword parmname">\\-\\-name</span>       | *Required.* Name of the index to create.                                               |         |
 | <span class="keyword parmname">&#8209;&#8209;expression</span> | *Required.* Field of the region values that are referenced by the index.               |         |
 | <span class="keyword parmname">\\-\\-region</span>     | *Required.* Name/Path of the region which corresponds to the "from" clause in a query. |         |
-| <span class="keyword parmname">\\-\\-member</span>     | Name/Id of the member on which index will be created.                                  |         |
+| <span class="keyword parmname">\\-\\-members</span>     | Name/Id of the member(s) on which index will be created.                                  |         |
 | <span class="keyword parmname">\\-\\-type</span>       | Type of the index. Valid values are: `range`, `key` and `hash`.                        | `range` |
-| <span class="keyword parmname">\\-\\-group</span>      | The index will be created on all the members in this member group.                     |         |
+| <span class="keyword parmname">\\-\\-groups</span>      | The index will be created on all the members in the group(s).                     |         |
 
 
 **Example Commands:**
@@ -725,7 +726,7 @@ See [Region Data Storage and Distribution](../../../developing/region_options/ch
 
 ``` pre
  create region --name=value [--type=value] [--template-region=value]
-    [--group=value(,value)*] [--skip-if-exists(=value)?]
+    [--groups=value(,value)*] [--skip-if-exists(=value)?]
     [--key-constraint=value] [--value-constraint=value]
     [--enable-statistics=value] [--entry-idle-time-expiration=value]
     [--entry-idle-time-expiration-action=value]
@@ -781,7 +782,7 @@ See [Region Data Storage and Distribution](../../../developing/region_options/ch
 <td> </td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-group</span></td>
+<td><span class="keyword parmname">\-\-groups</span></td>
 <td>Group(s) of members on which the region will be created.</td>
 <td> </td>
 </tr>
diff --git a/geode-docs/tools_modules/gfsh/command-pages/deploy.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/deploy.html.md.erb
index 1e42900..0564b9c 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/deploy.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/deploy.html.md.erb
@@ -21,22 +21,22 @@ limitations under the License.
 
 Deploy JAR-packaged applications to a member or members.
 
-Only one of either `--jar` or `--dir` may be specified.
+Only one of either `--jars` or `--dir` may be specified.
 
 **Availability:** Online. You must be connected in `gfsh` to a JMX Manager member to use this command.
 
 **Syntax:**
 
 ``` pre
-deploy [--group=value(,value)*] [--jar=value] [--dir=value]
+deploy [--groups=value(,value)*] [--jars=value(,value)*] [--dir=value]
 ```
 
 <a id="concept_6B38CB283BC048778A8E3908C1BDF221__table_gfk_42h_2w"></a>
 
 | Name                                          | Description                                                                                                                       |
 |-----------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
-| <span class="keyword parmname">&#8209;&#8209;group</span> | Group(s) to which the specified JARs will be deployed. If this option is not specified, the deployment will occur on all members. |
-| <span class="keyword parmname">\\-\\-jar</span>   | Path of the JAR to deploy.                                                                                                        |
+| <span class="keyword parmname">&#8209;&#8209;groups</span> | Group(s) to which the specified JARs will be deployed. If this option is not specified, the deployment will occur on all members. |
+| <span class="keyword parmname">\\-\\-jars</span>   | Path(s) of the JAR(s) to deploy.                                                                                                        |
 | <span class="keyword parmname">\\-\\-dir</span>   | Directory from which to deploy the JARs.                                                                                          |
 
 <span class="tablecap">Table 1. Deploy Parameters</span>
@@ -44,15 +44,15 @@ deploy [--group=value(,value)*] [--jar=value] [--dir=value]
 **Example Commands:**
 
 ``` pre
-deploy --jar=group1_functions.jar --group=Group1
+deploy --jars=group1_functions.jar --groups=Group1
 
-deploy --dir=libs/group1-libs --group=Group2
+deploy --dir=libs/group1-libs --groups=Group2
 ```
 
 **Sample Output:**
 
 ``` pre
-gfsh> deploy --jar=group1_functions.jar --group=Group1
+gfsh> deploy --jars=group1_functions.jar --groups=Group1
 
  Member   |     Deployed JAR     |                Deployed JAR Location            
 --------- | -------------------- | ---------------------------------------------------
@@ -60,7 +60,7 @@ datanode1 | group1_functions.jar | /usr/local/gemfire/deploy/GF#group1_functions
 datanode2 | group1_functions.jar | /usr/local/gemfire/deploy/GF#group1_functions.jar#1
 
 
-gfsh> deploy --dir=libs/group1-libs --group=Group2
+gfsh> deploy --dir=libs/group1-libs --groups=Group2
 
 Deploying files: group2_functions.jar, group2_dependencies.jar
 Total file size is: 0.64MB
diff --git a/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb
index a0834ba..5d32b73 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb
@@ -55,7 +55,7 @@ Deletes a disk store and all files on disk used by the disk store. Data for clos
 **Syntax:**
 
 ``` pre
-destroy disk-store --name=value [--group=value(,value)*]
+destroy disk-store --name=value [--groups=value(,value)*]
 ```
 
 **Parameters, destroy disk-store:**
@@ -63,7 +63,7 @@ destroy disk-store --name=value [--group=value(,value)*]
 | Name                                          | Description                                                                                                                          |
 |-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-name</span>  | *Required.* Name of the disk store to be deleted.                                                                                    |
-| <span class="keyword parmname">&#8209;&#8209;group</span> | Group(s) of members on which the disk store will be destroyed. If no group is specified, the disk store is destroyed on all members. |
+| <span class="keyword parmname">&#8209;&#8209;groups</span> | Group(s) of members on which the disk store will be destroyed. If no group is specified, the disk store is destroyed on all members. |
 
 
 **Example Commands:**
@@ -92,7 +92,7 @@ The default is for the function to be unregistered from all members.
 **Syntax:**
 
 ``` pre
-destroy function --id=value [--group=value] [--member=value]
+destroy function --id=value [--groups=value(,value)*] [--member=value]
 ```
 
 **Parameters, destroy function:**
@@ -138,8 +138,8 @@ gfsh>alter region --name=regionA --gateway-sender-id=""
 **Syntax:**
 
 ``` pre
-destroy gateway-sender --id=value [--group=value(,value)*]
-  [--member=value(,value)*]
+destroy gateway-sender --id=value [--groups=value(,value)*]
+  [--members=value(,value)*]
 ```
 
 **Parameters, destroy gateway-sender:**
@@ -147,8 +147,8 @@ destroy gateway-sender --id=value [--group=value(,value)*]
 | Name                                           | Description                                                                                |
 |------------------------------------------------|--------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id</span>     | *Required.* Unique gateway sender identifier. Use the `list gateways` command to obtain the ID. |
-| <span class="keyword parmname">\\-\\-group</span> | One or more groups of members from which this gateway sender will be destroyed.       |
-| <span class="keyword parmname">&#8209;&#8209;member</span> | Name or ID of the member from which this gateway sender will be destroyed.   |
+| <span class="keyword parmname">\\-\\-groups</span> | One or more groups of members from which this gateway sender will be destroyed.       |
+| <span class="keyword parmname">&#8209;&#8209;members</span> | Name or ID of the member(s) from which this gateway sender will be destroyed.   |
 
 **Example Commands:**
 
@@ -165,8 +165,8 @@ Destroy or remove the specified index.
 **Syntax:**
 
 ``` pre
-destroy index [--name=value] [--region=value] [--member=value] 
-[--group=value]
+destroy index [--name=value] [--region=value] [--members=value(,value)*]
+[--groups=value(,value)*]
 ```
 
 **Note:**
@@ -177,15 +177,15 @@ You must specify at least one of the parameter options. If you enter `destroy in
 | Name                                           | Description                                                                  |
 |------------------------------------------------|------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-name</span>   | Name of the index to be removed.                                            |
-| <span class="keyword parmname">\\-\\-member</span> | Id of the member on which index is to be removed.                            |
+| <span class="keyword parmname">\\-\\-members</span> | Id of the member(s) on which index is to be removed.                            |
 | <span class="keyword parmname">\\-\\-region</span> | Name of the region from which an index or all indexes are to be destroyed. |
-| <span class="keyword parmname">\\-\\-group</span>  | The index will be removed on all the members in this member group.           |
+| <span class="keyword parmname">\\-\\-groups</span>  | The index will be removed on all the members in the group(s).           |
 
 
 **Example Commands:**
 
 ``` pre
-destroy index --member=server2
+destroy index --members=server2
 destroy index --name=MyKeyIndex
 ```
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/execute.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/execute.html.md.erb
index 3e4dbc7..bb8b764 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/execute.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/execute.html.md.erb
@@ -30,7 +30,8 @@ Execute the function with the specified ID. By default, the function executes on
 **Syntax:**
 
 ``` pre
-execute function --id=value [--group=value] [--member=value] [--region=value] 
+execute function --id=value [--groups=value(,value)*]
+[--members=value(,value)*] [--region=value] 
 [--arguments=value(,value)*] [--result-collector=value] [--filter=value]
 ```
 
@@ -40,7 +41,7 @@ execute function --id=value [--group=value] [--member=value] [--region=value]
 |----------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id</span>               | *Required.* ID of the function to execute.                                                            |
 | <span class="keyword parmname">\\-\\-groups</span>           | One or more groups of members on which this function should be executed.                              |
-| <span class="keyword parmname">\\-\\-member</span>           | Name/ID of the member on which the function will be executed.                                         |
+| <span class="keyword parmname">\\-\\-members</span>           | Name/ID of the member(s) on which the function will be executed.                                         |
 | <span class="keyword parmname">\\-\\-region</span>           | Region on which the data dependent function will be executed.                                         |
 | <span class="keyword parmname">\\-\\-arguments</span>        | Arguments to the function in comma separated string format.                                           |
 | <span class="keyword parmname">\\-\\-result-collector</span> | Fully qualified class name of the `ResultCollector` to instantiate for gathering results.             |
@@ -52,8 +53,8 @@ execute function --id=value [--group=value] [--member=value] [--region=value]
 
 ``` pre
 execute function --id=InterestCalculations --region=/InterestRegion
-execute function --id=InterestCalculations --member=server1
-execute function --id=InterestCalculations --group=Group1
+execute function --id=InterestCalculations --members=server1
+execute function --id=InterestCalculations --groups=Group1
 ```
 
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
index 4fe2140..579169c 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/export.html.md.erb
@@ -92,14 +92,14 @@ If you do not specify any parameters, all member configuration will be exported.
 **Syntax:**
 
 ``` pre
-export config [--member=value(,value)*] [--group=value(,value)*]
+export config [--members=value(,value)*] [--groups=value(,value)*]
 [--dir=value]
 ```
 
 | Name                                           | Description                                                          |
 |------------------------------------------------|----------------------------------------------------------------------|
-| <span class="keyword parmname">\\-\\-member</span> | Name/Id of the member(s) whose configuration will be exported.       |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members whose configuration will be exported.            |
+| <span class="keyword parmname">\\-\\-members</span> | Name/Id of the member(s) whose configuration will be exported.       |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members whose configuration will be exported.            |
 | <span class="keyword parmname">\\-\\-dir</span>    | Directory to which the exported configuration files will be written. |
 
 <span class="tablecap">Table 2. Export Config Parameters</span>
@@ -108,13 +108,13 @@ export config [--member=value(,value)*] [--group=value(,value)*]
 
 ``` pre
 export config
-export config --member=member1
+export config --members=member1
 ```
 
 **Sample Output:**
 
 ``` pre
-gfsh>export config --member=member1
+gfsh>export config --members=member1
 Downloading Cache XML file: c:\PivotalGemFire70\Latest\.\member1-cache.xml
 Downloading properties file: c:\PivotalGemFire70\Latest\.\member1-gf.properties
 ```
@@ -168,7 +168,7 @@ The `--dir` parameter specifies a local directory to which log files will be wri
 **Syntax:**
 
 ``` pre
-export logs [--dir=value] [--group=value(,value)*] [--member=value(,value)*] 
+export logs [--dir=value] [--groups=value(,value)*] [--members=value(,value)*] 
 [--log-level=value] [--only-log-level=value] [--merge-log=value] 
 [--start-time=value] [--end-time=value] [logs-only(=value)?] 
 [--stats-only(=value)?] [--file-size-limit(=value)?]
@@ -177,8 +177,8 @@ export logs [--dir=value] [--group=value(,value)*] [--member=value(,value)*]
 | Name                                                   | Description                                                                                                                | Default Value |
 |--------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|---------------|
 | <span class="keyword parmname">\\-\\-dir</span>            | Local directory to which log files will be written when logs are exported using an http connection. Ignored when the command is executed over JMX.     |               | 
-| <span class="keyword parmname">\\-\\-group</span>          | Group of members whose log files will be exported.                                                                         |               |
-| <span class="keyword parmname">&#8209;&#8209;member</span>         | Name/ID of the member whose log files will be exported.                                                                    |               |
+| <span class="keyword parmname">\\-\\-groups</span>          | Group(s) of members whose log files will be exported.                                                                         |               |
+| <span class="keyword parmname">&#8209;&#8209;members</span>         | Name/ID of the member(s) whose log files will be exported.                                                            |               |
 | <span class="keyword parmname">\\-\\-log-level</span>      | Minimum level of log entries to export. Valid values are: `OFF`, `FATAL`, `ERROR`, `WARN`, `INFO`, `DEBUG`, `TRACE`, and `ALL`. | `INFO`        |
 | <span class="keyword parmname">\\-\\-only-log-level</span> | Whether to only include only entries that exactly match the <span class="keyword parmname">\\-\\-log-level</span> specified.  | false         |
 | <span class="keyword parmname">&#8209;&#8209;merge&#8209;log</span>      | Whether to merge logs after exporting to the target directory (deprecated).                                                             | false         |
@@ -243,14 +243,14 @@ Export the stack trace for a member or members.
 **Syntax:**
 
 ``` pre
-export stack-traces --file=value [--member=value] [--group=value]
+export stack-traces --file=value [--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 | Name                                           | Description                                                     |
 |------------------------------------------------|-----------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-file</span>   | *Required.* Filename to which the stack-traces will be written. |
-| <span class="keyword parmname">\\-\\-member</span> | Name or ID of the member whose log files will be exported.      |
-| <span class="keyword parmname">\\-\\-group</span>  | Group of members whose log files will be exported.              |
+| <span class="keyword parmname">\\-\\-members</span> | Name or ID of the member(s) whose log files will be exported.      |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members whose log files will be exported.          |
 
 <span class="tablecap">Table 6. Export Stack-Traces Parameters</span>
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/gc.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/gc.html.md.erb
index 611569f..cce12d7 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/gc.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/gc.html.md.erb
@@ -28,14 +28,14 @@ The default is for garbage collection to occur on all caching members.
 **Syntax:**
 
 ``` pre
-gc [--group=value(,value)*] [--member=value]
+gc [--groups=value(,value)*] [--member=value]
 ```
 
 <a id="concept_95E57FE81F5244FB810C58816212323E__table_dz5_bbh_2w"></a>
 
 | Name                                           | Description                                                                 |
 |------------------------------------------------|-----------------------------------------------------------------------------|
-| <span class="keyword parmname">\\-\\-group</span>  | One or more group(s) of members on which garbage collection will be forced. |
+| <span class="keyword parmname">\\-\\-groups</span>  | One or more group(s) of members on which garbage collection will be forced. |
 | <span class="keyword parmname">\\-\\-member</span> | Name/ID of the member on which garbage collection will be forced.           |
 
 <span class="tablecap">Table 1. GC Parameters</span>
@@ -44,7 +44,7 @@ gc [--group=value(,value)*] [--member=value]
 
 ``` pre
 gc --member=server1
-gc --group=Group1
+gc --groups=Group1
 gc
 ```
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/list.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/list.html.md.erb
index 2933973..fd4f057 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/list.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/list.html.md.erb
@@ -127,27 +127,27 @@ Display a list of JARs that were deployed to members using the deploy command.
 **Syntax:**
 
 ``` pre
-list deployed [--group=value(,value)*]
+list deployed [--groups=value(,value)*]
 ```
 
 **Parameters, list deployed:**
 
 | Name                                          | Description                                                                                                          |
 |-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------|
-| <span class="keyword parmname">&#8209;&#8209;group</span> | Group(s) of members for which deployed JARs will be displayed. If not specified, JARs for all members are displayed. |
+| <span class="keyword parmname">&#8209;&#8209;groups</span> | Group(s) of members for which deployed JARs will be displayed. If not specified, JARs for all members are displayed. |
 
 
 **Example Commands:**
 
 ``` pre
 list deployed
-list deployed --group=Group2
+list deployed --groups=Group2
 ```
 
 **Sample Output:**
 
 ``` pre
-gfsh> list deployed  --group=Group2
+gfsh> list deployed  --groups=Group2
 
  Member   |     Deployed JAR     |                JAR Location
 --------- | -------------------- | ---------------------------------------------------
@@ -210,7 +210,8 @@ List durable client CQs associated with the specified durable client id.
 **Syntax:**
 
 ``` pre
-list durable-cqs --durable-client-id=value [--member=value] [--group=value]
+list durable-cqs --durable-client-id=value
+ [--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 **Parameters, list durable-cqs:**
@@ -218,8 +219,8 @@ list durable-cqs --durable-client-id=value [--member=value] [--group=value]
 | Name                                                       | Description                                                                                            |
 |------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-durable-client-id </span> | *Required.* The ID used to identify the durable client.                                                |
-| <span class="keyword parmname">\\-\\-member</span>             | Name or Id of the member for which the durable client is registered and durable CQs will be displayed. |
-| <span class="keyword parmname">\\-\\-group</span>              | Group of members for which the durable client is registered and durable CQs will be displayed.         |
+| <span class="keyword parmname">\\-\\-members</span>             | Name or Id of the member(s) for which the durable client is registered and durable CQs will be displayed. |
+| <span class="keyword parmname">\\-\\-groups</span>              | Group(s) of members for which the durable client is registered and durable CQs will be displayed.         |
 
 
 **Example Commands**:
@@ -264,8 +265,8 @@ Display a list of registered functions. The default is to display functions for
 **Syntax:**
 
 ``` pre
-list functions [--matches=value] [--group=value(,value)*]
-[--member=value(,value)*]
+list functions [--matches=value] [--groups=value(,value)*]
+[--members=value(,value)*]
 ```
 
 **Parameters, list functions:**
@@ -273,8 +274,8 @@ list functions [--matches=value] [--group=value(,value)*]
 | Name                                             | Description                                                                                                                                                                                     |
 |--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-matches </span> | Pattern that the function ID must match in order to be included. Uses Java pattern matching rules, not UNIX. For example, to match any character any number of times use ".\*" instead of "\*". |
-| <span class="keyword parmname">\\-\\-group</span>    | Group(s) of members for which functions will be displayed. Use a comma separated list for multiple groups.                                                                                      |
-| <span class="keyword parmname">&#8209;&#8209;member </span>  | Name or ID of the member(s) for which functions will be displayed. Use a comma separated list for multiple members.                                                                             |
+| <span class="keyword parmname">\\-\\-groups</span>    | Group(s) of members for which functions will be displayed. Use a comma separated list for multiple groups.                                                                                      |
+| <span class="keyword parmname">&#8209;&#8209;members </span>  | Name or ID of the member(s) for which functions will be displayed. Use a comma separated list for multiple members.                                                                             |
 
 
 **Example Commands:**
@@ -322,15 +323,15 @@ Displays the gateway senders and receivers for a member or members.
 **Syntax:**
 
 ``` pre
-list gateways [--group=value(,value)*]
+list gateways [--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 **Parameters, list gateways:**
 
 | Name                                           | Description                                                                                                                    |
 |------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------|
-| <span class="keyword parmname">&#8209;&#8209;member</span> | Member(s) whose gateways senders and receiver display.                                                                         |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members for which Gateway Senders and Receivers will be displayed. Use a comma separated list for multiple groups. |
+| <span class="keyword parmname">&#8209;&#8209;members</span> | Member(s) whose gateways senders and receiver display.                                                                         |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members for which Gateway Senders and Receivers will be displayed. Use a comma separated list for multiple groups. |
 
 
 **Example Commands:**
@@ -484,23 +485,23 @@ Display regions of a member or members. If no parameter is specified, all region
 **Syntax:**
 
 ``` pre
-list regions [--group=value] [--member=value]
+list regions [--groups=value(,value)*] [--members=value(,value)*]
 ```
 
 **Parameters, list regions:**
 
 | Name                                            | Description                                                                 |
 |-------------------------------------------------|-----------------------------------------------------------------------------|
-| <span class="keyword parmname">\\-\\-group</span>   | Group of members for which regions will be displayed.                       |
-| <span class="keyword parmname">\\-\\-member </span> | Name or ID of the member of the member for which regions will be displayed. |
+| <span class="keyword parmname">\\-\\-groups</span>   | Group(s) of members for which regions will be displayed.                       |
+| <span class="keyword parmname">\\-\\-members </span> | Name or ID of the member(s) for which regions will be displayed. |
 
 
 **Example Commands:**
 
 ``` pre
 list regions
-list regions --group=G1
-list regions --member=member1
+list regions --groups=G1
+list regions --members=member1
 ```
 
 **Sample Output:**
diff --git a/geode-docs/tools_modules/gfsh/command-pages/netstat.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/netstat.html.md.erb
index 00446c1..2c6097d 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/netstat.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/netstat.html.md.erb
@@ -28,7 +28,7 @@ Report important network usage information/statistics for the given member.
 **Syntax:**
 
 ``` pre
-netstat [--member=value(,value)*] [--group=value] [--file=value] 
+netstat [--members=value(,value)*] [--group=value] [--file=value] 
 [--with-lsof(=value)?]
 ```
 
@@ -36,7 +36,7 @@ netstat [--member=value(,value)*] [--group=value] [--file=value]
 
 | Name                                              | Description                                                                                                                                               | Default Value |
 |---------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| <span class="keyword parmname">\\-\\-member </span>   | Name or ID of the member(s) on which to run the `netstat` command.                                                                                        |               |
+| <span class="keyword parmname">\\-\\-members </span>   | Name or ID of the member(s) on which to run the `netstat` command.                                                                                        |               |
 | <span class="keyword parmname">\\-\\-group</span>     | Group of members on which to run the `netstat` command.                                                                                                   |               |
 | <span class="keyword parmname">\\-\\-file</span>      | Text file to which output from the `netstat` command will be written. A "`.txt`" extension will be added if it is not already part of the specified name. |               |
 | <span class="keyword parmname">&#8209;&#8209;with&#8209;lsof</span> | Specifies whether `lsof` (list open files) command output should also be displayed. Not applicable for Microsoft Windows hosts.                           | false         |
@@ -47,8 +47,8 @@ netstat [--member=value(,value)*] [--group=value] [--file=value]
 
 ``` pre
 netstat
-netstat --member=server1
-netstat --member=server1 --file=server1_netstat.txt
+netstat --members=server1
+netstat --members=server1 --file=server1_netstat.txt
 ```
 
 **Sample Output:**
diff --git a/geode-docs/tools_modules/gfsh/command-pages/pause.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/pause.html.md.erb
index 86a1d8c..d368f78 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/pause.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/pause.html.md.erb
@@ -28,8 +28,8 @@ Pause the gateway sender on a member or members. See [Pausing Gateway Senders](.
 **Syntax:**
 
 ``` pre
-pause gateway-sender --id=value [--group=value(,value)*] 
-[--member=value]
+pause gateway-sender --id=value [--groups=value(,value)*] 
+[--members=value(,value)*]
 ```
 
 <a id="concept_44B6EC91FD464A1A91E438D6DF65C9D6__table_nhn_zcg_2w"></a>
@@ -37,8 +37,8 @@ pause gateway-sender --id=value [--group=value(,value)*]
 | Name                                           | Description                                                    |
 |------------------------------------------------|----------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id</span>     | *Required.* ID of the gateway sender.                          |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members on which to pause the gateway sender.      |
-| <span class="keyword parmname">\\-\\-member</span> | Name or ID of the member on which to pause the gateway sender. |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members on which to pause the gateway sender.      |
+| <span class="keyword parmname">\\-\\-members</span> | Name or ID of the member(s) on which to pause the gateway sender. |
 
 <span class="tablecap">Table 1. Pause Gateway-Sender Parameters</span>
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/resume.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/resume.html.md.erb
index 165226c..855f6f3 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/resume.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/resume.html.md.erb
@@ -28,8 +28,8 @@ Resume the gateway sender on a member or members.
 **Syntax:**
 
 ``` pre
-resume gateway-sender --id=value [--group=value(,value)*] 
-[--member=value]
+resume gateway-sender --id=value [--groups=value(,value)*] 
+[--members=value(,value)*]
 ```
 
 <a id="concept_8B0532D13CF34E0CB04ACC3F14F1E4A2__table_rwp_vbg_2w"></a>
@@ -37,15 +37,15 @@ resume gateway-sender --id=value [--group=value(,value)*]
 | Name                                           | Description                                                  |
 |------------------------------------------------|--------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id</span>     | *Required.* ID of the Gateway Sender.                        |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members on which to resume the Gateway Sender.   |
-| <span class="keyword parmname">\\-\\-member</span> | Name/Id of the member on which to resume the Gateway Sender. |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members on which to resume the Gateway Sender.   |
+| <span class="keyword parmname">\\-\\-members</span> | Name/Id of the member(s) on which to resume the Gateway Sender. |
 
 <span class="tablecap">Table 1. Resume Gateway-Sender Parameters</span>
 
 **Example Commands:**
 
 ``` pre
-resume gateway-sender --id=sender1-LN --group=LN-Group1
+resume gateway-sender --id=sender1-LN --groups=LN-Group1
 ```
 
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/show.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/show.html.md.erb
index 1d2a0da..5529868 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/show.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/show.html.md.erb
@@ -262,7 +262,7 @@ If a CQ name is provided, it counts the number of events in the subscription que
 
 ``` pre
 show subscription-queue-size --durable-client-Id=value
- [--member=value] [--group=value]
+ [--members=value(,value)*] [--groups=value(,value)*]
 ```
 
 <a id="topic_395C96B500AD430CBF3D3C8886A4CD2E__table_rcq_zjf_2w"></a>
@@ -271,8 +271,8 @@ show subscription-queue-size --durable-client-Id=value
 |------------------------------------------------------------|------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-durable-client-id </span> | *Required.* The ID used to identify the durable client.                      |
 | <span class="keyword parmname">\\-\\-durable-cq-name </span>   | The name that identifies the CQ.                                             |
-| <span class="keyword parmname">\\-\\-member </span>            | Name/Id of the member for which subscription queue events are to be counted. |
-| <span class="keyword parmname">\\-\\-group</span>              | Group of members for which subscription queue events are to be counted.      |
+| <span class="keyword parmname">\\-\\-members </span>            | Name/Id of the member(s) for which subscription queue events are to be counted. |
+| <span class="keyword parmname">\\-\\-groups</span>             | Group(s) of members for which subscription queue events are to be counted.   |
 
 <span class="tablecap">Table 4. Show Subscription-Queue-Size Parameters</span>
 
diff --git a/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb
index e6a63dc..28a76b7 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb
@@ -62,13 +62,13 @@ Note that you can only have one gateway receiver on each member, and unlike a ga
 **Syntax:**
 
 ``` pre
-start gateway-receiver [--group=value(,value)*] [--member=value]
+start gateway-receiver [--groups=value(,value)*] [--members=value(,value)*]
 ```
 
 | Name                                           | Description                                                      |
 |------------------------------------------------|------------------------------------------------------------------|
-| <span class="keyword parmname">\\-\\-member</span> | Name or ID of the member on which to start the Gateway Receiver. |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members on which to start the Gateway Receiver.      |
+| <span class="keyword parmname">\\-\\-members</span> | Name or ID of the member(s) on which to start the Gateway Receiver. |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members on which to start the Gateway Receiver.      |
 
 <span class="tablecap">Table 1. Start Gateway-Receiver Parameters</span>
 
@@ -76,7 +76,7 @@ start gateway-receiver [--group=value(,value)*] [--member=value]
 
 ``` pre
 start gateway-receiver
-start gateway-receiver --member=member1
+start gateway-receiver --members=member1
 ```
 
 **Sample Output:**
@@ -90,7 +90,7 @@ pc13(Manager:2242)<v5>:57631| Error  | GatewayReceiver is not available on membe
 pc13(2275)<v7>:47480        | OK     | GatewayReceiver is started on member pc13(2275)<v7>:47480
 pc13(2293)<v8>:55472        | OK     | GatewayReceiver is started on member pc13(2293)<v8>:55472
 
-gfsh>start gateway-receiver --member=pc13(2266)<v14>:36579
+gfsh>start gateway-receiver --members=pc13(2266)<v14>:36579
 GatewayReceiver is started on member pc13(2266)<v14>:36579
 
 gfsh>start gateway-receiver --group=RG1
@@ -112,14 +112,14 @@ For information on how to configure a gateway sender, see [Configure Gateway Sen
 **Syntax:**
 
 ``` pre
-start gateway-sender --id=value [--group=value(,value)*] [--member=value]
+start gateway-sender --id=value [--groups=value(,value)*] [--members=value(,value)*]
 ```
 
 | Name                                           | Description                                               |
 |------------------------------------------------|-----------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id</span>     | *Required.* ID of the GatewaySender.                      |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members on which to start the Gateway Sender. |
-| <span class="keyword parmname">\\-\\-member</span> | Member used to start the Gateway Sender                   |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members on which to start the Gateway Sender. |
+| <span class="keyword parmname">\\-\\-members</span> | Member(s) on which to start the Gateway Sender                   |
 
 <span class="tablecap">Table 2. Start Gateway-Sender Parameters</span>
 
@@ -127,8 +127,8 @@ start gateway-sender --id=value [--group=value(,value)*] [--member=value]
 
 ``` pre
 start gateway-sender --id=sender1-NY
-start gateway-sender --id=sender1-NY --member=server1
-start gateway-sender --id=sender1-NY --group=MemberGroup1,MemberGroup2
+start gateway-sender --id=sender1-NY --members=server1
+start gateway-sender --id=sender1-NY --groups=MemberGroup1,MemberGroup2
 ```
 
 **Sample Output:**
@@ -142,9 +142,9 @@ pc13(30621)<v7>:36015         | OK      | GatewaySender ln is started on member
 pc13(30633)<v8>:13633         | OK      | GatewaySender ln is started on member pc13(30633)<v8>:13633
 pc13(Manager:30588)<v5>:42792 | Error   | GatewaySender ln is not available on member pc13(Manager:30588)<v5>:42792
 
-gfsh>start gateway-sender --id=ln --member=pc13(30614)<v14>:44519
+gfsh>start gateway-sender --id=ln --members=pc13(30614)<v14>:44519
 GatewaySender ln is started on member pc13(30614)<v14>:44519
-gfsh>start gateway-sender --id=ln --group=SenderGroup1
+gfsh>start gateway-sender --id=ln --groups=SenderGroup1
 Member                 | Result| Message
 ---------------------- | ------| ------------------------------------------------------------
 pc13(30614)<v18>:15201 | OK    | GatewaySender ln is started on member pc13(30614)<v18>:15201
@@ -263,7 +263,8 @@ In addition, if gfsh is not already connected to a JMX Manager, the gfsh console
 **Syntax:**
 
 ``` pre
-start locator --name=value [--bind-address=value] [--force(=value)] [--group=value] [--hostname-for-clients=value]
+start locator --name=value [--bind-address=value] [--force(=value)]
+ [--groups=value(,value)*] [--hostname-for-clients=value]
  [--locators=value] [--log-level=value] [--mcast-address=value] [--mcast-port=value] [--port=value] [--dir=value]
  [--properties-file=value] [--security-properties-file=value] [--initial-heap=value] [--max-heap=value]
  [--connect(=value)] [--enable-cluster-configuration(=value)] [--load-from-cluster-configuration-dir(=value)]
@@ -302,7 +303,7 @@ start locator --name=value [--bind-address=value] [--force(=value)] [--group=val
 <td>false</td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-group</span></td>
+<td><span class="keyword parmname">\-\-groups</span></td>
 <td>Group(s) the locator will be a part of.</td>
 <td> </td>
 </tr>
@@ -465,8 +466,8 @@ start server --name=value [--assign-buckets(=value)] [--bind-address=value]
     [--cache-xml-file=value] [--classpath=value] [--disable-default-server(=value)]
     [--disable-exit-when-out-of-memory(=value)] [--enable-time-statistics(=value)]
     [--force(=value)] [--include-system-classpath(=value)] [--properties-file=value]
-    [--security-properties-file=value]
-    [--group=value] [--locators=value] [--locator-wait-time=value] [--log-level=value]
+    [--security-properties-file=value] [--groups=value(,value)*]
+    [--locators=value] [--locator-wait-time=value] [--log-level=value]
     [--mcast-address=value] [--mcast-port=value] [--memcached-port=value]
     [--memcached-protocol=value] [--rebalance(=value)] [--server-bind-address=value]
     [--server-port=value] [--spring-xml-location=value]
@@ -554,7 +555,7 @@ start server --name=value [--assign-buckets(=value)] [--bind-address=value]
 <td> </td>
 </tr>
 <tr class="even">
-<td><span class="keyword parmname">\-\-group</span></td>
+<td><span class="keyword parmname">\-\-groups</span></td>
 <td>Group(s) the Cache Server will be a part of.</td>
 <td> </td>
 </tr>
diff --git a/geode-docs/tools_modules/gfsh/command-pages/status.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/status.html.md.erb
index 6129069..0c71f04 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/status.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/status.html.md.erb
@@ -83,23 +83,23 @@ Display the status of the specified gateway receiver.
 **Syntax:**
 
 ``` pre
-status gateway-receiver [--group=value(,value)*] [--member=value]
+status gateway-receiver [--groups=value(,value)*] [--members=value(,value)*]
 ```
 
 <a id="topic_B0F45DC2D5F64FB1A2F738206BC6539E__table_mb3_p3f_2w"></a>
 
 | Name                                           | Description                                                     |
 |------------------------------------------------|-----------------------------------------------------------------|
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of Gateway Receivers for which to display status.      |
-| <span class="keyword parmname">\\-\\-member</span> | Name or ID of the Gateway Receiver for which to display status. |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of Gateway Receivers for which to display status.      |
+| <span class="keyword parmname">\\-\\-members</span> | Name or ID of the Gateway Receiver(s) for which to display status. |
 
 <span class="tablecap">Table 1. Status Gateway-Receiver Parameters</span>
 
 **Example Commands:**
 
 ``` pre
-status gateway-receiver --group=LN-Group1
-status gateway-receiver --member=server1
+status gateway-receiver --groups=LN-Group1
+status gateway-receiver --members=server1
 ```
 
 **Sample Output:**
@@ -118,7 +118,7 @@ pc13(Manager:8124)<v1>:52410 | GatewayReceiver is not available or already stopp
 pc13(8130):8180              | GatewayReceiver is not available or already stopped
 
 
-gfsh>status gateway-receiver --member=pc13(8151)<v2>:50130
+gfsh>status gateway-receiver --members=pc13(8151)<v2>:50130
 Member               | Port  |  Status
 -------------------- | ----- | --------
 pc13(8151)<v2>:50130 | 28592 | Running
@@ -140,8 +140,8 @@ Display the status of the specified gateway sender.
 **Syntax:**
 
 ``` pre
-status gateway-sender --id=value [--group=value(,value)*]
-[--member=value]
+status gateway-sender --id=value [--groups=value(,value)*]
+[--members=value(,value)*]
 ```
 
 <a id="topic_6F539877F0564F05AF264A9E704EC842__table_xc2_s3f_2w"></a>
@@ -149,15 +149,15 @@ status gateway-sender --id=value [--group=value(,value)*]
 | Name                                             | Description                                                                                               |
 |--------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id </span>     | *Required.* ID of the Gateway Sender.                                                                     |
-| <span class="keyword parmname">\\-\\-group </span>   | Group(s) of Gateway Senders for which to display status. Comma separated list for multiple member groups. |
-| <span class="keyword parmname">&#8209;&#8209;member </span> | Name/ID of the Gateway Sender for which to display status.                                                |
+| <span class="keyword parmname">\\-\\-groups </span>   | Group(s) of Gateway Senders for which to display status. Comma separated list for multiple member groups. |
+| <span class="keyword parmname">&#8209;&#8209;members </span> | Name/ID of the Gateway Sender(s) for which to display status.                                                |
 
 <span class="tablecap">Table 2. Status Gateway-Sender Parameters</span>
 
 **Example Commands:**
 
 ``` pre
-status gateway-receiver receiver1-LN --group=LN-Group1;
+status gateway-receiver receiver1-LN --groups=LN-Group1;
 ```
 
 **Sample Output:**
@@ -175,17 +175,17 @@ Member                         | Error
  pc13(8130):2365               | GatewaySender is not available
  pc13(Manager:8124)<v1>:43821  | GatewaySender is not available
 
-gfsh>status gateway-sender --id=ln_Serial --member=pc13(8151)<v2>:7411
+gfsh>status gateway-sender --id=ln_Serial --members=pc13(8151)<v2>:7411
 Member               |  Type  | Runtime Policy | Status
 -------------------  | ------ | -------------- | -----------
  pc13(8151)<v2>:7411 | Serial | Secondary      | Not Running
 
-gfsh>status gateway-sender --id=ln_Serial --member=pc13(8151)<v2>:7411
+gfsh>status gateway-sender --id=ln_Serial --members=pc13(8151)<v2>:7411
 Member               |  Type  | Runtime Policy | Status
 ------------------- -| ------ | -------------- | -------
  pc13(8151)<v2>:7411 | Serial | Primary        | Running
 
-gfsh>status gateway-sender --id=ln_Serial --group=Serial_Sender
+gfsh>status gateway-sender --id=ln_Serial --groups=Serial_Sender
 ==>
 Member                 |  Type  | Runtime Policy | Status
 ---------------------- | -------| -------------- | -----------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/stop.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/stop.html.md.erb
index 4eeaba2..138d484 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/stop.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/stop.html.md.erb
@@ -48,23 +48,23 @@ Stop the gateway receiver on a member or members.
 **Syntax:**
 
 ``` pre
-stop gateway-receiver [--group=value(,value)*] [--member=value]
+stop gateway-receiver [--groups=value(,value)*] [--members=value(,value)*]
 ```
 
 <a id="topic_CD1D526FD6F84A7B80B25C741129ED30__table_knl_r5g_2w"></a>
 
 | Name                                            | Description                                                                                                       |
 |-------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members on which to stop the Gateway Receiver. Use a comma-separated list for multiple member groups. |
-| <span class="keyword parmname">&#8209;&#8209;member </span> | Name/Id of the member on which to stop the Gateway Receiver.                                                      |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members on which to stop the Gateway Receiver. Use a comma-separated list for multiple member groups. |
+| <span class="keyword parmname">&#8209;&#8209;members </span> | Name/Id of the member(s) on which to stop the Gateway Receiver.                                                      |
 
 <span class="tablecap">Table 1. Stop Gateway-Receiver Parameters</span>
 
 **Example Commands:**
 
 ``` pre
-stop gateway-receiver --member=receiver1-LN 
-stop gateway-receiver --group=LN-Group1
+stop gateway-receiver --members=receiver1-LN 
+stop gateway-receiver --groups=LN-Group1
 ```
 
 **Sample Output:**
@@ -78,10 +78,10 @@ pc13(Manager:2242)<v5>:57631| Error  | GatewayReceiver is not available on membe
 pc13(2275)<v7>:47480        | OK     | GatewayReceiver is stopped on member pc13(2275)<v7>:47480
 pc13(2293)<v8>:55472        | OK     | GatewayReceiver is stopped on member pc13(2293)<v8>:55472
 
-gfsh>stop gateway-receiver --member=pc13(2266)<v14>:36579
+gfsh>stop gateway-receiver --members=pc13(2266)<v14>:36579
 GatewayReceiver is stopped on member pc13(2266)<v14>:36579
 
-gfsh>stop gateway-receiver --group=RG1
+gfsh>stop gateway-receiver --groups=RG1
          Member      | Result | Message
 -------------------- | -------| ----------------------------------------------------------
 pc13(2275)<v23>:27484| OK     | GatewayReceiver is stopped on member pc13(2275)<v23>:27484
@@ -101,7 +101,7 @@ Use caution with the `stop gateway-sender` command (or equivalent `GatewaySender
 **Syntax:**
 
 ``` pre
-stop gateway-sender --id=value [--group=value(,value)*] [--member=value]
+stop gateway-sender --id=value [--groups=value(,value)*] [--members=value(,value)*]
 ```
 
 <a id="topic_0BBDD4B3B8A44A65A610F766C9E85519__table_ggf_55g_2w"></a>
@@ -109,15 +109,15 @@ stop gateway-sender --id=value [--group=value(,value)*] [--member=value]
 | Name                                            | Description                                                |
 |-------------------------------------------------|------------------------------------------------------------|
 | <span class="keyword parmname">\\-\\-id </span>    | *Required.* ID of the Gateway Sender.                      |
-| <span class="keyword parmname">\\-\\-group</span>  | Group(s) of members on which to stop the Gateway Sender.   |
-| <span class="keyword parmname">\\-\\-member</span> | Name/Id of the member on which to stop the Gateway Sender. |
+| <span class="keyword parmname">\\-\\-groups</span>  | Group(s) of members on which to stop the Gateway Sender.   |
+| <span class="keyword parmname">\\-\\-members</span> | Name/Id of the member(s) on which to stop the Gateway Sender. |
 
 <span class="tablecap">Table 2. Stop Gateway-Sender Parameters</span>
 
 **Example Commands:**
 
 ``` pre
-stop gateway-sender --id=ln --member=server1
+stop gateway-sender --id=ln --members=server1
 ```
 
 **Sample Output:**
@@ -130,10 +130,11 @@ pc13(5184)<v7>:41914         | OK     | GatewaySender ln is stopped on member pc
 pc13(5192)<v8>:25704         | OK     | GatewaySender ln is stopped on member pc13(5192)<v8>:25704
 pc13(5174)<v6>:53996         | OK     | GatewaySender ln is stopped on member pc13(5174)<v6>:53996
 pc13(Manager:5148)<v5>:64040 | Error  | GatewaySender ln is not available on member pc13(Manager:5148)<v5>:64040
-gfsh>stop gateway-sender --id=ln --member=pc13(5174)<v14>:17819
+
+gfsh>stop gateway-sender --id=ln --members=pc13(5174)<v14>:17819
 GatewaySender ln is stopped on member pc13(5174)<v14>:17819
 
-gfsh>stop gateway-sender --id=ln --group=SenderGroup1
+gfsh>stop gateway-sender --id=ln --groups=SenderGroup1
 
 Member                | Result | Message
 --------------------- | ------ | -----------------------------------------------------------
diff --git a/geode-docs/tools_modules/gfsh/command-pages/undeploy.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/undeploy.html.md.erb
index 7cb5aae..c795536 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/undeploy.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/undeploy.html.md.erb
@@ -21,36 +21,36 @@ limitations under the License.
 
 Undeploy the JAR files that were deployed on members or groups using `deploy` command.
 
-If `--jar` is not specified, the command will undeploy all deployed JARs. If `--group` is not specified, the command applies to the entire cluster. Note that this command can't unload the classes that were loaded during deployment. Member(s) should be restarted for that.
+If `--jars` is not specified, the command will undeploy all deployed JARs. If `--groups` is not specified, the command applies to the entire cluster. Note that this command can't unload the classes that were loaded during deployment. Member(s) should be restarted for that.
 
 **Availability:** Online. You must be connected in `gfsh` to a JMX Manager member to use this command.
 
 **Syntax:**
 
 ``` pre
-undeploy [--jar=<jar to be undeployed>] [--group=<member-group-name>]
+undeploy [--jars=value(,value)*] [--groups=value(,value)*]
 ```
 
 <a id="concept_234FEC313B4A468E8851DD9B1B759B98__table_mcj_l5g_2w"></a>
 
 | Name                                          | Description                                                  | Default Value                       |
 |-----------------------------------------------|--------------------------------------------------------------|-------------------------------------|
-| <span class="keyword parmname">\\-\\-group</span> | Group(s) from which the specified JAR(s) will be undeployed. | undeploy will occur on all members. |
-| <span class="keyword parmname">\\-\\-jar</span>   | JAR or JARs to be undeployed.                                | All JARs will be undeployed.        |
+| <span class="keyword parmname">\\-\\-groups</span> | Group(s) from which the specified JAR(s) will be undeployed. | undeploy will occur on all members |
+| <span class="keyword parmname">\\-\\-jars</span>   | JAR or JARs to be undeployed.                                | All JARs will be undeployed        |
 
 <span class="tablecap">Table 1. Undeploy Parameters</span>
 
 **Example Commands:**
 
 ``` pre
-undeploy --jar=domain-objects.jar
-undeploy --group=Group1
+undeploy --jars=domain-objects.jar
+undeploy --groups=Group1
 ```
 
 **Sample Output:**
 
 ``` pre
-gfsh>undeploy --jar=domain-objects.jar
+gfsh>undeploy --jars=domain-objects.jar
 
   Member   |  Un-Deployed JAR   |         Un-Deployed From JAR Location        
 ---------- | ------------------ | ---------------------------------------------
@@ -58,7 +58,7 @@ datanode10 | domain-objects.jar | /usr/local/gemfire/deploy/GF#domain-objects#1
 datanode11 | domain-objects.jar | /usr/local/gemfire/deploy/GF#domain-objects#1 
 
 
-gfsh> undeploy --group=Group1
+gfsh> undeploy --groups=Group1
 
  Member   |     Un-Deployed JAR     |             Un-Deployed From JAR Location        
 --------- | ----------------------- | ------------------------------------------------------

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].