From 33371667cb3482b64a15260d5926adbb66d7dd5e Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 30 May 2017 22:42:23 -0400
Subject: [PATCH] Remove options that are not supported for rinv

---
 .../admin-guides/references/man1/rinv.1.rst    | 18 +++++++++---------
 perl-xCAT/xCAT/Usage.pm                        |  6 +++---
 xCAT-client/pods/man1/rinv.1.pod               | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rinv.1.rst b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
index df454d284..3cc89c839 100644
--- a/docs/source/guides/admin-guides/references/man1/rinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
@@ -28,18 +28,18 @@ BMC/MPA specific:
 \ **rinv**\  \ *noderange*\  {\ **pci | model | serial | asset | vpd | mprom | deviceid | guid | firm | diag | dimm | bios | mparom | mac | all**\ }
 
 
-OpenPOWER (using ipmi) server specific:
-=======================================
+OpenPOWER (IPMI) server specific:
+=================================
 
 
 \ **rinv**\  \ *noderange*\  [\ **model | serial | deviceid | uuid | guid | vpd | mprom | firm | all**\ ]
 
 
-OpenPOWER (using openbmc) server specific:
-==========================================
+OpenPOWER (OpenBMC) server specific:
+====================================
 
 
-\ **rinv**\  \ *noderange*\  [\ **model | serial | deviceid | uuid | guid | vpd | mprom | firm | cpu | dimm | all**\ ]
+\ **rinv**\  \ *noderange*\  [\ **model | serial | mprom | firm | cpu | dimm | all**\ ]
 
 
 PPC (with HMC) specific:
@@ -195,25 +195,25 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, nuumber of CPUs, amo
 
 \ **mprom**\ 
  
- Retrieves mprom firmware level
+ Retrieves mprom firmware level.
  
 
 
 \ **deviceid**\ 
  
- Retrieves device identification. Usually device, manufacturing and product ids.
+ Retrieves device identification. Usually device, manufacturing and product IDs.
  
 
 
 \ **uuid**\ 
  
- Retrieves the universally unique identifier
+ Retrieves the universally unique identifier.
  
 
 
 \ **guid**\ 
  
- Retrieves the global unique identifier
+ Retrieves the global unique identifier .
  
 
 
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 742f7a9a1..ff3e3ca69 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -97,10 +97,10 @@ my %usage = (
        rinv [-h|--help|-v|--version]
     BMC specific:
        rinv <noderange> [mprom|deviceid|uuid|guid|vpd|dimm|all]
-    OpenPOWER (using ipmi) server specific:
+    OpenPOWER (IPMI) server specific:
        rinv <noderange> [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all] 
-    OpenPOWER (using openbmc) server specific:
-       rinv <noderange> [model|serial|deviceid|uuid|guid|vpd|mprom|firm|cpu|dimm|all]
+    OpenPOWER (OpenBMC) server specific:
+       rinv <noderange> [model|serial|firm|cpu|dimm|all]
     MPA specific:
        rinv <noderange> [firm|bios|diag|mprom|sprom|mparom|mac|mtm] 
     PPC specific(with HMC):
diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod
index 3a5c92f29..b08b15279 100644
--- a/xCAT-client/pods/man1/rinv.1.pod
+++ b/xCAT-client/pods/man1/rinv.1.pod
@@ -10,13 +10,13 @@ B<rinv> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 B<rinv> I<noderange> {B<pci>|B<model>|B<serial>|B<asset>|B<vpd>|B<mprom>|B<deviceid>|B<guid>|B<firm>|B<diag>|B<dimm>|B<bios>|B<mparom>|B<mac>|B<all>}
 
-=head2 OpenPOWER (using ipmi) server specific:
+=head2 OpenPOWER (IPMI) server specific:
   
 B<rinv> I<noderange> [B<model>|B<serial>|B<deviceid>|B<uuid>|B<guid>|B<vpd>|B<mprom>|B<firm>|B<all>] 
 
-=head2 OpenPOWER (using openbmc) server specific:
+=head2 OpenPOWER (OpenBMC) server specific:
 
-B<rinv> I<noderange> [B<model>|B<serial>|B<deviceid>|B<uuid>|B<guid>|B<vpd>|B<mprom>|B<firm>|B<cpu>|B<dimm>|B<all>]
+B<rinv> I<noderange> [B<model>|B<serial>|B<mprom>|B<firm>|B<cpu>|B<dimm>|B<all>]
 
 =head2 PPC (with HMC) specific:
 
@@ -125,19 +125,19 @@ Diagnostics information of firmware.
 
 =item B<mprom>
 
-Retrieves mprom firmware level
+Retrieves mprom firmware level.
 
 =item B<deviceid>
 
-Retrieves device identification. Usually device, manufacturing and product ids. 
+Retrieves device identification. Usually device, manufacturing and product IDs. 
 
 =item B<uuid>
 
-Retrieves the universally unique identifier
+Retrieves the universally unique identifier.
 
 =item B<guid>
 
-Retrieves the global unique identifier 
+Retrieves the global unique identifier .
 
 =item B<all>