87 files changed, 17 insertions, 33 deletions

diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
index 7197b12a21..bad2cfe9d7 100644
--- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
@@ -63,19 +63,14 @@
 	parameters in the &smb.conf; file.
 	</para>
 
-	<figure id="idmap-sid2gid"><title>IDMAP: group SID to GID resolution.</title>
-	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-sid2gid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="howto/imagefiles/idmap-sid2gid.png" scale="50" scalefit="1"/></imageobject>
-	</mediaobject>
-	</figure>
-
-	<figure id="idmap-gid2sid"><title>IDMAP: GID resolution to matching SID.</title>
-	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-gid2sid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="howto/imagefiles/idmap-gid2sid.png" scale="50" scalefit="1"/></imageobject>
-	</mediaobject>
-	</figure>
+	<image id="idmap-sid2gid">
+		<description>IDMAP: group SID to GID resolution.</description>
+		<imagefile scale="50">idmap-sid2gid</imagefile>
+	</image>
+
+	<image id="idmap-gid2sid"><description>IDMAP: GID resolution to matching SID.</description>
+	<imagefile scale="50">idmap-gid2sid</imagefile>
+	</image>
 
 	<para>
 	In both cases, when winbindd is not running, only locally resolvable groups can be recognized. Please refer to
@@ -84,13 +79,9 @@
 	used to establish UNIX group to NT SID mappings as shown in <link linkend="idmap-store-gid2sid">IDMAP: storing group mappings</link>.
 	</para>
 
-	<figure id="idmap-store-gid2sid"><title>IDMAP storing group mappings.</title>
-	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-store-gid2sid" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="howto/imagefiles/idmap-store-gid2sid.png" scale="50" scalefit="1"/></imageobject>
-	</mediaobject>
-	</figure>
-
+	<image id="idmap-store-gid2sid"><description>IDMAP storing group mappings.</description>
+	<imagefile scale="50">idmap-store-gid2sid</imagefile>
+	</image>
 
 	<para>
 	<indexterm><primary>groupadd</primary></indexterm>
diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
index 4504c480b8..8a83997347 100644
--- a/docs/Samba-HOWTO-Collection/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/PDC.xml
@@ -41,13 +41,9 @@ network environment. Workstations A, B and C are representative of many physical
 network clients.
 </para>
 
-<figure id="domain-example"><title>An Example Domain.</title>
-<mediaobject>
-<imageobject role="latex"><imagedata fileref="howto/imagefiles/domain" width="4in" height="3in" scalefit="1"/></imageobject>
-<imageobject><imagedata fileref="howto/imagefiles/domain.png" scale="50" scalefit="1"/></imageobject>
-</mediaobject>
-</figure>
-
+<image id="domain-example"><description>An Example Domain.</description>
+<imagefile scale="50">domain</imagefile>
+</image>
 
 <?latex \newpage ?>
 
diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
index 2f3018f894..ae8450c772 100644
--- a/docs/Samba-HOWTO-Collection/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/Winbind.xml
@@ -95,12 +95,9 @@
 	</para></note>
 
 
-	<!--	<figure id="winbind_idmap"><title></title>
-	<mediaobject>
-	<imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap_winbind_no_loop" scale="50" scalefit="1"/></imageobject>
-	<imageobject><imagedata fileref="howto/imagefiles/idmap_winbind_no_loop.png" scale="50" scalefit="1"/></imageobject>
-	</mediaobject>
-	</figure>-->
+	<image id="winbind_idmap">
+	<imagefile scale="50">idmap_winbind_no_loop</imagefile>
+	</image>
 
 </sect1>
 
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore b/docs/Samba-HOWTO-Collection/images/.cvsignore
index f7b5423899..f7b5423899 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore
+++ b/docs/Samba-HOWTO-Collection/images/.cvsignore
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/10small.png b/docs/Samba-HOWTO-Collection/images/10small.png
index 56a9b0cd67..56a9b0cd67 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/10small.png
+++ b/docs/Samba-HOWTO-Collection/images/10small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/11small.png b/docs/Samba-HOWTO-Collection/images/11small.png
index 18f5d9e4dd..18f5d9e4dd 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/11small.png
+++ b/docs/Samba-HOWTO-Collection/images/11small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/12small.png b/docs/Samba-HOWTO-Collection/images/12small.png
index 5bdf809c1b..5bdf809c1b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/12small.png
+++ b/docs/Samba-HOWTO-Collection/images/12small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/13small.png b/docs/Samba-HOWTO-Collection/images/13small.png
index 536b2fc2c2..536b2fc2c2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/13small.png
+++ b/docs/Samba-HOWTO-Collection/images/13small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/14small.png b/docs/Samba-HOWTO-Collection/images/14small.png
index 89054249c0..89054249c0 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/14small.png
+++ b/docs/Samba-HOWTO-Collection/images/14small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/1small.png b/docs/Samba-HOWTO-Collection/images/1small.png
index c4905163c9..c4905163c9 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/1small.png
+++ b/docs/Samba-HOWTO-Collection/images/1small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/2small.png b/docs/Samba-HOWTO-Collection/images/2small.png
index 5fd9071349..5fd9071349 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/2small.png
+++ b/docs/Samba-HOWTO-Collection/images/2small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/3small.png b/docs/Samba-HOWTO-Collection/images/3small.png
index 22a39bae52..22a39bae52 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/3small.png
+++ b/docs/Samba-HOWTO-Collection/images/3small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/4small.png b/docs/Samba-HOWTO-Collection/images/4small.png
index 6b7f1b1fd4..6b7f1b1fd4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/4small.png
+++ b/docs/Samba-HOWTO-Collection/images/4small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/5small.png b/docs/Samba-HOWTO-Collection/images/5small.png
index b23e1fc2c7..b23e1fc2c7 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/5small.png
+++ b/docs/Samba-HOWTO-Collection/images/5small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/6small.png b/docs/Samba-HOWTO-Collection/images/6small.png
index 35a646d826..35a646d826 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/6small.png
+++ b/docs/Samba-HOWTO-Collection/images/6small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/7small.png b/docs/Samba-HOWTO-Collection/images/7small.png
index d182677510..d182677510 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/7small.png
+++ b/docs/Samba-HOWTO-Collection/images/7small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/8small.png b/docs/Samba-HOWTO-Collection/images/8small.png
index 08aca66386..08aca66386 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/8small.png
+++ b/docs/Samba-HOWTO-Collection/images/8small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/9small.png b/docs/Samba-HOWTO-Collection/images/9small.png
index 90c2cde327..90c2cde327 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/9small.png
+++ b/docs/Samba-HOWTO-Collection/images/9small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME001.png b/docs/Samba-HOWTO-Collection/images/WME001.png
index c5db7570bc..c5db7570bc 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME001.png
+++ b/docs/Samba-HOWTO-Collection/images/WME001.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME002.png b/docs/Samba-HOWTO-Collection/images/WME002.png
index 641f2179a0..641f2179a0 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME002.png
+++ b/docs/Samba-HOWTO-Collection/images/WME002.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME003.png b/docs/Samba-HOWTO-Collection/images/WME003.png
index 073c58eddd..073c58eddd 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME003.png
+++ b/docs/Samba-HOWTO-Collection/images/WME003.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME004.png b/docs/Samba-HOWTO-Collection/images/WME004.png
index 5053adeeec..5053adeeec 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME004.png
+++ b/docs/Samba-HOWTO-Collection/images/WME004.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME005.png b/docs/Samba-HOWTO-Collection/images/WME005.png
index 5e4e72e498..5e4e72e498 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME005.png
+++ b/docs/Samba-HOWTO-Collection/images/WME005.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME006.png b/docs/Samba-HOWTO-Collection/images/WME006.png
index cbd3183696..cbd3183696 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME006.png
+++ b/docs/Samba-HOWTO-Collection/images/WME006.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME007.png b/docs/Samba-HOWTO-Collection/images/WME007.png
index e0a113b080..e0a113b080 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME007.png
+++ b/docs/Samba-HOWTO-Collection/images/WME007.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME008.png b/docs/Samba-HOWTO-Collection/images/WME008.png
index b03a7853b4..b03a7853b4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME008.png
+++ b/docs/Samba-HOWTO-Collection/images/WME008.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME009.png b/docs/Samba-HOWTO-Collection/images/WME009.png
index f851876cee..f851876cee 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME009.png
+++ b/docs/Samba-HOWTO-Collection/images/WME009.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME010.png b/docs/Samba-HOWTO-Collection/images/WME010.png
index 589be02b22..589be02b22 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME010.png
+++ b/docs/Samba-HOWTO-Collection/images/WME010.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME011.png b/docs/Samba-HOWTO-Collection/images/WME011.png
index f15399b4a2..f15399b4a2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME011.png
+++ b/docs/Samba-HOWTO-Collection/images/WME011.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME012.png b/docs/Samba-HOWTO-Collection/images/WME012.png
index d2e46212f6..d2e46212f6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME012.png
+++ b/docs/Samba-HOWTO-Collection/images/WME012.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME013.png b/docs/Samba-HOWTO-Collection/images/WME013.png
index 0f0a70d062..0f0a70d062 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME013.png
+++ b/docs/Samba-HOWTO-Collection/images/WME013.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WME014.png b/docs/Samba-HOWTO-Collection/images/WME014.png
index 73f1dde37c..73f1dde37c 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WME014.png
+++ b/docs/Samba-HOWTO-Collection/images/WME014.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png b/docs/Samba-HOWTO-Collection/images/WXPP002.png
index b87001bca4..b87001bca4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP002.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png b/docs/Samba-HOWTO-Collection/images/WXPP003.png
index a60d6c413a..a60d6c413a 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP003.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png b/docs/Samba-HOWTO-Collection/images/WXPP005.png
index 4aa091767b..4aa091767b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP005.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png b/docs/Samba-HOWTO-Collection/images/WXPP009.png
index b540e238b8..b540e238b8 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP009.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png b/docs/Samba-HOWTO-Collection/images/WXPP014.png
index f1e02d3ce3..f1e02d3ce3 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png
+++ b/docs/Samba-HOWTO-Collection/images/WXPP014.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/a_small.png b/docs/Samba-HOWTO-Collection/images/a_small.png
index a6622ef6cf..a6622ef6cf 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/a_small.png
+++ b/docs/Samba-HOWTO-Collection/images/a_small.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/access1.dia b/docs/Samba-HOWTO-Collection/images/access1.dia
index 7fd2673800..7fd2673800 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/access1.dia
+++ b/docs/Samba-HOWTO-Collection/images/access1.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/access1.png b/docs/Samba-HOWTO-Collection/images/access1.png
index 0d070a6109..0d070a6109 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/access1.png
+++ b/docs/Samba-HOWTO-Collection/images/access1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/browsing1 b/docs/Samba-HOWTO-Collection/images/browsing1
index 8235df45f6..8235df45f6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/browsing1
+++ b/docs/Samba-HOWTO-Collection/images/browsing1
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png b/docs/Samba-HOWTO-Collection/images/browsing1.png
index bfe76dcb63..bfe76dcb63 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png
+++ b/docs/Samba-HOWTO-Collection/images/browsing1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia b/docs/Samba-HOWTO-Collection/images/cups1.dia
index e4cd3b1239..e4cd3b1239 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia
+++ b/docs/Samba-HOWTO-Collection/images/cups1.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups1.png b/docs/Samba-HOWTO-Collection/images/cups1.png
index cbe646a5fa..cbe646a5fa 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups1.png
+++ b/docs/Samba-HOWTO-Collection/images/cups1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia b/docs/Samba-HOWTO-Collection/images/cups2.dia
index 9dfb60f335..9dfb60f335 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia
+++ b/docs/Samba-HOWTO-Collection/images/cups2.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/cups2.png b/docs/Samba-HOWTO-Collection/images/cups2.png
index d0713c07ca..d0713c07ca 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/cups2.png
+++ b/docs/Samba-HOWTO-Collection/images/cups2.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/domain.dia b/docs/Samba-HOWTO-Collection/images/domain.dia
index a994d423e2..a994d423e2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/domain.dia
+++ b/docs/Samba-HOWTO-Collection/images/domain.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/domain.png b/docs/Samba-HOWTO-Collection/images/domain.png
index 82d299b086..82d299b086 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/domain.png
+++ b/docs/Samba-HOWTO-Collection/images/domain.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png b/docs/Samba-HOWTO-Collection/images/ethereal1.png
index c8655389d0..c8655389d0 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png
+++ b/docs/Samba-HOWTO-Collection/images/ethereal1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png b/docs/Samba-HOWTO-Collection/images/ethereal2.png
index f366772d3b..f366772d3b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png
+++ b/docs/Samba-HOWTO-Collection/images/ethereal2.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia
index b3b1d88c50..b3b1d88c50 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png
index b8cf5d2257..b8cf5d2257 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-gid2sid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia b/docs/Samba-HOWTO-Collection/images/idmap-groups.dia
index 04da158c53..04da158c53 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-groups.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png b/docs/Samba-HOWTO-Collection/images/idmap-groups.png
index e5c214574f..e5c214574f 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-groups.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia
index e6e5107698..e6e5107698 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png
index daadfc1f90..daadfc1f90 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2gid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia
index 91e00530a6..91e00530a6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png
index 3acc07bd11..3acc07bd11 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-sid2uid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia
index 957613b6f3..957613b6f3 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
index 911c996329..911c996329 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia
index de6ccaacb3..de6ccaacb3 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png
index f30c632500..f30c632500 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap-uid2sid.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia b/docs/Samba-HOWTO-Collection/images/idmap.dia
index 555933978b..555933978b 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia
+++ b/docs/Samba-HOWTO-Collection/images/idmap.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap.png b/docs/Samba-HOWTO-Collection/images/idmap.png
index b090ced632..b090ced632 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png b/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
index 5393f6a192..5393f6a192 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
+++ b/docs/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia
index 2f846ee8d4..2f846ee8d4 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
+++ b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png
index b80efe9f16..b80efe9f16 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
+++ b/docs/Samba-HOWTO-Collection/images/pdftoepsonusb.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia b/docs/Samba-HOWTO-Collection/images/pdftosocket.dia
index 53b6b7117c..53b6b7117c 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
+++ b/docs/Samba-HOWTO-Collection/images/pdftosocket.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png b/docs/Samba-HOWTO-Collection/images/pdftosocket.png
index ea4a9dae93..ea4a9dae93 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png
+++ b/docs/Samba-HOWTO-Collection/images/pdftosocket.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia b/docs/Samba-HOWTO-Collection/images/trusts1.dia
index 95cbbaa42f..95cbbaa42f 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia
+++ b/docs/Samba-HOWTO-Collection/images/trusts1.dia
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png b/docs/Samba-HOWTO-Collection/images/trusts1.png
index 72aa60d4cc..72aa60d4cc 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png
+++ b/docs/Samba-HOWTO-Collection/images/trusts1.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png b/docs/Samba-HOWTO-Collection/images/w2kp001.png
index 43adf23463..43adf23463 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp001.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png b/docs/Samba-HOWTO-Collection/images/w2kp002.png
index 13bb029f53..13bb029f53 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp002.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png b/docs/Samba-HOWTO-Collection/images/w2kp003.png
index c7b779900e..c7b779900e 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp003.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png b/docs/Samba-HOWTO-Collection/images/w2kp004.png
index d0e005a36e..d0e005a36e 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp004.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png b/docs/Samba-HOWTO-Collection/images/w2kp005.png
index a729b40cd7..a729b40cd7 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp005.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png b/docs/Samba-HOWTO-Collection/images/w2kp006.png
index ea96db055a..ea96db055a 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png
+++ b/docs/Samba-HOWTO-Collection/images/w2kp006.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png b/docs/Samba-HOWTO-Collection/images/wxpp001.png
index 2e689a17e2..2e689a17e2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp001.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png b/docs/Samba-HOWTO-Collection/images/wxpp004.png
index 656f67942e..656f67942e 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp004.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png b/docs/Samba-HOWTO-Collection/images/wxpp006.png
index a20b3ed583..a20b3ed583 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp006.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png b/docs/Samba-HOWTO-Collection/images/wxpp007.png
index cf41352220..cf41352220 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp007.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png b/docs/Samba-HOWTO-Collection/images/wxpp008.png
index 9958c7c873..9958c7c873 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp008.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png b/docs/Samba-HOWTO-Collection/images/wxpp010.png
index 068a0dfc73..068a0dfc73 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp010.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png b/docs/Samba-HOWTO-Collection/images/wxpp011.png
index 0cf88c04a6..0cf88c04a6 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp011.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png b/docs/Samba-HOWTO-Collection/images/wxpp012.png
index d89f3b5d31..d89f3b5d31 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp012.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png b/docs/Samba-HOWTO-Collection/images/wxpp013.png
index 451240ee38..451240ee38 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp013.png
diff --git a/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png b/docs/Samba-HOWTO-Collection/images/wxpp015.png
index 12fe2f31b2..12fe2f31b2 100644
--- a/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png
+++ b/docs/Samba-HOWTO-Collection/images/wxpp015.png