From 12257e3dc5315b98f7a2933107b8252721736770 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 12 Mar 2011 18:20:11 +0000
Subject: [PATCH] Remove -sR as an documented option. Mention it only as an
 alias for -sV.

---
 docs/refguide.xml | 48 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/docs/refguide.xml b/docs/refguide.xml
index da80e3df3..ba7c27c13 100644
--- a/docs/refguide.xml
+++ b/docs/refguide.xml
@@ -1850,11 +1850,7 @@ way.</para>
     provide all of this information.  If Nmap was compiled with
     OpenSSL support, it will connect to SSL servers to deduce the
     service listening behind that encryption layer.<indexterm><primary>SSL</primary><secondary>in version detection</secondary></indexterm>
-    When RPC services are
-    discovered, the Nmap RPC grinder<indexterm><primary>RPC grinder</primary></indexterm>
-    (<option>-sR</option>)<indexterm><primary><option>-sR</option></primary></indexterm>
-    is automatically used to determine the RPC program and version
-    numbers. Some UDP ports are left in the
+    Some UDP ports are left in the
     <literal>open|filtered</literal> state after a UDP port scan is
     unable to determine whether the port is open or filtered. Version
     detection will try to elicit a response from these ports (just as
@@ -1872,6 +1868,19 @@ way.</para>
     </notman>
     </para>
 
+    <para>When RPC services are discovered, the Nmap RPC
+    grinder<indexterm><primary>RPC grinder</primary></indexterm>
+    is automatically used to determine the RPC program and version
+    numbers. It takes all the TCP/UDP ports detected as RPC and floods
+    them with SunRPC program NULL commands in an attempt to determine
+    whether they are RPC ports, and if so, what program and version
+    number they serve up. Thus you can effectively obtain the same info
+    as <command>rpcinfo -p</command> even if the target's portmapper is
+    behind a firewall (or protected by TCP wrappers). Decoys do not
+    currently work with
+    RPC scan.<indexterm><primary>decoys</primary><secondary>which scans use</secondary></indexterm>
+    </para>
+
     <para>When Nmap receives responses from a service but cannot match
     them to its database, it prints out a special fingerprint and
     a URL for you to submit if to if you know for sure what is running
@@ -1898,6 +1907,10 @@ way.</para>
           Alternatively, you can use <option>-A</option>, which enables
           version detection among other things.</para>
 
+          <para><option>-sR</option><indexterm><primary><option>-sR</option></primary></indexterm>
+          is an alias for <option>-sV</option>. Prior to March 2011, it
+          was used to active the RPC grinder separately from version
+          detection, but now these options are always combined.</para>
         </listitem>
       </varlistentry>
 
@@ -1989,31 +2002,6 @@ way.</para>
           what you get with <option>--packet-trace</option>.</para>
         </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term>
-        <option>-sR</option> (RPC scan)
-          <indexterm significance="preferred"><primary><option>-sR</option></primary></indexterm>
-          <indexterm><primary>RPC scan</primary><see>RPC grinder</see></indexterm>
-          <indexterm><primary>RPC grinder</primary></indexterm>
-          </term>
-
-        <listitem>
-          <para>This method works in conjunction with the various port
-          scan methods of Nmap. It takes all the TCP/UDP ports found
-          open and floods them with SunRPC program NULL commands in an
-          attempt to determine whether they are RPC ports, and if so,
-          what program and version number they serve up. Thus you can
-          effectively obtain the same info as <command>rpcinfo -p</command> even if the
-          target's portmapper is behind a firewall (or protected by
-          TCP wrappers). Decoys do not currently work with
-	  RPC scan.<indexterm><primary>decoys</primary><secondary>which scans use</secondary></indexterm>
-          This is automatically enabled as part of version scan
-          (<option>-sV</option>) if you request that.  As version
-          detection includes this and is much more comprehensive,
-          <option>-sR</option> is rarely needed.</para>
-        </listitem>
-      </varlistentry>
   
     </variablelist>
     <indexterm class="endofrange" startref="man-version-detection-indexterm"/>