Conform better to the specs

(This used to be commit 412934e6d006697426e7adbcc686a5ab2b62742b)

diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index 22a08e4d08ec4d3dcced246df3ea091d36d19de5..9789711c0eb25d3609c17a5ebfcb1a102f5ebd14 100644 (file)
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -165,11 +165,11 @@ at how Samba helps to bridge the differences.
                        </listitem>
                </varlistentry>
 
-               <indexterm><primary>8.3</primary><secondary>file names</secondary></indexterm>
                <varlistentry>
                        <term>Case Sensitivity</term>
                        <listitem>
                <para>
+               <indexterm><primary>8.3</primary><secondary>file names</secondary></indexterm>
                MS Windows file names are generally upper case if made up of 8.3 (ie: 8 character file name
                and 3 character extension. If longer than 8.3 file names are Case Preserving, and Case
                Insensitive.
@@ -231,13 +231,14 @@ at how Samba helps to bridge the differences.
                        </listitem>
                </varlistentry>
 
-               <indexterm><primary>Links</primary><secondary>hard</secondary></indexterm>
-               <indexterm><primary>Links</primary><secondary>soft</secondary></indexterm>
-               <indexterm><primary>Short-Cuts</primary></indexterm>
                <varlistentry>
                        <term>Links and Short-Cuts</term>
                        <listitem>
                <para>
+               <indexterm><primary>Links</primary><secondary>hard</secondary></indexterm>
+               <indexterm><primary>Links</primary><secondary>soft</secondary></indexterm>
+               <indexterm><primary>Short-Cuts</primary></indexterm>
+
                MS Windows make use of "links and Short-Cuts" that are actually special types of files that will
                redirect an attempt to execute the file to the real location of the file. UNIX knows of file and directory
                links, but they are entirely different from what MS Windows users are used to.
@@ -404,7 +405,7 @@ Before using any of the following options please refer to the man page for &smb.
        <table frame='all' pgwide='0'><title>User and Group Based Controls</title>
        <tgroup cols='2'>
                <colspec align="left"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
                <thead>
                <row>
                        <entry align="center">Control Parameter</entry>
@@ -498,7 +499,7 @@ Before using any of the following options please refer to the man page for &smb.
        <table frame='all'><title>File and Directory Permission Based Controls</title>
                <tgroup cols='2'>
                        <colspec align="left"/>
-                       <colspec align="justify" width="1*"/>
+                       <colspec align="justify"/>
                <thead>
                <row>
                        <entry align="center">Control Parameter</entry>
@@ -588,8 +589,8 @@ Before using any of the following options please refer to the man page for &smb.
 
        <table frame='all'><title>Other Controls</title>
        <tgroup cols='2'>
-               <colspec align="justify" width="1*"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
+               <colspec align="justify"/>
                <thead>
                <row>
                        <entry align="center">Control Parameter</entry>
@@ -1169,13 +1170,13 @@ are examples taken from the mailing list in recent times.
 </screen>
                        </para>
 
-                       <note><para>
+                       <note>
                                <para>This is the same as doing:</para>
 <screen>
 &prompt;<userinput>chown jack /foodbar</userinput>
 &prompt;<userinput>chgrp engr /foodbar</userinput>
 </screen>
-                       </para></note>
+                       </note>
                </step>
                <step>
                        <para>Now do: 

diff --git a/docs/docbook/projdoc/Backup.xml b/docs/docbook/projdoc/Backup.xml
index b3c37aba5342e0722ec891856dac6b36d56a7a1e..bf391c5c6d3bbfe8b3c5334798b5aced2207933d 100644 (file)
--- a/docs/docbook/projdoc/Backup.xml
+++ b/docs/docbook/projdoc/Backup.xml
@@ -11,8 +11,6 @@
 <para>
 This chapter did not make it into this release.
 It is planned for the published release of this document.
-If you have something to contribute for this section please email it to
-<link url="mail://jht@samba.org">jht@samba.org</link>/
 </para>
 
 </sect1>

diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index e4169aeda352c63ff53ca48d70bca7ac1913342f..3be540e886ad89d09c88814b5206e0551ac70cd1 100644 (file)
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -1680,7 +1680,7 @@ specific model supports):
        <title>PPD's shipped with CUPS</title>
        <tgroup cols="2" align="left">
                <colspec align="left"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
                <thead><row><entry>PPD file</entry><entry>Printer type</entry></row></thead>
                <tbody>
                        <row><entry>deskjet.ppd</entry><entry>older HP inkjet printers and compatible</entry></row>

diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
index 94f6716e5d9b846bf5cb5e77d5f23c8d3a219670..9a7f2c1628ae550398ed4b6cb977647e3132638b 100644 (file)
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
@@ -165,8 +165,8 @@ There are three ways to create machine trust accounts:
        corresponding UNIX account are created by hand.
        </para></listitem>
 
-       <indexterm><primary>Server Manager</primary></indexterm>
        <listitem><para>
+       <indexterm><primary>Server Manager</primary></indexterm>
        Using the MS Windows NT4 Server Manager (either from an NT4 Domain member
        server, or using the Nexus toolkit available from the Microsoft web site.
        This tool can be run from any MS Windows machine so long as the user is
@@ -189,11 +189,12 @@ The first step in manually creating a machine trust account is to manually
 create the corresponding UNIX account in <filename>/etc/passwd</filename>. 
 This can be done using <command>vipw</command> or another 'add user' command
 that is normally used to create new UNIX accounts.  The following is an example for a Linux based Samba server:
-</para>
-
 <indexterm><primary>useradd</primary></indexterm>
 <indexterm><primary>vipw</primary></indexterm>
 
+
+</para>
+
 <para>
 <screen>
 &rootprompt;<userinput>/usr/sbin/useradd -g 100 -d /dev/null -c <replaceable>"machine nickname"</replaceable> \
@@ -203,9 +204,9 @@ that is normally used to create new UNIX accounts.  The following is an example
 </screen>
 </para>
 
-<indexterm><primary>chpass</primary></indexterm>
 
 <para>
+<indexterm><primary>chpass</primary></indexterm>
 On *BSD systems, this can be done using the <command>chpass</command> utility:
 </para>
 

diff --git a/docs/docbook/projdoc/InterdomainTrusts.xml b/docs/docbook/projdoc/InterdomainTrusts.xml
index 1a5953f2ab721f0eb8f3a5f4fb38aa12c58f1bff..04efc6fda63d19f00f419d21e9725c8e4dba50bf 100644 (file)
--- a/docs/docbook/projdoc/InterdomainTrusts.xml
+++ b/docs/docbook/projdoc/InterdomainTrusts.xml
@@ -101,9 +101,10 @@ security domains in similar manner to MS Windows NT4 style domains.
 <para>
 There are two steps to creating an interdomain trust relationship.  To effect a two-way trust
 relationship it is necessary for each domain administrator to create a trust account for the 
-other domain to use in verifying security credentials.</para>
+other domain to use in verifying security credentials.
 
 <indexterm><primary>Interdomain Trusts</primary><secondary>creating</secondary></indexterm>
+</para>
 
 <sect2>
 <title>Creating an NT4 Domain Trust</title>
@@ -123,12 +124,12 @@ The password needs to be typed twice (for standard confirmation).
 
 </sect2>
 
-<indexterm><primary>Interdomain Trusts</primary><secondary>Completing</secondary></indexterm>
 
 <sect2>
 <title>Completing an NT4 Domain Trust</title>
 
 <para>
+<indexterm><primary>Interdomain Trusts</primary><secondary>completing</secondary></indexterm>
 A trust relationship will work only when the other (trusting) domain makes the appropriate connections
 with the trusted domain. To consummate the trust relationship the administrator will launch the
 Domain User Manager, from the menu select Policies, then select Trust Relationships, then click on the

diff --git a/docs/docbook/projdoc/NT4Migration.xml b/docs/docbook/projdoc/NT4Migration.xml
index 23924aed595eb71200b9d325ad106b0033a16d04..8494e06ec83a90f12f52a922e7de1aa04ea00897 100644 (file)
--- a/docs/docbook/projdoc/NT4Migration.xml
+++ b/docs/docbook/projdoc/NT4Migration.xml
@@ -346,9 +346,9 @@ Minimise down-stream problems by:
 
 <table frame="all"><title>Nature of the Conversion Choices</title>
 <tgroup cols="3">
-       <colspec align="justify" width="1*"/>
-       <colspec align="justify" width="1*"/>
-       <colspec align="justify" width="1*"/>
+       <colspec align="justify"/>
+       <colspec align="justify"/>
+       <colspec align="justify"/>
        <thead>
        <row><entry>Simple</entry><entry>Upgraded</entry><entry>Redesign</entry></row>
        </thead>
@@ -392,7 +392,7 @@ Minimise down-stream problems by:
 <title>Samba-3 Implementation Choices</title>
 
 <variablelist>
-       <varlistentry><term>Authentication database/back end:</term><listitem><para>-</para>
+       <varlistentry><term>Authentication database/back end:</term><listitem>
                <para>
                Samba-3 can use an external authentication backend:
                </para>
@@ -414,7 +414,7 @@ Minimise down-stream problems by:
                </listitem>
        </varlistentry>
 
-        <varlistentry><term>Access Control Points:</term><listitem><para>-</para>
+        <varlistentry><term>Access Control Points:</term><listitem>
                <itemizedlist>
                         <listitem><para>On the Share itself - using Share ACLs</para></listitem>
                         <listitem><para>On the file system - using UNIX permissions on files and directories</para>
@@ -424,7 +424,7 @@ Minimise down-stream problems by:
                 </listitem>
         </varlistentry>
 
-        <varlistentry><term>Policies (migrate or create new ones):</term><listitem><para>-</para>
+        <varlistentry><term>Policies (migrate or create new ones):</term><listitem>
                 <itemizedlist>
                         <listitem><para>Using Group Policy Editor (NT4)</para></listitem>
                         <listitem><para>- Watch out for Tattoo effect</para></listitem>
@@ -432,7 +432,7 @@ Minimise down-stream problems by:
                 </listitem>
         </varlistentry>
 
-        <varlistentry><term>User and Group Profiles:</term><listitem><para>-</para>
+        <varlistentry><term>User and Group Profiles:</term><listitem>
                 <para>
                Platform specific so use platform tool to change from a Local to a Roaming profile
                Can use new profiles tool to change SIDs (NTUser.DAT)
@@ -440,14 +440,14 @@ Minimise down-stream problems by:
                 </listitem>
         </varlistentry>
 
-        <varlistentry><term>Logon Scripts:</term><listitem><para>-</para>
+        <varlistentry><term>Logon Scripts:</term><listitem>
                 <para>
                Know how they work
                </para>
                 </listitem>
         </varlistentry>
 
-        <varlistentry><term>User and Group mapping to Unix/Linux:</term><listitem><para>-</para>
+        <varlistentry><term>User and Group mapping to Unix/Linux:</term><listitem>
                 <itemizedlist>
                         <listitem><para>username map facility may be needed</para></listitem>
                         <listitem><para>Use 'net groupmap' to connect NT4 groups to Unix groups</para></listitem>
@@ -462,7 +462,7 @@ Minimise down-stream problems by:
                 </listitem>
         </varlistentry>
 
-        <varlistentry><term>OS specific scripts/programs may be needed:</term><listitem><para>-</para>
+        <varlistentry><term>OS specific scripts/programs may be needed:</term><listitem>
                 <itemizedlist>
                         <listitem><para>Add/Delete Users: Note OS limits on size of name
                                (Linux 8 chars) NT4 up to 254 chars</para></listitem>
@@ -475,7 +475,7 @@ Minimise down-stream problems by:
                 </listitem>
         </varlistentry>
 
-        <varlistentry><term>Migration Tools:</term><listitem><para>-</para>
+        <varlistentry><term>Migration Tools:</term><listitem>
                 <para>
                Domain Control (NT4 Style) Profiles, Policies, Access Controls, Security
                <itemizedlist>

diff --git a/docs/docbook/projdoc/NetworkBrowsing.xml b/docs/docbook/projdoc/NetworkBrowsing.xml
index 3f5e7b0ec4b06707d28bb8fc99b3081de127194f..b5d226efed4f1aaabcdcb30849622136cfa5836f 100644 (file)
--- a/docs/docbook/projdoc/NetworkBrowsing.xml
+++ b/docs/docbook/projdoc/NetworkBrowsing.xml
@@ -761,9 +761,11 @@ where:
 <variablelist>
 <varlistentry><term><replaceable>a.b.c.d</replaceable> and 
 <replaceable>e.f.g.h</replaceable></term>
-<indexterm><primary>LMB</primary><see>Local Master Browser</see></indexterm>
+<listitem><para>
+               <indexterm><primary>LMB</primary><see>Local Master Browser</see></indexterm>
 <indexterm><primary>Local Master Browser</primary></indexterm>
-<listitem><para>is either the LMB (Local Master Browser) IP address
+
+               is either the LMB (Local Master Browser) IP address
 or the broadcast address of the remote network.
 ie: the LMB is at 192.168.1.10, or the address
 could be given as 192.168.1.255 where the netmask
@@ -1392,7 +1394,7 @@ are done the browse lists look like :
        <tgroup cols="3">
                <colspec align="left"/>
                <colspec align="left"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
        <thead>
                <row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
        </thead>
@@ -1431,7 +1433,7 @@ the browse lists look like.
        <tgroup cols="3" align="left">
                <colspec align="left"/>
                <colspec align="left"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
 
        <thead>
                <row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>
@@ -1470,7 +1472,7 @@ are removed or shut off) the browse lists will look like :
        <tgroup cols="3" align="left">
                <colspec align="left"/>
                <colspec align="left"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
 
        <thead>
                <row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row>

diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
index bb8beb7d26a521e19400e9e5506d0eca1f4983c1..3a2a6da61e54497d4d172c4fa13518d3c0e54ef3 100644 (file)
--- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
+++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
@@ -685,7 +685,7 @@ Options recognized by this module are as follows:
        <title>Options recognized by pam_smbpass</title>
        <tgroup cols="2" align="left">
                <colspec align="left"/>
-               <colspec align="justify" width="1*"/>
+               <colspec align="justify"/>
        <tbody>
                <row><entry>debug</entry><entry>log more debugging info</entry></row>
                <row><entry>audit</entry><entry>like debug, but also logs unknown usernames</entry></row>

diff --git a/docs/docbook/projdoc/ProfileMgmt.xml b/docs/docbook/projdoc/ProfileMgmt.xml
index 013566b1249799ddcee752b99fd40d95b1bb061b..ff0c90067efdc1cdb9c9994fa97a3fc02506eb10 100644 (file)
--- a/docs/docbook/projdoc/ProfileMgmt.xml
+++ b/docs/docbook/projdoc/ProfileMgmt.xml
@@ -1202,14 +1202,14 @@ The choices are:
 
 <variablelist>
        <varlistentry>
-               <term>Local profiles:</term> <para>-</para>
+               <term>Local profiles:</term> 
                <listitem><para>
                I know of no registry keys that will allow auto-deletion of LOCAL profiles on log out
                </para></listitem>
        </varlistentry>
        
        <varlistentry>
-               <term>Roaming profiles:</term> <para>-</para>
+               <term>Roaming profiles:</term> 
                <listitem><para>
                As a user logs onto the network a centrally stored profile is copied to the workstation
                to form a local profile. This local profile will persist (remain on the workstation disk)
@@ -1225,7 +1225,7 @@ The <emphasis>Roaming Profile</emphasis> choices are:
 
 <variablelist>
        <varlistentry>
-               <term>Personal Roaming profiles</term> <para>-</para>
+               <term>Personal Roaming profiles</term> 
                <listitem><para>
                These are typically stored in a profile share on a central (or conveniently located
                local) server.
@@ -1238,12 +1238,12 @@ The <emphasis>Roaming Profile</emphasis> choices are:
        </varlistentry>
 
        <varlistentry>
-               <term>Group profiles</term> <para>-</para>
+               <term>Group profiles</term> 
                <listitem><para>These are loaded from a central profile server</para></listitem>
        </varlistentry>
 
        <varlistentry>
-               <term>Mandatory profiles</term> <para>-</para>
+               <term>Mandatory profiles</term> 
                <listitem><para>
                Mandatory profiles can be created for a user as well as for any group that a user
                is a member of. Mandatory profiles can NOT be changed by ordinary users. Only the administrator

diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
index 62aec85f16495ff631f5a6999ec1e8329985b997..ae440a4ee6d866fbe1f7f98794c1377259958be4 100644 (file)
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
@@ -28,7 +28,7 @@ that in some magical way is expected to solve all ills.
 
 <figure id="domain-example"><title>An Example Domain</title>
 <mediaobject>
-<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/domain" width="4in" height="3in" scalefit="1"/></imageobject>
+<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/domain" scalefit="1"/></imageobject>
 <imageobject><imagedata fileref="projdoc/imagefiles/domain.png" scale="50" scalefit="1"/></imageobject>
 </mediaobject>
 </figure>
@@ -445,7 +445,7 @@ The basic options shown above are explained as follows:
 </para>
 
 <variablelist>
-       <varlistentry><term>passdb backend</term><para>:</para>
+       <varlistentry><term>passdb backend</term>
                <listitem><para>
                This contains all the user and group account information. Acceptable values for a PDC
                are: <emphasis>smbpasswd, tdbsam, ldapsam</emphasis>. The 'guest' entry provides needed
@@ -457,7 +457,7 @@ The basic options shown above are explained as follows:
                can not effectively be distributed and therefore should not be used.
                </para></listitem>
        </varlistentry>
-       <varlistentry><term>Domain Control Parameters</term><para>:</para>
+       <varlistentry><term>Domain Control Parameters</term>
                <listitem><para>
                The parameters <emphasis>os level, preferred master, domain master, security, 
                encrypt passwords, domain logons</emphasis> play a central role in assuring domain
@@ -471,7 +471,7 @@ The basic options shown above are explained as follows:
                to do this, refer to <link linkend="passdb"></link>.
                </para></listitem>
        </varlistentry>
-       <varlistentry><term>Environment Parameters</term><para>:</para>
+       <varlistentry><term>Environment Parameters</term>
                <listitem><para>
                The parameters <emphasis>logon path, logon home, logon drive, logon script</emphasis> are
                environment support settings that help to facilitate client logon operations and that help
@@ -479,7 +479,7 @@ The basic options shown above are explained as follows:
                to the man page information for these parameters.
                </para></listitem>
        </varlistentry>
-       <varlistentry><term>NETLOGON Share</term><para>:</para>
+       <varlistentry><term>NETLOGON Share</term>
                <listitem><para>
                The NETLOGON share plays a central role in domain logon and domain membership support.
                This share is provided on all Microsoft domain controllers. It is used to provide logon
@@ -487,7 +487,7 @@ The basic options shown above are explained as follows:
                tools that may be needed for logon processing. This is an essential share on a domain controller.
                </para></listitem>
        </varlistentry>
-       <varlistentry><term>PROFILE Share</term><para>:</para>
+       <varlistentry><term>PROFILE Share</term>
                <listitem><para>
                This share is used to store user desktop profiles. Eash user must have a directory at the root
                of this share. This directory must be write enabled for the user and must be globally read enabled.

diff --git a/docs/docbook/projdoc/locking.xml b/docs/docbook/projdoc/locking.xml
index 9a1ff9e8c893bcea580321556be08e0fb79d9ac6..17dc518226ce5dbf4077a3dec9e7212993ff8da2 100644 (file)
--- a/docs/docbook/projdoc/locking.xml
+++ b/docs/docbook/projdoc/locking.xml
@@ -985,11 +985,12 @@ so far:
        <para>
        <quote>
        We are seeing lots of errors in the samba logs like:
+</quote>
 <programlisting>
 tdb(/usr/local/samba_2.2.7/var/locks/locking.tdb): rec_read bad magic
  0x4d6f4b61 at offset=36116
 </programlisting>
-
+<quote>
        What do these mean?
        </quote>
        </para>

diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml
index 4bc2634528f8029ddb373f7db64129f0b413abb7..5edfba734359cb6414ae154150ed6ac95c61a398 100644 (file)
--- a/docs/docbook/projdoc/passdb.xml
+++ b/docs/docbook/projdoc/passdb.xml
@@ -99,12 +99,14 @@ as follows:
 
 </sect2>
 
+<sect2>
+       <title>New Backends</title>
+
 <para>
 Samba-3 introduces the following new password backend capabilities:
 </para>
 
-<sect2>
-       <title>New Backends</title>
+
 
 <variablelist>
        <varlistentry><term>tdbsam:</term>
@@ -1140,7 +1142,7 @@ access to attrs=lmPassword,ntPassword
                                <title>Attributes in the sambaSamAccount objectclass (LDAP)</title>
                        <tgroup cols="2" align="justify">
                                        <colspec align="left"/>
-                                       <colspec align="justify" width="1*"/>
+                                       <colspec align="justify"/>
                        <tbody>
                                <row><entry><constant>sambaLMPassword</constant></entry><entry>the LANMAN password 16-byte hash stored as a character
 representation of a hexadecimal string.</entry></row>
@@ -1377,7 +1379,7 @@ Refer to the <command>logon home</command> parameter in the &smb.conf; man page
                                <title>Basic smb.conf options for MySQL passdb backend</title>
                                <tgroup cols="2">
                                        <colspec align="left"/>
-                                       <colspec align="justify" width="1*"/>
+                                       <colspec align="justify"/>
                                <thead>
                                        <row><entry>Field</entry><entry>Contents</entry></row>
                                </thead>
@@ -1410,7 +1412,7 @@ Refer to the <command>logon home</command> parameter in the &smb.conf; man page
                                <tgroup cols="3" align="justify">
                                        <colspec align="left"/>
                                        <colspec align="left"/>
-                                       <colspec align="justify" width="1*"/>
+                                       <colspec align="justify"/>
                        <thead>         
                                <row><entry>Field</entry><entry>Type</entry><entry>Contents</entry></row>
                        </thead>
@@ -1559,10 +1561,10 @@ Refer to the <command>logon home</command> parameter in the &smb.conf; man page
 
        <para>
                <smbconfblock>
-       [globals]
-               ...
+                       <smbconfsection>[globals]</smbconfsection>
+                       <member>...</member>
 <smbconfoption><name>passdb backend</name><value>tdbsam, smbpasswd</value></smbconfoption>
-               ...
+                       <member>...</member>
        </smbconfblock>
        </para>
 

diff --git a/docs/docbook/projdoc/printer_driver2.xml b/docs/docbook/projdoc/printer_driver2.xml
index 656b35c60826a4b8781e531cfafcc4e8b6eb4dd6..4c2b77cf5bc6717f961dffe5b0ad6a7d87341e46 100644 (file)
--- a/docs/docbook/projdoc/printer_driver2.xml
+++ b/docs/docbook/projdoc/printer_driver2.xml
@@ -157,9 +157,6 @@ related to printing are used in Samba. See also the
 &smb.conf; man page for detailed explanations:
 </para>
 
-<formalpara>
-       <title>List of printing related parameters in Samba 3</title>
-
 <para>Global level parameters: <smbconfoption><name>addprinter command</name></smbconfoption>, 
 <smbconfoption><name>deleteprinter command</name></smbconfoption>,
 <smbconfoption><name>disable spoolss</name></smbconfoption>,
@@ -190,7 +187,6 @@ related to printing are used in Samba. See also the
 <smbconfoption><name>queueresume command</name></smbconfoption>,
 <smbconfoption><name>total print jobs</name></smbconfoption>.
 </para>
-</formalpara>
 
 <para>
 Samba's printing support implements the Microsoft Remote Procedure

diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index 2b6e4613350334e789e136ae046f43cd6f643cf8..95411f429a5a51f63d72d415f7bfe958c42d88ac 100644 (file)
--- a/docs/docbook/projdoc/upgrading-to-3.0.xml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.xml
@@ -277,7 +277,7 @@ complete descriptions of new or modified parameters.
         <table frame='all'><title>TDB File Descriptions</title>
         <tgroup cols='3'>
                        <colspec align="left"/>
-                       <colspec align="justify" width="1*"/>
+                       <colspec align="justify"/>
                        <colspec align="left"/>
                 <thead>
                 <row>

diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml
index d800eae721d1d94f4f220fea3ffe36bd44e97133..2340e9355186646fc051615991451264234e4db6 100644 (file)
--- a/docs/docbook/projdoc/winbind.xml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -589,7 +589,7 @@ include the following entries in the [global] section:
 <para><smbconfexample>
                <title>smb.conf for winbind set-up</title>
 <smbconfsection>[global]</smbconfsection>
-     &lt;...&gt;
+<member>...</member>
 <smbconfcomment> separate domain and username with '+', like DOMAIN+username</smbconfcomment>
 <smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
 <smbconfcomment> use uids from 10000 to 20000 for domain users</smbconfcomment>

diff --git a/docs/docbook/xslt/expand-sambadoc.xsl b/docs/docbook/xslt/expand-sambadoc.xsl
index 6c09e4a5a5e91f935142edf9b64446b64a92bf85..34496a91fcb4633747bc2df2a6988083cc732f69 100644 (file)
--- a/docs/docbook/xslt/expand-sambadoc.xsl
+++ b/docs/docbook/xslt/expand-sambadoc.xsl
@@ -87,14 +87,14 @@
        </xsl:element>
 </xsl:template>
 
-<xsl:template match="smbconfexample/smbconfcomment">
+<xsl:template match="smbconfexample/smbconfcomment|smbconfblock/smbconfcomment">
        <xsl:element name="member">
                <xsl:text># </xsl:text>
                <xsl:apply-templates/>
        </xsl:element>
 </xsl:template>
 
-<xsl:template match="smbconfexample/smbconfsection">
+<xsl:template match="smbconfexample/smbconfsection|smbconfblock/smbconfsection">
        <xsl:element name="member">
                <xsl:text> </xsl:text>
        </xsl:element>