Add 60.ganesha to what gets installed by make install as well as by the RPM

[sahlberg/ctdb.git] / doc / ctdb.1.xml

diff --git a/doc/ctdb.1.xml b/doc/ctdb.1.xml
index f19e45a0d618b11d8dc97b88b988122e30b32774..31832a385cc8ec5c03b814bcaac859dfbefe2e33 100644 (file)
--- a/doc/ctdb.1.xml
+++ b/doc/ctdb.1.xml
@@ -5,8 +5,8 @@
 <refmeta>
        <refentrytitle>ctdb</refentrytitle>
        <manvolnum>1</manvolnum>
-       <refmiscinfo class="source"> </refmiscinfo>
-       <refmiscinfo class="manual"> </refmiscinfo>
+       <refmiscinfo class="source">ctdb</refmiscinfo>
+       <refmiscinfo class="manual">CTDB - clustered TDB database</refmiscinfo>
 </refmeta>
 
 
@@ -1027,9 +1027,12 @@ This is mainly useful for backing up persistent databases such as secrets.tdb an
       </para>
     </refsect2>
 
-    <refsect2><title>restoredb &lt;file&gt;</title>
+    <refsect2><title>restoredb &lt;file&gt; [dbname]</title>
       <para>
         This command restores a persistent database that was previously backed up using backupdb.
+       By default the data will be restored back into the same database as
+       it was created from. By specifying dbname you can restore the data
+       into a different database.
       </para>
     </refsect2>
 
@@ -1104,7 +1107,8 @@ This is mainly useful for backing up persistent databases such as secrets.tdb an
       <screen format="linespecific">
 Number of databases:10
 dbid:0x435d3410 name:notify.tdb path:/var/ctdb/notify.tdb.0 
-dbid:0x42fe72c5 name:locking.tdb path:/var/ctdb/locking.tdb.0 dbid:0x1421fb78 name:brlock.tdb path:/var/ctdb/brlock.tdb.0 
+dbid:0x42fe72c5 name:locking.tdb path:/var/ctdb/locking.tdb.0
+dbid:0x1421fb78 name:brlock.tdb path:/var/ctdb/brlock.tdb.0 
 dbid:0x17055d90 name:connections.tdb path:/var/ctdb/connections.tdb.0 
 dbid:0xc0bdde6a name:sessionid.tdb path:/var/ctdb/sessionid.tdb.0 
 dbid:0x122224da name:test.tdb path:/var/ctdb/test.tdb.0 
@@ -1214,19 +1218,6 @@ HEALTH: NO-HEALTHY-NODES - ERROR - Backup of corrupted TDB in '/var/ctdb/persist
       </para>
     </refsect2>
 
-    <refsect2><title>freeze</title>
-      <para>
-        This command will lock all the local TDB databases causing clients 
-        that are accessing these TDBs such as samba3 to block until the
-        databases are thawed.
-      </para>
-      <para>
-        This is primarily used by the recovery daemon to stop all samba
-        daemons from accessing any databases while the database is recovered
-        and rebuilt.
-      </para>
-    </refsect2>
-
     <refsect2><title>thaw</title>
       <para>
         Thaw a previously frozen node.