From ede2aaef281048123cacab9ae879f5c546787080 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Fri, 30 Nov 2012 09:39:22 +0100
Subject: [PATCH] lib/tdb: Rename manpages/ to man/.

Trying to be more consistent.

Karolin

Reviewed-by: Andreas Schneider <asn@samba.org>
---
 lib/tdb/{manpages => man}/tdbbackup.8.xml  | 6 +++---
 lib/tdb/{manpages => man}/tdbdump.8.xml    | 8 ++++----
 lib/tdb/{manpages => man}/tdbrestore.8.xml | 0
 lib/tdb/{manpages => man}/tdbtool.8.xml    | 2 +-
 lib/tdb/wscript                            | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename lib/tdb/{manpages => man}/tdbbackup.8.xml (97%)
 rename lib/tdb/{manpages => man}/tdbdump.8.xml (98%)
 rename lib/tdb/{manpages => man}/tdbrestore.8.xml (100%)
 rename lib/tdb/{manpages => man}/tdbtool.8.xml (99%)

diff --git a/lib/tdb/manpages/tdbbackup.8.xml b/lib/tdb/man/tdbbackup.8.xml
similarity index 97%
rename from lib/tdb/manpages/tdbbackup.8.xml
rename to lib/tdb/man/tdbbackup.8.xml
index 78fe32eb8ec..02936cf0d6b 100644
--- a/lib/tdb/manpages/tdbbackup.8.xml
+++ b/lib/tdb/man/tdbbackup.8.xml
@@ -33,8 +33,8 @@
 
 	<para><command>tdbbackup</command> is a tool that may be used to backup samba .tdb
 	files. This tool may also be used to verify the integrity of the .tdb files prior
-	to samba startup or during normal operation. If it finds file damage and it finds 
-	a prior backup the backup file will be restored. 
+	to samba startup or during normal operation. If it finds file damage and it finds
+	a prior backup the backup file will be restored.
 	</para>
 </refsect1>
 
@@ -128,7 +128,7 @@
 	The original Samba software and related utilities were created by Andrew Tridgell.
 	Samba is now developed by the Samba Team as an Open Source project similar to the way
 	the Linux kernel is developed.
-	</para> 
+	</para>
 
 	<para>The tdbbackup man page was written by John H Terpstra.</para>
 </refsect1>
diff --git a/lib/tdb/manpages/tdbdump.8.xml b/lib/tdb/man/tdbdump.8.xml
similarity index 98%
rename from lib/tdb/manpages/tdbdump.8.xml
rename to lib/tdb/man/tdbdump.8.xml
index 34201932434..25fd432eb6e 100644
--- a/lib/tdb/manpages/tdbdump.8.xml
+++ b/lib/tdb/man/tdbdump.8.xml
@@ -32,12 +32,12 @@
 	<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
 	<manvolnum>1</manvolnum></citerefentry> suite.</para>
 
-	<para><command>tdbdump</command> is a very simple utility that 'dumps' the 
-		contents of a TDB (Trivial DataBase) file to standard output in a 
+	<para><command>tdbdump</command> is a very simple utility that 'dumps' the
+		contents of a TDB (Trivial DataBase) file to standard output in a
 		human-readable format.
 	</para>
 
-	<para>This tool can be used when debugging problems with TDB files. It is 
+	<para>This tool can be used when debugging problems with TDB files. It is
 		intended for those who are somewhat familiar with Samba internals.
 	</para>
 </refsect1>
@@ -84,7 +84,7 @@
 	The original Samba software and related utilities were created by Andrew Tridgell.
 	Samba is now developed by the Samba Team as an Open Source project similar to the way
 	the Linux kernel is developed.
-	</para> 
+	</para>
 
 	<para>The tdbdump man page was written by Jelmer Vernooij.</para>
 </refsect1>
diff --git a/lib/tdb/manpages/tdbrestore.8.xml b/lib/tdb/man/tdbrestore.8.xml
similarity index 100%
rename from lib/tdb/manpages/tdbrestore.8.xml
rename to lib/tdb/man/tdbrestore.8.xml
diff --git a/lib/tdb/manpages/tdbtool.8.xml b/lib/tdb/man/tdbtool.8.xml
similarity index 99%
rename from lib/tdb/manpages/tdbtool.8.xml
rename to lib/tdb/man/tdbtool.8.xml
index c143b5ce04e..bc5c0014025 100644
--- a/lib/tdb/manpages/tdbtool.8.xml
+++ b/lib/tdb/man/tdbtool.8.xml
@@ -122,7 +122,7 @@
 		<replaceable>KEY</replaceable>
 		<replaceable>TDBFILE</replaceable>
 		</term>
-		<listitem><para>Move a record from the 
+		<listitem><para>Move a record from the
 		current database into <replaceable>TDBFILE</replaceable>.
 		</para></listitem>
 		</varlistentry>
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 9d309a0325c..7a3d0fa602a 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -94,20 +94,20 @@ def build(bld):
 
         bld.SAMBA_BINARY('tdbrestore',
                          'tools/tdbrestore.c',
-                         'tdb', manpages='manpages/tdbrestore.8')
+                         'tdb', manpages='man/tdbrestore.8')
 
         bld.SAMBA_BINARY('tdbdump',
                          'tools/tdbdump.c',
-                         'tdb', manpages='manpages/tdbdump.8')
+                         'tdb', manpages='man/tdbdump.8')
 
         bld.SAMBA_BINARY('tdbbackup',
                          'tools/tdbbackup.c',
                          'tdb',
-                         manpages='manpages/tdbbackup.8')
+                         manpages='man/tdbbackup.8')
 
         bld.SAMBA_BINARY('tdbtool',
                          'tools/tdbtool.c',
-                         'tdb', manpages='manpages/tdbtool.8')
+                         'tdb', manpages='man/tdbtool.8')
 
         # FIXME: This hardcoded list is stupid, stupid, stupid.
         bld.SAMBA_SUBSYSTEM('tdb-test-helpers',