Fix image support. If images are missing, this will now also cause the

docs build to break. Only images that are actually used are copied.
(This used to be commit 9b7099c94588916af6b3c4ebb7883e36d9bf2e6b)

10 files changed, 66 insertions, 66 deletions

diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index d677e4cba3..6058411b35 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -289,13 +289,13 @@
 		</para>
 
 		<image id="pktcap01">
-			<imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
-			<description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
+			<imagefile scale="53">WINREPRESSME-Capture</imagefile>
+			<imagedescription>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</imagedescription>
 		</image>
 
 		<image id="pktcap02">
-			<description>Windows Me &smbmdash; Later Broadcast Sample</description>
-			<imagefile scale="57">WINREPRESSME-Capture2.png</imagefile>
+			<imagedescription>Windows Me &smbmdash; Later Broadcast Sample</imagedescription>
+			<imagefile scale="57">WINREPRESSME-Capture2</imagefile>
 		</image>
 
 	  <para><indexterm>
@@ -601,8 +601,8 @@
 		</sect3>
 
 		<image id="hostannounce">
-			<description>Typical Windows 9x/Me Host Announcement</description>
-			<imagefile scale="55">HostAnnouncment.png</imagefile>
+			<imagedescription>Typical Windows 9x/Me Host Announcement</imagedescription>
+			<imagefile scale="55">HostAnnouncment</imagefile>
 		</image>
 
 	</sect2>
@@ -725,9 +725,9 @@
 		</para>
 
 		<image id="nullconnect">
-			<description>Typical Windows 9x/Me NULL SessionSetUp AndX Request</description>
+			<imagedescription>Typical Windows 9x/Me NULL SessionSetUp AndX Request</imagedescription>
 
-			<imagefile scale="65">NullConnect.png</imagefile>
+			<imagefile scale="65">NullConnect</imagefile>
 		</image>
 
 		<para>
@@ -743,8 +743,8 @@
 		</para>
 
 		<image id="userconnect">
-			<description>Typical Windows 9x/Me User SessionSetUp AndX Request</description>
-			<imagefile scale="65">UserConnect.png</imagefile>
+			<imagedescription>Typical Windows 9x/Me User SessionSetUp AndX Request</imagedescription>
+			<imagefile scale="65">UserConnect</imagefile>
 		</image>
 
 	 	<para>
@@ -898,13 +898,13 @@
 	</procedure>
 
 	<image id="XPCap01">
-        <description>Typical Windows XP NULL Session Setup AndX Request</description>
-		<imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
+        <imagedescription>Typical Windows XP NULL Session Setup AndX Request</imagedescription>
+		<imagefile scale="70">WindowsXP-NullConnection</imagefile>
 	</image>
 
 	<image id="XPCap02">
-        <description>Typical Windows XP User Session Setup AndX Request</description>
-		<imagefile scale="70">WindowsXP-UserConnection.png</imagefile>
+        <imagedescription>Typical Windows XP User Session Setup AndX Request</imagedescription>
+		<imagefile scale="70">WindowsXP-UserConnection</imagefile>
 	</image>
 
 		<sect3>
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 4e42b52039..8a0d359cf9 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -497,8 +497,8 @@
 		</para>
 
 		<image id="charitynet">
-			<description>Charity Administration Office Network</description>
-			<imagefile scale="100">Charity-Network.png</imagefile>
+			<imagedescription>Charity Administration Office Network</imagedescription>
+			<imagefile scale="100">Charity-Network</imagefile>
 		</image>
 
 		<procedure>
@@ -986,8 +986,8 @@ C:\WINDOWS: regedit ME-dpwc.reg
 		</para>
 
 		<image id="acctingnet2">
-			<description>Accounting Office Network Topology</description>
-			<imagefile scale="100">AccountingNetwork.png</imagefile>
+			<imagedescription>Accounting Office Network Topology</imagedescription>
+			<imagefile scale="100">AccountingNetwork</imagefile>
 		</image>
 
 		<table id="acctingnet">
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index f874a8b678..8a4e1ef2b2 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -303,8 +303,8 @@
 	</para>
 
 	<image id="acct2net">
-		<description>Abmas Accounting &smbmdash; 52 User Network Topology</description>
-		<imagefile scale="100">acct2net.png</imagefile>
+		<imagedescription>Abmas Accounting &smbmdash; 52 User Network Topology</imagedescription>
+		<imagefile scale="100">acct2net</imagefile>
 	</image>
 
 	<procedure>
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index 5ec4ab2166..7f8366c08a 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -163,8 +163,8 @@
 		</table>
 
 		<image id="ch04net">
-			<description>Abmas Network Topology &smbmdash; 130 Users</description>
-			<imagefile scale="90">chap4-net.png</imagefile>
+			<imagedescription>Abmas Network Topology &smbmdash; 130 Users</imagedescription>
+			<imagefile scale="90">chap4-net</imagefile>
 		</image>
 
 		<para>
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index 3c679c1b09..5375eb99a3 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -326,8 +326,8 @@
 	</para>
 
 	<image id="chap05net">
-		<description>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</description>
-		<imagefile scale="80">chap5-net.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</imagedescription>
+		<imagefile scale="80">chap5-net</imagefile>
 	</image>
 
 	<sect2 id="ch5-dnshcp-setup">
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index c8a547ac67..75acc22f3d 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -575,8 +575,8 @@
 	</para>
 
 	<image id="ch6-LDAPdiag">
-		<description>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</description>
-		<imagefile scale="70">UNIX-Samba-and-LDAP.png</imagefile>
+		<imagedescription>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</imagedescription>
+		<imagefile scale="70">UNIX-Samba-and-LDAP</imagefile>
 	</image>
 
 	<para><indexterm>
@@ -959,8 +959,8 @@
 	</para>
 
 	<image id="chap6net">
-		<description>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</description>
-		<imagefile scale="70">chap6-net.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</imagedescription>
+		<imagefile scale="70">chap6-net</imagefile>
 	</image>
 
       <para><indexterm>
@@ -3131,8 +3131,8 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 	</procedure>
 
 	<image id="XP-screen001">
-		<description>Windows XP Professional &smbmdash; User Shared Folders</description>
-		<imagefile scale="65">XP-screen001.png</imagefile>
+		<imagedescription>Windows XP Professional &smbmdash; User Shared Folders</imagedescription>
+		<imagefile scale="65">XP-screen001</imagefile>
 	</image>
 
 <table id="proffold">
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index 73134cf108..6ad6c6e8bf 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -709,13 +709,13 @@
 	    inconsistent directory information can be exceedingly difficult.</para>
 
 	<image id="chap7net">
-		<description>Network Topology &smbmdash; 2000 User Complex Design A</description>
-		<imagefile scale="80">chap7-net-Ar.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design A</imagedescription>
+		<imagefile scale="80">chap7-net-Ar</imagefile>
 	</image>
 
 	<image id="chap7net2">
-		<description>Network Topology &smbmdash; 2000 User Complex Design B</description>
-		<imagefile scale="80">chap7-net2-Br.png</imagefile>
+		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design B</imagedescription>
+		<imagefile scale="80">chap7-net2-Br</imagefile>
 	</image>
 
 	</sect3>
@@ -759,8 +759,8 @@
 	</para>
 
 	<image id="chap7idres">
-		<description>Samba and Authentication Backend Search Pathways</description>
-		<imagefile scale="80">chap7-idresol.png</imagefile>
+		<imagedescription>Samba and Authentication Backend Search Pathways</imagedescription>
+		<imagefile scale="80">chap7-idresol</imagefile>
 	</image>
 
       <para><indexterm>
@@ -800,8 +800,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz
 	This configuration tells Samba to use a single LDAP server as shown in
 	<link linkend="ch7singleLDAP"/>.
 	<image id="ch7singleLDAP">
-		<description>Samba Configuration to Use a Single LDAP Server</description>
-		<imagefile scale="100">ch7-singleLDAP.png</imagefile>
+		<imagedescription>Samba Configuration to Use a Single LDAP Server</imagedescription>
+		<imagefile scale="100">ch7-singleLDAP</imagefile>
 	</image>
 	<indexterm>
 	  <primary>LDAP</primary>
@@ -822,8 +822,8 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \
 	This configuration tells Samba to use a master LDAP server, with fail-over to a slave server if necessary,
 	as shown in <link linkend="ch7dualLDAP"/>.
 	<image id="ch7dualLDAP">
-		<description>Samba Configuration to Use a Dual (Fail-over) LDAP Server</description>
-		<imagefile scale="100">ch7-fail-overLDAP.png</imagefile>
+		<imagedescription>Samba Configuration to Use a Dual (Fail-over) LDAP Server</imagedescription>
+		<imagefile scale="100">ch7-fail-overLDAP</imagefile>
 	</image>
       </para>
 
@@ -847,8 +847,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 	</para>
 
 	<image id="ch7dualadd">
-		<description>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</description>
-		<imagefile scale="80">ch7-dual-additive-LDAP.png</imagefile>
+		<imagedescription>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</imagedescription>
+		<imagefile scale="80">ch7-dual-additive-LDAP</imagefile>
 	</image>
 
 	<para>
@@ -859,8 +859,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
         </para>
 
 		<image id="ch7dualok">
-			<description>Samba Configuration to Use Two LDAP Databases - The result is additive.</description>
-			<imagefile scale="80">ch7-dual-additive-LDAP-Ok.png</imagefile>
+			<imagedescription>Samba Configuration to Use Two LDAP Databases - The result is additive.</imagedescription>
+			<imagefile scale="80">ch7-dual-additive-LDAP-Ok</imagefile>
 		</image>
 
 	<note><para>
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index a6b196f365..e8f55b8611 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -183,8 +183,8 @@
 		</para>
 
 		<image id="ch8-migration">
-			<description>Schematic Explaining the <command>net rpc vampire</command> Process</description>
-			<imagefile scale="80">ch8-migration.png</imagefile>
+			<imagedescription>Schematic Explaining the <command>net rpc vampire</command> Process</imagedescription>
+			<imagefile scale="80">ch8-migration</imagefile>
 		</image>
 
 		<para>
@@ -297,8 +297,8 @@
 		</para>
 
 		<image id="NT4DUM">
-			<description>View of Accounts in NT4 Domain User Manager</description>
-			<imagefile scale="50">UserMgrNT4.png</imagefile>
+			<imagedescription>View of Accounts in NT4 Domain User Manager</imagedescription>
+			<imagefile scale="50">UserMgrNT4</imagefile>
 		</image>
 
 	</sect2>
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index e46fc22396..2efdde6539 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -29,8 +29,8 @@
 	</para>
 
 	<image id="ch09openmag">
-		<description>Open Magazine Samba Survey</description>
-		<imagefile scale="60">openmag.png</imagefile>
+		<imagedescription>Open Magazine Samba Survey</imagedescription>
+		<imagefile scale="60">openmag</imagefile>
 	</image>
 
 	<para>
@@ -516,8 +516,8 @@
 	</para>
 
 <image id="ch9-sambadc">
-	<description>Samba Domain: Samba Member Server</description>
-	<imagefile scale="75">chap9-SambaDC.png</imagefile>
+	<imagedescription>Samba Domain: Samba Member Server</imagedescription>
+	<imagefile scale="75">chap9-SambaDC</imagefile>
 </image>
 
 	<para><indexterm>
@@ -1098,8 +1098,8 @@ aliases:        files
 	</para>
 
 	<image id="ch9-adsdc">
-		<description>Active Directory Domain: Samba Member Server</description>
-		<imagefile scale="75">chap9-ADSDC.png</imagefile>
+		<imagedescription>Active Directory Domain: Samba Member Server</imagedescription>
+		<imagefile scale="75">chap9-ADSDC</imagefile>
 	</image>
 
 	<procedure>
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
index c3b244c405..0d1546d949 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -1195,8 +1195,8 @@ example:
 	</para>
 
 	<image id="lam-login">
-		<description>The LDAP Account Manager Login Screen</description>
-		<imagefile scale="50">lam-login.png</imagefile>
+		<imagedescription>The LDAP Account Manager Login Screen</imagedescription>
+		<imagefile scale="50">lam-login</imagefile>
 	</image>
 
       <para><indexterm>
@@ -1214,8 +1214,8 @@ example:
 	</para>
 
 	<image id="lam-config">
-		<description>The LDAP Account Manager Configuration Screen</description>
-		<imagefile scale="50">lam-config.png</imagefile>
+		<imagedescription>The LDAP Account Manager Configuration Screen</imagedescription>
+		<imagefile scale="50">lam-config</imagefile>
 	</image>
 
       <para><indexterm>
@@ -1241,8 +1241,8 @@ example:
 	</para>
 
 	<image id="lam-user">
-		<description>The LDAP Account Manager User Edit Screen</description>
-		<imagefile scale="50">lam-users.png</imagefile>
+		<imagedescription>The LDAP Account Manager User Edit Screen</imagedescription>
+		<imagefile scale="50">lam-users</imagefile>
 	</image>
 
 	<para>
@@ -1253,13 +1253,13 @@ example:
 	</para>
 
 	<image id="lam-group">
-		<description>The LDAP Account Manager Group Edit Screen</description>
-		<imagefile scale="50">lam-groups.png</imagefile>
+		<imagedescription>The LDAP Account Manager Group Edit Screen</imagedescription>
+		<imagefile scale="50">lam-groups</imagefile>
 	</image>
 
 	<image id="lam-group-mem">
-		<description>The LDAP Account Manager Group Membership Edit Screen</description>
-		<imagefile scale="50">lam-group-members.png</imagefile>
+		<imagedescription>The LDAP Account Manager Group Membership Edit Screen</imagedescription>
+		<imagefile scale="50">lam-group-members</imagefile>
 	</image>
 
       <para><indexterm>
@@ -1273,8 +1273,8 @@ example:
 	</para>
 
 	<image id="lam-host">
-		<description>The LDAP Account Manager Host Edit Screen</description>
-		<imagefile scale="50">lam-hosts.png</imagefile>
+		<imagedescription>The LDAP Account Manager Host Edit Screen</imagedescription>
+		<imagefile scale="50">lam-hosts</imagefile>
 	</image>
 
 	<para>