Fixes letterpages + smbconfexample

(This used to be commit 8cae3c6cfc8b9d895545f47b14ef388be54440a6)

8 files changed, 21 insertions, 40 deletions

diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
index feab045ddd..0f4db0795d 100644
--- a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
@@ -1070,14 +1070,10 @@ index default               sub
 <smbconfoption name="delete user script">/opt/IDEALX/sbin/smbldap-userdel '%u'</smbconfoption>
 <smbconfoption name="add group script">/opt/IDEALX/sbin/smbldap-groupadd -p '%g'</smbconfoption>
 <smbconfoption name="delete group script">/opt/IDEALX/sbin/smbldap-groupdel '%g'</smbconfoption>
-<smbconfoption name="add user to group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-groupmod -m '%g' '%u'</parameter></member>
-<smbconfoption name="delete user from group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-groupmod -x '%g' '%u'</parameter></member>
-<smbconfoption name="set primary group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-usermod -g '%g' '%u'</parameter></member>
-<smbconfoption name="add machine script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-useradd -w '%u'</parameter></member>
+<smbconfoption name="add user to group script">/opt/IDEALX/sbin/smbldap-groupmod -m '%g' '%u'</smbconfoption>
+<smbconfoption name="delete user from group script">/opt/IDEALX/sbin/smbldap-groupmod -x '%g' '%u'</smbconfoption>
+<smbconfoption name="set primary group script">/opt/IDEALX/sbin/smbldap-usermod -g '%g' '%u'</smbconfoption>
+<smbconfoption name="add machine script">/opt/IDEALX/sbin/smbldap-useradd -w '%u'</smbconfoption>
 <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption>
 <smbconfoption name="abort shutdown script">/sbin/shutdown -c</smbconfoption>
 <smbconfoption name="logon script">scripts\logon.bat</smbconfoption>
diff --git a/docs/Samba3-ByExample/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
index 26c89bbcaf..fda931fa0e 100644
--- a/docs/Samba3-ByExample/SBE-500UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
@@ -963,8 +963,7 @@ hosts:      files dns wins
 <smbconfoption name="add group script">/usr/sbin/groupadd '%g'</smbconfoption>
 <smbconfoption name="delete group script">/usr/sbin/groupdel '%g'</smbconfoption>
 <smbconfoption name="add user to group script">/usr/sbin/usermod -G '%g' '%u'</smbconfoption>
-<smbconfoption name="add machine script">/usr/sbin/</smbconfoption>
-<member><parameter>useradd -s /bin/false -d /var/lib/nobody '%u'</parameter></member>
+<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</smbconfoption>
 <smbconfoption name="preferred master">Yes</smbconfoption>
 <smbconfoption name="wins support">Yes</smbconfoption>
 <smbconfoption name="include">/etc/samba/dc-common.conf</smbconfoption>
diff --git a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
index a20a8f1633..d40414eda4 100644
--- a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
+++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
@@ -1878,12 +1878,9 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765
 	<smbconfoption name="delete user script">/opt/IDEALX/sbin/smbldap-userdel "%u"</smbconfoption>
 	<smbconfoption name="add group script">/opt/IDEALX/sbin/smbldap-groupadd -p "%g"</smbconfoption>
 	<smbconfoption name="delete group script">/opt/IDEALX/sbin/smbldap-groupdel "%g"</smbconfoption>
-	<smbconfoption name="add user to group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-groupmod -m "%u" "%g"</parameter></member>
-	<smbconfoption name="delete user from group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-groupmod -x "%u" "%g"</parameter></member>
-	<smbconfoption name="set primary group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-usermod -g "%g" "%u"</parameter></member>
+	<smbconfoption name="add user to group script">/opt/IDEALX/sbin/smbldap-groupmod -m "%u" "%g"</smbconfoption>
+	<smbconfoption name="delete user from group script">/opt/IDEALX/sbin/smbldap-groupmod -x "%u" "%g"</smbconfoption>
+	<smbconfoption name="set primary group script">/opt/IDEALX/sbin/smbldap-usermod -g "%g" "%u"</smbconfoption>
 	<smbconfoption name="add machine script">/opt/IDEALX/sbin/smbldap-useradd -w "%u"</smbconfoption>
 </smbconfblock>
 </example>
diff --git a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
index 57328217b2..bcc1181f34 100644
--- a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
+++ b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml
@@ -416,14 +416,10 @@
         <smbconfoption name="#delete user script">/opt/IDEALX/sbin/smbldap-userdel '%u'</smbconfoption>
         <smbconfoption name="add group script">/opt/IDEALX/sbin/smbldap-groupadd '%g'</smbconfoption>
         <smbconfoption name="#delete group script">/opt/IDEALX/sbin/smbldap-groupdel '%g'</smbconfoption>
-        <smbconfoption name="add user to group script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-groupmod -m '%u' '%g'</parameter></member>
-        <smbconfoption name="#delete user from group script">/opt/IDEALX/</smbconfoption>
-<member><parameter>sbin/smbldap-groupmod -x '%u' '%g'</parameter></member>
-        <smbconfoption name="set primary group script">/opt/IDEALX/</smbconfoption>
-<member><parameter>sbin/smbldap-usermod -g '%g' '%u'</parameter></member>
-        <smbconfoption name="add machine script">/opt/IDEALX/sbin/</smbconfoption>
-<member><parameter>smbldap-useradd -w '%u'</parameter></member>
+		<smbconfoption name="add user to group script">/opt/IDEALX/sbin/ smbldap-groupmod -m '%u' '%g'</smbconfoption>
+		<smbconfoption name="#delete user from group script">/opt/IDEALX/sbin/smbldap-groupmod -x '%u' '%g'</smbconfoption>
+		<smbconfoption name="set primary group script">/opt/IDEALX/sbin/smbldap-usermod -g '%g' '%u'</smbconfoption>
+		<smbconfoption name="add machine script">/opt/IDEALX/sbin/smbldap-useradd -w '%u'</smbconfoption>
         <smbconfoption name="logon script">scripts\logon.cmd</smbconfoption>
         <smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>
         <smbconfoption name="logon home">\\%L\%U</smbconfoption>
diff --git a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
index f823cc67bb..9a896e256b 100644
--- a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
+++ b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml
@@ -689,12 +689,9 @@ session: none
 <smbconfoption name="cups options">Raw</smbconfoption>
 <smbconfoption name="add user script">/opt/IDEALX/sbin/smbldap-useradd -m "%u"</smbconfoption>
 <smbconfoption name="add group script">/opt/IDEALX/sbin/smbldap-groupadd -p "%g"</smbconfoption>
-<smbconfoption name="add user to group script"></smbconfoption>
-<member><parameter>/opt/IDEALX/sbin/smbldap-groupmod -m "%u" "%g"</parameter></member>
-<smbconfoption name="delete user from group script"></smbconfoption>
-<member><parameter>/opt/IDEALX/sbin/smbldap-groupmod -x "%u" "%g"</parameter></member>
-<smbconfoption name="set primary group script"></smbconfoption>
-<member><parameter>/opt/IDEALX/sbin/smbldap-usermod -g "%g" "%u"</parameter></member>
+<smbconfoption name="add user to group script">/opt/IDEALX/sbin/smbldap-groupmod -m "%u" "%g"</smbconfoption>
+<smbconfoption name="delete user from group script">/opt/IDEALX/sbin/smbldap-groupmod -x "%u" "%g"</smbconfoption>
+<smbconfoption name="set primary group script">/opt/IDEALX/sbin/smbldap-usermod -g "%g" "%u"</smbconfoption>
 <smbconfoption name="add machine script">/usr/local/sbin/smbldap-useradd -w "%m"</smbconfoption>
 <smbconfoption name="logon script">logon.bat</smbconfoption>
 <smbconfoption name="logon path">\\%L\profiles\%U\%a</smbconfoption>
@@ -790,8 +787,7 @@ session: none
 <smbconfsection name="[acct_hp8500]"/>
 <smbconfoption name="comment">"Accounting Color Laser Printer"</smbconfoption>
 <smbconfoption name="path">/data/samba/spool/private</smbconfoption>
-<smbconfoption name="valid users">@acct, @acct_admin, @hr, "@Domain Admins",\</smbconfoption>
-<member><parameter>@Receptionist, dwayne, terri, danae, jerry</parameter></member>
+<smbconfoption name="valid users">@acct, @acct_admin, @hr, "@Domain Admins",@Receptionist, dwayne, terri, danae, jerry</smbconfoption>
 <smbconfoption name="create mask">0644</smbconfoption>
 <smbconfoption name="printable">Yes</smbconfoption>
 <smbconfoption name="copy">printers</smbconfoption>
diff --git a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
index 00d7670336..1a43987222 100644
--- a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
@@ -816,8 +816,7 @@ echo -e "\nNAT firewall done.\n"
 <smbconfoption name="passdb backend">tdbsam</smbconfoption>
 <smbconfoption name="pam password change">Yes</smbconfoption>
 <smbconfoption name="passwd program">/usr/bin/passwd %u</smbconfoption>
-<smbconfoption name="passwd chat"> </smbconfoption>
-<member><parameter>*New*Password* %n\n *Re-enter*new*password*%n\n *Password*changed*</parameter></member>
+<smbconfoption name="passwd chat">*New*Password* %n\n *Re-enter*new*password*%n\n *Password*changed*</smbconfoption>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="unix password sync">Yes</smbconfoption>
 <smbconfoption name="log level">1</smbconfoption>
diff --git a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
index 037881c33f..a599f6fe30 100644
--- a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
+++ b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
@@ -636,8 +636,7 @@ hosts:	files wins
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">BILLMORE</smbconfoption>
-<smbconfoption name="passwd chat"> </smbconfoption>
-<member><parameter>*New*Password* %n\n*Re-enter*new*password* %n\n *Password*changed*</parameter></member>
+<smbconfoption name="passwd chat">*New*Password* %n\n*Re-enter*new*password* %n\n *Password*changed*</smbconfoption>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="syslog">0</smbconfoption>
 <smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
@@ -648,8 +647,7 @@ hosts:	files wins
 <smbconfoption name="add group script">/usr/sbin/groupadd '%g'</smbconfoption>
 <smbconfoption name="delete group script">/usr/sbin/groupdel '%g'</smbconfoption>
 <smbconfoption name="add user to group script">/usr/sbin/usermod -G '%g' '%u'</smbconfoption>
-<smbconfoption name="add machine script"> </smbconfoption>
-<member><parameter>/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</parameter></member>
+<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</smbconfoption>
 <smbconfoption name="logon script">scripts\login.bat</smbconfoption>
 <smbconfoption name="logon path"> </smbconfoption>
 <smbconfoption name="logon drive">X:</smbconfoption>
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index 5e10e62961..4b514b1387 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -59,13 +59,13 @@
 <xsl:text>{\bfseries </xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text>
 </xsl:template>
 <xsl:param name="latex.documentclass">sambadoc</xsl:param>
-<xsl:param name="latex.documentclass.book">openright,twoside</xsl:param>
+<xsl:param name="latex.documentclass.book">letterpaper,openright,twoside</xsl:param>
 <xsl:param name="latex.babel.language">english</xsl:param>
 <xsl:variable name="ulink.footnotes" select="1"/>
 <xsl:variable name="ulink.show" select="0"/>
 
 <xsl:template match="smbconfblock/smbconfoption">
-	<xsl:value-of select="@name"/>
+	<xsl:text>	</xsl:text><xsl:value-of select="@name"/>
 	<xsl:if test="text() != ''">
 		<xsl:text> = </xsl:text>
 		<xsl:value-of select="text()"/>