From: Martin Schwenke <martin@meltin.net>
Date: Tue, 20 Oct 2015 01:37:17 +0000 (+1100)
Subject: ctdb-doc: Stop using "ctdb -n all ..."
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=94898dd5b0770683181ece15a9ad9c9f5d9286e9;p=obnox%2Fsamba%2Fsamba-obnox.git

ctdb-doc: Stop using "ctdb -n all ..."

This is deprecated.  For many commands it doesn't make sense.  Instead
of "ctdb ip -n all" use "ctdb ip all".

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index d5bcbbfde11..0ff848cf739 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -395,17 +395,6 @@ Recovery master:0
 	    If PNN-LIST is provided then status is given for
 	    the indicated node(s).
 	  </para>
-
-	  <para>
-	    By default, <command>ctdb nodestatus</command> gathers
-	    status from the local node.  However, if invoked with "-n
-	    all" (or similar) then status is gathered from the given
-	    node(s).  In particular <command>ctdb nodestatus
-	    all</command> and <command>ctdb nodestatus -n
-	    all</command> will produce different output.  It is
-	    possible to provide 2 different nodespecs (with and
-	    without "-n") but the output is usually confusing!
-	  </para>
 	</listitem>
       </itemizedlist>
 
@@ -510,11 +499,8 @@ pnn:3 192.168.2.203       OK
       <refsect3>
 	<title>Example</title>
 	<screen>
-# ctdb ping -n all
+# ctdb ping
 response from 0 time=0.000054 sec  (3 clients)
-response from 1 time=0.000144 sec  (2 clients)
-response from 2 time=0.000105 sec  (2 clients)
-response from 3 time=0.000114 sec  (2 clients)
 	</screen>
       </refsect3>
     </refsect2>
@@ -548,7 +534,7 @@ name:eth2 link:up references:1
     <refsect2>
       <title>ip</title>
       <para>
-	This command will display the list of public addresses that are provided by the cluster and which physical node is currently serving this ip. By default this command will ONLY show those public addresses that are known to the node itself. To see the full list of all public ips across the cluster you must use "ctdb ip -n all".
+	This command will display the list of public addresses that are provided by the cluster and which physical node is currently serving this ip. By default this command will ONLY show those public addresses that are known to the node itself. To see the full list of all public ips across the cluster you must use "ctdb ip all".
       </para>
       <refsect3>
 	<title>Example</title>
@@ -914,8 +900,7 @@ DB Statistics: locking.tdb
       <para>
 	This command only affects the run-time setting of a single
 	CTDB node.  This setting <emphasis>must</emphasis> be changed
-	on all nodes simultaneously by specifying <option>-n
-	all</option> (or similar).  For information about configuring
+	on all nodes simultaneously.  For information about configuring
 	the recovery lock file please see the
 	<citetitle>CTDB_RECOVERY_LOCK</citetitle> entry in
 	<citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
diff --git a/ctdb/web/testing.html b/ctdb/web/testing.html
index d0d39a35f8d..92182dd1b1b 100644
--- a/ctdb/web/testing.html
+++ b/ctdb/web/testing.html
@@ -99,9 +99,9 @@ Number of nodes:4
 </pre>
 
 <h3>ctdb ping</h3>
-this command tries to "ping" each of the CTDB daemons in the cluster.
+this command tries to "ping" the local CTDB daemon.
 <pre>
-  ctdb ping -n all
+  onnode -q all ctdb ping
 
   response from 0 time=0.000050 sec  (13 clients)
   response from 1 time=0.000154 sec  (27 clients)