Formatting updates and makefile update.

(This used to be commit cbbbf0e8526eba405df09fd45b35a6931bdd8763)

8 files changed, 25 insertions, 25 deletions

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 3b3f7b0879..dc3a8dd0da 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -28,7 +28,7 @@ endif
 
 # Paths
 OUTPUTDIR = output
-ARCHIVEDIR = $(OUTPUTDIR)/archive
+ARCHIVEDIR = archive
 SRCDIR = @SAMBASOURCEDIR@
 MANDIR = $(OUTPUTDIR)/manpages
 EPSTOPDF = @EPSTOPDF@
@@ -264,10 +264,10 @@ samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml xslt/extract-examples.xsl scri
 	for I in examples/*.conf; do { ./scripts/indent-smb.conf.pl < $$I > $$I.tmp; mv $$I.tmp $$I; } done
 
 # Archiving
-archive: guide howto
+archive: pdf
 	mkdir -p $(ARCHIVEDIR)
-	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-`date +%Y%m%d`.pdf
-	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-`date +%Y%m%d`.pdf
+	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-`date +%Y%m%d%H%M%S`.pdf
+	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-`date +%Y%m%d%H%M%S`.pdf
 
 # XSL scripts
 xslt/html.xsl: xslt/html-common.xsl settings.xsl
diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index c86137b15b..bcbb8c4a36 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -285,13 +285,13 @@
 		</para>
 
 		<image id="pktcap01">
-			<imagefile scale="53">WINREPRESSME-Capture</imagefile>
+			<imagefile scale="40">WINREPRESSME-Capture</imagefile>
 			<imagedescription>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</imagedescription>
 		</image>
 
 		<image id="pktcap02">
 			<imagedescription>Windows Me &smbmdash; Later Broadcast Sample</imagedescription>
-			<imagefile scale="57">WINREPRESSME-Capture2</imagefile>
+			<imagefile scale="42">WINREPRESSME-Capture2</imagefile>
 		</image>
 
 	  <para><indexterm>
@@ -598,7 +598,7 @@
 
 		<image id="hostannounce">
 			<imagedescription>Typical Windows 9x/Me Host Announcement</imagedescription>
-			<imagefile scale="55">HostAnnouncment</imagefile>
+			<imagefile scale="41">HostAnnouncment</imagefile>
 		</image>
 
 	</sect2>
@@ -723,7 +723,7 @@
 		<image id="nullconnect">
 			<imagedescription>Typical Windows 9x/Me NULL SessionSetUp AndX Request</imagedescription>
 
-			<imagefile scale="65">NullConnect</imagefile>
+			<imagefile scale="41">NullConnect</imagefile>
 		</image>
 
 		<para>
@@ -740,7 +740,7 @@
 
 		<image id="userconnect">
 			<imagedescription>Typical Windows 9x/Me User SessionSetUp AndX Request</imagedescription>
-			<imagefile scale="65">UserConnect</imagefile>
+			<imagefile scale="41">UserConnect</imagefile>
 		</image>
 
 	 	<para>
@@ -895,12 +895,12 @@
 
 	<image id="XPCap01">
         <imagedescription>Typical Windows XP NULL Session Setup AndX Request</imagedescription>
-		<imagefile scale="70">WindowsXP-NullConnection</imagefile>
+		<imagefile scale="50">WindowsXP-NullConnection</imagefile>
 	</image>
 
 	<image id="XPCap02">
         <imagedescription>Typical Windows XP User Session Setup AndX Request</imagedescription>
-		<imagefile scale="70">WindowsXP-UserConnection</imagefile>
+		<imagefile scale="50">WindowsXP-UserConnection</imagefile>
 	</image>
 
 		<sect3>
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 613e0f8483..dc45f02a4d 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -494,7 +494,7 @@
 
 		<image id="charitynet">
 			<imagedescription>Charity Administration Office Network</imagedescription>
-			<imagefile scale="100">Charity-Network</imagefile>
+			<imagefile scale="66">Charity-Network</imagefile>
 		</image>
 
 		<procedure>
@@ -983,7 +983,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 
 		<image id="acctingnet2">
 			<imagedescription>Accounting Office Network Topology</imagedescription>
-			<imagefile scale="100">AccountingNetwork</imagefile>
+			<imagefile scale="66">AccountingNetwork</imagefile>
 		</image>
 
 		<table id="acctingnet">
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
index b3350927a9..a54ac178e8 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -300,7 +300,7 @@
 
 	<image id="acct2net">
 		<imagedescription>Abmas Accounting &smbmdash; 52 User Network Topology</imagedescription>
-		<imagefile scale="100">acct2net</imagefile>
+		<imagefile scale="65">acct2net</imagefile>
 	</image>
 
 	<procedure>
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
index dbbbe4ece5..d03a2564a0 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -323,7 +323,7 @@
 
 	<image id="chap05net">
 		<imagedescription>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</imagedescription>
-		<imagefile scale="60">chap5-net</imagefile>
+		<imagefile scale="50">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 bf21fe5b1a..4f72876dc2 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -572,7 +572,7 @@
 
 	<image id="ch6-LDAPdiag">
 		<imagedescription>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</imagedescription>
-		<imagefile scale="60">UNIX-Samba-and-LDAP</imagefile>
+		<imagefile scale="50">UNIX-Samba-and-LDAP</imagefile>
 	</image>
 
 	<para><indexterm>
@@ -956,7 +956,7 @@
 
 	<image id="chap6net">
 		<imagedescription>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</imagedescription>
-		<imagefile scale="60">chap6-net</imagefile>
+		<imagefile scale="50">chap6-net</imagefile>
 	</image>
 
       <para><indexterm>
diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
index 19e7932e61..fbcf10e02f 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -706,12 +706,12 @@
 
 	<image id="chap7net">
 		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design A</imagedescription>
-		<imagefile scale="80">chap7-net-Ar</imagefile>
+		<imagefile scale="60">chap7-net-Ar</imagefile>
 	</image>
 
 	<image id="chap7net2">
 		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design B</imagedescription>
-		<imagefile scale="80">chap7-net2-Br</imagefile>
+		<imagefile scale="60">chap7-net2-Br</imagefile>
 	</image>
 
 	</sect3>
@@ -756,7 +756,7 @@
 
 	<image id="chap7idres">
 		<imagedescription>Samba and Authentication Backend Search Pathways</imagedescription>
-		<imagefile scale="60">chap7-idresol</imagefile>
+		<imagefile scale="55">chap7-idresol</imagefile>
 	</image>
 
       <para><indexterm>
@@ -797,7 +797,7 @@ passdb backend = ldapsam:ldap://master.abmas.biz
 	<link linkend="ch7singleLDAP"/>.
 	<image id="ch7singleLDAP">
 		<imagedescription>Samba Configuration to Use a Single LDAP Server</imagedescription>
-		<imagefile scale="60">ch7-singleLDAP</imagefile>
+		<imagefile scale="55">ch7-singleLDAP</imagefile>
 	</image>
 	<indexterm>
 	  <primary>LDAP</primary>
@@ -819,7 +819,7 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \
 	as shown in <link linkend="ch7dualLDAP"/>.
 	<image id="ch7dualLDAP">
 		<imagedescription>Samba Configuration to Use a Dual (Fail-over) LDAP Server</imagedescription>
-		<imagefile scale="60">ch7-fail-overLDAP</imagefile>
+		<imagefile scale="55">ch7-fail-overLDAP</imagefile>
 	</image>
       </para>
 
@@ -844,7 +844,7 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 
 	<image id="ch7dualadd">
 		<imagedescription>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</imagedescription>
-		<imagefile scale="60">ch7-dual-additive-LDAP</imagefile>
+		<imagefile scale="55">ch7-dual-additive-LDAP</imagefile>
 	</image>
 
 	<para>
@@ -856,7 +856,7 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 
 		<image id="ch7dualok">
 			<imagedescription>Samba Configuration to Use Two LDAP Databases - The result is additive.</imagedescription>
-			<imagefile scale="60">ch7-dual-additive-LDAP-Ok</imagefile>
+			<imagefile scale="55">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 a0a2a37f32..17796da032 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -180,7 +180,7 @@
 
 		<image id="ch8-migration">
 			<imagedescription>Schematic Explaining the <command>net rpc vampire</command> Process</imagedescription>
-			<imagefile scale="80">ch8-migration</imagefile>
+			<imagefile scale="55">ch8-migration</imagefile>
 		</image>
 
 		<para>