From: Martin Schwenke <martin@meltin.net>
Date: Thu, 29 Mar 2018 04:38:13 +0000 (+1100)
Subject: ctdb-docs: Drop references to CTDB_BASE from the documentation
X-Git-Tag: ldb-1.4.0~524
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3388aed012d269ee896a71bddcc5570f16b92d6a;p=thirdparty%2Fsamba.git

ctdb-docs: Drop references to CTDB_BASE from the documentation

CTDB_BASE should only ever be modified by test code.  It should not be
mentioned in the user documentation.

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

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 05d12315464..555c8cf5170 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -65,15 +65,6 @@
 
     <variablelist>
 
-      <varlistentry>
-	<term>CTDB_BASE=<parameter>DIRECTORY</parameter></term>
-	<listitem>
-	  <para>
-	    DIRECTORY containing CTDB scripts and configuration files.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>CTDB_INIT_STYLE=debian|redhat|suse</term>
 	<listitem>
@@ -1448,7 +1439,7 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
 	    an event script times out.
 	  </para>
 	  <para>
-	    Default is <filename><varname>CTDB_BASE</varname>/debug-hung-script.sh</filename>.
+	    Default is <filename>/usr/local/etc/ctdb/debug-hung-script.sh</filename>.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -1494,7 +1485,7 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
 	  </para>
 	  <para>
 	    No default, usually
-	    <filename><varname>CTDB_BASE</varname>/debug_locks.sh</filename>.
+	    <filename>/usr/local/etc/ctdb/debug_locks.sh</filename>.
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/ctdb/doc/onnode.1.xml b/ctdb/doc/onnode.1.xml
index 7c45563bd47..c9d56a97dd5 100644
--- a/ctdb/doc/onnode.1.xml
+++ b/ctdb/doc/onnode.1.xml
@@ -233,22 +233,6 @@
     </screen>
   </refsect1>
 
-  <refsect1>
-    <title>ENVIRONMENT</title>
-
-    <variablelist>
-      <varlistentry><term><envar>CTDB_BASE</envar></term>
-        <listitem>
-          <para>
-	    Directory containing CTDB configuration files.  The
-	    default is <filename>/usr/local/etc/ctdb</filename>.
-	  </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
   <refsect1>
     <title>FILES</title>
 
@@ -264,8 +248,7 @@
 	    is given precedence.  If a
 	    relative path is specified and no corresponding file
 	    exists relative to the current directory then the file is
-	    also searched for in the <filename>$CTDB_BASE</filename>
-	    directory.
+	    also searched for in the CTDB configuration directory.
 	  </para>
 	  <para>
 	    Otherwise the default is